[Dolibarr-git] [Dolibarr/dolibarr] 5bbcb5: Added expressions for product/service prices

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5bbcb58b4435a0ddd5981faa3393a3b63ac57326
      
https://github.com/Dolibarr/dolibarr/commit/5bbcb58b4435a0ddd5981faa3393a3b63ac57326
  Author: Ion Agorria <address@hidden>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

  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/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
    M htdocs/install/mysql/tables/llx_product_price.sql
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/priceparser.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/expression.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Added expressions for product/service prices


  Commit: 2c01370ce6f4dcb148e92459a094ed7e1041153a
      
https://github.com/Dolibarr/dolibarr/commit/2c01370ce6f4dcb148e92459a094ed7e1041153a
  Author: Ion Agorria <address@hidden>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

  Log Message:
  -----------
  Reimplemented 'find_min_price_product_fournisseur()'


  Commit: 1c7feb67ea7fa53816c873278eaf6cae4f76eb0c
      
https://github.com/Dolibarr/dolibarr/commit/1c7feb67ea7fa53816c873278eaf6cae4f76eb0c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  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/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
    M htdocs/install/mysql/tables/llx_product_price.sql
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/priceparser.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/expression.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge branch 'dinamic-prices-product' of
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
        htdocs/install/mysql/migration/3.7.0-3.8.0.sql
        htdocs/product/fournisseurs.php


  Commit: 56c00ae9e2691a75e7a5afebc278d053f52fe736
      
https://github.com/Dolibarr/dolibarr/commit/56c00ae9e2691a75e7a5afebc278d053f52fe736
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  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/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
    M htdocs/install/mysql/tables/llx_product_price.sql
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/priceparser.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/expression.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge branch 'IonAgorria-dinamic-prices-product' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0aab43c72843...56c00ae9e269