lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source 
Conflicts:
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2018-09-01 14:09:00 +02:00
commit 123a66dc2a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/class/product.class.php
View File

@ -1704,7 +1704,7 @@ class Product extends CommonObject
$price_ttc = price2num($price_ttc,'MU'); $price_ttc = price2num($price_ttc,'MU');
if ( $newminprice !== '' || $newminprice === 0) if ( $newminprice !== '' || $newminprice === 0)
{ {
$price_min = price2num($newminprice,'MU'); $price_min = price2num($newminprice,'MU');
$price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100)); $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
$price_min_ttc = price2num($price_min_ttc,'MU'); $price_min_ttc = price2num($price_min_ttc,'MU');
@ -2271,8 +2271,8 @@ class Product extends CommonObject
} }
} }
} }
// If stock decrease is on invoice validation, the theorical stock continue to // If stock decrease is on invoice validation, the theorical stock continue to
// count the orders to ship in theorical stock when some are already removed b invoice validation. // count the orders to ship in theorical stock when some are already removed b invoice validation.
// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation. // If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) if (! empty($conf->global->STOCK_CALCULATE_ON_BILL))
@ -4572,8 +4572,6 @@ class Product extends CommonObject
$langs->load('products'); $langs->load('products');
//$this->db->begin();
$label_type = 'label'; $label_type = 'label';
if ($type == 'short') if ($type == 'short')