| ';
diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php
index 2e47c7bf621..c3f8e7825d4 100644
--- a/htdocs/mrp/lib/mrp_mo.lib.php
+++ b/htdocs/mrp/lib/mrp_mo.lib.php
@@ -43,6 +43,12 @@ function moPrepareHead($object)
$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_production.php?id='.$object->id;
$head[$h][1] = $langs->trans("Production");
+ $arrayproduced = $object->fetchLinesLinked('produced', 0);
+ $nbProduced = 0;
+ foreach($arrayproduced as $lineproduced) {
+ $nbProduced += $lineproduced['qty'];
+ }
+ $head[$h][1].= ''.$nbProduced.' / '.$object->qty.'';
$head[$h][2] = 'production';
$h++;
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 68938f97a58..1993f6e46aa 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -62,6 +62,7 @@ $confirm = GETPOST('confirm', 'alpha');
$cancel = GETPOST('cancel', 'aZ09');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
//$lineid = GETPOST('lineid', 'int');
// Initialize technical objects
@@ -135,6 +136,10 @@ if (empty($reshook))
else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
}
}
+ if ($cancel && ! empty($backtopageforcancel)) {
+ $backtopage = $backtopageforcancel;
+ }
+
$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -202,7 +207,8 @@ if ($action == 'create')
print ' |