Merge lp:~vauxoo/openerp-venezuela-localization/israel_ut-integration into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Israel Fermin Montilla
Status: Merged
Merged at revision: 399
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/israel_ut-integration
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 285 lines (+16/-186)
7 files modified
l10n_ve_fiscal_requirements/__init__.py (+1/-0)
l10n_ve_fiscal_requirements/__openerp__.py (+14/-6)
l10n_ve_fiscal_requirements/data/l10n_ut_data.xml (+1/-1)
l10n_ve_fiscal_requirements/l10n_ut.py (+0/-2)
l10n_ve_ut/__init__.py (+0/-29)
l10n_ve_ut/__openerp__.py (+0/-47)
l10n_ve_ut/i18n/es_VE.po (+0/-101)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/israel_ut-integration
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Pending
Review via email: mp+78006@code.launchpad.net

Description of the change

Added the Tax Unit configuration functionality, it was on the l10n_ve_ut module before.

A change record of this module is on the __openerp__ description section

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 'l10n_ve_fiscal_requirements/__init__.py'
2--- l10n_ve_fiscal_requirements/__init__.py 2011-09-30 16:03:14 +0000
3+++ l10n_ve_fiscal_requirements/__init__.py 2011-10-03 21:16:31 +0000
4@@ -23,5 +23,6 @@
5 import invoice
6 import partner
7 import res_company
8+import l10n_ut
9 import wizard
10 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
11
12=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
13--- l10n_ve_fiscal_requirements/__openerp__.py 2011-09-30 23:48:42 +0000
14+++ l10n_ve_fiscal_requirements/__openerp__.py 2011-10-03 21:16:31 +0000
15@@ -27,12 +27,13 @@
16 "website" : "http://vauxoo.com",
17 "category": 'Generic Modules/Accounting',
18 "description": """Venezuelan Tax Laws Requirements:
19- - Invoice Control Number
20- - Tax-except
21- - Required address invoice
22+ - Invoice Control Number.
23+ - Tax-except concept
24+ - Required address invoice.
25 - Unique address invoice.
26 - VAT verification for Venezuela rules.
27 - Damaged "free forms" justification.
28+ - Tax Units configuration.
29 ---------------------------------------------------------------------------
30 For damaged invoices (Free form formats), you must go to the company and, under the configuration section,
31 create the corresponding journal and account.
32@@ -40,9 +41,13 @@
33 If you install this module with invoice data on the database, the concept_id will be
34 Empty for all those invoices, so, when you try to modify them you have to add a value on
35 that field
36+
37+ This module should also install a menu item under the accounting configuration menu.
38 ------------------------TECH INFO-------------------------------------------
39 CHANGELOG:
40 - For the migration to the l10n_ve on OpenERP:
41+ - Added the functionality to configure Tax Units, for this, it was necesary make this module depend on
42+ account_accountant, to make visible de accounting configuration menu.
43 - Added the functionality to change the control number on an invoice (free form format)
44 - Changed the Invoice Ref label to Control Number
45 - Integrated the l10n_ve_nro_ctrl module functionality on this one
46@@ -51,14 +56,17 @@
47 - If you need to withhold ISLR, you must install the module mentioned abofe
48
49 """,
50- 'init_xml': [],
51- "depends" : ["base", "base_vat", "purchase", "stock", "account"],
52+ 'init_xml': [
53+ 'data/l10n_ut_data.xml',
54+ ],
55+ "depends" : ["base_vat", "purchase", "stock", "account", "account_accountant"],
56 'update_xml': [
57 'view/stock_view.xml',
58 'view/account_invoice_view.xml',
59 'view/res_company_view.xml',
60+ 'view/l10n_ut_view.xml',
61 'wizard/wizard_invoice_nro_ctrl_view.xml',
62- 'wizard/wizard_nro_ctrl_view.xml'
63+ 'wizard/wizard_nro_ctrl_view.xml',
64 ],
65 'demo_xml': [],
66 'test': [],
67
68=== added directory 'l10n_ve_fiscal_requirements/data'
69=== renamed file 'l10n_ve_ut/l10n_ut_data.xml' => 'l10n_ve_fiscal_requirements/data/l10n_ut_data.xml'
70--- l10n_ve_ut/l10n_ut_data.xml 2011-09-22 19:11:11 +0000
71+++ l10n_ve_fiscal_requirements/data/l10n_ut_data.xml 2011-10-03 21:16:31 +0000
72@@ -1,6 +1,6 @@
73 <?xml version="1.0"?>
74 <openerp>
75- <data noupdate="0">
76+ <data noupdate="1">
77 <record id="l10n_ut_data_2011" model="l10n.ut">
78 <field name="name">39.623</field>
79 <field name="date">2011-03-01</field>
80
81=== renamed file 'l10n_ve_ut/l10n_ut.py' => 'l10n_ve_fiscal_requirements/l10n_ut.py'
82--- l10n_ve_ut/l10n_ut.py 2011-07-01 21:41:46 +0000
83+++ l10n_ve_fiscal_requirements/l10n_ut.py 2011-10-03 21:16:31 +0000
84@@ -72,5 +72,3 @@
85 return money
86
87 l10n_ut()
88-
89-
90
91=== renamed directory 'l10n_ve_ut/security' => 'l10n_ve_fiscal_requirements/security'
92=== renamed file 'l10n_ve_ut/l10n_ut_view.xml' => 'l10n_ve_fiscal_requirements/view/l10n_ut_view.xml'
93=== removed directory 'l10n_ve_ut'
94=== removed file 'l10n_ve_ut/__init__.py'
95--- l10n_ve_ut/__init__.py 2011-06-29 15:12:14 +0000
96+++ l10n_ve_ut/__init__.py 1970-01-01 00:00:00 +0000
97@@ -1,29 +0,0 @@
98-#!/usr/bin/python
99-# -*- encoding: utf-8 -*-
100-###########################################################################
101-# Module Writen to OpenERP, Open Source Management Solution
102-# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
103-# All Rights Reserved
104-###############Credits######################################################
105-# Coded by: Humberto Arocha <humberto@vauxoo.com>
106-# María Gabriela Quilarque <gabriela@vauxoo.com>
107-# Planified by: Nhomar Hernandez
108-# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
109-# Audited by: Humberto Arocha humberto@openerp.com.ve
110-#############################################################################
111-# This program is free software: you can redistribute it and/or modify
112-# it under the terms of the GNU General Public License as published by
113-# the Free Software Foundation, either version 3 of the License, or
114-# (at your option) any later version.
115-#
116-# This program is distributed in the hope that it will be useful,
117-# but WITHOUT ANY WARRANTY; without even the implied warranty of
118-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
119-# GNU General Public License for more details.
120-#
121-# You should have received a copy of the GNU General Public License
122-# along with this program. If not, see <http://www.gnu.org/licenses/>.
123-##############################################################################
124-
125-import l10n_ut
126-
127
128=== removed file 'l10n_ve_ut/__openerp__.py'
129--- l10n_ve_ut/__openerp__.py 2011-07-01 21:41:46 +0000
130+++ l10n_ve_ut/__openerp__.py 1970-01-01 00:00:00 +0000
131@@ -1,47 +0,0 @@
132-#!/usr/bin/python
133-# -*- encoding: utf-8 -*-
134-###########################################################################
135-# Module Writen to OpenERP, Open Source Management Solution
136-# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
137-# All Rights Reserved
138-###############Credits######################################################
139-# Coded by: Humberto Arocha <humberto@openerp.com.ve>
140-# María Gabriela Quilarque <gabriela@vauxoo.com>
141-# Planified by: Nhomar Hernandez
142-# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
143-# Audited by: Humberto Arocha humberto@openerp.com.ve
144-#############################################################################
145-# This program is free software: you can redistribute it and/or modify
146-# it under the terms of the GNU General Public License as published by
147-# the Free Software Foundation, either version 3 of the License, or
148-# (at your option) any later version.
149-#
150-# This program is distributed in the hope that it will be useful,
151-# but WITHOUT ANY WARRANTY; without even the implied warranty of
152-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
153-# GNU General Public License for more details.
154-#
155-# You should have received a copy of the GNU General Public License
156-# along with this program. If not, see <http://www.gnu.org/licenses/>.
157-##############################################################################
158-
159-{
160- "name" : "Tax Unit for Venezuela",
161- "version" : "0.2",
162- "author" : "Vauxoo",
163- "category" : "General",
164- "website": "http://wiki.openerp.org.ve/",
165- "description": '''
166- What do this module:
167- Record the value for the Tax Unit
168- ''',
169- "depends" : ["account"],
170- "init_xml" : [],
171- "update_xml" : [
172- "security/ir.model.access.csv",
173- "l10n_ut_view.xml",
174- "l10n_ut_data.xml",
175- ],
176- "active": False,
177- "installable": True
178-}
179
180=== removed directory 'l10n_ve_ut/i18n'
181=== removed file 'l10n_ve_ut/i18n/es_VE.po'
182--- l10n_ve_ut/i18n/es_VE.po 2011-07-01 21:41:46 +0000
183+++ l10n_ve_ut/i18n/es_VE.po 1970-01-01 00:00:00 +0000
184@@ -1,101 +0,0 @@
185-# Translation of OpenERP Server.
186-# This file contains the translation of the following modules:
187-# * l10n_ve_ut
188-#
189-msgid ""
190-msgstr ""
191-"Project-Id-Version: OpenERP Server 6.0.2\n"
192-"Report-Msgid-Bugs-To: support@openerp.com\n"
193-"POT-Creation-Date: 2011-07-01 21:25+0000\n"
194-"PO-Revision-Date: 2011-07-01 21:25+0000\n"
195-"Last-Translator: <>\n"
196-"Language-Team: \n"
197-"MIME-Version: 1.0\n"
198-"Content-Type: text/plain; charset=UTF-8\n"
199-"Content-Transfer-Encoding: \n"
200-"Plural-Forms: \n"
201-
202-#. module: l10n_ve_ut
203-#: model:ir.module.module,shortdesc:l10n_ve_ut.module_meta_information
204-msgid "Tax Unit for Venezuela"
205-msgstr "Unidad Tributaria para Venezuela"
206-
207-#. module: l10n_ve_ut
208-#: field:l10n.ut,name:0
209-msgid "Reference number"
210-msgstr "Número de Referencia"
211-
212-#. module: l10n_ve_ut
213-#: model:ir.actions.act_window,help:l10n_ve_ut.act_l10n_ut_tree
214-msgid "With Tax Unit you can create and manage the tax unit. The Tax Unit is established under the law of each country, is used for the withholding income and withholding vat."
215-msgstr "A través de la presente opción usted podrá crear y gestionar la Unitad Tributaria, la misma es establecida según la ley de cada país y es usada para las retenciones de ISLR y retenciones de IVA."
216-
217-#. module: l10n_ve_ut
218-#: model:ir.module.module,description:l10n_ve_ut.module_meta_information
219-msgid "\n"
220-" What do this module:\n"
221-" Record the value for the Tax Unit\n"
222-" "
223-msgstr "\n"
224-" What do this module:\n"
225-" Registra el valor de la Unidad Tributaria\n"
226-" "
227-
228-#. module: l10n_ve_ut
229-#: view:l10n.ut:0
230-msgid "Search Tax Unit"
231-msgstr "Búsqueda - Unidad Tributaria"
232-
233-#. module: l10n_ve_ut
234-#: view:l10n.ut:0
235-msgid "Tax Unit per date"
236-msgstr "Unidad Tributaria por fecha"
237-
238-#. module: l10n_ve_ut
239-#: help:l10n.ut,name:0
240-msgid "Reference number under the law"
241-msgstr "Número de Referencia según la ley"
242-
243-#. module: l10n_ve_ut
244-#: view:l10n.ut:0
245-msgid "Group By..."
246-msgstr "Agrupar por..."
247-
248-#. module: l10n_ve_ut
249-#: field:l10n.ut,amount:0
250-msgid "Amount"
251-msgstr "Monto"
252-
253-#. module: l10n_ve_ut
254-#: view:l10n.ut:0
255-msgid "date"
256-msgstr "Fecha"
257-
258-#. module: l10n_ve_ut
259-#: field:l10n.ut,date:0
260-msgid "Date"
261-msgstr "Fecha"
262-
263-#. module: l10n_ve_ut
264-#: model:ir.actions.act_window,name:l10n_ve_ut.act_l10n_ut_tree
265-#: model:ir.model,name:l10n_ve_ut.model_l10n_ut
266-#: model:ir.ui.menu,name:l10n_ve_ut.menu_action_l10n_ut_tree
267-#: view:l10n.ut:0
268-msgid "Tax Unit"
269-msgstr "Unidad Tributaria"
270-
271-#. module: l10n_ve_ut
272-#: field:l10n.ut,user_id:0
273-msgid "Salesman"
274-msgstr "Salesman"
275-
276-#. module: l10n_ve_ut
277-#: help:l10n.ut,date:0
278-msgid "Date on which goes into effect the new Unit Tax Unit"
279-msgstr "Fecha en la que entra en vigencia la nueva unidad tributaria"
280-
281-#. module: l10n_ve_ut
282-#: help:l10n.ut,amount:0
283-msgid "Amount of the tax unit in bs"
284-msgstr "Monto de la Unidad Tributaria en Bs."
285-