[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 8cdb25: FIX product_use_units was set
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 8cdb25: FIX product_use_units was set to 0 each time a con... |
|
Date: |
Thu, 04 Jul 2019 03:27:12 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 8cdb251ca5038bc2959d68b3f41991926fc18719
https://github.com/Dolibarr/dolibarr/commit/8cdb251ca5038bc2959d68b3f41991926fc18719
Author: atm-quentin <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/product/admin/product.php
Log Message:
-----------
FIX product_use_units was set to 0 each time a conf in block other was set
Commit: 6b43c325c74923158dc71a8c8a39f86a0f2adcf5
https://github.com/Dolibarr/dolibarr/commit/6b43c325c74923158dc71a8c8a39f86a0f2adcf5
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/compta/facture/invoicetemplate_list.php
Log Message:
-----------
Fix wrong column for filters on invoice template list
Commit: 1b4507f07d03555724eb3aa6e401b99432c8b0f7
https://github.com/Dolibarr/dolibarr/commit/1b4507f07d03555724eb3aa6e401b99432c8b0f7
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fix on a hidden option
Commit: ab7cb7bb2e3debda6ee7c7ce5a2c8dc2e87a3a5e
https://github.com/Dolibarr/dolibarr/commit/ab7cb7bb2e3debda6ee7c7ce5a2c8dc2e87a3a5e
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/fourn/facture/list.php
Log Message:
-----------
FIX Nowrap on amount
Commit: 8a25c854e9b75c9134e5232a0640799e9badaa9f
https://github.com/Dolibarr/dolibarr/commit/8a25c854e9b75c9134e5232a0640799e9badaa9f
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
Log Message:
-----------
Hide sensitive data
Commit: 3b0f1c733f36d6a6de2181da60783fdd71624da7
https://github.com/Dolibarr/dolibarr/commit/3b0f1c733f36d6a6de2181da60783fdd71624da7
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/main.inc.php
Log Message:
-----------
Fix missing token
Commit: a75a2ae8e45a730e9a74ac9944acb43aac4c4ee2
https://github.com/Dolibarr/dolibarr/commit/a75a2ae8e45a730e9a74ac9944acb43aac4c4ee2
Author: John Botella <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Fix missing hidden input and short label
Commit: d9560dbb6187a26c6badf7af3be04e467cccc1bf
https://github.com/Dolibarr/dolibarr/commit/d9560dbb6187a26c6badf7af3be04e467cccc1bf
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007new.modules.php
Log Message:
-----------
Fix var not initialized
Commit: 9d50c672088b16a6208358e4f1e890ca3ab0eaab
https://github.com/Dolibarr/dolibarr/commit/9d50c672088b16a6208358e4f1e890ca3ab0eaab
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/core/extrafieldsinexport.inc.php
Log Message:
-----------
FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
Commit: 126479b5a9408bc3c6c55fa640e276fc44d36c4e
https://github.com/Dolibarr/dolibarr/commit/126479b5a9408bc3c6c55fa640e276fc44d36c4e
Author: ptibogxiv <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Fix paymentmethod detach
Commit: 03938e21239396b44353f234a2d8219694722332
https://github.com/Dolibarr/dolibarr/commit/03938e21239396b44353f234a2d8219694722332
Author: ptibogxiv <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Update paymentmodes.php
Commit: ff68b110b27aca9c0f76b12d0ddc38acdd73726a
https://github.com/Dolibarr/dolibarr/commit/ff68b110b27aca9c0f76b12d0ddc38acdd73726a
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-02 (Tue, 02 Jul 2019)
Changed paths:
M htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
Log Message:
-----------
Fix phpcs
Commit: 433835860c2cbf470b9421d75f035a2567c33aee
https://github.com/Dolibarr/dolibarr/commit/433835860c2cbf470b9421d75f035a2567c33aee
Author: Ferran Marcet <address@hidden>
Date: 2019-07-03 (Wed, 03 Jul 2019)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
FIX: When saving an action it didn't save the label based on the type of
event if the label is empty and the type is customized
Commit: 3e53a06b2ef93b487dbb4b18ffb3b4c82292ad40
https://github.com/Dolibarr/dolibarr/commit/3e53a06b2ef93b487dbb4b18ffb3b4c82292ad40
Author: atm-florian.m <address@hidden>
Date: 2019-07-03 (Wed, 03 Jul 2019)
Changed paths:
M htdocs/fourn/commande/dispatch.php
M htdocs/langs/fr_FR/stocks.lang
Log Message:
-----------
minor spelling issues
Commit: 2f5b9ccb22b9bcd3cce64d3a234bdf3e945b6d1e
https://github.com/Dolibarr/dolibarr/commit/2f5b9ccb22b9bcd3cce64d3a234bdf3e945b6d1e
Author: atm-greg <address@hidden>
Date: 2019-07-03 (Wed, 03 Jul 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
fix case objecttmp is an invoice
Commit: 75aa11e5269efcccf6d3b4de08ebfa7f7dc6a217
https://github.com/Dolibarr/dolibarr/commit/75aa11e5269efcccf6d3b4de08ebfa7f7dc6a217
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/core/triggers/interface_20_all_Logevents.class.php
Log Message:
-----------
Code comment
Commit: 5fde7da18392dc9b25a300f72d3747d8e1dd9ea1
https://github.com/Dolibarr/dolibarr/commit/5fde7da18392dc9b25a300f72d3747d8e1dd9ea1
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/product/admin/product.php
Log Message:
-----------
Merge pull request #11439 from atm-quentin/FIX_empty_product_use_units
FIX empty product_use_units in product configuration
Commit: 10e3e37c6c2d560b283263e673ad46d86cc6981a
https://github.com/Dolibarr/dolibarr/commit/10e3e37c6c2d560b283263e673ad46d86cc6981a
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/don/class/don.class.php
Log Message:
-----------
Update don.class.php
Commit: 108c7aa9ca8ac848481869f0d2d6e184748d5ff0
https://github.com/Dolibarr/dolibarr/commit/108c7aa9ca8ac848481869f0d2d6e184748d5ff0
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/fourn/facture/list.php
Log Message:
-----------
Merge pull request #11444 from aspangaro/10.0p1
FIX SQL problem on donation & nowrap on amount
Commit: 2035cbaee12d5590cbaadcd0def15c141e758dd5
https://github.com/Dolibarr/dolibarr/commit/2035cbaee12d5590cbaadcd0def15c141e758dd5
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/compta/facture/invoicetemplate_list.php
Log Message:
-----------
Merge pull request #11440 from atm-maxime/7.0
Fix wrong column for filters on invoice template list
Commit: 125c2a65c06db67d8d96edb5c0fdbba0008bceff
https://github.com/Dolibarr/dolibarr/commit/125c2a65c06db67d8d96edb5c0fdbba0008bceff
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #11445 from atm-john/9.0_fix_dictionary
Fix missing hidden input and short label
Commit: 1926d430d8c7f8b4d253d79d4d6092925b218262
https://github.com/Dolibarr/dolibarr/commit/1926d430d8c7f8b4d253d79d4d6092925b218262
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge pull request #11448 from ptibogxiv/patch-196
Fix paymentmethod detach
Commit: 554c76e23265bff2f3010a13b3065d354cec3b57
https://github.com/Dolibarr/dolibarr/commit/554c76e23265bff2f3010a13b3065d354cec3b57
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
Merge pull request #11451 from fmarcet/8.0
FIX: When saving an action it didn't save the label based on the type of event
Commit: a9dfca70cf8d395bfaf16a75af8d61da02477939
https://github.com/Dolibarr/dolibarr/commit/a9dfca70cf8d395bfaf16a75af8d61da02477939
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/fourn/commande/dispatch.php
M htdocs/langs/fr_FR/stocks.lang
Log Message:
-----------
Merge pull request #11452 from atm-florianm/FIX_minor_spelling_issues
FIX: minor spelling issues
Commit: 63c93be94e0a28be0cb05fb08ecc3c76c2f2e7cc
https://github.com/Dolibarr/dolibarr/commit/63c93be94e0a28be0cb05fb08ecc3c76c2f2e7cc
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Update html.form.class.php
Commit: d04b19549ea20a610c7bb1b5dc9cb245ec92dcf4
https://github.com/Dolibarr/dolibarr/commit/d04b19549ea20a610c7bb1b5dc9cb245ec92dcf4
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #11453 from
atm-greg/FIX_9.0_selectForFormsList_for_invoices
fix case objecttmp is an invoice in selectForFormsList
Commit: bc309ace384fc6586e694dfcc09333d98eaa0cac
https://github.com/Dolibarr/dolibarr/commit/bc309ace384fc6586e694dfcc09333d98eaa0cac
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/compta/facture/invoicetemplate_list.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: f8de11492e16052251e11cec37b02654ffeb2e77
https://github.com/Dolibarr/dolibarr/commit/f8de11492e16052251e11cec37b02654ffeb2e77
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/langs/fr_FR/stocks.lang
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: ee0a65e7fac2066c6a8754abc61cd5b79d83824d
https://github.com/Dolibarr/dolibarr/commit/ee0a65e7fac2066c6a8754abc61cd5b79d83824d
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/comm/action/card.php
Commit: 8b0b824471758bc83969d0f63bb7e30409f74703
https://github.com/Dolibarr/dolibarr/commit/8b0b824471758bc83969d0f63bb7e30409f74703
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/class/html.form.class.php
M htdocs/product/admin/product.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 8e3620fce1d4a4106066e2f5cc78c64a75c838e5
https://github.com/Dolibarr/dolibarr/commit/8e3620fce1d4a4106066e2f5cc78c64a75c838e5
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/admin/dict.php
M htdocs/comm/action/card.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/fourn/commande/dispatch.php
M htdocs/product/admin/product.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
Commit: 69e0353e1222bdac14843607b3079cdb43eef823
https://github.com/Dolibarr/dolibarr/commit/69e0353e1222bdac14843607b3079cdb43eef823
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/fourn/facture/list.php
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 2fee41f712de17bf1e857f618070f4bf633e47e6
https://github.com/Dolibarr/dolibarr/commit/2fee41f712de17bf1e857f618070f4bf633e47e6
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-04 (Thu, 04 Jul 2019)
Changed paths:
M htdocs/admin/dict.php
M htdocs/comm/action/card.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/facture/list.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007new.modules.php
M htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/list.php
M htdocs/main.inc.php
M htdocs/product/admin/product.php
M htdocs/projet/element.php
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/fb69f23bbaaa...2fee41f712de