Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/core/lib/product.lib.php htdocs/langs/am_ET/mrp.lang htdocs/langs/ar_SA/mrp.lang htdocs/langs/az_AZ/mrp.lang htdocs/langs/bg_BG/mrp.lang htdocs/langs/bn_BD/mrp.lang htdocs/langs/bn_IN/mrp.lang htdocs/langs/bs_BA/mrp.lang htdocs/langs/ca_ES/mrp.lang htdocs/langs/cs_CZ/mrp.lang htdocs/langs/da_DK/mrp.lang htdocs/langs/de_DE/mrp.lang htdocs/langs/el_GR/mrp.lang htdocs/langs/en_US/mrp.lang htdocs/langs/es_ES/mrp.lang htdocs/langs/et_EE/mrp.lang htdocs/langs/eu_ES/mrp.lang htdocs/langs/fa_IR/mrp.lang htdocs/langs/fi_FI/mrp.lang htdocs/langs/fr_FR/mrp.lang htdocs/langs/gl_ES/mrp.lang htdocs/langs/he_IL/mrp.lang htdocs/langs/hi_IN/mrp.lang htdocs/langs/hr_HR/mrp.lang htdocs/langs/hu_HU/mrp.lang htdocs/langs/id_ID/mrp.lang htdocs/langs/is_IS/mrp.lang htdocs/langs/it_IT/mrp.lang htdocs/langs/ja_JP/mrp.lang htdocs/langs/ka_GE/mrp.lang htdocs/langs/km_KH/mrp.lang htdocs/langs/kn_IN/mrp.lang htdocs/langs/ko_KR/mrp.lang htdocs/langs/lo_LA/mrp.lang htdocs/langs/lt_LT/mrp.lang htdocs/langs/lv_LV/mrp.lang htdocs/langs/mk_MK/mrp.lang htdocs/langs/mn_MN/mrp.lang htdocs/langs/nb_NO/mrp.lang htdocs/langs/ne_NP/mrp.lang htdocs/langs/nl_NL/mrp.lang htdocs/langs/pl_PL/mrp.lang htdocs/langs/pt_PT/mrp.lang htdocs/langs/ro_RO/mrp.lang htdocs/langs/ru_RU/mrp.lang htdocs/langs/sk_SK/mrp.lang htdocs/langs/sl_SI/mrp.lang htdocs/langs/sq_AL/mrp.lang htdocs/langs/sr_RS/mrp.lang htdocs/langs/sv_SE/mrp.lang htdocs/langs/sw_SW/mrp.lang htdocs/langs/th_TH/mrp.lang htdocs/langs/tr_TR/mrp.lang htdocs/langs/uk_UA/mrp.lang htdocs/langs/uz_UZ/mrp.lang htdocs/langs/vi_VN/mrp.lang htdocs/langs/zh_CN/mrp.lang htdocs/langs/zh_HK/mrp.lang htdocs/langs/zh_TW/mrp.lang htdocs/mrp/class/mo.class.php htdocs/mrp/mo_agenda.php htdocs/mrp/mo_card.php htdocs/mrp/mo_document.php htdocs/mrp/mo_movements.php htdocs/mrp/mo_note.php htdocs/mrp/mo_production.php
This commit is contained in:
Laurent Destailleur
commit
d2a2d74f7e
@ -357,7 +357,7 @@ function show_stats_for_company($product, $socid)
|
|||||||
print '<td class="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
|
print '<td class="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Customer proposals
|
// Customer proposals
|
||||||
if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
|
if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
|
||||||
{
|
{
|
||||||
$nblines++;
|
$nblines++;
|
||||||
@ -509,7 +509,6 @@ function show_stats_for_company($product, $socid)
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// MO
|
// MO
|
||||||
if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
|
if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Поръчки за производство
|
Mrp=Поръчки за производство
|
||||||
MO=Поръчка за производство
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Поръчка за производство
|
||||||
MRPDescription=Модул за управление на поръчки за производство (ПП)
|
MRPDescription=Модул за управление на поръчки за производство (ПП)
|
||||||
MRPArea=Секция за планиране на материални изисквания
|
MRPArea=Секция за планиране на материални изисквания
|
||||||
MrpSetupPage=Настройка на модул за планиране на материални изисквания
|
MrpSetupPage=Настройка на модул за планиране на материални изисквания
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Comandes de Fabricació
|
Mrp=Comandes de Fabricació
|
||||||
MO=Comanda de fabricació
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Comanda de fabricació
|
||||||
MRPDescription=Mòdul per gestionar ordres de producció i fabricació (MO).
|
MRPDescription=Mòdul per gestionar ordres de producció i fabricació (MO).
|
||||||
MRPArea=Àrea MRP
|
MRPArea=Àrea MRP
|
||||||
MrpSetupPage=Configuració del mòdul MRP
|
MrpSetupPage=Configuració del mòdul MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Výrobní zakázky
|
Mrp=Výrobní zakázky
|
||||||
MO=Výrobní zakázka
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Výrobní zakázka
|
||||||
MRPDescription=Modul pro správu výrobních a výrobních objednávek (MO).
|
MRPDescription=Modul pro správu výrobních a výrobních objednávek (MO).
|
||||||
MRPArea=Oblast MRP
|
MRPArea=Oblast MRP
|
||||||
MrpSetupPage=Nastavení modulu MRP
|
MrpSetupPage=Nastavení modulu MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Fremstillingsordrer
|
Mrp=Fremstillingsordrer
|
||||||
MO=Fremstillingsordre
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Fremstillingsordre
|
||||||
MRPDescription=Modul til styring af produktions- og produktionsordrer (MO).
|
MRPDescription=Modul til styring af produktions- og produktionsordrer (MO).
|
||||||
MRPArea=MRP-område
|
MRPArea=MRP-område
|
||||||
MrpSetupPage=Opsætning af modul MRP
|
MrpSetupPage=Opsætning af modul MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Fertigungsaufträge
|
Mrp=Fertigungsaufträge
|
||||||
MO=Fertigungsauftrag
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Fertigungsauftrag
|
||||||
MRPDescription=Modul zur Verwaltung von Produktions- und Fertigungsaufträgen (MO).
|
MRPDescription=Modul zur Verwaltung von Produktions- und Fertigungsaufträgen (MO).
|
||||||
MRPArea=MRP Bereich
|
MRPArea=MRP Bereich
|
||||||
MrpSetupPage=Einrichtung des Moduls MRP
|
MrpSetupPage=Einrichtung des Moduls MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Παραγγελίες Παραγωγής
|
Mrp=Παραγγελίες Παραγωγής
|
||||||
MO=Παραγγελία Παραγωγής
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Παραγγελία Παραγωγής
|
||||||
MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO).
|
MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO).
|
||||||
MRPArea=Περιοχή MRP
|
MRPArea=Περιοχή MRP
|
||||||
MrpSetupPage=Ρύθμιση της μονάδας MRP
|
MrpSetupPage=Ρύθμιση της μονάδας MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
@ -75,6 +75,10 @@ ProductsToConsume=Products to consume
|
|||||||
ProductsToProduce=Products to produce
|
ProductsToProduce=Products to produce
|
||||||
UnitCost=Unit cost
|
UnitCost=Unit cost
|
||||||
TotalCost=Total 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)
|
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.
|
GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
|
||||||
|
|
||||||
|
=======
|
||||||
|
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
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Dolibarr language file - Source file is en_US - mrp
|
# Dolibarr language file - Source file is en_US - mrp
|
||||||
Mrp=Ordenes de Fabricación
|
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).
|
MRPDescription=Módulo para administrar producción y Ordenes de Fabricación (OF).
|
||||||
MRPArea=Area MRP
|
MRPArea=Area MRP
|
||||||
MrpSetupPage=Configuración de módulo MRP
|
MrpSetupPage=Configuración de módulo MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Dolibarr language file - Source file is en_US - mrp
|
# Dolibarr language file - Source file is en_US - mrp
|
||||||
Mrp=Ordenes de Fabricación
|
Mrp=Ordenes de Fabricación
|
||||||
MO=Orden de Fabricación
|
ManufacturingOrder=Orden de Fabricación
|
||||||
MrpSetupPage=Configuración del módulo de MRP
|
MrpSetupPage=Configuración del módulo de MRP
|
||||||
MenuBOM=Facturas de material
|
MenuBOM=Facturas de material
|
||||||
LatestBOMModified=Últimas %s Cuentas de materiales modificadas
|
LatestBOMModified=Últimas %s Cuentas de materiales modificadas
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Órdenes de fabricación
|
Mrp=Órdenes de fabricación
|
||||||
MO=Orden de fabricación
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Orden de fabricación
|
||||||
MRPDescription=Módulo para gestionar producción y Órdenes de Fabricación (OF).
|
MRPDescription=Módulo para gestionar producción y Órdenes de Fabricación (OF).
|
||||||
MRPArea=Área MRP
|
MRPArea=Área MRP
|
||||||
MrpSetupPage=Configuración del módulo MRP
|
MrpSetupPage=Configuración del módulo MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Dolibarr language file - Source file is en_US - mrp
|
# Dolibarr language file - Source file is en_US - mrp
|
||||||
Mrp=Órdenes de Fabricación
|
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).
|
MRPDescription=Modulo para gestionar la producción y órdenes de fabricación (OF).
|
||||||
MRPArea=Área PRM
|
MRPArea=Área PRM
|
||||||
MrpSetupPage=Configuración del modulo PRM
|
MrpSetupPage=Configuración del modulo PRM
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
MO=Manufacturing Order
|
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
ManufacturingOrder=Manufacturing Order
|
||||||
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=بخش برنامهریزی مواد اولیه
|
MRPArea=بخش برنامهریزی مواد اولیه
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Ordres de fabrication
|
Mrp=Ordres de fabrication
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Ordre de fabrication
|
MO=Ordre de fabrication
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module de gestion de production et Ordres de Fabrication (OF).
|
||||||
MRPArea=Espace MRP
|
MRPArea=Espace MRP
|
||||||
MrpSetupPage=Configuration du module MRP
|
MrpSetupPage=Configuration du module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Ordes de fabricación
|
Mrp=Ordes de fabricación
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Pesanan Manufaktur
|
Mrp=Pesanan Manufaktur
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Pesanan manufaktur
|
MO=Pesanan manufaktur
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Modul untuk mengelola produksi dan Pesanan Manufaktur (MO).
|
||||||
MRPArea=Area MRP
|
MRPArea=Area MRP
|
||||||
MrpSetupPage=Pengaturan MRP modul
|
MrpSetupPage=Pengaturan MRP modul
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Ordini di produzione
|
Mrp=Ordini di produzione
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Ordine di produzione
|
MO=Ordine di produzione
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Modulo per la gestione degli ordini di produzione (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Configurazione del modulo MRP
|
MrpSetupPage=Configurazione del modulo MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Ražošanas pasūtījumi
|
Mrp=Ražošanas pasūtījumi
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Ražošanas pasūtījums
|
MO=Ražošanas pasūtījums
|
||||||
MOs=Manufacturing orders
|
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.
|
MRPDescription=Ražošanas un ražošanas pasūtījumu (MO) pārvaldības modulis.
|
||||||
MRPArea=MRP apgabals
|
MRPArea=MRP apgabals
|
||||||
MrpSetupPage=MRP moduļa iestatīšana
|
MrpSetupPage=MRP moduļa iestatīšana
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Produksjonsordrer
|
Mrp=Produksjonsordrer
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Produksjonsordre
|
MO=Produksjonsordre
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
=======
|
||||||
|
ManufacturingOrder=Produksjonsordre
|
||||||
|
>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
|
||||||
MRPDescription=Modul for å administrere produksjons- og produksjonsordrer (PO).
|
MRPDescription=Modul for å administrere produksjons- og produksjonsordrer (PO).
|
||||||
MRPArea=MRP-område
|
MRPArea=MRP-område
|
||||||
MrpSetupPage=Oppsett av MRP-modul
|
MrpSetupPage=Oppsett av MRP-modul
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Productieorders
|
Mrp=Productieorders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Productieorder
|
MO=Productieorder
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
=======
|
||||||
|
ManufacturingOrder=Productieorder
|
||||||
|
>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
|
||||||
MRPDescription=Module om productie- en productieorders (PO) te beheren.
|
MRPDescription=Module om productie- en productieorders (PO) te beheren.
|
||||||
MRPArea=MRP-gebied
|
MRPArea=MRP-gebied
|
||||||
MrpSetupPage=Installatie van module MRP
|
MrpSetupPage=Installatie van module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Dolibarr language file - Source file is en_US - mrp
|
# Dolibarr language file - Source file is en_US - mrp
|
||||||
Mrp=Ordens de fabricação
|
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).
|
MRPDescription=Módulo para gerenciar ordens de produção e manufatura (MO).
|
||||||
MRPArea=Area MRP
|
MRPArea=Area MRP
|
||||||
MenuBOM=Lista de materiais
|
MenuBOM=Lista de materiais
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
Mrp=Encomendas de Manufatura
|
Mrp=Encomendas de Manufatura
|
||||||
MO=Encomenda de Manufatura
|
MO=Encomenda de Manufatura
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
@ -13,6 +14,22 @@ BOMsSetup=Configuração do módulo de FM
|
|||||||
ListOfBOMs=Lista das faturas do material - FM
|
ListOfBOMs=Lista das faturas do material - FM
|
||||||
ListOfManufacturingOrders=Lista das Encomendas de Manufaturação
|
ListOfManufacturingOrders=Lista das Encomendas de Manufaturação
|
||||||
NewBOM=Nova fatura de material
|
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.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
|
ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
|
||||||
BOMsNumberingModules=Modelos de numeração de FM
|
BOMsNumberingModules=Modelos de numeração de FM
|
||||||
BOMsModelModule=Modelos de documento de FM
|
BOMsModelModule=Modelos de documento de FM
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
Mrp=Comenzi de producţie
|
Mrp=Comenzi de producţie
|
||||||
MO=Comandă de producţie
|
MO=Comandă de producţie
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
@ -9,6 +10,18 @@ LatestBOMModified=Ultimele %s bonuri de consum modificate
|
|||||||
LatestMOModified=Ultimele %s Comenzi de producţie modificate
|
LatestMOModified=Ultimele %s Comenzi de producţie modificate
|
||||||
Bom=Bonuri de consum
|
Bom=Bonuri de consum
|
||||||
BillOfMaterials=Bon 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
|
BOMsSetup=Configurarea modulului BOM
|
||||||
ListOfBOMs=Listă bonuri de consum - BOM
|
ListOfBOMs=Listă bonuri de consum - BOM
|
||||||
ListOfManufacturingOrders=Listă comenzi de producţie
|
ListOfManufacturingOrders=Listă comenzi de producţie
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP-område
|
MRPArea=MRP-område
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Üretim Emirleri
|
Mrp=Üretim Emirleri
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Üretim Emri
|
MO=Üretim Emri
|
||||||
MOs=Manufacturing orders
|
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.
|
MRPDescription=Üretim ve Üretim Siparişlerini (MO) yönetmek için modül.
|
||||||
MRPArea=MRP Alanı
|
MRPArea=MRP Alanı
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Đơn đặt hàng sản xuất
|
Mrp=Đơn đặt hàng sản xuất
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Đơn hàng sản xuất
|
MO=Đơn hàng sản xuất
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=Khu vực MRP
|
MRPArea=Khu vực MRP
|
||||||
MrpSetupPage=Thiết lập mô-đun MRP
|
MrpSetupPage=Thiết lập mô-đun MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=Manufacturing Orders
|
Mrp=Manufacturing Orders
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=Manufacturing Order
|
MO=Manufacturing Order
|
||||||
MOs=Manufacturing orders
|
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).
|
MRPDescription=Module to manage production and Manufacturing Orders (MO).
|
||||||
MRPArea=MRP Area
|
MRPArea=MRP Area
|
||||||
MrpSetupPage=Setup of module MRP
|
MrpSetupPage=Setup of module MRP
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
Mrp=製造訂單
|
Mrp=製造訂單
|
||||||
|
<<<<<<< HEAD
|
||||||
MO=製造訂單
|
MO=製造訂單
|
||||||
MOs=Manufacturing orders
|
MOs=Manufacturing orders
|
||||||
|
=======
|
||||||
|
ManufacturingOrder=製造訂單
|
||||||
|
>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
|
||||||
MRPDescription=管理生產和製造訂單（MO）的模組。
|
MRPDescription=管理生產和製造訂單（MO）的模組。
|
||||||
MRPArea=MRP區域
|
MRPArea=MRP區域
|
||||||
MrpSetupPage=MRP模組設定
|
MrpSetupPage=MRP模組設定
|
||||||
|
|||||||
@ -987,7 +987,7 @@ class Mo extends CommonObject
|
|||||||
|
|
||||||
$result = '';
|
$result = '';
|
||||||
|
|
||||||
$label = img_picto('', $this->picto).' <u>'.$langs->trans("MO").'</u>';
|
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ManufacturingOrder").'</u>';
|
||||||
$label .= '<br>';
|
$label .= '<br>';
|
||||||
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
|
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
|
||||||
if (isset($this->status)) {
|
if (isset($this->status)) {
|
||||||
|
|||||||
@ -96,7 +96,7 @@ if ($conf->use_javascript_ajax)
|
|||||||
|
|
||||||
print '<div class="div-table-responsive-no-min">';
|
print '<div class="div-table-responsive-no-min">';
|
||||||
print '<table class="noborder nohover centpercent">';
|
print '<table class="noborder nohover centpercent">';
|
||||||
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("MO").'</th></tr>'."\n";
|
print '<tr class="liste_titre"><th colspan="2">' . $langs->trans("Statistics") . ' - ' . $langs->trans("ManufacturingOrder") . '</th></tr>' . "\n";
|
||||||
$listofstatus = array(0, 1, 2, 3, 9);
|
$listofstatus = array(0, 1, 2, 3, 9);
|
||||||
foreach ($listofstatus as $status)
|
foreach ($listofstatus as $status)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -37,7 +37,7 @@ function moPrepareHead($object)
|
|||||||
$head = array();
|
$head = array();
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$object->id;
|
$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';
|
$head[$h][2] = 'card';
|
||||||
$h++;
|
$h++;
|
||||||
|
|
||||||
|
|||||||
@ -131,7 +131,7 @@ if ($object->id > 0)
|
|||||||
$head = moPrepareHead($object);
|
$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
|
// Object card
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
|
|||||||
@ -314,7 +314,7 @@ if ($action == 'create')
|
|||||||
// Part to edit record
|
// Part to edit record
|
||||||
if (($id || $ref) && $action == 'edit')
|
if (($id || $ref) && $action == 'edit')
|
||||||
{
|
{
|
||||||
print load_fiche_titre($langs->trans("MO"), '', 'mrp');
|
print load_fiche_titre($langs->trans("ManufacturingOrder"), '', 'mrp');
|
||||||
|
|
||||||
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
|
||||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||||
@ -353,7 +353,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
$res = $object->fetch_optionals();
|
$res = $object->fetch_optionals();
|
||||||
|
|
||||||
$head = moPrepareHead($object);
|
$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 = '';
|
$formconfirm = '';
|
||||||
|
|
||||||
|
|||||||
@ -103,8 +103,7 @@ if ($object->id)
|
|||||||
*/
|
*/
|
||||||
$head = moPrepareHead($object);
|
$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
|
// Build file list
|
||||||
$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
|
$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
|
||||||
|
|||||||
@ -242,7 +242,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
$res = $object->fetch_optionals();
|
$res = $object->fetch_optionals();
|
||||||
|
|
||||||
$head = moPrepareHead($object);
|
$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 = '';
|
$formconfirm = '';
|
||||||
|
|
||||||
|
|||||||
@ -87,7 +87,7 @@ if ($id > 0 || !empty($ref))
|
|||||||
|
|
||||||
$head = moPrepareHead($object);
|
$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
|
// Object card
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
|
|||||||
@ -413,7 +413,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
$res = $object->fetch_optionals();
|
$res = $object->fetch_optionals();
|
||||||
|
|
||||||
$head = moPrepareHead($object);
|
$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 = '';
|
$formconfirm = '';
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user