[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f64092: FIX order or proposals billed
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f64092: FIX order or proposals billed if both workflow con... |
|
Date: |
Fri, 09 Aug 2019 16:59:27 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: f64092a1e84896b91d54c56cd7d9b49936bca74f
https://github.com/Dolibarr/dolibarr/commit/f64092a1e84896b91d54c56cd7d9b49936bca74f
Author: atm-arnaud <address@hidden>
Date: 2019-08-01 (Thu, 01 Aug 2019)
Changed paths:
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
Log Message:
-----------
FIX order or proposals billed if both workflow conf activated
Commit: cd0d5c41f5d02952ba556f9487d03f3281024636
https://github.com/Dolibarr/dolibarr/commit/cd0d5c41f5d02952ba556f9487d03f3281024636
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-01 (Thu, 01 Aug 2019)
Changed paths:
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
Log Message:
-----------
Update interface_20_modWorkflow_WorkflowManager.class.php
Commit: e4f2728494ad7927c51a6b663489a1ffdbe990cc
https://github.com/Dolibarr/dolibarr/commit/e4f2728494ad7927c51a6b663489a1ffdbe990cc
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-01 (Thu, 01 Aug 2019)
Changed paths:
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
Log Message:
-----------
Merge pull request #11608 from
atm-arnaud/8.0_FIX_workflow_propal_and_order_billed
FIX order or proposals billed if both workflow conf activated
Commit: 7a2e08a6812bec0ecfde8355ea999558f8dbf92e
https://github.com/Dolibarr/dolibarr/commit/7a2e08a6812bec0ecfde8355ea999558f8dbf92e
Author: ptibogxiv <address@hidden>
Date: 2019-08-02 (Fri, 02 Aug 2019)
Changed paths:
M htdocs/ticket/class/api_tickets.class.php
Log Message:
-----------
Fix author in message / ticket API
Commit: 74e3a423fdea0c85d1e1e6ee9bc8bceff710df67
https://github.com/Dolibarr/dolibarr/commit/74e3a423fdea0c85d1e1e6ee9bc8bceff710df67
Author: ptibogxiv <address@hidden>
Date: 2019-08-02 (Fri, 02 Aug 2019)
Changed paths:
M htdocs/api/class/api_documents.class.php
Log Message:
-----------
Fix document list for products in API
Commit: 3a0c1954d6358c5e1909871ba146b68559d01c51
https://github.com/Dolibarr/dolibarr/commit/3a0c1954d6358c5e1909871ba146b68559d01c51
Author: ptibogxiv <address@hidden>
Date: 2019-08-02 (Fri, 02 Aug 2019)
Changed paths:
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Fix application_fee_amount
need fix in v10 too
Commit: 2d34a0c4c164d3caa5c9f5c3a5355d064a051f8b
https://github.com/Dolibarr/dolibarr/commit/2d34a0c4c164d3caa5c9f5c3a5355d064a051f8b
Author: ptibogxiv <address@hidden>
Date: 2019-08-02 (Fri, 02 Aug 2019)
Changed paths:
M htdocs/stripe/admin/stripe.php
Log Message:
-----------
Fix table in admin stripe.php
Commit: 13eef54392e8a5f415c4c2eef0bdb8e3b0350ca4
https://github.com/Dolibarr/dolibarr/commit/13eef54392e8a5f415c4c2eef0bdb8e3b0350ca4
Author: ptibogxiv <address@hidden>
Date: 2019-08-03 (Sat, 03 Aug 2019)
Changed paths:
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Fix round for application fee in stripe
Commit: d30ce126e0838cb7f174cb88dd2be842f83e08f3
https://github.com/Dolibarr/dolibarr/commit/d30ce126e0838cb7f174cb88dd2be842f83e08f3
Author: ptibogxiv <address@hidden>
Date: 2019-08-03 (Sat, 03 Aug 2019)
Changed paths:
M htdocs/stripe/config.php
Log Message:
-----------
Fix update stripe api for more compliance to API
Commit: 07cc21a113187c85887bdfe9844be9d370697067
https://github.com/Dolibarr/dolibarr/commit/07cc21a113187c85887bdfe9844be9d370697067
Author: ptibogxiv <address@hidden>
Date: 2019-08-03 (Sat, 03 Aug 2019)
Changed paths:
M htdocs/stripe/charge.php
Log Message:
-----------
Fix display payment intent in stripe's charge list
Commit: 5339bb71ac2df1cfae61ab90acdce8c340179209
https://github.com/Dolibarr/dolibarr/commit/5339bb71ac2df1cfae61ab90acdce8c340179209
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-03 (Sat, 03 Aug 2019)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/fr_FR/bills.lang
Log Message:
-----------
FIX Fatal situation if payment removed on expense report. Action
set_unpaid was not available.
Commit: 4ed1ff5b9bc9231ef2945494974da3ee3f8367df
https://github.com/Dolibarr/dolibarr/commit/4ed1ff5b9bc9231ef2945494974da3ee3f8367df
Author: ptibogxiv <address@hidden>
Date: 2019-08-03 (Sat, 03 Aug 2019)
Changed paths:
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Fix display only stripe sources for customer
Commit: 4633af3f5d84f175dd528d8c452138631172971d
https://github.com/Dolibarr/dolibarr/commit/4633af3f5d84f175dd528d8c452138631172971d
Author: ptibogxiv <address@hidden>
Date: 2019-08-03 (Sat, 03 Aug 2019)
Changed paths:
M htdocs/stripe/charge.php
Log Message:
-----------
Update charge.php
Commit: 0ede65448232e0cc652745344fa6fb2c53c0c0c7
https://github.com/Dolibarr/dolibarr/commit/0ede65448232e0cc652745344fa6fb2c53c0c0c7
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-04 (Sun, 04 Aug 2019)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 10.0.1
Commit: baa2e870d0e9b8f112e8298115cf6fdc7b9b631e
https://github.com/Dolibarr/dolibarr/commit/baa2e870d0e9b8f112e8298115cf6fdc7b9b631e
Author: Frédéric FRANCE <address@hidden>
Date: 2019-08-05 (Mon, 05 Aug 2019)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Update admin.lang
found in admin/company.php
Commit: 41c07b9b4364dc5c6a261dcbd65cb00a68ee1d45
https://github.com/Dolibarr/dolibarr/commit/41c07b9b4364dc5c6a261dcbd65cb00a68ee1d45
Author: atm-greg <address@hidden>
Date: 2019-08-05 (Mon, 05 Aug 2019)
Changed paths:
M htdocs/livraison/card.php
Log Message:
-----------
fix bad test in delivery card
Commit: 1d4fc32c20f0beb8d5eb21965ae413e9fc616674
https://github.com/Dolibarr/dolibarr/commit/1d4fc32c20f0beb8d5eb21965ae413e9fc616674
Author: atm-greg <address@hidden>
Date: 2019-08-05 (Mon, 05 Aug 2019)
Changed paths:
M htdocs/livraison/card.php
Log Message:
-----------
fix second bad test
Commit: fde526f59df4343c991b40800b8406ed656e7028
https://github.com/Dolibarr/dolibarr/commit/fde526f59df4343c991b40800b8406ed656e7028
Author: Frédéric FRANCE <address@hidden>
Date: 2019-08-05 (Mon, 05 Aug 2019)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
Log Message:
-----------
Update pdf_einstein.modules.php
Commit: 7f23b77cbec9639f263d2ff8ad8a3b68e6885817
https://github.com/Dolibarr/dolibarr/commit/7f23b77cbec9639f263d2ff8ad8a3b68e6885817
Author: Frédéric FRANCE <address@hidden>
Date: 2019-08-05 (Mon, 05 Aug 2019)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
Log Message:
-----------
Update pdf_proforma.modules.php
Commit: 05ac4eec52c8fe5c585dbc8171ee891e45742e9e
https://github.com/Dolibarr/dolibarr/commit/05ac4eec52c8fe5c585dbc8171ee891e45742e9e
Author: ptibogxiv <address@hidden>
Date: 2019-08-06 (Tue, 06 Aug 2019)
Changed paths:
M htdocs/stripe/charge.php
Log Message:
-----------
Update charge.php
Commit: 69985339d86b1668704ce64c16f51699ca25717f
https://github.com/Dolibarr/dolibarr/commit/69985339d86b1668704ce64c16f51699ca25717f
Author: Frédéric FRANCE <address@hidden>
Date: 2019-08-06 (Tue, 06 Aug 2019)
Changed paths:
M htdocs/product/dynamic_price/class/price_parser.class.php
Log Message:
-----------
Update price_parser.class.php
Commit: ee8d99351df76ef2e12a11a379b12c9ba69a64d3
https://github.com/Dolibarr/dolibarr/commit/ee8d99351df76ef2e12a11a379b12c9ba69a64d3
Author: ptibogxiv <address@hidden>
Date: 2019-08-06 (Tue, 06 Aug 2019)
Changed paths:
M htdocs/product/stats/facture.php
Log Message:
-----------
Update facture.php
Commit: 0fc92b92a25da11770e8649805ae4b9226acbada
https://github.com/Dolibarr/dolibarr/commit/0fc92b92a25da11770e8649805ae4b9226acbada
Author: ptibogxiv <address@hidden>
Date: 2019-08-06 (Tue, 06 Aug 2019)
Changed paths:
M htdocs/product/stats/facture.php
Log Message:
-----------
Update facture.php
Commit: 322ec32ff53a442a82838ce521429df74f2a1fb2
https://github.com/Dolibarr/dolibarr/commit/322ec32ff53a442a82838ce521429df74f2a1fb2
Author: ptibogxiv <address@hidden>
Date: 2019-08-07 (Wed, 07 Aug 2019)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
FIX duration when creating service
Commit: 0b831ccdf73f7bd6bc8a5d1a59c270d4f0270fb1
https://github.com/Dolibarr/dolibarr/commit/0b831ccdf73f7bd6bc8a5d1a59c270d4f0270fb1
Author: Regis Houssin <address@hidden>
Date: 2019-08-09 (Fri, 09 Aug 2019)
Changed paths:
M htdocs/product/admin/product.php
Log Message:
-----------
FIX better help message with multicompany
Commit: 0efcd590e283b7996cdb35495952b606282229aa
https://github.com/Dolibarr/dolibarr/commit/0efcd590e283b7996cdb35495952b606282229aa
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-09 (Fri, 09 Aug 2019)
Changed paths:
M htdocs/product/admin/product.php
Log Message:
-----------
Merge pull request #11668 from hregis/10.0_mc
FIX better help message with multicompany
Commit: 88c66d24fe729bad33fee28149d8eb298b051538
https://github.com/Dolibarr/dolibarr/commit/88c66d24fe729bad33fee28149d8eb298b051538
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-09 (Fri, 09 Aug 2019)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Merge pull request #11662 from ptibogxiv/patch-219
FIX duration when creating service
Commit: 8f2786cf7b9fa87820d385a693a7dfa7bf2ed0ab
https://github.com/Dolibarr/dolibarr/commit/8f2786cf7b9fa87820d385a693a7dfa7bf2ed0ab
Author: Abbes Bahfir <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/debugbar/class/TraceableDB.php
Log Message:
-----------
fix:this is not accessible in static context
Commit: f752b96a7e96fb87092f3c080c05a5e61c640e1a
https://github.com/Dolibarr/dolibarr/commit/f752b96a7e96fb87092f3c080c05a5e61c640e1a
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/product/admin/product.php
M htdocs/product/card.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 2dee289fc6eda76e05cc185583f02b1578b4ed35
https://github.com/Dolibarr/dolibarr/commit/2dee289fc6eda76e05cc185583f02b1578b4ed35
Author: Je2fb <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/product/dynamic_price/class/price_parser.class.php
Log Message:
-----------
Update price_parser.class.php
Calculation with supplier_min_price work
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
Commit: 6a8910f1092141b5bc2bcc65d77ed17a5ba496a1
https://github.com/Dolibarr/dolibarr/commit/6a8910f1092141b5bc2bcc65d77ed17a5ba496a1
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge pull request #11649 from ptibogxiv/patch-216
FIX qty in invoice list on product's stats
Commit: 2a726441a07c12263646c69bcbce5e2bdaedebf5
https://github.com/Dolibarr/dolibarr/commit/2a726441a07c12263646c69bcbce5e2bdaedebf5
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
Log Message:
-----------
Merge pull request #11635 from frederic34/patch-10
FIX Return code of pdf_einstein.modules.php and proformat
Commit: cee92356c604a09e3e37b385cce4d3aca0d11b85
https://github.com/Dolibarr/dolibarr/commit/cee92356c604a09e3e37b385cce4d3aca0d11b85
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/product/dynamic_price/class/price_parser.class.php
Log Message:
-----------
Merge pull request #11644 from frederic34/patch-11
Update price_parser.class.php
Commit: 049a08f4351e36aceef4a57d6d99c27daac7c192
https://github.com/Dolibarr/dolibarr/commit/049a08f4351e36aceef4a57d6d99c27daac7c192
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #11631 from frederic34/patch-9
Update admin.lang
Commit: 2824dee11ad0060dc65fdfdb9f79e860eed2558a
https://github.com/Dolibarr/dolibarr/commit/2824dee11ad0060dc65fdfdb9f79e860eed2558a
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/langs/en_US/admin.lang
M htdocs/product/dynamic_price/class/price_parser.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
Commit: ab370137a88ecc7984fd700749570735399541d3
https://github.com/Dolibarr/dolibarr/commit/ab370137a88ecc7984fd700749570735399541d3
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge pull request #11628 from ptibogxiv/patch-210
FIX display only stripe sources for customer
Commit: eea5ad9b81198382c80bc50d2f79836b933f809c
https://github.com/Dolibarr/dolibarr/commit/eea5ad9b81198382c80bc50d2f79836b933f809c
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/stripe/charge.php
Log Message:
-----------
Merge pull request #11627 from ptibogxiv/patch-209
FIX display payment intent in stripe's charge list
Commit: 46a5c05b758ea4ec9bec7f302c9940cd5da29e99
https://github.com/Dolibarr/dolibarr/commit/46a5c05b758ea4ec9bec7f302c9940cd5da29e99
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Merge pull request #11623 from ptibogxiv/patch-207
FIX round for application fee in stripe
Commit: 6089547e0e3bbe1099d58078472cfdb36e6e1fe7
https://github.com/Dolibarr/dolibarr/commit/6089547e0e3bbe1099d58078472cfdb36e6e1fe7
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/societe/paymentmodes.php
M htdocs/stripe/charge.php
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 76b0f42d4ceca8b72b796a77d569fac297b1644c
https://github.com/Dolibarr/dolibarr/commit/76b0f42d4ceca8b72b796a77d569fac297b1644c
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/api/class/api_documents.class.php
Log Message:
-----------
Merge pull request #11620 from ptibogxiv/patch-204
FIX document list for products in API
Commit: c6471956894af4196cf3f6da153d0e8fa31d1a69
https://github.com/Dolibarr/dolibarr/commit/c6471956894af4196cf3f6da153d0e8fa31d1a69
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/livraison/card.php
Log Message:
-----------
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields
FIX delivery extrafields
Commit: 13a8ef825860f134cd064d3cce778625e66515d5
https://github.com/Dolibarr/dolibarr/commit/13a8ef825860f134cd064d3cce778625e66515d5
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/ticket/class/api_tickets.class.php
Log Message:
-----------
Merge pull request #11618 from ptibogxiv/patch-203
FIX author in message / ticket API
Commit: 0cb1210acc03c72e6733a199394c5f62d49c18f6
https://github.com/Dolibarr/dolibarr/commit/0cb1210acc03c72e6733a199394c5f62d49c18f6
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/stripe/admin/stripe.php
Log Message:
-----------
Merge pull request #11622 from ptibogxiv/patch-206
Fix table in admin stripe.php
Commit: 31fa26c2be91fc208455d54d7ebb45a3ef0243cb
https://github.com/Dolibarr/dolibarr/commit/31fa26c2be91fc208455d54d7ebb45a3ef0243cb
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expensereport/card.php
M htdocs/livraison/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 5dc2fd8ca09b570eb6c6e7b17fa5c70add20ac6b
https://github.com/Dolibarr/dolibarr/commit/5dc2fd8ca09b570eb6c6e7b17fa5c70add20ac6b
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Merge pull request #11621 from ptibogxiv/patch-205
Fix application_fee_amount
Commit: babeb529865735bd711735d6dc406502b062019e
https://github.com/Dolibarr/dolibarr/commit/babeb529865735bd711735d6dc406502b062019e
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/stripe/config.php
Log Message:
-----------
Merge pull request #11624 from ptibogxiv/patch-208
Fix update stripe api for more compliance to API
Commit: 96fb4c52eabe5c8a0d4283518f32a4c1dda0b0f3
https://github.com/Dolibarr/dolibarr/commit/96fb4c52eabe5c8a0d4283518f32a4c1dda0b0f3
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expensereport/card.php
M htdocs/livraison/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
Commit: d0f1a23f8b0f00e048018d2b0d092f13d734ebe8
https://github.com/Dolibarr/dolibarr/commit/d0f1a23f8b0f00e048018d2b0d092f13d734ebe8
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M htdocs/stripe/config.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 8647a20c18b6542248819a595dd0905661f7d2ce
https://github.com/Dolibarr/dolibarr/commit/8647a20c18b6542248819a595dd0905661f7d2ce
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-10 (Sat, 10 Aug 2019)
Changed paths:
M ChangeLog
M htdocs/api/class/api_documents.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expensereport/card.php
M htdocs/langs/en_US/admin.lang
M htdocs/livraison/card.php
M htdocs/product/admin/product.php
M htdocs/product/card.php
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/product/stats/facture.php
M htdocs/societe/paymentmodes.php
M htdocs/stripe/admin/stripe.php
M htdocs/stripe/charge.php
M htdocs/stripe/class/stripe.class.php
M htdocs/stripe/config.php
M htdocs/ticket/class/api_tickets.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/deb6186338de...8647a20c18b6