[Dolibarr-git] [Dolibarr/dolibarr] cc4c58: Fix sql error

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cc4c5873e689b44f288b90ffd225c1b29b39e127
      
https://github.com/Dolibarr/dolibarr/commit/cc4c5873e689b44f288b90ffd225c1b29b39e127
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-10 (Sun, 10 Jan 2016)

  Changed paths:
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Fix sql error


  Commit: 6648ef0064975f2b57562c07a135c97e172481ae
      
https://github.com/Dolibarr/dolibarr/commit/6648ef0064975f2b57562c07a135c97e172481ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-10 (Sun, 10 Jan 2016)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  Fix missing include


  Commit: 99eec6b32c3095fc535f53a11f21f9c37f8eaa64
      
https://github.com/Dolibarr/dolibarr/commit/99eec6b32c3095fc535f53a11f21f9c37f8eaa64
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-10 (Sun, 10 Jan 2016)

  Changed paths:
    M htdocs/core/class/conf.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e9e081bc372b...99eec6b32c30