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
This commit is contained in:
Laurent Destailleur 2020-04-16 16:02:28 +02:00
commit d176840bfb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4806,9 +4806,10 @@ class Product extends CommonObject
* This function need a lot of load. If you use it on list, use a cache to execute it once for each product id. * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
* If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible. * If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
* *
* @param string $option '' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual' * @param string $option '' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual'
* @return int < 0 if KO, > 0 if OK * @param int $includedraftpoforvirtual Include draft status of PO for virtual stock calculation
* @see load_virtual_stock(), loadBatchInfo() * @return int < 0 if KO, > 0 if OK
* @see load_virtual_stock(), loadBatchInfo()
*/ */
public function load_stock($option = '', $includedraftpoforvirtual = null) public function load_stock($option = '', $includedraftpoforvirtual = null)
{ {
@ -4878,11 +4879,12 @@ class Product extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Load value ->stock_theorique of a product. Property this->id must be defined. * Load value ->stock_theorique of a product. Property this->id must be defined.
* This function need a lot of load. If you use it on list, use a cache to execute it one for each product id. * This function need a lot of load. If you use it on list, use a cache to execute it one for each product id.
* *
* @return int < 0 if KO, > 0 if OK * @param int $includedraftpoforvirtual Include draft status of PO for virtual stock calculation
* @see load_stock(), loadBatchInfo() * @return int < 0 if KO, > 0 if OK
* @see load_stock(), loadBatchInfo()
*/ */
public function load_virtual_stock($includedraftpoforvirtual = null) public function load_virtual_stock($includedraftpoforvirtual = null)
{ {