diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang index c754d411408..2fa68d36061 100644 --- a/htdocs/langs/en_US/mrp.lang +++ b/htdocs/langs/en_US/mrp.lang @@ -49,4 +49,6 @@ DisableStockChangeHelp=When this flag is set, there is no stock change on this p BomAndBomLines=Bills Of Material and lines BOMLine=Line of BOM WarehouseForProduction=Warehouse for production -CreateMO=Create MO \ No newline at end of file +CreateMO=Create MO +ToConsume=A consommer +Manufactured=Fabriqué diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php index 1408162b111..7cbb7256b5f 100644 --- a/htdocs/mrp/mo_card.php +++ b/htdocs/mrp/mo_card.php @@ -251,7 +251,10 @@ if ($action == 'create') } });*/ } - else { + else if (jQuery('#fk_bom').val() < 0) { + // Redirect to page with all fields defined except fk_bom set + console.log(jQuery('#fk_product').val()); + window.location.href = '?action=create&qty='+jQuery('#qty').val()+'&fk_product='+jQuery('#fk_product').val()+'&label='+jQuery('#label').val()+'&fk_project='+jQuery('#fk_project').val()+'&fk_warehouse='+jQuery('#fk_warehouse').val(); /* $('#qty').val(''); $("#fk_product").val(''); @@ -275,15 +278,19 @@ if ($action == 'create') print ''; // Cancel for create does not post form if we don't know the backtopage print ''; - print load_fiche_titre($langs->trans("ToConsume")); + if (GETPOST('fk_bom', 'int') > 0) { + print load_fiche_titre($langs->trans("ToConsume")); - print '