openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01478
[Merge] lp:~openerp-dev/openobject-addons/rpa-dev-addons2 into lp:openobject-addons
rpa (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/rpa-dev-addons2 into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#423124 PO does wrongly take into account supplier information in product when using purchase UOM
https://bugs.launchpad.net/bugs/423124
#511193 unit factor is limited to 5 zeros
https://bugs.launchpad.net/bugs/511193
#535401 Production orders ignore chained location at destination
https://bugs.launchpad.net/bugs/535401
#641110 Cannot record outgoing stock move with prodlot for consumable products
https://bugs.launchpad.net/bugs/641110
#663662 [6.0rc1] bug in 'request a quotation' from PR
https://bugs.launchpad.net/bugs/663662
#663999 [6.0RC1] delivery - usability issues
https://bugs.launchpad.net/bugs/663999
#664344 Unclear help texts in product_expiry
https://bugs.launchpad.net/bugs/664344
#666781 useless list comprehension and browse in split_moves
https://bugs.launchpad.net/bugs/666781
#667327 [v6 RC1] Consume products in Production order not working in GTK client
https://bugs.launchpad.net/bugs/667327
#667558 product_visible_discount uses discount in changing UoM in sale order of OpenERP v6.0 rc1
https://bugs.launchpad.net/bugs/667558
#683718 [v6 RC1] stock addon: _product_value badly implemented
https://bugs.launchpad.net/bugs/683718
Bug fixes:
https://bugs.launchpad.net/openobject-addons/+bug/535401
https://bugs.launchpad.net/openobject-addons/+bug/663999
--
https://code.launchpad.net/~openerp-dev/openobject-addons/rpa-dev-addons2/+merge/44453
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/rpa-dev-addons2.
=== modified file 'delivery/delivery_data.xml'
--- delivery/delivery_data.xml 2010-10-17 13:09:11 +0000
+++ delivery/delivery_data.xml 2010-12-22 12:34:58 +0000
@@ -6,53 +6,5 @@
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
</record>
- <!-- Create a transporter -->
-
- <record id="delivery_partner" model="res.partner">
- <field name="name">The Poste</field>
- </record>
- <record id="delivery_partner_address" model="res.partner.address">
- <field name="type">default</field>
- <field name="partner_id" ref="delivery_partner"/>
- </record>
-
- <!-- Create a partner -->
-
- <record id="delivery_product" model="product.product">
- <field name="name">Delivery by Poste</field>
- <field name="type">service</field>
- <field model="product.category" name="categ_id" search="[]"/>
- </record>
-
- <!-- Carrier -->
-
- <record id="delivery_carrier" model="delivery.carrier">
- <field name="name">The Poste</field>
- <field name="partner_id" ref="delivery_partner"/>
- <field name="product_id" ref="delivery_product"/>
- </record>
-
- <!-- Carrier Grids -->
-
- <record id="delivery_grid" model="delivery.grid">
- <field name="name">The Poste - Pricelist</field>
- <field name="carrier_id" ref="delivery_carrier"/>
- </record>
- <record id="delivery_grid_line1" model="delivery.grid.line">
- <field name="name">Weight <= 5kg</field>
- <field name="grid_id" ref="delivery_grid"/>
- <field eval="5" name="max_value"/>
- <field eval="20" name="list_price"/>
- <field eval="10" name="standard_price"/>
- </record>
- <record id="delivery_grid_line2" model="delivery.grid.line">
- <field name="name">Weight > 5kg</field>
- <field name="grid_id" ref="delivery_grid"/>
- <field name="operator">>=</field>
- <field eval="5" name="max_value"/>
- <field eval="50" name="list_price"/>
- <field eval="30" name="standard_price"/>
- </record>
-
</data>
</openerp>
=== modified file 'delivery/delivery_demo.xml'
--- delivery/delivery_demo.xml 2010-10-17 13:09:11 +0000
+++ delivery/delivery_demo.xml 2010-12-22 12:34:58 +0000
@@ -1,9 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
+
+ <!-- Create a transporter -->
+
+ <record id="delivery_partner" model="res.partner">
+ <field name="name">The Poste</field>
+ </record>
+ <record id="delivery_partner_address" model="res.partner.address">
+ <field name="type">default</field>
+ <field name="partner_id" ref="delivery_partner"/>
+ </record>
+
+ <!-- Create a partner -->
+
+ <record id="delivery_product" model="product.product">
+ <field name="name">Delivery by Poste</field>
+ <field name="type">service</field>
+ <field model="product.category" name="categ_id" search="[]"/>
+ </record>
+
+ <!-- Carrier -->
+
+ <record id="delivery_carrier" model="delivery.carrier">
+ <field name="name">The Poste</field>
+ <field name="partner_id" ref="delivery_partner"/>
+ <field name="product_id" ref="delivery_product"/>
+ </record>
+
+ <!-- Carrier Grids -->
+
+ <record id="delivery_grid" model="delivery.grid">
+ <field name="name">The Poste - Pricelist</field>
+ <field name="carrier_id" ref="delivery_carrier"/>
+ </record>
+ <record id="delivery_grid_line1" model="delivery.grid.line">
+ <field name="name">Weight <= 5kg</field>
+ <field name="grid_id" ref="delivery_grid"/>
+ <field eval="5" name="max_value"/>
+ <field eval="20" name="list_price"/>
+ <field eval="10" name="standard_price"/>
+ </record>
+ <record id="delivery_grid_line2" model="delivery.grid.line">
+ <field name="name">Weight > 5kg</field>
+ <field name="grid_id" ref="delivery_grid"/>
+ <field name="operator">>=</field>
+ <field eval="5" name="max_value"/>
+ <field eval="50" name="list_price"/>
+ <field eval="30" name="standard_price"/>
+ </record>
+
<record id="delivery_grid_line3" model="delivery.grid.line">
<field name="name">Free if price >= 300</field>
- <field name="grid_id" ref="delivery.delivery_grid"/>
+ <field name="grid_id" ref="delivery_grid"/>
<field eval="300" name="max_value"/>
<field name="operator">>=</field>
<field name="type">price</field>
=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml 2010-11-12 06:23:46 +0000
+++ marketing_campaign/marketing_campaign_view.xml 2010-12-22 12:34:58 +0000
@@ -143,7 +143,7 @@
</group>
<group colspan="2" col="2">
<separator string="Filter" colspan="4"/>
- <field name="ir_filter_id" domain="[('model_id', '=', object_id)]"/>
+ <field name="ir_filter_id"/>
</group>
<newline/>
<group colspan="2" col="4">
=== modified file 'mrp/__openerp__.py'
--- mrp/__openerp__.py 2010-10-05 07:59:22 +0000
+++ mrp/__openerp__.py 2010-12-22 12:34:58 +0000
@@ -34,7 +34,7 @@
* Make to Stock / Make to Order (by line)
* Multi-level BoMs, no limit
* Multi-level routing, no limit
- * Routing and workcenter integrated with analytic accounting
+ * Routing and work center integrated with analytic accounting
* Scheduler computation periodically / Just In Time module
* Multi-pos, multi-warehouse
* Different reordering policies
=== modified file 'mrp/i18n/ar.po'
--- mrp/i18n/ar.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/ar.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/bg.po'
--- mrp/i18n/bg.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/bg.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Бр. цикли"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/bs.po'
--- mrp/i18n/bs.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/bs.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/ca.po'
--- mrp/i18n/ca.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/ca.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Núm. de cicles"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +514,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +566,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +659,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Temps en hores per realitzar un cicle."
#. module: mrp
@@ -1070,7 +1078,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1720,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descripció del centre de producció. Descriu aquà que és un cicle segons "
"aquest centre de producció."
@@ -1798,9 +1806,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1841,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2279,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -3117,9 +3125,9 @@
#~ "produir."
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La llista d'operacions (llista de centres de producció) per produir el "
=== modified file 'mrp/i18n/cs.po'
--- mrp/i18n/cs.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/cs.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/de.po'
--- mrp/i18n/de.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/de.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr "Anzahl Zyklen"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Maximale Anzahl an Fertigungsvorgängen dieser Fertigungsstelle."
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Maßgeblicher Lagerort für Verfügbarkeit von Waren."
@@ -528,7 +536,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Spezifiziere Stundensatz der Fertigungsstelle."
#. module: mrp
@@ -580,7 +588,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Spezifiziere Kosten der Fertigungsstelle pro Zyklus"
#. module: mrp
@@ -673,7 +681,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Zeit in Stunden für einen Auftragszyklus"
#. module: mrp
@@ -1114,7 +1122,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr "Reihenfolge bei Anzeige der Liste für Fertigungsstellen"
#. module: mrp
@@ -1769,8 +1777,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Beschreibung der Fertigungsstelle. Beschreibe hier den Fertigungszyklus aus "
"der Perspektive dieser Fertigungsstelle."
@@ -1863,9 +1871,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
"Liste der Fertigungsvorgänge (Liste Fertigungsstellen) für die Produktion "
@@ -1902,7 +1910,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Anzahl Fertigungsvorgänge die bei einer Fertigungsstelle parallel bearbeitet "
@@ -2366,9 +2374,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
"Fertigungsvorgänge (Arbeitsauftragsliste) für die Herstellung des "
@@ -3252,9 +3260,9 @@
#~ "geändert werden"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Arbeitsplätze, an denen Fertigprodukte produziert werden. Das \"Routing\" "
=== modified file 'mrp/i18n/el.po'
--- mrp/i18n/el.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/el.po 2010-12-22 12:34:58 +0000
@@ -31,6 +31,14 @@
msgstr "ΑÏ. ΚÏκλων"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -42,7 +50,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -509,7 +517,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -561,7 +569,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -654,7 +662,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "ΧÏόνος ενός κÏκλου σε ÏŽÏες"
#. module: mrp
@@ -1073,7 +1081,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1715,8 +1723,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"ΠεÏιγÏαφή κÎντÏου εÏγασίας. Εξηγείστε εδώ τι αποτελεί κÏκλο για το κÎντÏο "
"αυτό."
@@ -1801,9 +1809,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1836,7 +1844,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2274,9 +2282,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -3039,9 +3047,9 @@
#~ msgstr "plus"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Η λίστα των λειτουÏγιών (λίστα κÎντÏων εÏγασίας) ποαÏαγωγής του "
=== modified file 'mrp/i18n/es.po'
--- mrp/i18n/es.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/es.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr "Núm. de ciclos"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Número de operaciones que este centro de producción puede realizar."
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Ubicación donde el sistema buscará los componentes."
@@ -529,7 +537,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Indica coste del centro de trabajo por hora."
#. module: mrp
@@ -581,7 +589,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Especifique el coste por centro de prodcción"
#. module: mrp
@@ -675,7 +683,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
@@ -1125,7 +1133,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
"Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
"de trabajo."
@@ -1803,8 +1811,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descripción del centro de producción. Describa aquà que es un ciclo según "
"este centro de producción."
@@ -1898,9 +1906,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
"La lista de las operaciones (lista de los centros de trabajo) para producir "
@@ -1938,7 +1946,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Número de operaciones que este centro de producción puede realizar en "
@@ -2408,9 +2416,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
"La lista de las operaciones (lista de los centros de trabajo) para producir "
@@ -3304,9 +3312,9 @@
#~ msgstr "Nombre de modelo no válido en la definición de acción."
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La lista de operaciones (lista de centros de producción) para producir el "
=== modified file 'mrp/i18n/es_AR.po'
--- mrp/i18n/es_AR.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/es_AR.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/es_EC.po'
--- mrp/i18n/es_EC.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/es_EC.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Núm. de ciclos"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +514,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +566,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +659,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
@@ -1070,7 +1078,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1720,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descripción del centro de producción. Describa aquà que es un ciclo según "
"este centro de producción."
@@ -1798,9 +1806,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1841,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2279,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/et.po'
--- mrp/i18n/et.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/et.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Tsükklite No."
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Aeg tundides mis kulub ühes tsükklis."
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Töökeskonna kirjeldus. selgita siin mis tsükklid kuuluvad sellele "
"töökeskonnale."
@@ -1791,9 +1799,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1826,7 +1834,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2264,9 +2272,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/fi.po'
--- mrp/i18n/fi.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/fi.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr "Kiertojen määrä"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +514,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +566,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +659,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Yhden kierron kesto tunneissa."
#. module: mrp
@@ -1070,7 +1078,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1713,8 +1721,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Työpisteen kuvaus. Selitä tässä mitä kierros tarkoittaa tässä työpisteessä."
@@ -1798,9 +1806,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1841,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2279,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2991,9 +2999,9 @@
#~ msgstr "Varastoitava tuote prosessi"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Lista toiminnoista (työpisteistä) jotka tuotteen valmistaminen vaatii. "
=== modified file 'mrp/i18n/fr.po'
--- mrp/i18n/fr.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/fr.po 2010-12-22 12:34:58 +0000
@@ -45,6 +45,14 @@
msgstr "Nombre de Cycles"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Nombre d'opérations simultanées du poste de charge"
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Emplacement des composants"
@@ -540,7 +548,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Précisez le coût horaire du centre de charge"
#. module: mrp
@@ -592,7 +600,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Précisez le coût par cycle du poste de charge"
#. module: mrp
@@ -685,7 +693,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Temps nécessaire à la réalisation d'un cycle"
#. module: mrp
@@ -1772,8 +1780,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Description du centre de travail. Expliquez ici ce qu'est le cycle d'après "
"le centre de travail."
@@ -1862,9 +1870,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
"La liste des opérations (liste des postes de charge) pour fabriquer le "
@@ -1901,7 +1909,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Nombre d'opérations que ce poste de charge peut réaliser en parallèle. Si ce "
@@ -2352,9 +2360,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
"La liste des opérations (liste des postes de charge) pour fabriquer le "
@@ -3159,9 +3167,9 @@
#~ msgstr "Ordres de production en cours"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La liste des opérations pour fabriquer le produit fini. La gammeest "
=== modified file 'mrp/i18n/hi.po'
--- mrp/i18n/hi.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/hi.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +509,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +561,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +654,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1073,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1714,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1798,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1833,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2271,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/hr.po'
--- mrp/i18n/hr.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/hr.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/hu.po'
--- mrp/i18n/hu.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/hu.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/id.po'
--- mrp/i18n/id.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/id.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/it.po'
--- mrp/i18n/it.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/it.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "N. Cicli di Lavoro"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Numero di operazioni che questo centro di lavoro può fare."
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Punto di stoccaggio dove il sistema cercherà i componenti"
@@ -516,7 +524,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Specificare il costo orario per il centro di lavoro."
#. module: mrp
@@ -568,7 +576,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Specificare il costo per ciclo per il centro di lavoro."
#. module: mrp
@@ -661,7 +669,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tempo in ore per completare un ciclo."
#. module: mrp
@@ -1083,7 +1091,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1726,8 +1734,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1810,9 +1818,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1845,7 +1853,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Numero di operazioni che questo centro di lavoro può fare in parallelo. Se "
@@ -2292,9 +2300,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2662,9 +2670,9 @@
#~ msgstr "Ciclo di lavoro del materiale"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La lista delle lavorazioni (lista dei centri di lavoro) per ottenere il "
=== modified file 'mrp/i18n/ko.po'
--- mrp/i18n/ko.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/ko.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr "싸ì´í´ 횟수"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -503,7 +511,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -555,7 +563,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -648,7 +656,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "í•œ 사ì´í´ì„ 수행하는 시간"
#. module: mrp
@@ -1067,7 +1075,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1708,8 +1716,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "워í¬ì„¼í„° 설명. ì´ ì›Œí¬ì„¼í„°ì— 기초하여 사ì´í´ì„ 설명하ì‹ì‹œì˜¤."
#. module: mrp
@@ -1792,9 +1800,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1827,7 +1835,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2265,9 +2273,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2872,9 +2880,9 @@
#~ msgstr "견ì ìš”ì²ì´ ìƒì„±ë˜ì–´ 공급ìžì—게 ì „ì†¡ë©ë‹ˆë‹¤."
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "ì™„ì œí’ˆ ìƒì‚°ì„ 위한 오í¼ë ˆì´ì…˜ 리스트 (워í¬ì„¼í„° 리스트). ì´ ë¼ìš°íŒ…ì€ ì£¼ë¡œ 오í¼ë ˆì´ì…˜ ì¤‘ì˜ ì›Œí¬ì„¼í„° ì›ê°€ 계산과 ìƒì‚° 계íšì— 기초한 "
=== modified file 'mrp/i18n/lt.po'
--- mrp/i18n/lt.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/lt.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr "Ciklų skaiÄius"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +514,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +566,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +659,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Vieno ciklo laikas valandomis."
#. module: mrp
@@ -1070,7 +1078,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1720,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "Darbo centro parašymas. Nurodomas koks yra šio darbo centro ciklas."
#. module: mrp
@@ -1796,9 +1804,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1831,7 +1839,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2269,9 +2277,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2955,9 +2963,9 @@
#~ msgstr "plius"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Tai yra darbų sąrašas (sąrašas darbo centrų) pagaminti pabaigtus produktus. "
=== modified file 'mrp/i18n/mrp.pot'
--- mrp/i18n/mrp.pot 2010-12-21 19:47:51 +0000
+++ mrp/i18n/mrp.pot 2010-12-22 12:34:58 +0000
@@ -27,6 +27,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -442,6 +450,12 @@
msgstr ""
#. module: mrp
+#: help:mrp.workcenter,product_id:0
+#: help:mrp.workcenter,product_id:0
+msgid "Fill this product to track easily your production costs in the analytic accounting."
+msgstr ""
+
+#. module: mrp
#: field:mrp.production.workcenter.line,cycle:0
msgid "Nbr of cycles"
msgstr ""
@@ -470,7 +484,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -521,8 +535,16 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -613,7 +635,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1003,7 +1025,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
-msgid "Gives the sequence order when displaying a list of routing workcenters."
+msgid "Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1613,7 +1635,7 @@
#. module: mrp
#: help:mrp.workcenter,note:0
-msgid "Description of the workcenter. Explain here what's a cycle according to this workcenter."
+msgid "Description of the work center. Explain here what's a cycle according to this work center."
msgstr ""
#. module: mrp
@@ -1687,7 +1709,7 @@
#. module: mrp
#: help:mrp.production,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
msgstr ""
#. module: mrp
@@ -1718,7 +1740,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
-msgid "Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."
+msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
#. module: mrp
@@ -2131,7 +2153,7 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
msgstr ""
#. module: mrp
=== modified file 'mrp/i18n/nl.po'
--- mrp/i18n/nl.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/nl.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Aantal cycli"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -505,7 +513,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -557,7 +565,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -650,7 +658,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tijd in uren voor één productiecyclus."
#. module: mrp
@@ -1069,7 +1077,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1720,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Omschrijving van de werkplaats. Leg uit wat een cyclus is vanuit het "
"gezichtspunt van deze werkplaats."
@@ -1798,9 +1806,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1841,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2279,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2642,9 +2650,9 @@
#~ msgstr "Wacht op beschikbare producten ter reservering"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "De lijst van handelingen (lijst van werkplaatsen) voor het produceren van "
=== modified file 'mrp/i18n/nl_BE.po'
--- mrp/i18n/nl_BE.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/nl_BE.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/pl.po'
--- mrp/i18n/pl.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/pl.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Liczba cykli"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Liczba operacji, którą to centrum może wykonać."
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Strefa, w której system będzie oczekiwał komponentów."
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr "Obłożenie centrum roboczego"
#. module: mrp
@@ -518,7 +526,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Podaj godzinowy koszt centrum roboczego"
#. module: mrp
@@ -570,7 +578,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Podaj koszt centrum roboczego na cykl"
#. module: mrp
@@ -663,7 +671,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Czas wykonania jednego cyklu w godzinach"
#. module: mrp
@@ -1090,7 +1098,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr "Ustala kolejność wyświetlania na liście centrów roboczych."
#. module: mrp
@@ -1742,8 +1750,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "Opis centrum roboczego. Opisz co jest cyklem dla tego centrum."
#. module: mrp
@@ -1826,9 +1834,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1861,7 +1869,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2299,9 +2307,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2751,9 +2759,9 @@
#~ msgstr "plus"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Lista operacji (lista centrów roboczych) do wyprodukowania produktu "
=== modified file 'mrp/i18n/pt.po'
--- mrp/i18n/pt.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/pt.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Núm. de ciclos"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Número de operacões que este centro de produção pode realizar."
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Local onde o sistema irá procurar componentes."
@@ -519,7 +527,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Indica o custo do centro de trabalho por hora."
#. module: mrp
@@ -571,7 +579,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Especifique o custe do centro de trabalho por ciclo"
#. module: mrp
@@ -664,7 +672,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tempo em horas por fazer um ciclo."
#. module: mrp
@@ -1083,7 +1091,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1724,8 +1732,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descrição do centro de trabalho. Explicar aqui o que é um ciclo de acordo "
"para este centro de trabalho."
@@ -1810,9 +1818,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1845,7 +1853,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2283,9 +2291,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/pt_BR.po'
--- mrp/i18n/pt_BR.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/pt_BR.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Núm. de ciclos"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -503,7 +511,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -555,7 +563,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -648,7 +656,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tempo em hora para fazer um ciclo."
#. module: mrp
@@ -1067,7 +1075,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1710,8 +1718,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descrição do centro de trabalho. Explique aqui o que é um ciclo de acordo "
"com este centro de trabalho."
@@ -1796,9 +1804,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1831,7 +1839,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2269,9 +2277,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/ro.po'
--- mrp/i18n/ro.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/ro.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Nr de cicluri"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/ru.po'
--- mrp/i18n/ru.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/ru.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Кол-во циклов"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð² чаÑах на выполнение одного цикла"
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"ОпиÑание учаÑтка обработка. Укажите здеÑÑŒ, что ÑоответÑтвует циклу учаÑтка."
@@ -1790,9 +1798,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1833,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2271,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2688,9 +2696,9 @@
#~ msgstr "ЗаÑвка выÑлана поÑтавщику"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "СпиÑок операций и учаÑтков обработки Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ñтва готового изделиÑ. "
=== modified file 'mrp/i18n/sk.po'
--- mrp/i18n/sk.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/sk.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +509,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +561,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +654,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1073,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1714,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1798,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1833,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2271,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/sl.po'
--- mrp/i18n/sl.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/sl.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/sq.po'
--- mrp/i18n/sq.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/sq.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +509,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +561,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +654,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1073,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1714,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1798,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1833,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2271,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/sv.po'
--- mrp/i18n/sv.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/sv.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "No. Of Cycles"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Platser där systemet ska titta efter komponenter"
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -505,7 +513,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -557,7 +565,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -650,7 +658,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Time in hours for doing one cycle."
#. module: mrp
@@ -1069,7 +1077,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1710,11 +1718,11 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
#. module: mrp
#: help:mrp.product.produce,mode:0
@@ -1796,9 +1804,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1831,7 +1839,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2269,9 +2277,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -3098,14 +3106,14 @@
#~ msgstr "Product quantity"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgid "Stockable Product Process"
=== modified file 'mrp/i18n/tlh.po'
--- mrp/i18n/tlh.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/tlh.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/tr.po'
--- mrp/i18n/tr.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/tr.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "Çevrim Sayısı"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2715,9 +2723,9 @@
#~ msgstr "Ä°ptal Edildi"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Operasyon Listesi (iş merkezi listesi) Bitmiş ürünleri üretmek için. The "
=== modified file 'mrp/i18n/uk.po'
--- mrp/i18n/uk.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/uk.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/vi.po'
--- mrp/i18n/vi.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/vi.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr ""
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +509,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +561,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +654,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1073,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1714,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1798,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1833,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2271,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/zh_CN.po'
--- mrp/i18n/zh_CN.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/zh_CN.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "周期"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "一个周期的工作å°æ—¶æ•°"
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "æ ¹æ®ä¸å·¥ä½œä¸å¿ƒè¯´æ˜Žåœ¨ä»€ä¹ˆå¾ªçŽ¯"
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2722,7 +2730,7 @@
#~ " * Make to Stock / Make to Order (by line)\n"
#~ " * Multi-level BoMs, no limit\n"
#~ " * Multi-level routing, no limit\n"
-#~ " * Routing and workcenter integrated with analytic accounting\n"
+#~ " * Routing and work center integrated with analytic accounting\n"
#~ " * Scheduler computation periodically / Just In Time module\n"
#~ " * Multi-pos, multi-warehouse\n"
#~ " * Different reordering policies\n"
@@ -3065,9 +3073,9 @@
#~ msgstr "æ£"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr "这生产æˆå“çš„è¿ä½œåˆ—表(工作ä¸å¿ƒåˆ—表)工艺路线主è¦æ˜¯ç”¨äºŽè®¡ç®—这生产计划的工作ä¸å¿ƒçš„æˆæœ¬å’Œè®¡åˆ’未æ¥çš„工作ä¸å¿ƒçš„未æ¥è´Ÿè·"
=== modified file 'mrp/i18n/zh_HK.po'
--- mrp/i18n/zh_HK.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/zh_HK.po 2010-12-22 12:34:58 +0000
@@ -29,6 +29,14 @@
msgstr "週期數"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -40,7 +48,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +509,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +561,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +654,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "ä¸€å€‹å¾ªç’°æ‰€é ˆçš„å°æ™‚數"
#. module: mrp
@@ -1065,7 +1073,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1714,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "工作ä¸å¿ƒä¹‹æ述。在æ¤èªªæ˜Žæ¤å·¥ä½œä¸å¿ƒæ˜¯ä¾æ“šé‚£å€‹é€±æœŸã€‚"
#. module: mrp
@@ -1790,9 +1798,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1833,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2271,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/i18n/zh_TW.po'
--- mrp/i18n/zh_TW.po 2010-12-22 05:46:19 +0000
+++ mrp/i18n/zh_TW.po 2010-12-22 12:34:58 +0000
@@ -28,6 +28,14 @@
msgstr "週期數"
#. module: mrp
+<<<<<<< TREE
+=======
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
+#. module: mrp
+>>>>>>> MERGE-SOURCE
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr ""
@@ -39,7 +47,7 @@
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +508,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +560,7 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +653,7 @@
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "ä¸€å€‹å¾ªç’°æ‰€é ˆçš„å°æ™‚數"
#. module: mrp
@@ -1064,7 +1072,7 @@
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1713,8 @@
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "工作ä¸å¿ƒä¹‹æ述。在æ¤èªªæ˜Žæ¤å·¥ä½œä¸å¿ƒæ˜¯ä¾æ“šé‚£å€‹é€±æœŸã€‚"
#. module: mrp
@@ -1789,9 +1797,9 @@
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1832,7 @@
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2270,9 @@
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2010-12-21 14:35:42 +0000
+++ mrp/mrp.py 2010-12-22 12:34:58 +0000
@@ -39,15 +39,15 @@
_description = 'Work Center'
_inherits = {'resource.resource':"resource_id"}
_columns = {
- 'note': fields.text('Description', help="Description of the workcenter. Explain here what's a cycle according to this workcenter."),
- 'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."),
+ 'note': fields.text('Description', help="Description of the work center. Explain here what's a cycle according to this work center."),
+ 'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."),
'time_cycle': fields.float('Time for 1 cycle (hour)', help="Time in hours for doing one cycle."),
'time_start': fields.float('Time before prod.', help="Time in hours for the setup."),
'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."),
- 'costs_hour': fields.float('Cost per hour', help="Specify Cost of Workcenter per hour."),
+ 'costs_hour': fields.float('Cost per hour', help="Specify Cost of Work center per hour."),
'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
help="Complete this only if you want automatic analytic accounting entries on production orders."),
- 'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Workcenter per cycle."),
+ 'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work center per cycle."),
'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
help="Complete this only if you want automatic analytic accounting entries on production orders."),
'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
@@ -109,7 +109,7 @@
_columns = {
'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
'name': fields.char('Name', size=64, required=True),
- 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing workcenters."),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing work centers."),
'cycle_nbr': fields.float('Number of Cycles', required=True,
help="Number of iterations this work center has to do in the specified operation of the routing."),
'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work center to achieve the operation of the specified routing."),
@@ -211,7 +211,7 @@
'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
- 'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."),
+ 'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
@@ -335,7 +335,7 @@
result = result + res[0]
result2 = result2 + res[1]
return result, result2
-
+
def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
@@ -442,7 +442,7 @@
'date_finished': fields.datetime('End Date'),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
- 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
+ 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
help="This is the internal picking list that brings the finished product to the production plan"),
@@ -664,8 +664,6 @@
"""
stock_mov_obj = self.pool.get('stock.move')
production = self.browse(cr, uid, production_id, context=context)
-
- final_product_todo = []
produced_qty = 0
if production_mode == 'consume_produce':
@@ -706,10 +704,7 @@
stock_mov_obj.action_consume(cr, uid, [raw_product.id], consumed_qty, production.location_src_id.id, context=context)
if production_mode == 'consume_produce':
- # To produce remaining qty of final product
- vals = {'state':'confirmed'}
- final_product_todo = [x.id for x in production.move_created_ids]
- stock_mov_obj.write(cr, uid, final_product_todo, vals)
+
produced_products = {}
for produced_product in production.move_created_ids2:
if produced_product.scrapped:
=== modified file 'mrp/report/mrp_report_view.xml'
--- mrp/report/mrp_report_view.xml 2010-12-10 12:31:03 +0000
+++ mrp/report/mrp_report_view.xml 2010-12-22 12:34:58 +0000
@@ -7,7 +7,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Work Centers load">
+ <tree string="Work Center Loads">
<field name="name"/>
<field name="workcenter_id"/>
<field name="cycle"/>
@@ -29,7 +29,7 @@
</graph>
</field>
</record>
-
+
<record id="view_workcenter_load_search" model="ir.ui.view">
<field name="name">report.workcenter.load.search</field>
<field name="model">report.workcenter.load</field>
=== modified file 'mrp/report/workcenter_load.py'
--- mrp/report/workcenter_load.py 2010-11-19 13:48:01 +0000
+++ mrp/report/workcenter_load.py 2010-12-22 12:34:58 +0000
@@ -124,7 +124,7 @@
x_index.append((dates[date]['name'], date))
pdf_string = StringIO.StringIO()
can = canvas.init(fname=pdf_string, format='pdf')
- can.set_title("Work Centers Load")
+ can.set_title("Work Center Loads")
chart_object.set_defaults(line_plot.T, line_style=None)
if datas['form']['measure_unit'] == 'cycles':
y_label = "Load (Cycles)"
@@ -132,7 +132,7 @@
y_label = "Load (Hours)"
# For add the report header on the top of the report.
- tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Centers Load", line_style=None)
+ tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Center Loads", line_style=None)
tb.draw()
ar = area.T(legend = legend.T(),
x_grid_style = line_style.gray70_dash1,
=== modified file 'mrp/security/ir.model.access.csv'
--- mrp/security/ir.model.access.csv 2010-12-15 09:19:25 +0000
+++ mrp/security/ir.model.access.csv 2010-12-22 12:34:58 +0000
@@ -71,3 +71,5 @@
"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_stock_warehouse_mrp_manager","stock.warehouse.mrp.manager","stock.model_stock_warehouse","mrp.group_mrp_manager",1,0,0,0
+"access_stock_location_mrp_manager","stock.location.mrp.manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
=== modified file 'mrp/stock.py'
--- mrp/stock.py 2010-12-16 04:33:35 +0000
+++ mrp/stock.py 2010-12-22 12:34:58 +0000
@@ -140,6 +140,13 @@
res.append(new_move)
return {}
+ def trigger_move_state(self, cr, uid, move, state, context=None):
+ new_moves = super(StockMove, self).trigger_move_state(cr, uid, move, state, context=context)
+ if state == 'confirm':
+ new_moves =[x.id for x in new_moves]
+ self.write(cr, uid, new_moves, {'production_id': False}, context=context)
+ return new_moves
+
StockMove()
=== modified file 'mrp/test/mrp_report.yml'
--- mrp/test/mrp_report.yml 2010-09-17 13:24:56 +0000
+++ mrp/test/mrp_report.yml 2010-12-22 12:34:58 +0000
@@ -26,7 +26,7 @@
file(os.path.join(tools.config['test_report_directory'], 'mrp-product_price_report.'+format), 'wb+').write(data)
-
- In order to test the PDF reports defined on a MRP, we will print Workcenter Load Report
+ In order to test the PDF reports defined on a MRP, we will print Work Center Loads Report
-
!python {model: mrp.workcenter}: |
import netsvc, tools, os, time
=== modified file 'product/pricelist_view.xml'
--- product/pricelist_view.xml 2010-10-16 08:26:55 +0000
+++ product/pricelist_view.xml 2010-12-22 12:34:58 +0000
@@ -208,5 +208,11 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
+
+ <menuitem
+ action="product_pricelist_type_action" id="menu_product_pricelist_type_action2"
+ parent="product.menu_product_pricelist_main" sequence="2"
+ groups="base.group_extended"/>
+
</data>
</openerp>
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2010-12-21 12:56:38 +0000
+++ purchase/purchase_view.xml 2010-12-22 12:34:58 +0000
@@ -11,13 +11,42 @@
<menuitem id="menu_purchase_config_purchase" name="Configuration"
parent="base.menu_purchase_root" sequence="100"/>
+ <menuitem
+ id="menu_purchase_config_pricelist" name="Pricelists"
+ parent="menu_purchase_config_purchase" sequence="50"/>
+
<menuitem
action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
- parent="menu_purchase_config_purchase" sequence="2"/>
+ parent="menu_purchase_config_pricelist" sequence="20"/>
<menuitem
action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
- parent="menu_purchase_config_purchase" sequence="1"/>
+ parent="menu_purchase_config_pricelist" sequence="10"/>
+
+ <menuitem
+ action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
+ parent="menu_purchase_config_pricelist" sequence="2"
+ groups="base.group_extended"/>
+
+ <menuitem
+ id="menu_product_in_config_purchase" name="Product"
+ parent="menu_purchase_config_purchase" sequence="30"/>
+
+ <menuitem
+ action="product.product_category_action_form" id="menu_product_category_config_purchase"
+ parent="purchase.menu_product_in_config_purchase" sequence="10"/>
+
+ <menuitem
+ id="menu_purchase_unit_measure_purchase" name="Units of Measure"
+ parent="purchase.menu_product_in_config_purchase" sequence="20"/>
+
+ <menuitem
+ action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
+ parent="menu_purchase_unit_measure_purchase" sequence="30"/>
+
+ <menuitem
+ action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
+ parent="menu_purchase_unit_measure_purchase" sequence="30"/>
<!--supplier addresses action-->
@@ -83,6 +112,10 @@
<!--product menu-->
<menuitem id="menu_procurement_management_product" name="Products"
parent="base.menu_purchase_root" sequence="8"/>
+
+ <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
+ parent="menu_procurement_management_product" sequence="10"/>
+
<menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
parent="menu_procurement_management_product"/>
@@ -205,7 +238,7 @@
<separator orientation="vertical"/>
<filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
<separator orientation="vertical"/>
- <filter icon="terp-gtk-go-back-rtl" string="To be Invoiced" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
+ <filter icon="terp-gtk-go-back-rtl" string="No Invoice" domain="[('invoice_ids','=', False)]" separator="1" help="Purchase order with No Invoice" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="name" select="1" string="Reference"/>
<field name="partner_id" select="1"/>
=== modified file 'purchase/wizard/purchase_line_invoice.py'
--- purchase/wizard/purchase_line_invoice.py 2010-12-20 13:00:56 +0000
+++ purchase/wizard/purchase_line_invoice.py 2010-12-22 12:34:58 +0000
@@ -19,8 +19,6 @@
#
##############################################################################
-import netsvc
-import ir
from osv import osv
from tools.translate import _
@@ -52,7 +50,6 @@
invoices = {}
invoice_obj=self.pool.get('account.invoice')
purchase_line_obj=self.pool.get('purchase.order.line')
- purchase_obj = self.pool.get('purchase.order')
property_obj=self.pool.get('ir.property')
account_fiscal_obj=self.pool.get('account.fiscal.position')
invoice_line_obj=self.pool.get('account.invoice.line')
=== modified file 'resource/__openerp__.py'
--- resource/__openerp__.py 2010-08-18 07:11:15 +0000
+++ resource/__openerp__.py 2010-12-22 12:34:58 +0000
@@ -28,7 +28,7 @@
"description": """
Module for resource management
A resource represent something that can be scheduled
- (a developer on a task or a workcenter on manufacturing orders).
+ (a developer on a task or a work center on manufacturing orders).
This module manages a resource calendar associated to every resource.
It also manages the leaves of every resource.
=== modified file 'resource/i18n/en_US.po'
--- resource/i18n/en_US.po 2010-08-18 07:11:15 +0000
+++ resource/i18n/en_US.po 2010-12-22 12:34:58 +0000
@@ -189,7 +189,7 @@
msgid "\n"
" Module for resource management\n"
" A resource represent something that can be scheduled\n"
-" (a developer on a task or a workcenter on manufacturing orders).\n"
+" (a developer on a task or a work center on manufacturing orders).\n"
" This module manages a resource calendar associated to every resource.\n"
" It also manages the leaves of every resource.\n"
"\n"
@@ -197,7 +197,7 @@
msgstr "\n"
" Module for resource management\n"
" A resource represent something that can be scheduled\n"
-" (a developer on a task or a workcenter on manufacturing orders).\n"
+" (a developer on a task or a work center on manufacturing orders).\n"
" This module manages a resource calendar associated to every resource.\n"
" It also manages the leaves of every resource.\n"
"\n"
=== modified file 'resource/i18n/mn.po'
--- resource/i18n/mn.po 2010-12-22 05:46:19 +0000
+++ resource/i18n/mn.po 2010-12-22 12:34:58 +0000
@@ -371,6 +371,28 @@
#~ msgstr "Ðжлын мөчлөг хайх"
#~ msgid ""
+<<<<<<< TREE
+=======
+#~ "\n"
+#~ " Module for resource management\n"
+#~ " A resource represent something that can be scheduled\n"
+#~ " (a developer on a task or a work center on manufacturing orders).\n"
+#~ " This module manages a resource calendar associated to every resource.\n"
+#~ " It also manages the leaves of every resource.\n"
+#~ "\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Module for resource management\n"
+#~ " Ðөөц гÑдÑг нь хувиарлаж болох Ñмар нÑг зүйлийг Ñ…ÑлнÑ\n"
+#~ " (хөгжүүлÑгчийг даалгаварт, цехийг үйлдвÑрлÑлд гÑÑ… мÑÑ‚).\n"
+#~ " ÐÐ½Ñ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ нь бүх нөөцийн календарийг удирдана.\n"
+#~ " Мөн нөөцийн чөлөөг удирдана.\n"
+#~ "\n"
+#~ " "
+
+#~ msgid ""
+>>>>>>> MERGE-SOURCE
#~ "If the active field is set to true, it will allow you to hide the resource "
#~ "record without removing it."
#~ msgstr ""
=== modified file 'resource/i18n/nl.po'
--- resource/i18n/nl.po 2010-12-22 05:46:19 +0000
+++ resource/i18n/nl.po 2010-12-22 12:34:58 +0000
@@ -376,6 +376,29 @@
#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
#~ msgid ""
+<<<<<<< TREE
+=======
+#~ "\n"
+#~ " Module for resource management\n"
+#~ " A resource represent something that can be scheduled\n"
+#~ " (a developer on a task or a work center on manufacturing orders).\n"
+#~ " This module manages a resource calendar associated to every resource.\n"
+#~ " It also manages the leaves of every resource.\n"
+#~ "\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Module voor resource beheer\n"
+#~ " Een resource vertegenwoordigt iets dat kan worden gepland\n"
+#~ " (een ontwikkelaar op een taak, een bewerkingsplaats op "
+#~ "productieorders).\n"
+#~ " Deze module beheert een resource agenda gekoppeld aan elke resource.\n"
+#~ " Het beheert ook de afwezigheid van elke resource.\n"
+#~ "\n"
+#~ " "
+
+#~ msgid ""
+>>>>>>> MERGE-SOURCE
#~ "If the active field is set to true, it will allow you to hide the resource "
#~ "record without removing it."
#~ msgstr ""
=== modified file 'stock/stock.py'
--- stock/stock.py 2010-12-21 07:16:53 +0000
+++ stock/stock.py 2010-12-22 12:34:58 +0000
@@ -798,10 +798,11 @@
move_ids = self.pool.get('stock.move').search(cr, uid, [('picking_id', 'in', ids)])
for move in self.pool.get('stock.move').browse(cr, uid, move_ids):
if move.state not in ('done', 'cancel'):
+
if move.product_qty != 0.0:
return False
else:
- move.write(cr, uid, [move.id], {'state': 'done'})
+ move.write({'state': 'done'})
return True
def test_assigned(self, cr, uid, ids):
@@ -869,7 +870,7 @@
@return {'contact': address, 'invoice': address} for invoice
"""
partner_obj = self.pool.get('res.partner')
- partner = picking.address_id.partner_id
+ partner = (picking.purchase_id and picking.purchase_id.partner_id) or (picking.sale_id and picking.sale_id.partner_id) or picking.address_id.partner_id
return partner_obj.address_get(cr, uid, [partner.id],
['contact', 'invoice'])
@@ -972,7 +973,7 @@
if picking.invoice_state != '2binvoiced':
continue
payment_term_id = False
- partner = picking.address_id and picking.address_id.partner_id
+ partner = (picking.purchase_id and picking.purchase_id.partner_id) or (picking.sale_id and picking.sale_id.partner_id) or (picking.address_id and picking.address_id.partner_id)
if not partner:
raise osv.except_osv(_('Error, no partner !'),
_('Please put a partner on the picking list if you want to generate invoice.'))
@@ -1287,6 +1288,9 @@
@param ids: List of Picking Ids
@param context: A standard dictionary for contextual values
"""
+ if context is None:
+ context = {}
+ data_obj = self.pool.get('ir.model.data')
for pick in self.browse(cr, uid, ids, context=context):
msg=''
if pick.auto_picking:
@@ -1296,6 +1300,11 @@
'in':_('Reception'),
'internal': _('Internal picking'),
}
+ view_list = {
+ 'out': 'view_picking_out_form',
+ 'in': 'view_picking_in_form',
+ 'internal': 'view_picking_form',
+ }
message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
if pick.min_date:
msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
@@ -1306,8 +1315,10 @@
'done': _('is done.'),
'draft':_('is in draft state.'),
}
+ res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))
+ context.update({'view_id': res and res[1] or False})
message += state_list[pick.state]
- self.log(cr, uid, pick.id, message)
+ self.log(cr, uid, pick.id, message, context=context)
return True
stock_picking()
@@ -1751,7 +1762,8 @@
result.setdefault(m.picking_id, [])
result[m.picking_id].append( (m, dest) )
return result
- def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
+
+ def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
res_obj = self.pool.get('res.company')
picking_obj = self.pool.get('stock.picking')
pick_id= picking_obj.create(cr, uid, {
@@ -1768,6 +1780,7 @@
'date': picking.date,
})
return pick_id
+
def action_confirm(self, cr, uid, ids, context=None):
""" Confirms stock move.
@return: List of ids.
@@ -1783,11 +1796,18 @@
new_moves = []
if context is None:
context = {}
+ seq_obj = self.pool.get('ir.sequence')
for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
- pick_name = picking.name or ''
if picking:
- pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
+ # name of new picking according to its type
+ new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
+ pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
+ # Need to check name of old picking because it always considers picking as "OUT" when created from Sale Order
+ old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
+ if old_ptype != picking.type:
+ old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
+ self.pool.get('stock.picking').write(cr, uid, picking.id, {'name': old_pick_name}, context=context)
else:
pickid = False
for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
@@ -1810,9 +1830,10 @@
if pickid:
wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
if new_moves:
- create_chained_picking(self, cr, uid, new_moves, context)
- create_chained_picking(self, cr, uid, moves, context)
- return []
+ new_moves += create_chained_picking(self, cr, uid, new_moves, context)
+ return new_moves
+ all_moves = create_chained_picking(self, cr, uid, moves, context)
+ return all_moves
def action_assign(self, cr, uid, ids, *args):
""" Changes state to confirmed or waiting.
@@ -2065,10 +2086,9 @@
if move.picking_id:
picking_ids.append(move.picking_id.id)
if move.move_dest_id.id and (move.state != 'done'):
- self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
- #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
+ self.write(cr, uid, [move.id], {'stock_move_history_ids': [(4, move.move_dest_id.id)]}, context=context)
if move.move_dest_id.state in ('waiting', 'confirmed'):
- self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
+ self.action_assign(cr, uid, [move.move_dest_id.id])
if move.move_dest_id.picking_id:
wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
if move.move_dest_id.auto_validate:
@@ -2254,7 +2274,18 @@
self.write(cr, uid, [current_move], update_val)
return res
- def action_consume(self, cr, uid, ids, quantity, location_id=False, context=None):
+ def trigger_move_state(self, cr, uid, move, state, context=None):
+ if isinstance(move, (int, long)):
+ move = [move]
+ res = []
+ if state == 'confirm':
+ res = self.action_confirm(cr, uid, move, context=context)
+ if state == 'assigned':
+ self.check_assign(cr, uid, move, context=context)
+ self.force_assign(cr, uid, move, context=context)
+ return res
+
+ def action_consume(self, cr, uid, ids, quantity, location_id=False, context=None):
""" Consumed product with specific quatity from specific source location
@param cr: the database cursor
@param uid: the user id
@@ -2284,12 +2315,12 @@
quantity = move.product_qty
uos_qty = quantity / move_qty * move.product_uos_qty
+ state = (move.state in ('confirm', 'assign') and move.state) or 'confirm'
if quantity_rest > 0:
default_val = {
'product_qty': quantity,
'product_uos_qty': uos_qty,
- 'state': move.state,
'location_id': location_id or move.location_id.id,
}
if move.product_id.track_production and location_id:
@@ -2322,6 +2353,8 @@
for (id, name) in product_obj.name_get(cr, uid, [new_move.product_id.id]):
message = _('Product ') + " '" + name + "' "+ _("is consumed with") + " '" + str(new_move.product_qty) + "' "+ _("quantity.")
self.log(cr, uid, new_move.id, message)
+
+ self.trigger_move_state(cr, uid, res, state, context=context)
self.action_done(cr, uid, res)
return res
@@ -2473,7 +2506,6 @@
""" Finish the inventory
@return: True
"""
-
if context is None:
context = {}
move_obj = self.pool.get('stock.move')
@@ -2497,8 +2529,9 @@
move_ids = []
for line in inv.inventory_line_id:
pid = line.product_id.id
- product_context.update(uom=line.product_uom.id)
+ product_context.update(uom=line.product_uom.id,date=inv.date)
amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
+
change = line.product_qty - amount
lot_id = line.prod_lot_id.id
if change:
@@ -2509,7 +2542,6 @@
'product_uom': line.product_uom.id,
'prodlot_id': lot_id,
'date': inv.date,
- 'date': inv.date,
}
if change > 0:
value.update( {
@@ -2568,7 +2600,7 @@
'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
}
- def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
+ def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
""" Changes UoM and name if product_id changes.
@param location_id: Location id
@param product: Changed product_id
@@ -2580,7 +2612,7 @@
if not uom:
prod = self.pool.get('product.product').browse(cr, uid, [product], {'uom': uom})[0]
uom = prod.uom_id.id
- amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom})[product]
+ amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom, 'to_date': to_date})[product]
result = {'product_qty': amount, 'product_uom': uom}
return {'value': result}
=== modified file 'stock/stock_data.xml'
--- stock/stock_data.xml 2010-12-20 14:54:13 +0000
+++ stock/stock_data.xml 2010-12-22 12:34:58 +0000
@@ -18,7 +18,7 @@
<field name="name">Production Lot</field>
<field name="object">stock.production.lot</field>
</record>
-
+
<!--
Resource: stock.location
-->
@@ -47,7 +47,7 @@
<field name="usage">inventory</field>
<field name="company_id"></field>
</record>
-
+
<record id="location_inventory" model="stock.location">
<field name="name">Inventory loss</field>
<field name="location_id" ref="stock_location_locations_virtual"/>
@@ -99,7 +99,7 @@
<field name="name">Stock</field>
<field name="location_id" ref="stock_location_company"/>
</record>
-
+
<!--
Properties
-->
@@ -113,7 +113,11 @@
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_stock_customer')]"/>
<field eval="'stock.location,'+str(stock_location_customers)" name="value"/>
</record>
-
+
+ <record id="base.main_partner" model="res.partner">
+ <field name="property_stock_customer" eval="ref('stock_location_stock')"/>
+ </record>
+
<record forcecreate="True" id="property_stock_procurement" model="ir.property">
<field name="name">property_stock_procurement</field>
<field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_procurement')]"/>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2010-12-20 13:00:56 +0000
+++ stock/stock_view.xml 2010-12-22 12:34:58 +0000
@@ -9,10 +9,30 @@
<menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
+ <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
+ parent="stock.menu_stock_product" sequence="0"/>
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
<menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
+ <menuitem
+ id="menu_product_in_config_stock" name="Product"
+ parent="stock.menu_stock_configuration" sequence="2"/>
+ <menuitem
+ action="product.product_category_action_form" id="menu_product_category_config_stock"
+ parent="stock.menu_product_in_config_stock" sequence="0"/>
+ <menuitem
+ action="product.product_ul_form_action" groups="base.group_extended"
+ id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
+ <menuitem
+ id="menu_stock_unit_measure_stock" name="Units of Measure"
+ parent="stock.menu_product_in_config_stock" sequence="2"/>
+ <menuitem
+ action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+ parent="stock.menu_stock_unit_measure_stock" sequence="0"/>
+ <menuitem
+ action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+ parent="stock.menu_stock_unit_measure_stock" sequence="1"/>
<record id="stock_inventory_line_tree" model="ir.ui.view">
<field name="name">stock.inventory.line.tree</field>
@@ -37,7 +57,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Stock Inventory Lines">
- <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','<>','service')]"/>
+ <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id" groups="base.group_extended"/>
@@ -97,7 +117,7 @@
<field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
<tree string="Products" editable="bottom">
<field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
- <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','<>','service')]"/>
+ <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<field name="prod_lot_id" groups="base.group_extended"/>
@@ -109,7 +129,7 @@
<form string="Products ">
<field domain="[('usage','=','internal')]" name="location_id"/>
<newline/>
- <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','<>','service')]"/>
+ <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<group colspan="2" col="4">
=== modified file 'wiki_faq/wiki_faq.xml'
--- wiki_faq/wiki_faq.xml 2010-08-12 14:31:06 +0000
+++ wiki_faq/wiki_faq.xml 2010-12-22 12:34:58 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
- <data>
+ <data noupdate="1">
<record id="wiki_groups_faq" model="wiki.groups">
<field name="name">Internal FAQ</field>
<field name="method">list</field>
=== modified file 'wiki_quality_manual/wiki_quality_manual.xml'
--- wiki_quality_manual/wiki_quality_manual.xml 2010-06-25 16:07:45 +0000
+++ wiki_quality_manual/wiki_quality_manual.xml 2010-12-22 12:34:58 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
- <data>
+ <data noupdate="1">
<record id="wiki_quality_manual" model="wiki.wiki">
<field name="name">Quality Manual</field>
<field name="tags">quality, faq, manual</field>
