diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 8c0253e927c..d643498162f 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -357,7 +357,7 @@ function show_stats_for_company($product, $socid) print ''.$langs->trans("TotalQuantity").''; print ''; - // Customer proposals + // Customer proposals if (!empty($conf->propal->enabled) && $user->rights->propale->lire) { $nblines++; @@ -509,7 +509,6 @@ function show_stats_for_company($product, $socid) print ''; } - // MO if (!empty($conf->mrp->enabled) && $user->rights->mrp->read) { diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/am_ET/mrp.lang +++ b/htdocs/langs/am_ET/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/ar_SA/mrp.lang +++ b/htdocs/langs/ar_SA/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/az_AZ/mrp.lang +++ b/htdocs/langs/az_AZ/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang index a3c2904513a..f05b0cef519 100644 --- a/htdocs/langs/bg_BG/mrp.lang +++ b/htdocs/langs/bg_BG/mrp.lang @@ -1,6 +1,6 @@ Mrp=Поръчки за производство -MO=Поръчка за производство MOs=Manufacturing orders +ManufacturingOrder=Поръчка за производство MRPDescription=Модул за управление на поръчки за производство (ПП) MRPArea=Секция за планиране на материални изисквания MrpSetupPage=Настройка на модул за планиране на материални изисквания diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/bn_BD/mrp.lang +++ b/htdocs/langs/bn_BD/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/bn_IN/mrp.lang +++ b/htdocs/langs/bn_IN/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/bs_BA/mrp.lang +++ b/htdocs/langs/bs_BA/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang index b37b577475c..c533fae10f5 100644 --- a/htdocs/langs/ca_ES/mrp.lang +++ b/htdocs/langs/ca_ES/mrp.lang @@ -1,6 +1,6 @@ Mrp=Comandes de Fabricació -MO=Comanda de fabricació MOs=Manufacturing orders +ManufacturingOrder=Comanda de fabricació MRPDescription=Mòdul per gestionar ordres de producció i fabricació (MO). MRPArea=Àrea MRP MrpSetupPage=Configuració del mòdul MRP diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang index ee97c7b368f..3f4024bbd8b 100644 --- a/htdocs/langs/cs_CZ/mrp.lang +++ b/htdocs/langs/cs_CZ/mrp.lang @@ -1,6 +1,6 @@ Mrp=Výrobní zakázky -MO=Výrobní zakázka MOs=Manufacturing orders +ManufacturingOrder=Výrobní zakázka MRPDescription=Modul pro správu výrobních a výrobních objednávek (MO). MRPArea=Oblast MRP MrpSetupPage=Nastavení modulu MRP diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang index f9474dbaaf5..b809bb8da13 100644 --- a/htdocs/langs/da_DK/mrp.lang +++ b/htdocs/langs/da_DK/mrp.lang @@ -1,6 +1,6 @@ Mrp=Fremstillingsordrer -MO=Fremstillingsordre MOs=Manufacturing orders +ManufacturingOrder=Fremstillingsordre MRPDescription=Modul til styring af produktions- og produktionsordrer (MO). MRPArea=MRP-område MrpSetupPage=Opsætning af modul MRP diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang index abb37ad22ba..effcd72420a 100644 --- a/htdocs/langs/de_DE/mrp.lang +++ b/htdocs/langs/de_DE/mrp.lang @@ -1,6 +1,6 @@ Mrp=Fertigungsaufträge -MO=Fertigungsauftrag MOs=Manufacturing orders +ManufacturingOrder=Fertigungsauftrag MRPDescription=Modul zur Verwaltung von Produktions- und Fertigungsaufträgen (MO). MRPArea=MRP Bereich MrpSetupPage=Einrichtung des Moduls MRP diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang index b3936567cdd..9dba9248508 100644 --- a/htdocs/langs/el_GR/mrp.lang +++ b/htdocs/langs/el_GR/mrp.lang @@ -1,6 +1,6 @@ Mrp=Παραγγελίες Παραγωγής -MO=Παραγγελία Παραγωγής MOs=Manufacturing orders +ManufacturingOrder=Παραγγελία Παραγωγής MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO). MRPArea=Περιοχή MRP MrpSetupPage=Ρύθμιση της μονάδας MRP diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang index f4c6eb9246a..a308035b83d 100644 --- a/htdocs/langs/en_US/mrp.lang +++ b/htdocs/langs/en_US/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP @@ -75,6 +75,10 @@ ProductsToConsume=Products to consume ProductsToProduce=Products to produce UnitCost=Unit cost TotalCost=Total cost +<<<<<<< HEAD BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. - \ No newline at end of file + +======= +BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git diff --git a/htdocs/langs/es_AR/mrp.lang b/htdocs/langs/es_AR/mrp.lang index a8b70a8377e..0fcf28a866f 100644 --- a/htdocs/langs/es_AR/mrp.lang +++ b/htdocs/langs/es_AR/mrp.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - mrp Mrp=Ordenes de Fabricación -MO=Orden de Fabricación +ManufacturingOrder=Orden de Fabricación MRPDescription=Módulo para administrar producción y Ordenes de Fabricación (OF). MRPArea=Area MRP MrpSetupPage=Configuración de módulo MRP diff --git a/htdocs/langs/es_CL/mrp.lang b/htdocs/langs/es_CL/mrp.lang index c523e0836b6..f43c1d88ba9 100644 --- a/htdocs/langs/es_CL/mrp.lang +++ b/htdocs/langs/es_CL/mrp.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - mrp Mrp=Ordenes de Fabricación -MO=Orden de Fabricación +ManufacturingOrder=Orden de Fabricación MrpSetupPage=Configuración del módulo de MRP MenuBOM=Facturas de material LatestBOMModified=Últimas %s Cuentas de materiales modificadas diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang index 47ae2fc9595..5c55b55c5e0 100644 --- a/htdocs/langs/es_ES/mrp.lang +++ b/htdocs/langs/es_ES/mrp.lang @@ -1,6 +1,6 @@ Mrp=Órdenes de fabricación -MO=Orden de fabricación MOs=Manufacturing orders +ManufacturingOrder=Orden de fabricación MRPDescription=Módulo para gestionar producción y Órdenes de Fabricación (OF). MRPArea=Área MRP MrpSetupPage=Configuración del módulo MRP diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang index 8488907e055..9b371e0293e 100644 --- a/htdocs/langs/es_PE/mrp.lang +++ b/htdocs/langs/es_PE/mrp.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - mrp Mrp=Órdenes de Fabricación -MO=Orden de Fabricación +ManufacturingOrder=Orden de Fabricación MRPDescription=Modulo para gestionar la producción y órdenes de fabricación (OF). MRPArea=Área PRM MrpSetupPage=Configuración del modulo PRM diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang index dd830a8e434..ce25a3d236b 100644 --- a/htdocs/langs/et_EE/mrp.lang +++ b/htdocs/langs/et_EE/mrp.lang @@ -1,6 +1,6 @@ Mrp=Manufacturing Orders -MO=Manufacturing Order MOs=Manufacturing orders +ManufacturingOrder=Manufacturing Order MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/eu_ES/mrp.lang +++ b/htdocs/langs/eu_ES/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang index 74aa70bfac9..1dc4b25c5c8 100644 --- a/htdocs/langs/fa_IR/mrp.lang +++ b/htdocs/langs/fa_IR/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=بخش برنامه‌ریزی مواد اولیه MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/fi_FI/mrp.lang +++ b/htdocs/langs/fi_FI/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang index 32d53d270cd..1c2592068d2 100644 --- a/htdocs/langs/fr_FR/mrp.lang +++ b/htdocs/langs/fr_FR/mrp.lang @@ -1,6 +1,10 @@ Mrp=Ordres de fabrication +<<<<<<< HEAD MO=Ordre de fabrication MOs=Manufacturing orders +======= +ManufacturingOrder=Ordre de fabrication +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module de gestion de production et Ordres de Fabrication (OF). MRPArea=Espace MRP MrpSetupPage=Configuration du module MRP diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang index 14eee8d483e..74e6c5e0154 100644 --- a/htdocs/langs/gl_ES/mrp.lang +++ b/htdocs/langs/gl_ES/mrp.lang @@ -1,6 +1,10 @@ Mrp=Ordes de fabricación +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/he_IL/mrp.lang +++ b/htdocs/langs/he_IL/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/hi_IN/mrp.lang +++ b/htdocs/langs/hi_IN/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/hr_HR/mrp.lang +++ b/htdocs/langs/hr_HR/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/hu_HU/mrp.lang +++ b/htdocs/langs/hu_HU/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang index 5d0342b3136..5956fffdd62 100644 --- a/htdocs/langs/id_ID/mrp.lang +++ b/htdocs/langs/id_ID/mrp.lang @@ -1,6 +1,10 @@ Mrp=Pesanan Manufaktur +<<<<<<< HEAD MO=Pesanan manufaktur MOs=Manufacturing orders +======= +ManufacturingOrder=Pesanan manufaktur +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Modul untuk mengelola produksi dan Pesanan Manufaktur (MO). MRPArea=Area MRP MrpSetupPage=Pengaturan MRP modul diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/is_IS/mrp.lang +++ b/htdocs/langs/is_IS/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang index 9db0cbe4008..b09f3395a10 100644 --- a/htdocs/langs/it_IT/mrp.lang +++ b/htdocs/langs/it_IT/mrp.lang @@ -1,6 +1,10 @@ Mrp=Ordini di produzione +<<<<<<< HEAD MO=Ordine di produzione MOs=Manufacturing orders +======= +ManufacturingOrder=Ordine di produzione +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Modulo per la gestione degli ordini di produzione (MO). MRPArea=MRP Area MrpSetupPage=Configurazione del modulo MRP diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/ja_JP/mrp.lang +++ b/htdocs/langs/ja_JP/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/ka_GE/mrp.lang +++ b/htdocs/langs/ka_GE/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/km_KH/mrp.lang +++ b/htdocs/langs/km_KH/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/kn_IN/mrp.lang +++ b/htdocs/langs/kn_IN/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/ko_KR/mrp.lang +++ b/htdocs/langs/ko_KR/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/lo_LA/mrp.lang +++ b/htdocs/langs/lo_LA/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/lt_LT/mrp.lang +++ b/htdocs/langs/lt_LT/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang index d55d005dbd0..bff9a0eb06e 100644 --- a/htdocs/langs/lv_LV/mrp.lang +++ b/htdocs/langs/lv_LV/mrp.lang @@ -1,6 +1,10 @@ Mrp=Ražošanas pasūtījumi +<<<<<<< HEAD MO=Ražošanas pasūtījums MOs=Manufacturing orders +======= +ManufacturingOrder=Ražošanas pasūtījums +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Ražošanas un ražošanas pasūtījumu (MO) pārvaldības modulis. MRPArea=MRP apgabals MrpSetupPage=MRP moduļa iestatīšana diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/mk_MK/mrp.lang +++ b/htdocs/langs/mk_MK/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/mn_MN/mrp.lang +++ b/htdocs/langs/mn_MN/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang index e6ea08e39d7..875be1c549d 100644 --- a/htdocs/langs/nb_NO/mrp.lang +++ b/htdocs/langs/nb_NO/mrp.lang @@ -1,6 +1,10 @@ Mrp=Produksjonsordrer +<<<<<<< HEAD MO=Produksjonsordre MOs=Manufacturing orders +======= +ManufacturingOrder=Produksjonsordre +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Modul for å administrere produksjons- og produksjonsordrer (PO). MRPArea=MRP-område MrpSetupPage=Oppsett av MRP-modul diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/ne_NP/mrp.lang +++ b/htdocs/langs/ne_NP/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang index eaaa9d827a5..74d6c0447de 100644 --- a/htdocs/langs/nl_NL/mrp.lang +++ b/htdocs/langs/nl_NL/mrp.lang @@ -1,6 +1,10 @@ Mrp=Productieorders +<<<<<<< HEAD MO=Productieorder MOs=Manufacturing orders +======= +ManufacturingOrder=Productieorder +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module om productie- en productieorders (PO) te beheren. MRPArea=MRP-gebied MrpSetupPage=Installatie van module MRP diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/pl_PL/mrp.lang +++ b/htdocs/langs/pl_PL/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang index ee398122b08..b35d3cbd228 100644 --- a/htdocs/langs/pt_BR/mrp.lang +++ b/htdocs/langs/pt_BR/mrp.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - mrp Mrp=Ordens de fabricação -MO=Ordem de fabricação +ManufacturingOrder=Ordem de fabricação MRPDescription=Módulo para gerenciar ordens de produção e manufatura (MO). MRPArea=Area MRP MenuBOM=Lista de materiais diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang index 5128c7a5d91..d89ad769fb5 100644 --- a/htdocs/langs/pt_PT/mrp.lang +++ b/htdocs/langs/pt_PT/mrp.lang @@ -1,3 +1,4 @@ +<<<<<<< HEAD Mrp=Encomendas de Manufatura MO=Encomenda de Manufatura MOs=Manufacturing orders @@ -13,6 +14,22 @@ BOMsSetup=Configuração do módulo de FM ListOfBOMs=Lista das faturas do material - FM ListOfManufacturingOrders=Lista das Encomendas de Manufaturação NewBOM=Nova fatura de material +======= +Mrp=Manufacturing Orders +ManufacturingOrder=Manufacturing Order +MRPDescription=Module to manage production and Manufacturing Orders (MO). +MRPArea=MRP Area +MrpSetupPage=Setup of module MRP +MenuBOM=Bills of material +LatestBOMModified=Latest %s Bills of materials modified +LatestMOModified=Latest %s Manufacturing Orders modified +Bom=Bills of Material +BillOfMaterials=Bill of Material +BOMsSetup=Setup of module BOM +ListOfBOMs=List of bills of material - BOM +ListOfManufacturingOrders=List of Manufacturing Orders +NewBOM=New bill of material +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git ProductBOMHelp=Product to create with this BOM.
Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list. BOMsNumberingModules=Modelos de numeração de FM BOMsModelModule=Modelos de documento de FM diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang index 7e50b46154f..7d528c21be4 100644 --- a/htdocs/langs/ro_RO/mrp.lang +++ b/htdocs/langs/ro_RO/mrp.lang @@ -1,3 +1,4 @@ +<<<<<<< HEAD Mrp=Comenzi de producţie MO=Comandă de producţie MOs=Manufacturing orders @@ -9,6 +10,18 @@ LatestBOMModified=Ultimele %s bonuri de consum modificate LatestMOModified=Ultimele %s Comenzi de producţie modificate Bom=Bonuri de consum BillOfMaterials=Bon de consum +======= +Mrp=Manufacturing Orders +ManufacturingOrder=Manufacturing Order +MRPDescription=Module to manage production and Manufacturing Orders (MO). +MRPArea=MRP Area +MrpSetupPage=Setup of module MRP +MenuBOM=Bills of material +LatestBOMModified=Latest %s Bills of materials modified +LatestMOModified=Latest %s Manufacturing Orders modified +Bom=Bills of Material +BillOfMaterials=Bill of Material +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git BOMsSetup=Configurarea modulului BOM ListOfBOMs=Listă bonuri de consum - BOM ListOfManufacturingOrders=Listă comenzi de producţie diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang index 14f9b820743..34a614b5203 100644 --- a/htdocs/langs/ru_RU/mrp.lang +++ b/htdocs/langs/ru_RU/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/sk_SK/mrp.lang +++ b/htdocs/langs/sk_SK/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/sl_SI/mrp.lang +++ b/htdocs/langs/sl_SI/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/sq_AL/mrp.lang +++ b/htdocs/langs/sq_AL/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/sr_RS/mrp.lang +++ b/htdocs/langs/sr_RS/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang index c17d2ea60a6..38e27d6fd41 100644 --- a/htdocs/langs/sv_SE/mrp.lang +++ b/htdocs/langs/sv_SE/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP-område MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/sw_SW/mrp.lang +++ b/htdocs/langs/sw_SW/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/th_TH/mrp.lang +++ b/htdocs/langs/th_TH/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang index e5a11e3ca43..7cfe3bfd883 100644 --- a/htdocs/langs/tr_TR/mrp.lang +++ b/htdocs/langs/tr_TR/mrp.lang @@ -1,6 +1,10 @@ Mrp=Üretim Emirleri +<<<<<<< HEAD MO=Üretim Emri MOs=Manufacturing orders +======= +ManufacturingOrder=Üretim Emri +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Üretim ve Üretim Siparişlerini (MO) yönetmek için modül. MRPArea=MRP Alanı MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/uk_UA/mrp.lang +++ b/htdocs/langs/uk_UA/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/uz_UZ/mrp.lang +++ b/htdocs/langs/uz_UZ/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang index 5e79c6e8c6e..73ea762c332 100644 --- a/htdocs/langs/vi_VN/mrp.lang +++ b/htdocs/langs/vi_VN/mrp.lang @@ -1,6 +1,10 @@ Mrp=Đơn đặt hàng sản xuất +<<<<<<< HEAD MO=Đơn hàng sản xuất MOs=Manufacturing orders +======= +ManufacturingOrder=Đơn hàng sản xuất +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=Khu vực MRP MrpSetupPage=Thiết lập mô-đun MRP diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/zh_CN/mrp.lang +++ b/htdocs/langs/zh_CN/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang index dd830a8e434..c27001f9417 100644 --- a/htdocs/langs/zh_HK/mrp.lang +++ b/htdocs/langs/zh_HK/mrp.lang @@ -1,6 +1,10 @@ Mrp=Manufacturing Orders +<<<<<<< HEAD MO=Manufacturing Order MOs=Manufacturing orders +======= +ManufacturingOrder=Manufacturing Order +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=Module to manage production and Manufacturing Orders (MO). MRPArea=MRP Area MrpSetupPage=Setup of module MRP diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang index 160aa9091e2..433408695b7 100644 --- a/htdocs/langs/zh_TW/mrp.lang +++ b/htdocs/langs/zh_TW/mrp.lang @@ -1,6 +1,10 @@ Mrp=製造訂單 +<<<<<<< HEAD MO=製造訂單 MOs=Manufacturing orders +======= +ManufacturingOrder=製造訂單 +>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git MRPDescription=管理生產和製造訂單（MO）的模組。 MRPArea=MRP區域 MrpSetupPage=MRP模組設定 diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index 0d623988a3f..cf4b4ccddd1 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -987,7 +987,7 @@ class Mo extends CommonObject $result = ''; - $label = img_picto('', $this->picto).' '.$langs->trans("MO").''; + $label = img_picto('', $this->picto).' '.$langs->trans("ManufacturingOrder").''; $label .= '
'; $label .= ''.$langs->trans('Ref').': '.$this->ref; if (isset($this->status)) { diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php index d4359dcae90..b7b96319a16 100644 --- a/htdocs/mrp/index.php +++ b/htdocs/mrp/index.php @@ -96,7 +96,7 @@ if ($conf->use_javascript_ajax) print '
'; print ''; - print ''."\n"; + print '' . "\n"; $listofstatus = array(0, 1, 2, 3, 9); foreach ($listofstatus as $status) { diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php index f203633584e..eb61c42e83d 100644 --- a/htdocs/mrp/lib/mrp_mo.lib.php +++ b/htdocs/mrp/lib/mrp_mo.lib.php @@ -37,7 +37,7 @@ function moPrepareHead($object) $head = array(); $head[$h][0] = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$object->id; - $head[$h][1] = $langs->trans("MO"); + $head[$h][1] = $langs->trans("ManufacturingOrder"); $head[$h][2] = 'card'; $h++; diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php index e6892e949e5..d8031015064 100644 --- a/htdocs/mrp/mo_agenda.php +++ b/htdocs/mrp/mo_agenda.php @@ -131,7 +131,7 @@ if ($object->id > 0) $head = moPrepareHead($object); - print dol_get_fiche_head($head, 'agenda', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'agenda', $langs->trans("ManufacturingOrder"), -1, $object->picto); // Object card // ------------------------------------------------------------ diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php index 19adf082458..952d0dedab4 100644 --- a/htdocs/mrp/mo_card.php +++ b/htdocs/mrp/mo_card.php @@ -314,7 +314,7 @@ if ($action == 'create') // Part to edit record if (($id || $ref) && $action == 'edit') { - print load_fiche_titre($langs->trans("MO"), '', 'mrp'); + print load_fiche_titre($langs->trans("ManufacturingOrder"), '', 'mrp'); print ''; print ''; @@ -353,7 +353,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = moPrepareHead($object); - print dol_get_fiche_head($head, 'card', $langs->trans("MO"), -1, $object->picto); + + print dol_get_fiche_head($head, 'card', $langs->trans("ManufacturingOrder"), -1, $object->picto); $formconfirm = ''; diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php index 42de53412e6..a83feb54aea 100644 --- a/htdocs/mrp/mo_document.php +++ b/htdocs/mrp/mo_document.php @@ -103,8 +103,7 @@ if ($object->id) */ $head = moPrepareHead($object); - print dol_get_fiche_head($head, 'document', $langs->trans("MO"), -1, $object->picto); - + print dol_get_fiche_head($head, 'document', $langs->trans("ManufacturingOrder"), -1, $object->picto); // Build file list $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1); diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php index efa6c6f5167..522c740e58f 100644 --- a/htdocs/mrp/mo_movements.php +++ b/htdocs/mrp/mo_movements.php @@ -242,7 +242,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = moPrepareHead($object); - print dol_get_fiche_head($head, 'stockmovement', $langs->trans("MO"), -1, $object->picto); + + print dol_get_fiche_head($head, 'stockmovement', $langs->trans("ManufacturingOrder"), -1, $object->picto); $formconfirm = ''; diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php index 8cdb243e888..7a9cb5b8eae 100644 --- a/htdocs/mrp/mo_note.php +++ b/htdocs/mrp/mo_note.php @@ -87,7 +87,7 @@ if ($id > 0 || !empty($ref)) $head = moPrepareHead($object); - print dol_get_fiche_head($head, 'note', $langs->trans("MO"), -1, $object->picto); + print dol_get_fiche_head($head, 'note', $langs->trans("ManufacturingOrder"), -1, $object->picto); // Object card // ------------------------------------------------------------ diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 8ec9c627013..058aeeacf39 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -413,7 +413,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $res = $object->fetch_optionals(); $head = moPrepareHead($object); - print dol_get_fiche_head($head, 'production', $langs->trans("MO"), -1, $object->picto); + + print dol_get_fiche_head($head, 'production', $langs->trans("ManufacturingOrder"), -1, $object->picto); $formconfirm = '';
'.$langs->trans("Statistics").' - '.$langs->trans("MO").'
' . $langs->trans("Statistics") . ' - ' . $langs->trans("ManufacturingOrder") . '