diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 0f22e00de3c..658205a7c36 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -467,6 +467,55 @@ class Mo extends CommonObject
}
}
+ /**
+ * Get list of lines linked to current line for a defined role.
+ *
+ * @param string $role Get lines linked to current line with the selected role ('consumed', 'produced', ...)
+ * @param int $lineid Id of production line to filter childs
+ * @return array Array of lines
+ */
+ public function fetchLinesLinked($role, $lineid = 0)
+ {
+ $resarray = array();
+ $mostatic = new MoLine($this->db);
+
+ $sql = 'SELECT ';
+ $sql .= $mostatic->getFieldList();
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$mostatic->table_element.' as t';
+ $sql .= " WHERE t.role = '".$this->db->escape($role)."'";
+ if ($lineid > 0) $sql .= ' AND t.fk_mrp_production = '.$lineid;
+ else $sql .= 'AND t.fk_mo = '.$this->id;
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+
+ $i=0;
+ while ($i < $num) {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ $resarray[] = array(
+ 'rowid'=> $obj->rowid,
+ 'qty' => $obj->qty,
+ 'role' => $obj->role,
+ 'fk_product' => $obj->fk_product,
+ 'fk_warehouse' => $obj->fk_warehouse,
+ 'batch' => $obj->batch,
+ 'fk_stock_movement' => $obj->fk_stock_movement
+ );
+ }
+
+ $i++;
+ }
+
+ return $resarray;
+ } else {
+ $this->error = $this->db->lasterror();
+ var_dump($this->error);
+ return array();
+ }
+ }
+
/**
* Update object into database
*
@@ -1458,25 +1507,6 @@ class MoLine extends CommonObjectLine
}
}
- /**
- * Get list of lines linked to current line for a defined role
- *
- * @param string $role Get lines linked to current line with the selected role ('consumed', 'produced', ...)
- * @return array Array of lines
- */
- public function fetchLinesLinked($role)
- {
- $array = array();
-
- $sql = 'SELECT rowid, qty ';
- $sql .= $this->getFieldList();
- $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
- else $sql .= ' WHERE 1 = 1';
-
- return $array;
- }
-
/**
* Update object into database
*
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 840e46c9c1c..9c588d927de 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -104,6 +104,7 @@ $upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->enti
$permissiontoproduce = $permissiontoadd;
+
/*
* Actions
*/
@@ -152,6 +153,10 @@ if (empty($reshook))
$object->setProject(GETPOST('projectid', 'int'));
}
+ if ($action == 'confirm_reopen') {
+ $result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
+ }
+
if ($action == 'confirm_consumeandproduceall') {
$stockmove = new MouvementStock($db);
@@ -169,8 +174,8 @@ if (empty($reshook))
$i=1;
while (GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
// Check warehouse is set if we should have to
- if (GETPOST('idwarehouse-'.$line->id.'-'.$i)) {
- if (! (GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0)) {
+ if (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i)) { // If there is a warehouse to set
+ if (price2num(GETPOST('qty-'.$line->id.'-'.$i)) > 0 && ! (GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0)) { // If there is a quantity to dispatch and warehouse not set.
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
$error++;
@@ -186,7 +191,8 @@ if (empty($reshook))
if (! $error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
// Record stock movement
$id_product_batch = 0;
- $idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+ $stockmove->origin = $object;
+ $idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), price2num(GETPOST('qty-'.$line->id.'-'.$i)), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
if ($idstockmove < 0) {
$error++;
setEventMessages($stockmove->error, $stockmove->errors, 'errors');
@@ -201,7 +207,7 @@ if (empty($reshook))
$moline->position = $pos;
$moline->fk_product = $line->fk_product;
$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
- $moline->qty = GETPOST('qty-'.$line->id.'-'.$i);
+ $moline->qty = price2num(GETPOST('qty-'.$line->id.'-'.$i));
$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
$moline->role = 'consumed';
$moline->fk_mrp_production = $line->id;
@@ -231,8 +237,8 @@ if (empty($reshook))
$i=1;
while (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
// Check warehouse is set if we should have to
- if (GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i)) {
- if (! (GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {
+ if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) { // If there is a warehouse to set
+ if (price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i)) > 0 && ! (GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) { // If there is a quantity to dispatch and warehouse not set.
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
$error++;
@@ -248,7 +254,8 @@ if (empty($reshook))
if (! $error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
// Record stock movement
$id_product_batch = 0;
- $idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), GETPOST('qtytoproduce-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+ $stockmove->origin = $object;
+ $idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i)), 0, $labelmovement, dol_now(), '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
if ($idstockmove < 0) {
$error++;
setEventMessages($stockmove->error, $stockmove->errors, 'errors');
@@ -263,7 +270,7 @@ if (empty($reshook))
$moline->position = $pos;
$moline->fk_product = $line->fk_product;
$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
- $moline->qty = GETPOST('qtytoproduce-'.$line->id.'-'.$i);
+ $moline->qty = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
$moline->role = 'produced';
$moline->fk_mrp_production = $line->id;
@@ -285,13 +292,47 @@ if (empty($reshook))
}
if (! $error) {
+ $consumptioncomplete = true;
+ $productioncomplete = true;
+
+ if (GETPOST('autoclose', 'int')) {
+ foreach($object->lines as $line) {
+ if ($line->role == 'toconsume') {
+ $arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
+ $alreadyconsumed = 0;
+ foreach($arrayoflines as $line2) {
+ $alreadyconsumed += $line2['qty'];
+ }
+
+ if ($alreadyconsumed < $line->qty) {
+ $consumptioncomplete = false;
+ }
+ }
+ if ($line->role == 'toproduce') {
+ $arrayoflines = $object->fetchLinesLinked('produced', $line->id);
+ $alreadyproduced = 0;
+ foreach($arrayoflines as $line2) {
+ $alreadyproduced += $line2['qty'];
+ }
+
+ if ($alreadyproduced < $line->qty) {
+ $productioncomplete = false;
+ }
+ }
+ }
+ }
+ else {
+ $consumptioncomplete = false;
+ $productioncomplete = false;
+ }
+
// Update status of MO
- $qtyremaintoconsume = 0;
- $qtyremaintoproduce = 0;
- if ($qtyremaintoconsume == 0 && $qtyremaintoproduce == 0) {
- $result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
- } else {
+ dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+ //var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+ if ($consumptioncomplete && $productioncomplete) {
$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+ } else {
+ $result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
}
if ($result <= 0) {
$error++;
@@ -479,7 +520,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
} else {
print ''.$langs->trans('Consume').'';
}
- } else {
+ } elseif ($object->status == Mo::STATUS_DRAFT) {
print ''.$langs->trans('Consume').'';
}
@@ -490,7 +531,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
} else {
print ''.$langs->trans('Produce').'';
}
- } else {
+ } elseif ($object->status == Mo::STATUS_DRAFT) {
print ''.$langs->trans('Produce').'';
}
@@ -501,9 +542,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
} else {
print ''.$langs->trans('ConsumeAndProduceAll').'';
}
- } else {
+ } elseif ($object->status == Mo::STATUS_DRAFT) {
print ''.$langs->trans('ConsumeAndProduceAll').'';
}
+
+ // Reopen
+ if ($object->status == Mo::STATUS_PRODUCED) {
+ if ($permissiontoproduce) {
+ print ''.$langs->trans('ReOpen').'';
+ } else {
+ print ''.$langs->trans('ReOpen').'';
+ }
+ }
}
print '';
@@ -585,10 +635,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$tmpproduct = new Product($db);
$tmpproduct->fetch($line->fk_product);
- $arrayoflines = $line->fetchLinesLinked('consumed');
+ $arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
$alreadyconsumed = 0;
foreach($arrayoflines as $line2) {
- $alreadyconsumed += $line2->qty;
+ $alreadyconsumed += $line2['qty'];
}
print '';
@@ -612,7 +662,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '
';
// Show detailed of already consumed with js code to collapse
- //$arrayoflines = $line->fetchLinesLinked('consumed');
+ //$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
if ($action == 'consumeandproduceall') {
$i = 1;
@@ -697,10 +747,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$tmpproduct = new Product($db);
$tmpproduct->fetch($line->fk_product);
- $arrayoflines = $line->fetchLinesLinked('produced');
+ $arrayoflines = $object->fetchLinesLinked('produced', $line->id);
$alreadyproduced = 0;
foreach($arrayoflines as $line2) {
- $alreadyproduced += $line2->qty;
+ $alreadyproduced += $line2['qty'];
}
print '';