Merge lp:~vauxoo/openerp-venezuela-localization/truiz-openerp-venezuela-localization-search-invoices into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Tulio Ruiz (Vauxoo)
Status: Needs review
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/truiz-openerp-venezuela-localization-search-invoices
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 374 lines (+197/-80)
7 files modified
l10n_ve_split_invoice/__init__.py (+1/-1)
l10n_ve_split_invoice/__openerp__.py (+3/-0)
l10n_ve_split_invoice/i18n/es_VE.po (+122/-78)
l10n_ve_split_invoice/invoice.py (+37/-1)
l10n_ve_split_invoice/security/ir.model.access.csv (+4/-0)
l10n_ve_split_invoice/security/split_invoice_security.xml (+8/-0)
l10n_ve_split_invoice/view/invoice_view.xml (+22/-0)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/truiz-openerp-venezuela-localization-search-invoices
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
Review via email: mp+94791@code.launchpad.net

Description of the change

Se agrega un bontón en la vista de factura que permite ver todas las facturas que se general al momento de validar facturas que poseen más líneas de las indicadas en la configuración dispuesta para tal fin

To post a comment you must log in.

Unmerged revisions

632. By Tulio Ruiz (Vauxoo)

[FIX] Traducción del modulo

631. By Tulio Ruiz (Vauxoo)

[ADD] Grupos y seguridad para el boton que busca las facturas asociadas

630. By Tulio Ruiz (Vauxoo)

Agregado boton parfa ver las otras facturas

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_split_invoice/__init__.py'
2--- l10n_ve_split_invoice/__init__.py 2012-01-19 20:03:36 +0000
3+++ l10n_ve_split_invoice/__init__.py 2012-02-27 16:07:22 +0000
4@@ -25,4 +25,4 @@
5 import installer
6 import res_company
7 import invoice
8-
9+import wizard
10
11=== modified file 'l10n_ve_split_invoice/__openerp__.py'
12--- l10n_ve_split_invoice/__openerp__.py 2012-01-19 20:03:36 +0000
13+++ l10n_ve_split_invoice/__openerp__.py 2012-02-27 16:07:22 +0000
14@@ -58,6 +58,9 @@
15 "update_xml" : [
16 "installer_view.xml",
17 "view/company_view.xml",
18+ "view/invoice_view.xml",
19+ "security/split_invoice_security.xml",
20+ "security/ir.model.access.csv",
21 ],
22 "active": False,
23 "installable": True,
24
25=== modified file 'l10n_ve_split_invoice/i18n/es_VE.po'
26--- l10n_ve_split_invoice/i18n/es_VE.po 2011-12-20 14:43:41 +0000
27+++ l10n_ve_split_invoice/i18n/es_VE.po 2012-02-27 16:07:22 +0000
28@@ -6,8 +6,8 @@
29 msgstr ""
30 "Project-Id-Version: OpenERP Server 6.0.3\n"
31 "Report-Msgid-Bugs-To: support@openerp.com\n"
32-"POT-Creation-Date: 2011-12-16 15:04+0000\n"
33-"PO-Revision-Date: 2011-12-16 15:04+0000\n"
34+"POT-Creation-Date: 2012-02-27 15:15+0000\n"
35+"PO-Revision-Date: 2012-02-27 15:15+0000\n"
36 "Last-Translator: <>\n"
37 "Language-Team: \n"
38 "MIME-Version: 1.0\n"
39@@ -16,65 +16,14 @@
40 "Plural-Forms: \n"
41
42 #. module: l10n_ve_split_invoice
43-#: view:res.company:0
44-msgid "Invoice Lines Configutarion"
45-msgstr "Configuración de líneas de factura"
46-
47-#. module: l10n_ve_split_invoice
48-#: code:addons/l10n_ve_split_invoice/invoice.py:40
49-#, python-format
50-msgid "Error !"
51-msgstr "Error !"
52-
53-#. module: l10n_ve_split_invoice
54-#: model:ir.module.module,description:l10n_ve_split_invoice.module_meta_information
55-msgid "\n"
56-"For legal reasons in Venezuela we need just ONE invoice per page, with this module depending on your company configuration you will stablish the number of lines per invoice, with this you will be able of:\n"
57-" \n"
58-" 1.-Add module for establishing the number of lines per invoice\n"
59-" 2.-Split Invoice according number of lines per invoice once you confirm it.\n"
60-"\n"
61-"-------Testing Instructions--------\n"
62-"Once you installed the module:\n"
63-"\n"
64-"1.- Go to Administration - Companies, open one of your companies (if more than one) and \n"
65-" open the Configuration page.\n"
66-"2.- Set a number of lines per invoice on the corresponding field.\n"
67-"\n"
68-"3.- Go to Account - Clients - Client Invoices and create a new invoice with more lines \n"
69-" than you previously specified on the company configuration\n"
70-"\n"
71-"4.- Validate the invoice document\n"
72-"\n"
73-"The document should be now splited on N invoices with the number of lines that you specified\n"
74-"\n"
75-" "
76-msgstr "\n"
77-"Por razones legales en Venezuela tenemos una sola factura por página, dependiendo de la configuración de este módulo tu puedes establecer el número de líneas por factura , con esto usted será capaz de:\n"
78-" \n"
79-" 1.-Añadir módulo para establecer el número de líneas por factura\n"
80-" 2.-Dividir el número de factura en función de las líneas por factura una vez que se confirme esto.\n"
81-"\n"
82-"-------Instrucciones pruebas--------\n"
83-"Una vez que ha instalado el módulo:\n"
84-"\n"
85-"1.- Ir a la administración - Empresas, abra una de las empresas (si hay más de uno) y \n"
86-" abrir la página de configuración.\n"
87-"2.- Establecer un número de líneas por factura en el campo correspondiente.\n"
88-"\n"
89-"3.- Ir a la cuenta - Clientes - Facturas de clientes y crear una nueva factura con más líneas\n"
90-" de lo que previamente se específica en la configuración de la empresa\n"
91-"\n"
92-"4.- Validar la factura\n"
93-"\n"
94-"El documento debe ser ahora dividido en N facturas con el número de líneas que ha específicado\n"
95-"\n"
96-" "
97-
98-#. module: l10n_ve_split_invoice
99-#: model:ir.model,name:l10n_ve_split_invoice.model_res_company
100-msgid "Companies"
101-msgstr "Compañías"
102+#: model:ir.model,name:l10n_ve_split_invoice.model_account_invoice
103+msgid "Invoice"
104+msgstr "Factura"
105+
106+#. module: l10n_ve_split_invoice
107+#: help:res.company,lines_invoice:0
108+msgid "Number of lines per invoice"
109+msgstr "Número de líneas por factura"
110
111 #. module: l10n_ve_split_invoice
112 #: constraint:res.company:0
113@@ -82,12 +31,43 @@
114 msgstr "Error! no se pueden crear empresas recursivas."
115
116 #. module: l10n_ve_split_invoice
117-#: help:res.company,lines_invoice:0
118-msgid "Number of lines per invoice"
119-msgstr "Número de líneas por factura"
120-
121-#. module: l10n_ve_split_invoice
122-#: code:addons/l10n_ve_split_invoice/invoice.py:40
123+#: view:split.invoice.config:0
124+msgid "Split Invoice Configurator"
125+msgstr "Split Invoice Configurator"
126+
127+#. module: l10n_ve_split_invoice
128+#: model:ir.model,name:l10n_ve_split_invoice.model_res_company
129+msgid "res.company"
130+msgstr "res.company"
131+
132+#. module: l10n_ve_split_invoice
133+#: model:ir.model,name:l10n_ve_split_invoice.model_stock_invoice_onshipping
134+msgid "Stock Invoice Onshipping"
135+msgstr "Factura de Stock en el envío"
136+
137+#. module: l10n_ve_split_invoice
138+#: code:addons/l10n_ve_split_invoice/installer.py:51
139+#, python-format
140+msgid "The number of customer invoice lines must be at least one"
141+msgstr "The number of customer invoice lines must be at least one"
142+
143+#. module: l10n_ve_split_invoice
144+#: view:account.invoice:0
145+msgid "Search asociated"
146+msgstr "Buscar asociadas"
147+
148+#. module: l10n_ve_split_invoice
149+#: field:res.company,lines_invoice:0
150+msgid "Invoice Lines"
151+msgstr "Líneas de la factura"
152+
153+#. module: l10n_ve_split_invoice
154+#: view:res.company:0
155+msgid "Invoice Lines Configutarion"
156+msgstr "Configuración de líneas de factura"
157+
158+#. module: l10n_ve_split_invoice
159+#: code:addons/l10n_ve_split_invoice/invoice.py:41
160 #, python-format
161 msgid "Please set an invoice lines value in:\n"
162 "Administration->Company->Configuration->Invoice lines"
163@@ -95,9 +75,19 @@
164 "Administración->Compañía->Configuración->Líneas de la factura"
165
166 #. module: l10n_ve_split_invoice
167-#: model:ir.model,name:l10n_ve_split_invoice.model_account_invoice
168-msgid "Invoice"
169-msgstr "Factura"
170+#: field:split.invoice.config,progress:0
171+msgid "Configuration Progress"
172+msgstr "Configuration Progress"
173+
174+#. module: l10n_ve_split_invoice
175+#: view:split.invoice.config:0
176+msgid "title"
177+msgstr "title"
178+
179+#. module: l10n_ve_split_invoice
180+#: view:split.invoice.config:0
181+msgid "res_config_contents"
182+msgstr "res_config_contents"
183
184 #. module: l10n_ve_split_invoice
185 #: view:res.company:0
186@@ -105,12 +95,66 @@
187 msgstr "Configuración"
188
189 #. module: l10n_ve_split_invoice
190-#: field:res.company,lines_invoice:0
191-msgid "Invoice Lines"
192-msgstr "Líneas de la factura"
193-
194-#. module: l10n_ve_split_invoice
195-#: model:ir.module.module,shortdesc:l10n_ve_split_invoice.module_meta_information
196-msgid "Split Invoices"
197-msgstr "Dividir la factura"
198+#: model:ir.model,name:l10n_ve_split_invoice.model_split_invoice_config
199+msgid "\n"
200+" Fiscal Requirements installer wizard\n"
201+" "
202+msgstr "\n"
203+" Asistente de instalación de requerimientos fiscales\n"
204+" "
205+
206+#. module: l10n_ve_split_invoice
207+#: code:addons/l10n_ve_split_invoice/invoice.py:91
208+#, python-format
209+msgid "No Invoices were created"
210+msgstr "No se crearon facturas"
211+
212+#. module: l10n_ve_split_invoice
213+#: view:split.invoice.config:0
214+msgid "\n"
215+"Configure your company with the maximum number\n"
216+"of lines in your customer invoices\n"
217+" "
218+msgstr "\n"
219+"Configure your company with the maximum number\n"
220+"of lines in your customer invoices\n"
221+" "
222+
223+#. module: l10n_ve_split_invoice
224+#: code:addons/l10n_ve_split_invoice/invoice.py:91
225+#, python-format
226+msgid "Error"
227+msgstr "Error"
228+
229+#. module: l10n_ve_split_invoice
230+#: code:addons/l10n_ve_split_invoice/installer.py:51
231+#: code:addons/l10n_ve_split_invoice/invoice.py:41
232+#, python-format
233+msgid "Error !"
234+msgstr "Error !"
235+
236+#. module: l10n_ve_split_invoice
237+#: field:split.invoice.config,config_logo:0
238+msgid "Image"
239+msgstr "Image"
240+
241+#. module: l10n_ve_split_invoice
242+#: view:split.invoice.config:0
243+msgid "Configure Customer Invoice Lines"
244+msgstr "Configure Customer Invoice Lines"
245+
246+#. module: l10n_ve_split_invoice
247+#: field:split.invoice.config,name:0
248+msgid "Max Invoice Lines"
249+msgstr "Max Invoice Lines"
250+
251+#. module: l10n_ve_split_invoice
252+#: help:split.invoice.config,name:0
253+msgid "Select the maximum number of lines in your customer invoices"
254+msgstr "Select the maximum number of lines in your customer invoices"
255+
256+#. module: l10n_ve_split_invoice
257+#: model:ir.actions.act_window,name:l10n_ve_split_invoice.action_config_split_invoice
258+msgid "Configure Withholdings VAT for Venezuela"
259+msgstr "Configurar retenciones de IVA para Venezuela"
260
261
262=== modified file 'l10n_ve_split_invoice/invoice.py'
263--- l10n_ve_split_invoice/invoice.py 2012-02-09 20:15:35 +0000
264+++ l10n_ve_split_invoice/invoice.py 2012-02-27 16:07:22 +0000
265@@ -34,6 +34,7 @@
266 '''
267 Split the invoice when the lines exceed the maximum set for the company
268 '''
269+ inv_ids = []
270 for inv in self.browse(cr, uid, ids):
271 inv_id =False
272 if inv.company_id.lines_invoice < 1:
273@@ -67,15 +68,50 @@
274 for il in lst:
275 self.pool.get('account.invoice.line').write(cr,uid,il.id,{'invoice_id':inv_id})
276 self.button_compute(cr, uid, [inv.id], set_total=True)
277+ inv_ids.append(inv_id)
278+ inv_ids.append(inv.id)
279 if inv_id:
280 wf_service = netsvc.LocalService("workflow")
281 self.button_compute(cr, uid, [inv_id], set_total=True)
282 # wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
283 return True
284
285+ def search_asociated_invoice(self, cr, uid, ids, context=None):
286+ if context is None:
287+ context = {}
288+ data_pool = self.pool.get('ir.model.data')
289+ inv_type = self.read(cr, uid, ids[0], ['type', 'name'])
290+ name = inv_type['name']
291+ inv_type = inv_type['type']
292+ invoice_ids = self.search(cr, uid, [('name', '=', name)])
293+ # inv_type = context.get('inv_type', False)
294+ action_model = False
295+ action = {}
296+ if not invoice_ids:
297+ raise osv.except_osv(_('Error'), _('No Invoices were created'))
298+ if inv_type == "out_invoice":
299+ action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
300+ elif inv_type == "in_invoice":
301+ action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree2")
302+ elif inv_type == "out_refund":
303+ action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree3")
304+ elif inv_type == "in_refund":
305+ action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree4")
306+ if action_model:
307+ action_pool = self.pool.get(action_model)
308+ action = action_pool.read(cr, uid, action_id, context=context)
309+ action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
310+ print "**** name ", name
311+ print "**** open invoice ", invoice_ids
312+ print "**** domain ", action['domain']
313+ print "**** action_id ", action_id
314+ print "**** type ", inv_type
315+ action.update({'nodestroy': True})
316+ return action
317+
318 def action_date_assign(self, cr, uid, ids, *args):
319 data = super(account_invoice, self).action_date_assign(cr, uid, ids, *args)
320- self.split_invoice(cr,uid,ids)
321+ inv_ids = self.split_invoice(cr,uid,ids)
322 return True
323
324 account_invoice()
325
326=== added directory 'l10n_ve_split_invoice/security'
327=== added file 'l10n_ve_split_invoice/security/ir.model.access.csv'
328--- l10n_ve_split_invoice/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
329+++ l10n_ve_split_invoice/security/ir.model.access.csv 2012-02-27 16:07:22 +0000
330@@ -0,0 +1,4 @@
331+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
332+"access_account_split_invoice_manager","account.invoice","model_account_invoice","l10n_ve_split_invoice.group_account_split_invoice_manager",1,0,0,0
333+
334+
335
336=== added file 'l10n_ve_split_invoice/security/split_invoice_security.xml'
337--- l10n_ve_split_invoice/security/split_invoice_security.xml 1970-01-01 00:00:00 +0000
338+++ l10n_ve_split_invoice/security/split_invoice_security.xml 2012-02-27 16:07:22 +0000
339@@ -0,0 +1,8 @@
340+<?xml version="1.0" encoding="utf-8"?>
341+<openerp>
342+ <data noupdate="1">
343+ <record id="group_account_split_invoice_manager" model="res.groups">
344+ <field name="name">Split Search / Manager</field>
345+ </record>
346+ </data>
347+</openerp>
348
349=== added file 'l10n_ve_split_invoice/view/invoice_view.xml'
350--- l10n_ve_split_invoice/view/invoice_view.xml 1970-01-01 00:00:00 +0000
351+++ l10n_ve_split_invoice/view/invoice_view.xml 2012-02-27 16:07:22 +0000
352@@ -0,0 +1,22 @@
353+<?xml version="1.0" encoding="utf-8"?>
354+<openerp>
355+ <data>
356+ <record id="search_asociated_invoices" model="ir.ui.view">
357+ <field name="name">account.invoice.search</field>
358+ <field name="model">account.invoice</field>
359+ <field name="type">form</field>
360+ <field name="inherit_id" ref="account.invoice_form"/>
361+ <field name="arch" type="xml">
362+ <xpath expr='//button[@name="invoice_cancel"]' position='after'>
363+ <button
364+ string="Search asociated"
365+ name="search_asociated_invoice"
366+ type="object"
367+ icon="gtk-new"
368+ groups="l10n_ve_split_invoice.group_account_split_invoice_manager"/>
369+ </xpath>
370+ </field>
371+ </record>
372+ </data>
373+</openerp>
374+