Commit Graph

79396 Commits

Author SHA1 Message Date
Frédéric FRANCE
61d432865b
wip 2019-09-07 14:33:36 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
Laurent Destailleur
5d6ccfdf00 Fix phpcs 2019-09-07 13:12:39 +02:00
Laurent Destailleur
f483c673aa
Merge pull request #9912 from atm-greg/Edit_priceHT_for_predefined_products
NEW add ability to edit price ht before adding a line
2019-09-07 11:30:13 +02:00
Laurent Destailleur
881b69d117
Merge branch 'develop' into Edit_priceHT_for_predefined_products 2019-09-07 11:29:49 +02:00
Laurent Destailleur
a5d04e8fd5
Update product.php 2019-09-07 11:26:21 +02:00
Laurent Destailleur
c7a90ad528
Update product.php 2019-09-07 11:25:58 +02:00
Laurent Destailleur
eb7f964268
Update objectline_create.tpl.php 2019-09-07 11:25:11 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus
Differentiate supplier orders status
2019-09-07 10:54:03 +02:00
Laurent Destailleur
7386ba61d7
Merge pull request #11673 from ptibogxiv/patch-221
NEW display supplier in objectline if defined
2019-09-07 10:50:32 +02:00
Laurent Destailleur
df90016ad7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-07 10:43:47 +02:00
Laurent Destailleur
397e656161 Update doc 2019-09-07 10:43:35 +02:00
Laurent Destailleur
131c3d8f7a
Merge pull request #9612 from atm-greg/Hook_on_commonGenerateDocument
NEW add hook on commongeneratedocument
2019-09-07 10:27:06 +02:00
Laurent Destailleur
7fe2483a82
Merge branch 'develop' into Hook_on_commonGenerateDocument 2019-09-07 10:26:23 +02:00
Laurent Destailleur
c9a62b09c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-07 09:50:08 +02:00
Laurent Destailleur
bdbae9b3bc Fix phpcs 2019-09-06 23:51:33 +02:00
Laurent Destailleur
4e5b4964dc
Merge pull request #11827 from aspangaro/10.0_boxes_nowrap
FIX Nowrap missing on amount in boxes
2019-09-06 23:37:23 +02:00
Laurent Destailleur
72dcb98c5c
Merge pull request #11819 from aspangaro/10.0_theme
FIX Missing ticket icon on md theme
2019-09-06 23:35:20 +02:00
Laurent Destailleur
dd39f5a285
Merge pull request #11823 from hregis/develop_pdf
FIX change "rowid" type in llx_accounting_account (bigint instead int)
2019-09-06 23:34:39 +02:00
Laurent Destailleur
ca71f02d41
Merge branch 'develop' into develop_pdf 2019-09-06 23:30:12 +02:00
Laurent Destailleur
b4aa030dd3
Merge pull request #11824 from ptibogxiv/patch-253
FIX: dol_thirdparty_id for stripe PI
2019-09-06 23:29:34 +02:00
Laurent Destailleur
a168c989f8
Update stripe.class.php 2019-09-06 23:29:27 +02:00
Laurent Destailleur
b2fe04e2f7
Merge pull request #11832 from hregis/10.0_mc
FIX avoid Warning: A non-numeric value encountered
2019-09-06 23:25:56 +02:00
Laurent Destailleur
f12a012932
Update card.php 2019-09-06 23:25:40 +02:00
Laurent Destailleur
f338a5f9ad Debug module datapolicy 2019-09-06 19:56:00 +02:00
Laurent Destailleur
89e1cdff61 Debug module datapolicy 2019-09-06 19:41:15 +02:00
Laurent Destailleur
231725e351 Fix scrutinizer 2019-09-06 19:12:43 +02:00
Laurent Destailleur
018a43e1d3 Fix 2019-09-06 18:57:34 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
74203a6896 Fix phpcs 2019-09-06 16:01:54 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
57a15b88fa Fix UMR 2019-09-06 14:07:42 +02:00
Laurent Destailleur
bc7bf3b4b5 FIX bad consistency in list of invoice for direct debit order. 2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea Fix wrong warning 2019-09-06 13:02:52 +02:00
Laurent Destailleur
104858cf47 Fix date selection on supplier proposal line not yet supported 2019-09-06 12:51:10 +02:00
Laurent Destailleur
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
e1ee70fd8f Start to implement date selection of supplier proposals 2019-09-06 12:45:27 +02:00
Laurent Destailleur
123eace8c0 Fix look and feel v10 2019-09-06 12:44:23 +02:00
Laurent Destailleur
0ed7ab07fd Fix date selection for supplier proposal not yet supported 2019-09-06 12:41:34 +02:00
Regis Houssin
369961b376 FIX avoid Warning: A non-numeric value encountered 2019-09-06 11:55:41 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
florian HENRY
d50114df64 mostlyDone 2019-09-06 09:20:18 +02:00
Laurent Destailleur
ec1751bae9 Doxygen 2019-09-06 02:47:20 +02:00