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

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f809800e013fd4e5c45c663bef2754b6281a03aa
      
https://github.com/Dolibarr/dolibarr/commit/f809800e013fd4e5c45c663bef2754b6281a03aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

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


  Commit: 060b59ac6ca6b9fe14d35d4f8455888ef679a413
      
https://github.com/Dolibarr/dolibarr/commit/060b59ac6ca6b9fe14d35d4f8455888ef679a413
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output


  Commit: 5fb8068374d1eeadd68e9296ad29e08e7fdd86f0
      
https://github.com/Dolibarr/dolibarr/commit/5fb8068374d1eeadd68e9296ad29e08e7fdd86f0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M htdocs/core/boxes/box_produits.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/langs/en_US/products.lang
    M htdocs/product/admin/dynamic_prices.php
    M htdocs/product/class/product.class.php
    M htdocs/product/dynamic_price/class/price_parser.class.php
    M htdocs/product/dynamic_price/editor.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e0a0817123e2...5fb8068374d1