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

Merge pull request #16536 from Hystepik/develop#2

Browse Source 
Fix #16525 : new button manufacturing order
This commit is contained in:
Laurent Destailleur 2021-03-04 16:13:01 +01:00 committed by GitHub
commit afd751777c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/mrp/class/mo.class.php
View File

@ -168,7 +168,7 @@ class Mo extends CommonObject
/** /**
* @var string Name of subtable line * @var string Name of subtable line
*/ */
public $table_element_line = 'mo_production'; public $table_element_line = 'mrp_production';
/** /**
* @var string Field with ID of parent key if this field has a parent * @var string Field with ID of parent key if this field has a parent

16
htdocs/mrp/mo_production.php
View File

@ -48,7 +48,7 @@ $confirm = GETPOST('confirm', 'alpha');
$cancel = GETPOST('cancel', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha');
//$lineid = GETPOST('lineid', 'int'); $lineid = GETPOST('lineid', 'int');
$collapse = GETPOST('collapse', 'aZ09comma'); $collapse = GETPOST('collapse', 'aZ09comma');
@ -724,6 +724,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
} }
print '</td>'; print '</td>';
} }
if ($permissiontodelete) {
print '<td></td>';
}
print '</tr>'; print '</tr>';
if ($action == 'addconsumeline') { if ($action == 'addconsumeline') {
@ -849,6 +852,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($conf->productbatch->enabled) { if ($conf->productbatch->enabled) {
print '<td></td>'; // Lot print '<td></td>'; // Lot
} }
if ($permissiontodelete) {
$href = $_SERVER["PHP_SELF"];
$href .= '?id='.$object->id;
$href .= '&action=deleteline';
$href .= '&lineid='.$line->id;
print '<td class="center">';
print '<a href="'.$href.'">';
print img_picto('', "delete");
print '</a>';
print '</td>';
}
print '</tr>'; print '</tr>';
// Show detailed of already consumed with js code to collapse // Show detailed of already consumed with js code to collapse