[Dolibarr-git] [Dolibarr/dolibarr] 522393: Fix #3188 SQL error if qty or discount is not a nu...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  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: 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: 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…


Compare: 
https://github.com/Dolibarr/dolibarr/compare/14eee82a646a...6b2d7f7d19f3