| '.$langs->trans("ManageLotSerial").' | ';
$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
- print $form->selectarray('status_batch', $statutarray, (GETPOSTISSET('status_batch') ? GETPOST('status_batch') : $object->status_batch));
+
+ print $form->selectarray('status_batch', $statutarray, GETPOSTISSET('status_batch') ? GETPOST('status_batch') : $object->status_batch);
+
+ print '';
+ print img_warning().' '.$langs->trans("WarningConvertFromBatchToSerial").'';
+
+ print '';
+ print img_warning().' '.$langs->trans("WarningTransferBatchStockMouvToGlobal").'';
+
+ if ($object->status_batch) {
+ // Display message to make user know that all batch will be move into global stock
+ print '';
+
+ // Display message to explain that if the product currently have a quantity higher or equal to 2, switching to this choice means we will still have a product with different objects of the same batch (while we want a unique serial number)
+ if ($object->status_batch == 1) {
+ print '';
+ }
+ }
+
print ' |
';
if (!empty($object->status_batch) || !empty($conf->use_javascript_ajax)) {
$langs->load("admin");
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a548c8705d869..99c2d30459274 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1296,6 +1296,42 @@ public function update($id, $user, $notrigger = false, $action = 'update', $upda
}
}
+ if (!$this->hasbatch() && $this->oldcopy->hasbatch()) {
+ // Selection of all product stock mouvements that contains batchs
+ $sql = 'SELECT pb.qty, pb.fk_entrepot, pb.batch FROM '.MAIN_DB_PREFIX.'product_batch as pb';
+ $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
+ $sql.= ' WHERE ps.fk_product = '.(int) $this->id;
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $inventorycode = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+
+ while ($obj = $this->db->fetch_object($resql)) {
+ $value = $obj->qty;
+ $fk_entrepot = $obj->fk_entrepot;
+ $price = 0;
+ $dlc = '';
+ $dluo = '';
+ $batch = $obj->batch;
+
+ // To know how to revert stockMouvement (add or remove)
+ $addOremove = $value > 0 ? 1 : 0; // 1 if remove, 0 if add
+ $label = $langs->trans('BatchStockMouvementAddInGlobal');
+ $res = $this->correct_stock_batch($user, $fk_entrepot, abs($value), $addOremove, $label, $price, $dlc, $dluo, $batch, $inventorycode, '', null, 0, null, true);
+
+ if ($res > 0) {
+ $label = $langs->trans('BatchStockMouvementAddInGlobal');
+ $res = $this->correct_stock($user, $fk_entrepot, abs($value), (int) empty($addOremove), $label, $price, $inventorycode, '', null, 0);
+ if ($res < 0) {
+ $error++;
+ }
+ } else {
+ $error++;
+ }
+ }
+ }
+ }
+
// Actions on extra fields
if (!$error) {
$result = $this->insertExtraFields();
@@ -5535,9 +5571,10 @@ public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label =
* @param int $origin_id Origin id of element
* @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (usefull only if product is a subproduct)
* @param Extrafields $extrafields Array of extrafields
+ * @param boolean $force_update_batch Force update batch
* @return int <0 if KO, >0 if OK
*/
- public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null)
+ public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)
{
// phpcs:enable
if ($id_entrepot) {
@@ -5557,7 +5594,7 @@ public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $l
$movementstock = new MouvementStock($this->db);
$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin_type and ->fk_origin
- $result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot, false, 0, $disablestockchangeforsubproduct);
+ $result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot, false, 0, $disablestockchangeforsubproduct, 0, $force_update_batch);
if ($result >= 0) {
if ($extrafields) {
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 2291effe8c467..bada9c6194ecb 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -175,9 +175,10 @@ public function __construct($db)
* @param int $id_product_batch Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
* @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (usefull only if product is a subproduct)
* @param int $donotcleanemptylines Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
+ * @param boolean $force_update_batch Allows to add batch stock movement even if $product doesn't use batch anymore
* @return int <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
*/
- public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0)
+ public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false)
{
// phpcs:enable
global $conf, $langs;
@@ -559,7 +560,7 @@ public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price =
}
// Update detail of stock for the lot.
- if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
+ if (!$error && isModEnabled('productbatch') && (($product->hasbatch() && !$skip_batch) || $force_update_batch)) {
if ($id_product_batch > 0) {
$result = $this->createBatch($id_product_batch, $qty);
if ($result == -2 && $fk_product_stock > 0) { // The entry for this product batch does not exists anymore, bu we already have a llx_product_stock, so we recreate the batch entry in product_batch