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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/class/extrafields.class.php
This commit is contained in:
Laurent Destailleur 2020-03-30 19:42:53 +02:00
commit efaea37d61
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/extrafields.class.php
View File

@ -2168,7 +2168,7 @@ class ExtraFields
if (in_array($key_type, array('date', 'datetime'))) if (in_array($key_type, array('date', 'datetime')))
{ {
if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)."year") continue; // Value was not provided, we should not set it. if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
// Clean parameters // Clean parameters
$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int')); $value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
} }

2
htdocs/fourn/commande/card.php
View File

@ -1241,7 +1241,7 @@ if (empty($reshook))
'', '',
null, null,
null, null,
array(), $array_option,
$lines[$i]->fk_unit, $lines[$i]->fk_unit,
0, 0,
$element, $element,

6
htdocs/product/class/api_products.class.php
View File

@ -861,11 +861,11 @@ class Products extends DolibarrApi
} }
if ($result) { if ($result) {
$this->productsupplier->fetch($id, $ref); $product_fourn = new ProductFournisseur($this->db);
$this->productsupplier->list_product_fournisseur_price($id, '', '', 0, 0); $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
} }
return $this->_cleanObjectDatas($this->productsupplier); return $this->_cleanObjectDatas($product_fourn_list);
} }
/** /**

5
htdocs/product/stock/replenish.php
View File

@ -702,7 +702,10 @@ while ($i < ($limit ? min($num, $limit) : $num))
//depending on conf, use either physical stock or //depending on conf, use either physical stock or
//virtual stock to compute the stock to buy value //virtual stock to compute the stock to buy value
$stocktobuy = max(max($desiredstock, $alertstock) - $stock - $ordered, 0);
if(empty($usevirtualstock)) $stocktobuy = max(max($desiredstock, $alertstock) - $stock - $ordered, 0);
else $stocktobuy = max(max($desiredstock, $alertstock) - $stock, 0); //ordered is already in $stock in virtual mode
$disabled = ''; $disabled = '';
if ($ordered > 0) if ($ordered > 0)
{ {