[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 522393: Fix #3188 SQL error if qty or
From: |
Juanjo Menent |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 522393: Fix #3188 SQL error if qty or discount is not a nu... |
Date: |
Sat, 01 Aug 2015 06:02:14 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 5223934ff03c05588f4a6832d110621221ddd346
https://github.com/Dolibarr/dolibarr/commit/5223934ff03c05588f4a6832d110621221ddd346
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-07-14 (Tue, 14 Jul 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix #3188 SQL error if qty or discount is not a number on proposal add line
Commit: 8505e914695a0723da9fe719f1dfc3e1f4b4495b
https://github.com/Dolibarr/dolibarr/commit/8505e914695a0723da9fe719f1dfc3e1f4b4495b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-07-19 (Sun, 19 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: [ bug 1791 ] Margin menu not available if any Finance module is not
enabled
Commit: 5b0c216b42c1a6096791169c9109696f28e3dc1b
https://github.com/Dolibarr/dolibarr/commit/5b0c216b42c1a6096791169c9109696f28e3dc1b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-07-19 (Sun, 19 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/contact/exportimport.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/societe/info.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.5' into bug-1791
Conflicts:
ChangeLog
Commit: 14eee82a646a80e2253c0209382bf00bad1308e6
https://github.com/Dolibarr/dolibarr/commit/14eee82a646a80e2253c0209382bf00bad1308e6
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-19 (Sun, 19 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge pull request #3277 from marcosgdf/bug-1791
Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled
Commit: 038f171d6cb628ad9f1902f0f33232580c63d3a0
https://github.com/Dolibarr/dolibarr/commit/038f171d6cb628ad9f1902f0f33232580c63d3a0
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-07-20 (Mon, 20 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
Log Message:
-----------
Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment
date in turnover reports for salaries
Close #3074
Commit: 428bd14b55153547aa44a1b8022d26f702eb6f00
https://github.com/Dolibarr/dolibarr/commit/428bd14b55153547aa44a1b8022d26f702eb6f00
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-07-21 (Tue, 21 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/compta/facture/stats/index.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/class/html.form.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/societe/info.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
# Veuillez entrer un message de validation pour expliquer en quoi cette fusion
est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une
branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.
Commit: 646ad48bd068d7070b809ac84729ce0d9ed579f6
https://github.com/Dolibarr/dolibarr/commit/646ad48bd068d7070b809ac84729ce0d9ed579f6
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-07-21 (Tue, 21 Jul 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Better fix for not numeric qty or discount
Commit: 73c7ef5a88970a4ed370fb777b3460447622af38
https://github.com/Dolibarr/dolibarr/commit/73c7ef5a88970a4ed370fb777b3460447622af38
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-07-22 (Wed, 22 Jul 2015)
Log Message:
-----------
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
Commit: a0fc119ce55660f80b55b4f40693a1c8da3c4ddd
https://github.com/Dolibarr/dolibarr/commit/a0fc119ce55660f80b55b4f40693a1c8da3c4ddd
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
Log Message:
-----------
Merge pull request #3290 from marcosgdf/bug-3074
Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment
date in turnover reports for salaries
Commit: 6b2d7f7d19f329991d72559c9a9c2754e0cc17fe
https://github.com/Dolibarr/dolibarr/commit/6b2d7f7d19f329991d72559c9a9c2754e0cc17fe
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #3200 from atm-maxime/3.5
Fix #3188 SQL error if qty or discount is not a number on proposal ad…
Commit: 66761145019ac6356e6ad62e486dc3cb846c9c4e
https://github.com/Dolibarr/dolibarr/commit/66761145019ac6356e6ad62e486dc3cb846c9c4e
Author: fmarcet <address@hidden>
Date: 2015-07-27 (Mon, 27 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix: Not showing product supplier reference when page break
Commit: 824da6d2b05250fced519f58eacec5583df72aa9
https://github.com/Dolibarr/dolibarr/commit/824da6d2b05250fced519f58eacec5583df72aa9
Author: phf <address@hidden>
Date: 2015-07-27 (Mon, 27 Jul 2015)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
Commit: 565b0861d9c9209fd40b1b15a08ee91fd05792f8
https://github.com/Dolibarr/dolibarr/commit/565b0861d9c9209fd40b1b15a08ee91fd05792f8
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #3323 from fmarcet/3.6
Fix: Not showing product's supplier reference when page break
Commit: c2eb47f3a19e92a6ae2cc924ebaa49fcc1b62f4a
https://github.com/Dolibarr/dolibarr/commit/c2eb47f3a19e92a6ae2cc924ebaa49fcc1b62f4a
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #3325 from atm-ph/3.6_fix_timespent_id
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
Commit: 6adc3ba6040fadfc8db6bb4e95f883f27c5bda34
https://github.com/Dolibarr/dolibarr/commit/6adc3ba6040fadfc8db6bb4e95f883f27c5bda34
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
Commit: 13dee1876a6d32c885611be78f406abf608b3f49
https://github.com/Dolibarr/dolibarr/commit/13dee1876a6d32c885611be78f406abf608b3f49
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-30 (Thu, 30 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/resultat/clientfourn.php
Commit: 2a67bd1f38ec0cee3a99e91d7caef476efe92352
https://github.com/Dolibarr/dolibarr/commit/2a67bd1f38ec0cee3a99e91d7caef476efe92352
Author: Juanjo Menent <address@hidden>
Date: 2015-08-01 (Sat, 01 Aug 2015)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Fix #3314 Display state in bank account card
Commit: 05b0a9b6757e6f0917ada434c4762bec4ee5bbf3
https://github.com/Dolibarr/dolibarr/commit/05b0a9b6757e6f0917ada434c4762bec4ee5bbf3
Author: Juanjo Menent <address@hidden>
Date: 2015-08-01 (Sat, 01 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
Commit: 9ae31f3a085ce01452d552c0a8cabfe70998d5b6
https://github.com/Dolibarr/dolibarr/commit/9ae31f3a085ce01452d552c0a8cabfe70998d5b6
Author: Juanjo Menent <address@hidden>
Date: 2015-08-01 (Sat, 01 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/34b1ce618f0c...9ae31f3a085c