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

Merge pull request #18902 from xgerhard/fix-negative-stock-correction

Browse Source 
Fix #18895 Fix negative stock correction
This commit is contained in:
Laurent Destailleur 2021-10-05 18:45:50 +02:00 committed by GitHub
commit 06eb138b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5111,7 +5111,7 @@ class Product extends CommonObject
* *
* @param User $user user asking change * @param User $user user asking change
* @param int $id_entrepot id of warehouse * @param int $id_entrepot id of warehouse
* @param double $nbpiece nb of units * @param double $nbpiece nb of units (should be always positive, use $movement to decide if we add or remove)
* @param int $movement 0 = add, 1 = remove * @param int $movement 0 = add, 1 = remove
* @param string $label Label of stock movement * @param string $label Label of stock movement
* @param double $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed. * @param double $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
@ -5129,6 +5129,13 @@ class Product extends CommonObject
include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
if ($nbpiece < 0) {
if (!$movement) {
$movement = 1;
}
$nbpiece = abs($nbpiece);
}
$op[0] = "+".trim($nbpiece); $op[0] = "+".trim($nbpiece);
$op[1] = "-".trim($nbpiece); $op[1] = "-".trim($nbpiece);
@ -5155,7 +5162,7 @@ class Product extends CommonObject
* *
* @param User $user user asking change * @param User $user user asking change
* @param int $id_entrepot id of warehouse * @param int $id_entrepot id of warehouse
* @param double $nbpiece nb of units * @param double $nbpiece nb of units (should be always positive, use $movement to decide if we add or remove)
* @param int $movement 0 = add, 1 = remove * @param int $movement 0 = add, 1 = remove
* @param string $label Label of stock movement * @param string $label Label of stock movement
* @param double $price Price to use for stock eval * @param double $price Price to use for stock eval
@ -5176,6 +5183,13 @@ class Product extends CommonObject
include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
if ($nbpiece < 0) {
if (!$movement) {
$movement = 1;
}
$nbpiece = abs($nbpiece);
}
$op[0] = "+".trim($nbpiece); $op[0] = "+".trim($nbpiece);
$op[1] = "-".trim($nbpiece); $op[1] = "-".trim($nbpiece);