[Dolibarr-git] [Dolibarr/dolibarr] 949f9e: Fix: [ bug #1832 ] SQL error when adding a product...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 949f9e40a083cda147619fd5b16bda347eef9f1e
      
https://github.com/Dolibarr/dolibarr/commit/949f9e40a083cda147619fd5b16bda347eef9f1e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix: [ bug #1832 ] SQL error when adding a product with no price defined to 
an object


  Commit: 58a61e129498aeef2512d27351336772f98b4c7b
      
https://github.com/Dolibarr/dolibarr/commit/58a61e129498aeef2512d27351336772f98b4c7b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Changed int typecast to float


  Commit: 6d25cf6f6ab835c8547e2e7aa5d45a262de82947
      
https://github.com/Dolibarr/dolibarr/commit/6d25cf6f6ab835c8547e2e7aa5d45a262de82947
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions.lib.php

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

Conflicts:
        ChangeLog


  Commit: f831bdd2315d9da8039986763ebc880b4bc6a945
      
https://github.com/Dolibarr/dolibarr/commit/f831bdd2315d9da8039986763ebc880b4bc6a945
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1832' into 3.6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8f339712ab8b...f831bdd2315d