[Dolibarr-git] [Dolibarr/dolibarr] d959c5: Fix: Accountancy - SQL error

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d959c552f2656d2723c6d0c47404434fb5250af2
      
https://github.com/Dolibarr/dolibarr/commit/d959c552f2656d2723c6d0c47404434fb5250af2
  Author: aspangaro <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Fix: Accountancy - SQL error


  Commit: 4bda3a3f2193472f1f41440523c656052575c53d
      
https://github.com/Dolibarr/dolibarr/commit/4bda3a3f2193472f1f41440523c656052575c53d
  Author: aspangaro <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/products.lang
    M htdocs/product/admin/product.php
    M htdocs/product/composition/card.php
    M htdocs/product/list.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/projet/list.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-33


  Commit: fb57941b211ca21a5821efa202b07ae9f20f1171
      
https://github.com/Dolibarr/dolibarr/commit/fb57941b211ca21a5821efa202b07ae9f20f1171
  Author: aspangaro <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  typo


  Commit: eac822d821a1dbd276f381e22f99ea7159b18d16
      
https://github.com/Dolibarr/dolibarr/commit/eac822d821a1dbd276f381e22f99ea7159b18d16
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  Merge pull request #3069 from aspangaro/develop-patch33

Fix: Accountancy - SQL error & typo


Compare: 
https://github.com/Dolibarr/dolibarr/compare/44d4d23c00fa...eac822d821a1