[MERGE]: Merging with the same branch

bzr revid: rpa@tinyerp.com-20101222041855-qu0jo8139sq27ltu
This commit is contained in:
rpa (Open ERP) 2010-12-22 09:48:55 +05:30
commit 2cb0475219
60 changed files with 795 additions and 716 deletions

View File

@ -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 &lt;= 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 &gt; 5kg</field>
<field name="grid_id" ref="delivery_grid"/>
<field name="operator">&gt;=</field>
<field eval="5" name="max_value"/>
<field eval="50" name="list_price"/>
<field eval="30" name="standard_price"/>
</record>
</data>
</openerp>

View File

@ -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 &lt;= 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 &gt; 5kg</field>
<field name="grid_id" ref="delivery_grid"/>
<field name="operator">&gt;=</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 &gt;= 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">&gt;=</field>
<field name="type">price</field>

View File

@ -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">

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Бр. цикли"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Núm. de cicles"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -649,7 +649,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr "Anzahl Zyklen"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
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
@ -673,7 +673,7 @@ msgstr "Kosten Information"
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -32,7 +32,7 @@ msgstr "Αρ. Κύκλων"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -47,7 +47,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -652,7 +652,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr "Núm. de ciclos"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
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
@ -675,7 +675,7 @@ msgstr "Información de costes"
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Núm. de ciclos"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -649,7 +649,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Tsükklite No."
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr "Kiertojen määrä"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -649,7 +649,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -44,7 +44,7 @@ msgstr "Nombre de Cycles"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
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
@ -681,7 +681,7 @@ msgstr "Information de coût"
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -644,7 +644,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "N. Cicli di Lavoro"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
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
@ -659,7 +659,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr "싸이클 횟수"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -646,7 +646,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr "Ciklų skaičius"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -649,7 +649,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -28,7 +28,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -431,6 +431,12 @@ msgstr ""
msgid "Complete this only if you want automatic analytic accounting entries on production orders."
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"
@ -512,7 +518,7 @@ msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_workcenter_load
msgid "Workcenter Load"
msgid "Work Center Load"
msgstr ""
#. module: mrp
@ -613,7 +619,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Aantal cycli"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -648,7 +648,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Liczba cykli"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
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
@ -44,7 +44,7 @@ msgstr "Wykorzystanie centrum roboczego"
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr "Obłożenie centrum roboczego"
#. module: mrp
@ -663,7 +663,7 @@ msgstr "Inofrmacje kosztowe"
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Núm. de ciclos"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
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
@ -664,7 +664,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Núm. de ciclos"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -646,7 +646,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Nr de cicluri"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Кол-во циклов"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -644,7 +644,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -644,7 +644,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "No. Of Cycles"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -648,7 +648,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "Çevrim Sayısı"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -644,7 +644,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "周期"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -30,7 +30,7 @@ msgstr "週期數"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -45,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -644,7 +644,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -29,7 +29,7 @@ msgstr "週期數"
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of operations this workcenter can do."
msgid "Number of iterations this work center has to do in the specified operation of the routing."
msgstr ""
#. module: mrp
@ -44,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
msgid "Work Centers load"
msgid "Work Center Loads"
msgstr ""
#. module: mrp
@ -643,7 +643,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: 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

View File

@ -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"/>

View File

@ -124,7 +124,7 @@ class report_custom(report_int):
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 @@ class report_custom(report_int):
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,

View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
71 access_report_mrp_inout_user report.mrp.inout user model_report_mrp_inout mrp.group_mrp_user 1 0 0 0
72 access_report_workcenter_load_user report.workcenter.load.user model_report_workcenter_load mrp.group_mrp_user 1 0 0 0
73 access_mrp_bom_salesman mrp.bom model_mrp_bom base.group_sale_salesman 1 0 0 0
74 access_stock_warehouse_mrp_manager stock.warehouse.mrp.manager stock.model_stock_warehouse mrp.group_mrp_manager 1 0 0 0
75 access_stock_location_mrp_manager stock.location.mrp.manager stock.model_stock_location mrp.group_mrp_manager 1 0 0 0

View File

@ -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

View File

@ -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>

View File

@ -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"/>

View File

@ -19,8 +19,6 @@
#
##############################################################################
import netsvc
import ir
from osv import osv
from tools.translate import _
@ -52,7 +50,6 @@ class purchase_line_invoice(osv.osv_memory):
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')

View File

@ -798,10 +798,11 @@ class stock_picking(osv.osv):
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 @@ class stock_picking(osv.osv):
@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 @@ class stock_picking(osv.osv):
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 @@ class stock_picking(osv.osv):
@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 @@ class stock_picking(osv.osv):
'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 @@ class stock_picking(osv.osv):
'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()
@ -2473,7 +2484,6 @@ class stock_inventory(osv.osv):
""" Finish the inventory
@return: True
"""
if context is None:
context = {}
move_obj = self.pool.get('stock.move')
@ -2497,8 +2507,9 @@ class stock_inventory(osv.osv):
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 +2520,6 @@ class stock_inventory(osv.osv):
'product_uom': line.product_uom.id,
'prodlot_id': lot_id,
'date': inv.date,
'date': inv.date,
}
if change > 0:
value.update( {
@ -2568,7 +2578,7 @@ class stock_inventory_line(osv.osv):
'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 +2590,7 @@ class stock_inventory_line(osv.osv):
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}

View File

@ -114,6 +114,10 @@
<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')]"/>

View File

@ -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','&lt;&gt;','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','&lt;&gt;','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','&lt;&gt;','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','&lt;&gt;','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','&lt;&gt;','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','&lt;&gt;','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<group colspan="2" col="4">

View File

@ -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>

View File

@ -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>