openerp-argentina

Merge lp:~brunovillasanti/openerp-argentina/l10n_ar_account_payment-5.0 into lp:~openerp-argentina-team/openerp-argentina/l10n_ar_account_payment-5.0

  1. l10n_ar_account_payment-5.0
  2. Merge into l10n_ar_account_payment-5.0
Proposed by Bruno M. Villasanti (Thymbra)
Status: Merged
Merged at revision: 24
Proposed branch: lp:~brunovillasanti/openerp-argentina/l10n_ar_account_payment-5.0
Merge into: lp:~openerp-argentina-team/openerp-argentina/l10n_ar_account_payment-5.0
Diff against target: 103 lines (+15/-15)
1 file modified
l10n_ar_account_payment/payment_report.xml (+15/-15)
To merge this branch: bzr merge lp:~brunovillasanti/openerp-argentina/l10n_ar_account_payment-5.0
Reviewer Review Type Date Requested Status
Sebastian Kennedy Pending
Review via email: mp+77838@code.launchpad.net

Description of the change

El merge contine fix del bug [1] por el cual luego del renombrado del módulo payment_openunit => ou_account_payment, el path a los reportes odt quedaron sin actualizar.

Se ha tenido en cuenta un nuevo renombrado del módulo: ou_account_payment => l10n_ar_account_payment

[1] https://bugs.launchpad.net/openerp-argentina/+bug/864785

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_ar_account_payment/payment_report.xml'
2--- l10n_ar_account_payment/payment_report.xml 2011-10-02 18:29:42 +0000
3+++ l10n_ar_account_payment/payment_report.xml 2011-10-02 22:36:24 +0000
4@@ -10,7 +10,7 @@
5 string="Orden de Pago"
6 model="payment.order"
7 name="payment_order_report"
8- rml="payment_openunit/report/order_report.odt"
9+ rml="l10n_ar_account_payment/report/order_report.odt"
10 auto="False"
11 header="True"
12 />
13@@ -20,8 +20,8 @@
14 <field name="model">payment.order</field>
15 <field name="report_name">payment_order_report</field>
16 <field name="report_type">oo-pdf</field>
17- <field name="parser_loc">payment_openunit/report/order_report.py</field>
18- <field name="report_rml">payment_openunit/report/order_report.odt</field>
19+ <field name="parser_loc">l10n_ar_account_payment/report/order_report.py</field>
20+ <field name="report_rml">l10n_ar_account_payment/report/order_report.odt</field>
21 <field name="parser_state">loc</field>
22 <field name="header" eval="True"/>
23 </record>
24@@ -34,7 +34,7 @@
25 string="Orden de Egreso"
26 model="payment.order"
27 name="payment_egreso_report"
28- rml="payment_openunit/report/egreso_report.odt"
29+ rml="l10n_ar_account_payment/report/egreso_report.odt"
30 auto="False"
31 header="True"
32 />
33@@ -44,8 +44,8 @@
34 <field name="model">payment.order</field>
35 <field name="report_name">payment_egreso_report</field>
36 <field name="report_type">oo-pdf</field>
37- <field name="parser_loc">payment_openunit/report/egreso_report.py</field>
38- <field name="report_rml">payment_openunit/report/egreso_report.odt</field>
39+ <field name="parser_loc">l10n_ar_account_payment/report/egreso_report.py</field>
40+ <field name="report_rml">l10n_ar_account_payment/report/egreso_report.odt</field>
41 <field name="parser_state">loc</field>
42 <field name="header" eval="True"/>
43 </record>
44@@ -58,7 +58,7 @@
45 string="Orden de Pago"
46 model="payment.tarjetas.credito"
47 name="payment_tarjetas_credito_report"
48- rml="payment_openunit/report/payment_tarjetas_credito.odt"
49+ rml="l10n_ar_account_payment/report/payment_tarjetas_credito.odt"
50 auto="False"
51 header="True"
52 />
53@@ -68,8 +68,8 @@
54 <field name="model">payment.tarjetas.credito</field>
55 <field name="report_name">payment_tarjetas_credito_report</field>
56 <field name="report_type">oo-pdf</field>
57- <field name="parser_loc">payment_openunit/report/payment_tarjetas_credito.py</field>
58- <field name="report_rml">payment_openunit/report/payment_tarjetas_credito.odt</field>
59+ <field name="parser_loc">l10n_ar_account_payment/report/payment_tarjetas_credito.py</field>
60+ <field name="report_rml">l10n_ar_account_payment/report/payment_tarjetas_credito.odt</field>
61 <field name="parser_state">loc</field>
62 <field name="header" eval="True"/>
63 </record>
64@@ -82,7 +82,7 @@
65 string="Orden de Pago"
66 model="payment.multi"
67 name="payment_multi_report"
68- rml="payment_openunit/report/payment_multi.odt"
69+ rml="l10n_ar_account_payment/report/payment_multi.odt"
70 auto="False"
71 header="True"
72 />
73@@ -92,8 +92,8 @@
74 <field name="model">payment.multi</field>
75 <field name="report_name">payment_multi_report</field>
76 <field name="report_type">oo-pdf</field>
77- <field name="parser_loc">payment_openunit/report/payment_multi.py</field>
78- <field name="report_rml">payment_openunit/report/payment_multi.odt</field>
79+ <field name="parser_loc">l10n_ar_account_payment/report/payment_multi.py</field>
80+ <field name="report_rml">l10n_ar_account_payment/report/payment_multi.odt</field>
81 <field name="parser_state">loc</field>
82 <field name="header" eval="True"/>
83 </record>
84@@ -131,7 +131,7 @@
85 string="Comprobante Retencion"
86 model="payment.retenciones.efectuadas"
87 name="payment_retenciones_efectuadas_report"
88- rml="payment_openunit/report/retenciones.odt"
89+ rml="l10n_ar_account_payment/report/retenciones.odt"
90 auto="False"
91 header="True"
92 />
93@@ -141,8 +141,8 @@
94 <field name="model">payment.retenciones.efectuadas</field>
95 <field name="report_name">payment_retenciones_efectuadas_report</field>
96 <field name="report_type">oo-pdf</field>
97- <field name="parser_loc">payment_openunit/report/retenciones.py</field>
98- <field name="report_rml">payment_openunit/report/retenciones.odt</field>
99+ <field name="parser_loc">l10n_ar_account_payment/report/retenciones.py</field>
100+ <field name="report_rml">l10n_ar_account_payment/report/retenciones.odt</field>
101 <field name="parser_state">loc</field>
102 <field name="header" eval="True"/>
103 </record>