Product '.$obj->rowid.'-'.$obj->ref.' in warehouse id='.$obj->fk_entrepot.' (product_stock.id='.$obj->psrowid.'): '.$obj->reel.' (Stock product_stock.reel) != '.($obj->reelbatch ? $obj->reelbatch : '0').' (Stock batch sum product_batch)';
- // Fix
+ // Fix is required
if ($obj->reel != $obj->reelbatch) {
- if ($methodtofix == 'updatebatch') {
- // Method 1
- print ' -> Insert qty '.($obj->reel - $obj->reelbatch).' with lot 000000 linked to fk_product_stock='.$obj->psrowid;
+ if (empty($obj->tobatch)) {
+ // If product is not a product that support batches, we can clean stock by deleting the product batch lines
+ print ' -> Delete qty '.$obj->reelbatch.' for any lot linked to fk_product_stock='.$obj->psrowid;
+ $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."product_batch";
+ $sql2 .= " WHERE fk_product_stock = ".((int) $obj->psrowid);
+ print '
'.$sql2;
+
if (GETPOST('clean_product_stock_batch') == 'confirmed') {
- $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_batch(fk_product_stock, batch, qty)";
- $sql2 .= "VALUES(".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
$resql2 = $db->query($sql2);
if (!$resql2) {
- // TODO If it fails, we must make update
- //$sql2 ="UPDATE ".MAIN_DB_PREFIX."product_batch";
- //$sql2.=" SET ".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
- //$sql2.=" WHERE fk_product_stock = ".((int) $obj->psrowid)
- }
- }
- }
- if ($methodtofix == 'updatestock') {
- // Method 2
- print ' -> Update qty of product_stock with qty = '.($obj->reelbatch ? ((float) $obj->reelbatch) : '0').' for ps.rowid = '.((int) $obj->psrowid);
- if (GETPOST('clean_product_stock_batch') == 'confirmed') {
- $error = 0;
-
- $db->begin();
-
- $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_stock";
- $sql2 .= " SET reel = ".($obj->reelbatch ? ((float) $obj->reelbatch) : '0')." WHERE rowid = ".((int) $obj->psrowid);
- $resql2 = $db->query($sql2);
- if ($resql2) {
- // We update product_stock, so we must fill p.stock into product too.
- $sql3 = 'UPDATE '.MAIN_DB_PREFIX.'product p SET p.stock= (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid)';
- $resql3 = $db->query($sql3);
- if (!$resql3) {
- $error++;
- dol_print_error($db);
- }
- } else {
$error++;
dol_print_error($db);
}
+ }
+ } else {
+ if ($methodtofix == 'updatebatch') {
+ // Method 1
+ print ' -> Insert qty '.($obj->reel - $obj->reelbatch).' with lot 000000 linked to fk_product_stock='.$obj->psrowid;
+ $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_batch(fk_product_stock, batch, qty)";
+ $sql2 .= "VALUES(".((int) $obj->psrowid).", '000000', ".((float) ($obj->reel - $obj->reelbatch)).")";
+ print '
'.$sql2;
- if (!$error) {
- $db->commit();
- } else {
- $db->rollback();
+ if (GETPOST('clean_product_stock_batch') == 'confirmed') {
+ $resql2 = $db->query($sql2);
+ if (!$resql2) {
+ // TODO If it fails, we must make update
+ //$sql2 ="UPDATE ".MAIN_DB_PREFIX."product_batch";
+ //$sql2.=" SET ".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
+ //$sql2.=" WHERE fk_product_stock = ".((int) $obj->psrowid)
+ }
+ }
+ }
+ if ($methodtofix == 'updatestock') {
+ // Method 2
+ print ' -> Update qty of product_stock with qty = '.($obj->reelbatch ? ((float) $obj->reelbatch) : '0').' for ps.rowid = '.((int) $obj->psrowid);
+ $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_stock";
+ $sql2 .= " SET reel = ".($obj->reelbatch ? ((float) $obj->reelbatch) : '0')." WHERE rowid = ".((int) $obj->psrowid);
+ print '
'.$sql2;
+
+ if (GETPOST('clean_product_stock_batch') == 'confirmed') {
+ $error = 0;
+
+ $db->begin();
+
+ $resql2 = $db->query($sql2);
+ if ($resql2) {
+ // We update product_stock, so we must fill p.stock into product too.
+ $sql3 = 'UPDATE '.MAIN_DB_PREFIX.'product p SET p.stock= (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid)';
+ $resql3 = $db->query($sql3);
+ if (!$resql3) {
+ $error++;
+ dol_print_error($db);
+ }
+ } else {
+ $error++;
+ dol_print_error($db);
+ }
+
+ if (!$error) {
+ $db->commit();
+ } else {
+ $db->rollback();
+ }
}
}
}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 3b911a4c2c7..9bd1a202245 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1277,7 +1277,7 @@ if (!empty($arrayfields['p.stock']['checked'])) {
print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"], "p.stock", "", $param, '', $sortfield, $sortorder, 'right ');
}
if (!empty($arrayfields['stock_virtual']['checked'])) {
- print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
}
if (!empty($arrayfields['p.tobatch']['checked'])) {
print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"], "p.tobatch", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -1854,7 +1854,7 @@ while ($i < $imaxinloop) {
}
if ($usercancreadprice) {
if ($product_static->stock_reel < 0) { print ''; }
- print price(price2num($product_static->stock_reel, 'MS'));
+ print price(price2num($product_static->stock_reel, 'MS'), 0, $langs, 1, 0);
if ($product_static->stock_reel < 0) { print ''; }
}
}
@@ -1872,7 +1872,7 @@ while ($i < $imaxinloop) {
}
if ($usercancreadprice) {
if ($product_static->stock_theorique < 0) { print ''; }
- print price(price2num($product_static->stock_theorique, 'MS'));
+ print price(price2num($product_static->stock_theorique, 'MS'), 0, $langs, 1, 0);
if ($product_static->stock_theorique < 0) { print ''; }
}
}
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 9946e7a9077..22c475ab337 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -493,7 +493,7 @@ if ($resql) {
print img_warning($langs->trans("StockLowerThanLimit", $objp->seuil_stock_alerte)).' ';
}
if ($objp->stock_physique < 0) { print ''; }
- print price2num($objp->stock_physique, 'MS');
+ print price(price2num($objp->stock_physique, 'MS'), 0, $langs, 1, 0);
if ($objp->stock_physique < 0) { print ''; }
print ' | ';
@@ -502,7 +502,7 @@ if ($resql) {
if ($nb_warehouse > 1) {
foreach ($warehouses_list as &$wh) {
print '';
- print empty($product->stock_warehouse[$wh['id']]->real) ? '0' : $product->stock_warehouse[$wh['id']]->real;
+ print price(empty($product->stock_warehouse[$wh['id']]->real) ? 0 : $product->stock_warehouse[$wh['id']]->real, 0, $langs, 1, 0);
print ' | ';
}
}
@@ -511,11 +511,11 @@ if ($resql) {
// Virtual stock
if ($virtualdiffersfromphysical) {
print '';
- if ($objp->seuil_stock_alerte != '' && ($product->stock_theorique < $objp->seuil_stock_alerte)) {
+ if ($objp->seuil_stock_alerte != '' && ($product->stock_theorique < (float) $objp->seuil_stock_alerte)) {
print img_warning($langs->trans("StockLowerThanLimit", $objp->seuil_stock_alerte)).' ';
}
if ($objp->stock_physique < 0) { print ''; }
- print price2num($product->stock_theorique, 'MS');
+ print price2num($product->stock_theorique, 'MS', 0, $langs, 1, 0);
if ($objp->stock_physique < 0) { print ''; }
print ' | ';
}