Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-mrp_consume_produce-dev-julio into lp:addons-vauxoo

Proposed by Juan Carlos Hernandez
Status: Merged
Merged at revision: 457
Proposed branch: lp:~vauxoo/addons-vauxoo/addons-vauxoo-mrp_consume_produce-dev-julio
Merge into: lp:addons-vauxoo
Diff against target: 208 lines (+170/-0)
5 files modified
mrp_consume_produce/__openerp__.py (+2/-0)
mrp_consume_produce/i18n/es.po (+146/-0)
mrp_consume_produce/security/ir.model.access.csv (+7/-0)
mrp_consume_produce/security/mrp_security.xml (+14/-0)
mrp_consume_produce/wizard/mrp_consume_produce.py (+1/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-mrp_consume_produce-dev-julio
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Pending
Rodolfo Lopez Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+125064@code.launchpad.net

Description of the change

add traduction and security with groups and model access

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mrp_consume_produce/__openerp__.py'
2--- mrp_consume_produce/__openerp__.py 2012-09-17 21:52:28 +0000
3+++ mrp_consume_produce/__openerp__.py 2012-09-18 22:24:19 +0000
4@@ -38,6 +38,8 @@
5 'update_xml': [
6 'wizard/wizard_view.xml',
7 'mrp_consume_produce_view.xml',
8+ 'security/mrp_security.xml',
9+ 'security/ir.model.access.csv',
10 ],
11 'demo_xml': [],
12 'test': [],
13
14=== added directory 'mrp_consume_produce/i18n'
15=== added file 'mrp_consume_produce/i18n/es.po'
16--- mrp_consume_produce/i18n/es.po 1970-01-01 00:00:00 +0000
17+++ mrp_consume_produce/i18n/es.po 2012-09-18 22:24:19 +0000
18@@ -0,0 +1,146 @@
19+# Translation of OpenERP Server.
20+# This file contains the translation of the following modules:
21+# * mrp_consume_produce
22+#
23+msgid ""
24+msgstr ""
25+"Project-Id-Version: OpenERP Server 6.1\n"
26+"Report-Msgid-Bugs-To: \n"
27+"POT-Creation-Date: 2012-09-18 21:14+0000\n"
28+"PO-Revision-Date: 2012-09-18 16:28-0600\n"
29+"Last-Translator: juan <openerp1@hotmil.com>\n"
30+"Language-Team: \n"
31+"MIME-Version: 1.0\n"
32+"Content-Type: text/plain; charset=UTF-8\n"
33+"Content-Transfer-Encoding: 8bit\n"
34+"Plural-Forms: \n"
35+
36+#. module: mrp_consume_produce
37+#: model:ir.model,name:mrp_consume_produce.model_mrp_production
38+msgid "Manufacturing Order"
39+msgstr "Orden de Producción"
40+
41+#. module: mrp_consume_produce
42+#: field:mrp.consume.line,wizard2_id:0
43+#: field:mrp.consume.line,wizard_id:0
44+msgid "Wizard"
45+msgstr "Wizard"
46+
47+#. module: mrp_consume_produce
48+#: field:mrp.production,consumed:0
49+msgid "consumed?"
50+msgstr "consumido?"
51+
52+#. module: mrp_consume_produce
53+#: field:mrp.consume.line,location_id:0
54+msgid "Location"
55+msgstr "Ubicación"
56+
57+#. module: mrp_consume_produce
58+#: field:mrp.production,len_move:0
59+msgid "moves"
60+msgstr "movimientos"
61+
62+#. module: mrp_consume_produce
63+#: field:mrp.consume.line,product_uom:0
64+msgid "Unit of Measure"
65+msgstr "Unidad de Medida"
66+
67+#. module: mrp_consume_produce
68+#: field:mrp.consume.line,product_id:0
69+msgid "Product"
70+msgstr "Producto"
71+
72+#. module: mrp_consume_produce
73+#: view:mrp.production:0
74+msgid "Finished Consumed"
75+msgstr "Finalizar Consumo"
76+
77+#. module: mrp_consume_produce
78+#: model:ir.actions.act_window,name:mrp_consume_produce.create_produce_action
79+#: model:ir.actions.act_window,name:mrp_consume_produce.produce_wizard
80+#: view:mrp.produce:0
81+#: view:mrp.production:0
82+msgid "Produce"
83+msgstr "Producir"
84+
85+#. module: mrp_consume_produce
86+#: view:mrp.production:0
87+msgid "Products Produced"
88+msgstr "Productos Producidos"
89+
90+#. module: mrp_consume_produce
91+#: constraint:mrp.production:0
92+msgid "Order quantity cannot be negative or zero!"
93+msgstr "Cantidad de pedido no puede ser negativo o cero!"
94+
95+#. module: mrp_consume_produce
96+#: model:ir.model,name:mrp_consume_produce.model_mrp_consume
97+msgid "mrp.consume"
98+msgstr "mrp.consume"
99+
100+#. module: mrp_consume_produce
101+#: view:mrp.production:0
102+msgid "Finish Production"
103+msgstr "Finalizar Producción"
104+
105+#. module: mrp_consume_produce
106+#: view:mrp.production:0
107+msgid "Consumed"
108+msgstr "Consumir"
109+
110+#. module: mrp_consume_produce
111+#: help:mrp.production,consumed:0
112+msgid "indicates if product to consume have been consumed or canceled"
113+msgstr "indica si los productos a consumir han sido consumidos o cancelados"
114+
115+#. module: mrp_consume_produce
116+#: model:ir.model,name:mrp_consume_produce.model_mrp_produce
117+msgid "mrp.produce"
118+msgstr "mrp.produce"
119+
120+#. module: mrp_consume_produce
121+#: sql_constraint:mrp.production:0
122+msgid "Reference must be unique per Company!"
123+msgstr "Referencia deben ser única por Empresa!"
124+
125+#. module: mrp_consume_produce
126+#: field:mrp.consume.line,quantity:0
127+msgid "Quantity"
128+msgstr "Cantidad"
129+
130+#. module: mrp_consume_produce
131+#: view:mrp.produce:0
132+msgid "Produced Products"
133+msgstr "Productos Producidos"
134+
135+#. module: mrp_consume_produce
136+#: model:ir.actions.act_window,name:mrp_consume_produce.consume_wizard
137+#: model:ir.actions.act_window,name:mrp_consume_produce.create_consume_action
138+#: view:mrp.consume:0
139+#: field:mrp.consume,consume_line_ids:0
140+#: field:mrp.produce,produce_line_ids:0
141+msgid "Consume"
142+msgstr "Consumir"
143+
144+#. module: mrp_consume_produce
145+#: field:mrp.consume.line,move_id:0
146+msgid "Move"
147+msgstr "Mover"
148+
149+#. module: mrp_consume_produce
150+#: view:mrp.consume:0
151+#: view:mrp.produce:0
152+msgid "Cancel"
153+msgstr "Cancelar"
154+
155+#. module: mrp_consume_produce
156+#: model:ir.model,name:mrp_consume_produce.model_mrp_consume_line
157+msgid "mrp.consume.line"
158+msgstr "mrp.consume.line"
159+
160+#. module: mrp_consume_produce
161+#: field:mrp.consume.line,location_dest_id:0
162+msgid "Dest. Location"
163+msgstr "Dest. Location"
164+
165
166=== added directory 'mrp_consume_produce/security'
167=== added file 'mrp_consume_produce/security/ir.model.access.csv'
168--- mrp_consume_produce/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
169+++ mrp_consume_produce/security/ir.model.access.csv 2012-09-18 22:24:19 +0000
170@@ -0,0 +1,7 @@
171+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
172+access_mrp_consume_manager,mrp.consume.manager,model_mrp_consume,group_mrp_consume_manager,1,1,1,1
173+access_mrp_consume_user,mrp.consume.user,model_mrp_consume,group_mrp_consume_user,1,0,0,0
174+access_mrp_produce_manager,mrp.produce.manager,model_mrp_produce,group_mrp_consume_manager,1,1,1,1
175+access_mrp_produce_user,mrp.produce.user,model_mrp_produce,group_mrp_consume_user,1,0,0,0
176+access_mrp_consume_line_manager,mrp.consume.line.manager,model_mrp_consume_line,group_mrp_consume_manager,1,1,1,1
177+access_mrp_consume_line_user,mrp.consume.line.user,model_mrp_consume_line,group_mrp_consume_user,1,0,0,0
178
179=== added file 'mrp_consume_produce/security/mrp_security.xml'
180--- mrp_consume_produce/security/mrp_security.xml 1970-01-01 00:00:00 +0000
181+++ mrp_consume_produce/security/mrp_security.xml 2012-09-18 22:24:19 +0000
182@@ -0,0 +1,14 @@
183+<?xml version="1.0" encoding="utf-8"?>
184+<openerp>
185+ <data>
186+
187+ <record model="res.groups" id="group_mrp_consume_manager">
188+ <field name="name">Mrp Consume / Manager</field>
189+ </record>
190+
191+ <record model="res.groups" id="group_mrp_consume_user">
192+ <field name="name">Mrp Consume / User</field>
193+ </record>
194+
195+ </data>
196+</openerp>
197
198=== modified file 'mrp_consume_produce/wizard/mrp_consume_produce.py'
199--- mrp_consume_produce/wizard/mrp_consume_produce.py 2012-09-17 21:45:04 +0000
200+++ mrp_consume_produce/wizard/mrp_consume_produce.py 2012-09-18 22:24:19 +0000
201@@ -26,6 +26,7 @@
202 import time
203 from osv import osv, fields
204 import decimal_precision as dp
205+from tools.translate import _
206
207 class mrp_consume(osv.osv_memory):
208 _name='mrp.consume'