[Dolibarr-git] [Dolibarr/dolibarr] 50091d: Closes #2534 SQL error when editing a supplier inv...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 50091dfe8bbada8fde2e5bc318e6570eaa13b15d
      
https://github.com/Dolibarr/dolibarr/commit/50091dfe8bbada8fde2e5bc318e6570eaa13b15d
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Closes #2534 SQL error when editing a supplier invoice line


  Commit: 8ce66aad7987329a857d8355dceafc37f955e646
      
https://github.com/Dolibarr/dolibarr/commit/8ce66aad7987329a857d8355dceafc37f955e646
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2534

Conflicts:
        ChangeLog


  Commit: a92c8ccbd55447db9559be6cbefb7fdbae004434
      
https://github.com/Dolibarr/dolibarr/commit/a92c8ccbd55447db9559be6cbefb7fdbae004434
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  git push origin 3.6Merge branch 'marcosgdf-bug-2534' into 3.6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d8b50722f39b...a92c8ccbd554