Merge remote branch 'upstream/develop' into tooltip

2015-02-02 13:48:39 +01:00 · 2015-02-02 13:48:39 +01:00 · 482eec1cce
commit 482eec1cce
parent fb22de1ecd 9c087e27d0
15 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,6 +9,7 @@ default.properties
 .buildpath
 .gitmodules
 dolibarr_install.log
 upgrade.log
 doxygen_warnings.log
 /.project
 .DS_Store
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
--- a/htdocs/includes/evalmath/evalmath.class.php
+++ b/htdocs/includes/evalmath/evalmath.class.php
--- a/htdocs/product/class/priceexpression.class.php
+++ b/htdocs/product/class/priceexpression.class.php
--- a/htdocs/product/class/priceparser.class.php
+++ b/htdocs/product/class/priceparser.class.php
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
--- a/htdocs/product/expression.php
+++ b/htdocs/product/expression.php
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php