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

Proposed by hbto [Vauxoo] http://www.vauxoo.com
Status: Merged
Merged at revision: 492
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/hbto_wh_iva_restructured
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 131 lines (+47/-19)
3 files modified
l10n_ve_withholding_iva/__init__.py (+1/-7)
l10n_ve_withholding_iva/__openerp__.py (+12/-12)
l10n_ve_withholding_iva/model/__init__.py (+34/-0)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/hbto_wh_iva_restructured
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Approve
Review via email: mp+86641@code.launchpad.net

Description of the change

[IMP] Restructuring folder so now each files got to an
intuitive folder, complying with the directions for
structuring folders at vauxoo

To post a comment you must log in.
Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

Aprobado.

Saludos.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_withholding_iva/__init__.py'
2--- l10n_ve_withholding_iva/__init__.py 2011-10-25 20:33:16 +0000
3+++ l10n_ve_withholding_iva/__init__.py 2011-12-22 00:56:24 +0000
4@@ -22,13 +22,7 @@
5 # You should have received a copy of the GNU Affero General Public License
6 # along with this program. If not, see <http://www.gnu.org/licenses/>.
7 ################################################################################
8-import wh_iva
9-import account
10-import invoice
11-import partner
12-import generate_txt
13+import model
14 import report
15-import installer
16-import wizard
17
18 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
19
20=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
21--- l10n_ve_withholding_iva/__openerp__.py 2011-10-28 17:13:52 +0000
22+++ l10n_ve_withholding_iva/__openerp__.py 2011-12-22 00:56:24 +0000
23@@ -8,6 +8,7 @@
24 # Coded by: Javier Duran <javier@nvauxoo.com>
25 # Maria Gabriela Quilarque <gabriela@openerp.com.ve>
26 # Nhomar Hernandez <nhomar@vauxoo.com>
27+# Humberto Arocha <hbto@vauxoo.com>
28 # Planified by: Nhomar Hernandez
29 # Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
30 # Audited by: Humberto Arocha humberto@openerp.com.ve
31@@ -27,7 +28,7 @@
32 ##############################################################################
33 {
34 "name" : "Management withholding vat based in the Venezuelan tax laws",
35- "version" : "0.2",
36+ "version" : "1.0",
37 "author" : "Vauxoo",
38 "website" : "http://vauxoo.com",
39 "category": 'Generic Modules/Accounting',
40@@ -47,20 +48,19 @@
41 'init_xml': [],
42 "depends" : ["l10n_ve_withholding"],
43 'update_xml': [
44- 'withholding_vat_report.xml',
45 'security/wh_iva_security.xml',
46 'security/ir.model.access.csv',
47- 'generate_txt_view.xml',
48- 'txt_wh_report.xml',
49- 'account_invoice_view.xml',
50- 'account_view.xml',
51- 'partner_view.xml',
52- 'wh_iva_view.xml',
53+ 'view/generate_txt_view.xml',
54+ 'view/account_invoice_view.xml',
55+ 'view/account_view.xml',
56+ 'view/partner_view.xml',
57+ 'view/wh_iva_view.xml',
58 "data/l10n_ve_withholding_data.xml",
59- "wh_iva_workflow.xml",
60- "account_workflow.xml",
61- "l10n_ve_withholding_iva_installer.xml",
62- "account_workflow.xml",
63+ 'report/txt_wh_report.xml',
64+ 'report/withholding_vat_report.xml',
65+ "workflow/wh_iva_workflow.xml",
66+ "workflow/account_workflow.xml",
67+ "wizard/l10n_ve_withholding_iva_installer.xml",
68 ],
69 'demo_xml': ["demo/l10n_ve_withholding_iva_demo.xml"],
70 'test': [],
71
72=== added directory 'l10n_ve_withholding_iva/model'
73=== added file 'l10n_ve_withholding_iva/model/__init__.py'
74--- l10n_ve_withholding_iva/model/__init__.py 1970-01-01 00:00:00 +0000
75+++ l10n_ve_withholding_iva/model/__init__.py 2011-12-22 00:56:24 +0000
76@@ -0,0 +1,34 @@
77+#!/usr/bin/python
78+# -*- encoding: utf-8 -*-
79+###########################################################################
80+# Module Writen to OpenERP, Open Source Management Solution
81+# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
82+# All Rights Reserved
83+###############Credits######################################################
84+# Coded by: Vauxoo C.A.
85+# Planified by: Nhomar Hernandez
86+# Audited by: Vauxoo C.A.
87+#############################################################################
88+# This program is free software: you can redistribute it and/or modify
89+# it under the terms of the GNU Affero General Public License as published by
90+# the Free Software Foundation, either version 3 of the License, or
91+# (at your option) any later version.
92+#
93+# This program is distributed in the hope that it will be useful,
94+# but WITHOUT ANY WARRANTY; without even the implied warranty of
95+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
96+# GNU Affero General Public License for more details.
97+#
98+# You should have received a copy of the GNU Affero General Public License
99+# along with this program. If not, see <http://www.gnu.org/licenses/>.
100+################################################################################
101+import wh_iva
102+import account
103+import invoice
104+import partner
105+import generate_txt
106+import report
107+import installer
108+import wizard
109+
110+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
111
112=== renamed file 'l10n_ve_withholding_iva/account.py' => 'l10n_ve_withholding_iva/model/account.py'
113=== renamed file 'l10n_ve_withholding_iva/generate_txt.py' => 'l10n_ve_withholding_iva/model/generate_txt.py'
114=== renamed file 'l10n_ve_withholding_iva/installer.py' => 'l10n_ve_withholding_iva/model/installer.py'
115=== renamed file 'l10n_ve_withholding_iva/invoice.py' => 'l10n_ve_withholding_iva/model/invoice.py'
116=== renamed file 'l10n_ve_withholding_iva/partner.py' => 'l10n_ve_withholding_iva/model/partner.py'
117=== renamed file 'l10n_ve_withholding_iva/wh_iva.py' => 'l10n_ve_withholding_iva/model/wh_iva.py'
118=== renamed file 'l10n_ve_withholding_iva/txt_wh_report.xml' => 'l10n_ve_withholding_iva/report/txt_wh_report.xml'
119=== renamed file 'l10n_ve_withholding_iva/withholding_vat_report.xml' => 'l10n_ve_withholding_iva/report/withholding_vat_report.xml'
120=== added directory 'l10n_ve_withholding_iva/view'
121=== renamed file 'l10n_ve_withholding_iva/account_invoice_view.xml' => 'l10n_ve_withholding_iva/view/account_invoice_view.xml'
122=== renamed file 'l10n_ve_withholding_iva/account_view.xml' => 'l10n_ve_withholding_iva/view/account_view.xml'
123=== renamed file 'l10n_ve_withholding_iva/generate_txt_view.xml' => 'l10n_ve_withholding_iva/view/generate_txt_view.xml'
124=== renamed file 'l10n_ve_withholding_iva/partner_view.xml' => 'l10n_ve_withholding_iva/view/partner_view.xml'
125=== renamed file 'l10n_ve_withholding_iva/wh_iva_view.xml' => 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
126=== added directory 'l10n_ve_withholding_iva/wizard'
127=== removed directory 'l10n_ve_withholding_iva/wizard'
128=== renamed file 'l10n_ve_withholding_iva/l10n_ve_withholding_iva_installer.xml' => 'l10n_ve_withholding_iva/wizard/l10n_ve_withholding_iva_installer.xml'
129=== added directory 'l10n_ve_withholding_iva/workflow'
130=== renamed file 'l10n_ve_withholding_iva/account_workflow.xml' => 'l10n_ve_withholding_iva/workflow/account_workflow.xml'
131=== renamed file 'l10n_ve_withholding_iva/wh_iva_workflow.xml' => 'l10n_ve_withholding_iva/workflow/wh_iva_workflow.xml'