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
=== modified file 'l10n_ve_split_invoice/__init__.py'
--- l10n_ve_split_invoice/__init__.py 2012-01-19 20:03:36 +0000
+++ l10n_ve_split_invoice/__init__.py 2012-02-27 16:07:22 +0000
@@ -25,4 +25,4 @@
25import installer25import installer
26import res_company26import res_company
27import invoice27import invoice
2828import wizard
2929
=== modified file 'l10n_ve_split_invoice/__openerp__.py'
--- l10n_ve_split_invoice/__openerp__.py 2012-01-19 20:03:36 +0000
+++ l10n_ve_split_invoice/__openerp__.py 2012-02-27 16:07:22 +0000
@@ -58,6 +58,9 @@
58 "update_xml" : [58 "update_xml" : [
59 "installer_view.xml",59 "installer_view.xml",
60 "view/company_view.xml",60 "view/company_view.xml",
61 "view/invoice_view.xml",
62 "security/split_invoice_security.xml",
63 "security/ir.model.access.csv",
61 ],64 ],
62 "active": False,65 "active": False,
63 "installable": True,66 "installable": True,
6467
=== modified file 'l10n_ve_split_invoice/i18n/es_VE.po'
--- l10n_ve_split_invoice/i18n/es_VE.po 2011-12-20 14:43:41 +0000
+++ l10n_ve_split_invoice/i18n/es_VE.po 2012-02-27 16:07:22 +0000
@@ -6,8 +6,8 @@
6msgstr ""6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.3\n"7"Project-Id-Version: OpenERP Server 6.0.3\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2011-12-16 15:04+0000\n"9"POT-Creation-Date: 2012-02-27 15:15+0000\n"
10"PO-Revision-Date: 2011-12-16 15:04+0000\n"10"PO-Revision-Date: 2012-02-27 15:15+0000\n"
11"Last-Translator: <>\n"11"Last-Translator: <>\n"
12"Language-Team: \n"12"Language-Team: \n"
13"MIME-Version: 1.0\n"13"MIME-Version: 1.0\n"
@@ -16,65 +16,14 @@
16"Plural-Forms: \n"16"Plural-Forms: \n"
1717
18#. module: l10n_ve_split_invoice18#. module: l10n_ve_split_invoice
19#: view:res.company:019#: model:ir.model,name:l10n_ve_split_invoice.model_account_invoice
20msgid "Invoice Lines Configutarion"20msgid "Invoice"
21msgstr "Configuración de líneas de factura"21msgstr "Factura"
2222
23#. module: l10n_ve_split_invoice23#. module: l10n_ve_split_invoice
24#: code:addons/l10n_ve_split_invoice/invoice.py:4024#: help:res.company,lines_invoice:0
25#, python-format25msgid "Number of lines per invoice"
26msgid "Error !"26msgstr "Número de líneas por factura"
27msgstr "Error !"
28
29#. module: l10n_ve_split_invoice
30#: model:ir.module.module,description:l10n_ve_split_invoice.module_meta_information
31msgid "\n"
32"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"
33" \n"
34" 1.-Add module for establishing the number of lines per invoice\n"
35" 2.-Split Invoice according number of lines per invoice once you confirm it.\n"
36"\n"
37"-------Testing Instructions--------\n"
38"Once you installed the module:\n"
39"\n"
40"1.- Go to Administration - Companies, open one of your companies (if more than one) and \n"
41" open the Configuration page.\n"
42"2.- Set a number of lines per invoice on the corresponding field.\n"
43"\n"
44"3.- Go to Account - Clients - Client Invoices and create a new invoice with more lines \n"
45" than you previously specified on the company configuration\n"
46"\n"
47"4.- Validate the invoice document\n"
48"\n"
49"The document should be now splited on N invoices with the number of lines that you specified\n"
50"\n"
51" "
52msgstr "\n"
53"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"
54" \n"
55" 1.-Añadir módulo para establecer el número de líneas por factura\n"
56" 2.-Dividir el número de factura en función de las líneas por factura una vez que se confirme esto.\n"
57"\n"
58"-------Instrucciones pruebas--------\n"
59"Una vez que ha instalado el módulo:\n"
60"\n"
61"1.- Ir a la administración - Empresas, abra una de las empresas (si hay más de uno) y \n"
62" abrir la página de configuración.\n"
63"2.- Establecer un número de líneas por factura en el campo correspondiente.\n"
64"\n"
65"3.- Ir a la cuenta - Clientes - Facturas de clientes y crear una nueva factura con más líneas\n"
66" de lo que previamente se específica en la configuración de la empresa\n"
67"\n"
68"4.- Validar la factura\n"
69"\n"
70"El documento debe ser ahora dividido en N facturas con el número de líneas que ha específicado\n"
71"\n"
72" "
73
74#. module: l10n_ve_split_invoice
75#: model:ir.model,name:l10n_ve_split_invoice.model_res_company
76msgid "Companies"
77msgstr "Compañías"
7827
79#. module: l10n_ve_split_invoice28#. module: l10n_ve_split_invoice
80#: constraint:res.company:029#: constraint:res.company:0
@@ -82,12 +31,43 @@
82msgstr "Error! no se pueden crear empresas recursivas."31msgstr "Error! no se pueden crear empresas recursivas."
8332
84#. module: l10n_ve_split_invoice33#. module: l10n_ve_split_invoice
85#: help:res.company,lines_invoice:034#: view:split.invoice.config:0
86msgid "Number of lines per invoice"35msgid "Split Invoice Configurator"
87msgstr "Número de líneas por factura"36msgstr "Split Invoice Configurator"
8837
89#. module: l10n_ve_split_invoice38#. module: l10n_ve_split_invoice
90#: code:addons/l10n_ve_split_invoice/invoice.py:4039#: model:ir.model,name:l10n_ve_split_invoice.model_res_company
40msgid "res.company"
41msgstr "res.company"
42
43#. module: l10n_ve_split_invoice
44#: model:ir.model,name:l10n_ve_split_invoice.model_stock_invoice_onshipping
45msgid "Stock Invoice Onshipping"
46msgstr "Factura de Stock en el envío"
47
48#. module: l10n_ve_split_invoice
49#: code:addons/l10n_ve_split_invoice/installer.py:51
50#, python-format
51msgid "The number of customer invoice lines must be at least one"
52msgstr "The number of customer invoice lines must be at least one"
53
54#. module: l10n_ve_split_invoice
55#: view:account.invoice:0
56msgid "Search asociated"
57msgstr "Buscar asociadas"
58
59#. module: l10n_ve_split_invoice
60#: field:res.company,lines_invoice:0
61msgid "Invoice Lines"
62msgstr "Líneas de la factura"
63
64#. module: l10n_ve_split_invoice
65#: view:res.company:0
66msgid "Invoice Lines Configutarion"
67msgstr "Configuración de líneas de factura"
68
69#. module: l10n_ve_split_invoice
70#: code:addons/l10n_ve_split_invoice/invoice.py:41
91#, python-format71#, python-format
92msgid "Please set an invoice lines value in:\n"72msgid "Please set an invoice lines value in:\n"
93"Administration->Company->Configuration->Invoice lines"73"Administration->Company->Configuration->Invoice lines"
@@ -95,9 +75,19 @@
95"Administración->Compañía->Configuración->Líneas de la factura"75"Administración->Compañía->Configuración->Líneas de la factura"
9676
97#. module: l10n_ve_split_invoice77#. module: l10n_ve_split_invoice
98#: model:ir.model,name:l10n_ve_split_invoice.model_account_invoice78#: field:split.invoice.config,progress:0
99msgid "Invoice"79msgid "Configuration Progress"
100msgstr "Factura"80msgstr "Configuration Progress"
81
82#. module: l10n_ve_split_invoice
83#: view:split.invoice.config:0
84msgid "title"
85msgstr "title"
86
87#. module: l10n_ve_split_invoice
88#: view:split.invoice.config:0
89msgid "res_config_contents"
90msgstr "res_config_contents"
10191
102#. module: l10n_ve_split_invoice92#. module: l10n_ve_split_invoice
103#: view:res.company:093#: view:res.company:0
@@ -105,12 +95,66 @@
105msgstr "Configuración"95msgstr "Configuración"
10696
107#. module: l10n_ve_split_invoice97#. module: l10n_ve_split_invoice
108#: field:res.company,lines_invoice:098#: model:ir.model,name:l10n_ve_split_invoice.model_split_invoice_config
109msgid "Invoice Lines"99msgid "\n"
110msgstr "Líneas de la factura"100" Fiscal Requirements installer wizard\n"
111101" "
112#. module: l10n_ve_split_invoice102msgstr "\n"
113#: model:ir.module.module,shortdesc:l10n_ve_split_invoice.module_meta_information103" Asistente de instalación de requerimientos fiscales\n"
114msgid "Split Invoices"104" "
115msgstr "Dividir la factura"105
106#. module: l10n_ve_split_invoice
107#: code:addons/l10n_ve_split_invoice/invoice.py:91
108#, python-format
109msgid "No Invoices were created"
110msgstr "No se crearon facturas"
111
112#. module: l10n_ve_split_invoice
113#: view:split.invoice.config:0
114msgid "\n"
115"Configure your company with the maximum number\n"
116"of lines in your customer invoices\n"
117" "
118msgstr "\n"
119"Configure your company with the maximum number\n"
120"of lines in your customer invoices\n"
121" "
122
123#. module: l10n_ve_split_invoice
124#: code:addons/l10n_ve_split_invoice/invoice.py:91
125#, python-format
126msgid "Error"
127msgstr "Error"
128
129#. module: l10n_ve_split_invoice
130#: code:addons/l10n_ve_split_invoice/installer.py:51
131#: code:addons/l10n_ve_split_invoice/invoice.py:41
132#, python-format
133msgid "Error !"
134msgstr "Error !"
135
136#. module: l10n_ve_split_invoice
137#: field:split.invoice.config,config_logo:0
138msgid "Image"
139msgstr "Image"
140
141#. module: l10n_ve_split_invoice
142#: view:split.invoice.config:0
143msgid "Configure Customer Invoice Lines"
144msgstr "Configure Customer Invoice Lines"
145
146#. module: l10n_ve_split_invoice
147#: field:split.invoice.config,name:0
148msgid "Max Invoice Lines"
149msgstr "Max Invoice Lines"
150
151#. module: l10n_ve_split_invoice
152#: help:split.invoice.config,name:0
153msgid "Select the maximum number of lines in your customer invoices"
154msgstr "Select the maximum number of lines in your customer invoices"
155
156#. module: l10n_ve_split_invoice
157#: model:ir.actions.act_window,name:l10n_ve_split_invoice.action_config_split_invoice
158msgid "Configure Withholdings VAT for Venezuela"
159msgstr "Configurar retenciones de IVA para Venezuela"
116160
117161
=== modified file 'l10n_ve_split_invoice/invoice.py'
--- l10n_ve_split_invoice/invoice.py 2012-02-09 20:15:35 +0000
+++ l10n_ve_split_invoice/invoice.py 2012-02-27 16:07:22 +0000
@@ -34,6 +34,7 @@
34 '''34 '''
35 Split the invoice when the lines exceed the maximum set for the company35 Split the invoice when the lines exceed the maximum set for the company
36 '''36 '''
37 inv_ids = []
37 for inv in self.browse(cr, uid, ids):38 for inv in self.browse(cr, uid, ids):
38 inv_id =False39 inv_id =False
39 if inv.company_id.lines_invoice < 1:40 if inv.company_id.lines_invoice < 1:
@@ -67,15 +68,50 @@
67 for il in lst:68 for il in lst:
68 self.pool.get('account.invoice.line').write(cr,uid,il.id,{'invoice_id':inv_id})69 self.pool.get('account.invoice.line').write(cr,uid,il.id,{'invoice_id':inv_id})
69 self.button_compute(cr, uid, [inv.id], set_total=True)70 self.button_compute(cr, uid, [inv.id], set_total=True)
71 inv_ids.append(inv_id)
72 inv_ids.append(inv.id)
70 if inv_id:73 if inv_id:
71 wf_service = netsvc.LocalService("workflow")74 wf_service = netsvc.LocalService("workflow")
72 self.button_compute(cr, uid, [inv_id], set_total=True)75 self.button_compute(cr, uid, [inv_id], set_total=True)
73# wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)76# wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
74 return True77 return True
7578
79 def search_asociated_invoice(self, cr, uid, ids, context=None):
80 if context is None:
81 context = {}
82 data_pool = self.pool.get('ir.model.data')
83 inv_type = self.read(cr, uid, ids[0], ['type', 'name'])
84 name = inv_type['name']
85 inv_type = inv_type['type']
86 invoice_ids = self.search(cr, uid, [('name', '=', name)])
87 # inv_type = context.get('inv_type', False)
88 action_model = False
89 action = {}
90 if not invoice_ids:
91 raise osv.except_osv(_('Error'), _('No Invoices were created'))
92 if inv_type == "out_invoice":
93 action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
94 elif inv_type == "in_invoice":
95 action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree2")
96 elif inv_type == "out_refund":
97 action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree3")
98 elif inv_type == "in_refund":
99 action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree4")
100 if action_model:
101 action_pool = self.pool.get(action_model)
102 action = action_pool.read(cr, uid, action_id, context=context)
103 action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
104 print "**** name ", name
105 print "**** open invoice ", invoice_ids
106 print "**** domain ", action['domain']
107 print "**** action_id ", action_id
108 print "**** type ", inv_type
109 action.update({'nodestroy': True})
110 return action
111
76 def action_date_assign(self, cr, uid, ids, *args):112 def action_date_assign(self, cr, uid, ids, *args):
77 data = super(account_invoice, self).action_date_assign(cr, uid, ids, *args)113 data = super(account_invoice, self).action_date_assign(cr, uid, ids, *args)
78 self.split_invoice(cr,uid,ids)114 inv_ids = self.split_invoice(cr,uid,ids)
79 return True115 return True
80116
81account_invoice()117account_invoice()
82118
=== added directory 'l10n_ve_split_invoice/security'
=== added file 'l10n_ve_split_invoice/security/ir.model.access.csv'
--- l10n_ve_split_invoice/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
+++ l10n_ve_split_invoice/security/ir.model.access.csv 2012-02-27 16:07:22 +0000
@@ -0,0 +1,4 @@
1"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
2"access_account_split_invoice_manager","account.invoice","model_account_invoice","l10n_ve_split_invoice.group_account_split_invoice_manager",1,0,0,0
3
4
05
=== added file 'l10n_ve_split_invoice/security/split_invoice_security.xml'
--- l10n_ve_split_invoice/security/split_invoice_security.xml 1970-01-01 00:00:00 +0000
+++ l10n_ve_split_invoice/security/split_invoice_security.xml 2012-02-27 16:07:22 +0000
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data noupdate="1">
4 <record id="group_account_split_invoice_manager" model="res.groups">
5 <field name="name">Split Search / Manager</field>
6 </record>
7 </data>
8</openerp>
09
=== added file 'l10n_ve_split_invoice/view/invoice_view.xml'
--- l10n_ve_split_invoice/view/invoice_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_ve_split_invoice/view/invoice_view.xml 2012-02-27 16:07:22 +0000
@@ -0,0 +1,22 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4 <record id="search_asociated_invoices" model="ir.ui.view">
5 <field name="name">account.invoice.search</field>
6 <field name="model">account.invoice</field>
7 <field name="type">form</field>
8 <field name="inherit_id" ref="account.invoice_form"/>
9 <field name="arch" type="xml">
10 <xpath expr='//button[@name="invoice_cancel"]' position='after'>
11 <button
12 string="Search asociated"
13 name="search_asociated_invoice"
14 type="object"
15 icon="gtk-new"
16 groups="l10n_ve_split_invoice.group_account_split_invoice_manager"/>
17 </xpath>
18 </field>
19 </record>
20 </data>
21</openerp>
22