Merge lp:~vauxoo/openerp-venezuela-localization/jose-fiscal-requerements into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Status: Merged
Merged at revision: 615
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-fiscal-requerements
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 58 lines (+3/-3)
3 files modified
l10n_ve_fiscal_requirements/__openerp__.py (+1/-1)
l10n_ve_withholding_islr/__openerp__.py (+1/-1)
l10n_ve_withholding_iva/__openerp__.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-fiscal-requerements
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+92862@code.launchpad.net

This proposal supersedes a proposal from 2012-02-13.

Description of the change

Change order to load view in the __openerp__.py

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge Realizado.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py 2012-01-28 00:06:26 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py 2012-02-13 21:45:38 +0000
@@ -68,13 +68,13 @@
68 'installer_view.xml',68 'installer_view.xml',
69 'security/acc_inv_refund_security.xml',69 'security/acc_inv_refund_security.xml',
70 'security/ir.model.access.csv',70 'security/ir.model.access.csv',
71 'wizard/wizard_nro_ctrl_view.xml',
71 'view/account_invoice_view.xml',72 'view/account_invoice_view.xml',
72 'view/res_company_view.xml',73 'view/res_company_view.xml',
73 'view/l10n_ut_view.xml',74 'view/l10n_ut_view.xml',
74 'view/partner_view.xml',75 'view/partner_view.xml',
75 'view/account_inv_refund_nctrl_view.xml',76 'view/account_inv_refund_nctrl_view.xml',
76 'wizard/wizard_invoice_nro_ctrl_view.xml',77 'wizard/wizard_invoice_nro_ctrl_view.xml',
77 'wizard/wizard_nro_ctrl_view.xml',
78 'wizard/wizard_url_seniat_view.xml',78 'wizard/wizard_url_seniat_view.xml',
79 'wizard/update_info_partner.xml',79 'wizard/update_info_partner.xml',
80 'wizard/account_invoice_debit_view.xml',80 'wizard/account_invoice_debit_view.xml',
8181
=== modified file 'l10n_ve_withholding_islr/__openerp__.py'
--- l10n_ve_withholding_islr/__openerp__.py 2012-01-17 00:10:40 +0000
+++ l10n_ve_withholding_islr/__openerp__.py 2012-02-13 21:45:38 +0000
@@ -58,6 +58,7 @@
58 ],58 ],
59 "update_xml" : [59 "update_xml" : [
60 "view/installer.xml",60 "view/installer.xml",
61 "islr_wh_report.xml",
61 "security/wh_islr_security.xml",62 "security/wh_islr_security.xml",
62 "security/ir.model.access.csv",63 "security/ir.model.access.csv",
63 "data/l10n_ve_islr_withholding_data.xml",64 "data/l10n_ve_islr_withholding_data.xml",
@@ -68,7 +69,6 @@
68 "view/islr_wh_doc_view.xml",69 "view/islr_wh_doc_view.xml",
69 "view/islr_wh_concept_view.xml",70 "view/islr_wh_concept_view.xml",
70 "view/product_view.xml",71 "view/product_view.xml",
71 "islr_wh_report.xml",
72 "islr_xml_wh.xml",72 "islr_xml_wh.xml",
73 "workflow/islr_wh_workflow.xml",73 "workflow/islr_wh_workflow.xml",
74 "workflow/account_workflow.xml",74 "workflow/account_workflow.xml",
7575
=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py 2012-01-03 15:23:32 +0000
+++ l10n_ve_withholding_iva/__openerp__.py 2012-02-13 21:45:38 +0000
@@ -50,6 +50,7 @@
50 'update_xml': [50 'update_xml': [
51 'security/wh_iva_security.xml',51 'security/wh_iva_security.xml',
52 'security/ir.model.access.csv',52 'security/ir.model.access.csv',
53 'report/withholding_vat_report.xml',
53 'view/generate_txt_view.xml',54 'view/generate_txt_view.xml',
54 'view/account_invoice_view.xml',55 'view/account_invoice_view.xml',
55 'view/account_view.xml',56 'view/account_view.xml',
@@ -57,7 +58,6 @@
57 'view/wh_iva_view.xml',58 'view/wh_iva_view.xml',
58 "data/l10n_ve_withholding_data.xml",59 "data/l10n_ve_withholding_data.xml",
59 'report/txt_wh_report.xml',60 'report/txt_wh_report.xml',
60 'report/withholding_vat_report.xml',
61 "workflow/wh_iva_workflow.xml",61 "workflow/wh_iva_workflow.xml",
62 "workflow/account_workflow.xml", 62 "workflow/account_workflow.xml",
63 "wizard/l10n_ve_withholding_iva_installer.xml",63 "wizard/l10n_ve_withholding_iva_installer.xml",