diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang index 3ec0398d59b..f47354958eb 100644 --- a/htdocs/langs/en_US/mrp.lang +++ b/htdocs/langs/en_US/mrp.lang @@ -63,6 +63,7 @@ ConsumeAndProduceAll=Consume and Produce All Manufactured=Manufactured TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce. ForAQuantityOf=For a quantity to produce of %s +ForAQuantityToConsumeOf=For a quantity to disassemble of %s ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order? ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements. ProductionForRef=Production of %s diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index ea37715b4e5..d48d4959fd1 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -1280,7 +1280,13 @@ class Mo extends CommonObject print ''; print ''.$langs->trans('Ref').''; - print ''.$langs->trans('Qty').' ('.$langs->trans("ForAQuantityOf", $this->bom->qty).')'; + print ''.$langs->trans('Qty'); + if ($this->bom->bomtype == 0) { + print ' ('.$langs->trans("ForAQuantityOf", $this->bom->qty).')'; + } else { + print ' ('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')'; + } + print ''; print ''.$langs->trans('QtyFrozen').''; print ''.$langs->trans('DisableStockChange').''; //print ''.$langs->trans('Efficiency').''; diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 6f35f1f1a25..65d4da3c908 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -707,16 +707,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ''; print ''.$langs->trans("Product").''; + // Qty print ''.$langs->trans("Qty").''; + // Cost price if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) { print ''.$langs->trans("UnitCost").''; } + // Qty already consumed print ''.$langs->trans("QtyAlreadyConsumed").''; + // Warehouse print ''; if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) { print $langs->trans("Warehouse"); } print ''; + // Lot - serial if ($conf->productbatch->enabled) { print ''; if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) { @@ -724,6 +729,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } print ''; } + // Action if ($permissiontodelete) { print ''; } @@ -735,17 +741,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ''; print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300'); print ''; + // Qty print ''; + // Cost price if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) { print ''; } - print ''; + // Qty already consumed + print ''; + // Warehouse print ''; print ''; print ''; + // Lot - serial if ($conf->productbatch->enabled) { print ''; } + // Action + if ($permissiontodelete) { + print ''; + } print ''; }