[Dolibarr-git] [Dolibarr/dolibarr] fc5899: Relocation of expression files

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fc5899174be30836c958bda923f43851ec4d919b
      
https://github.com/Dolibarr/dolibarr/commit/fc5899174be30836c958bda923f43851ec4d919b
  Author: Ion Agorria <address@hidden>
  Date:   2015-03-14 (Sat, 14 Mar 2015)

  Changed paths:
    R htdocs/product/class/priceexpression.class.php
    R htdocs/product/class/priceparser.class.php
    A htdocs/product/dynamic_price/class/price_expression.class.php
    A htdocs/product/dynamic_price/class/price_parser.class.php
    A htdocs/product/dynamic_price/editor.php
    R htdocs/product/expression.php

  Log Message:
  -----------
  Relocation of expression files


  Commit: 5f9b1fa02900e0eeb626aa88f137cde777ca17f7
      
https://github.com/Dolibarr/dolibarr/commit/5f9b1fa02900e0eeb626aa88f137cde777ca17f7
  Author: Ion Agorria <address@hidden>
  Date:   2015-03-14 (Sat, 14 Mar 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Changes for applying new paths


  Commit: 9871aaed19fccacfdb645f0457419f1fb21b3e2d
      
https://github.com/Dolibarr/dolibarr/commit/9871aaed19fccacfdb645f0457419f1fb21b3e2d
  Author: Ion Agorria <address@hidden>
  Date:   2015-03-14 (Sat, 14 Mar 2015)

  Changed paths:
    A htdocs/product/dynamic_price/class/price_global_variable.class.php
    A htdocs/product/dynamic_price/class/price_global_variable_updater.class.php

  Log Message:
  -----------
  Price global variables and updaters classes


  Commit: 2c80b3993748471387ff7ccc6b0e64246e49cb00
      
https://github.com/Dolibarr/dolibarr/commit/2c80b3993748471387ff7ccc6b0e64246e49cb00
  Author: Ion Agorria <address@hidden>
  Date:   2015-03-14 (Sat, 14 Mar 2015)

  Changed paths:
    M htdocs/core/modules/modDynamicPrices.class.php
    A htdocs/product/admin/dynamic_prices.php

  Log Message:
  -----------
  Configuration page of dinamic prices and price global variables editor


  Commit: 2d09d8196f85e56b970de315e9f5fa686782cc28
      
https://github.com/Dolibarr/dolibarr/commit/2d09d8196f85e56b970de315e9f5fa686782cc28
  Author: Ion Agorria <address@hidden>
  Date:   2015-03-14 (Sat, 14 Mar 2015)

  Changed paths:
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/products.lang

  Log Message:
  -----------
  Language additions


  Commit: e76b6e740f442e865939303134488f821f709c46
      
https://github.com/Dolibarr/dolibarr/commit/e76b6e740f442e865939303134488f821f709c46
  Author: Ion Agorria <address@hidden>
  Date:   2015-03-14 (Sat, 14 Mar 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_c_price_global_variable.sql
    A htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql

  Log Message:
  -----------
  SQL additions


  Commit: 55140afde412aec6254ba5b82e69ce6a4cacd510
      
https://github.com/Dolibarr/dolibarr/commit/55140afde412aec6254ba5b82e69ce6a4cacd510
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/modDynamicPrices.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
    A htdocs/install/mysql/tables/llx_c_price_global_variable.sql
    A htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/products.lang
    A htdocs/product/admin/dynamic_prices.php
    R htdocs/product/class/priceexpression.class.php
    R htdocs/product/class/priceparser.class.php
    M htdocs/product/class/product.class.php
    A htdocs/product/dynamic_price/class/price_expression.class.php
    A htdocs/product/dynamic_price/class/price_global_variable.class.php
    A htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
    A htdocs/product/dynamic_price/class/price_parser.class.php
    A htdocs/product/dynamic_price/editor.php
    R htdocs/product/expression.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge branch 'price-global-variables' of
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables

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


  Commit: eb7f2f464ea6db47ed356d21773fbd9781af45e7
      
https://github.com/Dolibarr/dolibarr/commit/eb7f2f464ea6db47ed356d21773fbd9781af45e7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/modDynamicPrices.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
    A htdocs/install/mysql/tables/llx_c_price_global_variable.sql
    A htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/products.lang
    A htdocs/product/admin/dynamic_prices.php
    R htdocs/product/class/priceexpression.class.php
    R htdocs/product/class/priceparser.class.php
    M htdocs/product/class/product.class.php
    A htdocs/product/dynamic_price/class/price_expression.class.php
    A htdocs/product/dynamic_price/class/price_global_variable.class.php
    A htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
    A htdocs/product/dynamic_price/class/price_parser.class.php
    A htdocs/product/dynamic_price/editor.php
    R htdocs/product/expression.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge branch 'IonAgorria-price-global-variables' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a55af4387bae...eb7f2f464ea6