Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-dja into lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa

  1. trunk-new-account-tax-design-tpa-dja
  2. Merge into trunk-new-account-tax-desi...
Proposed by Dharmraj Zala(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-dja
Merge into: lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa
Diff against target: 166 lines (+118/-23)
1 file modified
l10n_pe/account_tax.xml (+118/-23)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-dja
Reviewer Review Type Date Requested Status
OpenERP R&D Team Pending
Review via email: mp+221542@code.launchpad.net

Description of the change

Hello,

I've improved demo-data as per new tax-design in the module l10n_pe.

Thanks,
DJA.

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-dja updated
9474. By Dharmraj Zala(OpenERP)

[IMP] improved code as per new changes

9475. By Dharmraj Zala(OpenERP)

[MERGE] with parent branch

9476. By Dharmraj Zala(OpenERP)

[IMP] improved code

9477. By Dharmraj Zala(OpenERP)

[MERGE] with parent branch

Unmerged revisions

9477. By Dharmraj Zala(OpenERP)

[MERGE] with parent branch

9476. By Dharmraj Zala(OpenERP)

[IMP] improved code

9475. By Dharmraj Zala(OpenERP)

[MERGE] with parent branch

9474. By Dharmraj Zala(OpenERP)

[IMP] improved code as per new changes

9473. By Jitendra Prajapati(OpenERP)

[IMP]add account_id data

9472. By Dharmraj Zala(OpenERP)

[IMP] improved demodata of l10_pe for account.tax.template as per new design of tax template

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_pe/account_tax.xml'
2--- l10n_pe/account_tax.xml 2011-11-10 09:06:36 +0000
3+++ l10n_pe/account_tax.xml 2014-07-02 06:17:26 +0000
4@@ -5,44 +5,139 @@
5 <record id="ITAX_18" model="account.tax.template">
6 <field name="chart_template_id" ref="pe_chart_template"/>
7 <field name="name">IGV 18% Venta</field>
8- <field name="amount">0.180000</field>
9+ <field name="amount">18</field>
10 <field name="type">percent</field>
11 <field name="type_tax_use">sale</field>
12- <field name="account_collected_id" ref="401110"/>
13- <field name="account_paid_id" ref="401110"/>
14- <field name="base_code_id" ref="vat_code_base_sale_18"/>
15- <field name="tax_code_id" ref="vat_code_igv_receive_18"/>
16- <field name="ref_base_code_id" ref="vat_code_base_sale_18"/>
17- <field name="ref_tax_code_id" ref="vat_code_igv_receive_18"/>
18+ </record>
19+
20+ <record id="ITAX_18_invoice_base_line" model="account.tax.line.template">
21+ <field name="code_type">base</field>
22+ <field name="tax_amount">100</field>
23+ <field name="apply_on">invoice</field>
24+ <field name="code_id" ref="vat_code_base_sale_18"/>
25+ <field name="tax_id" ref="ITAX_18"/>
26+ <field name="amount">100</field>
27+ </record>
28+
29+ <record id="ITAX_18_invoice_tax_line" model="account.tax.line.template">
30+ <field name="code_type">tax</field>
31+ <field name="tax_amount">18</field>
32+ <field name="apply_on">invoice</field>
33+ <field name="account_id" ref="401110"/>
34+ <field name="code_id" ref="vat_code_igv_receive_18"/>
35+ <field name="tax_id" ref="ITAX_18"/>
36+ <field name="amount">18</field>
37+ </record>
38+
39+ <record id="ITAX_18_refund_base_line" model="account.tax.line.template">
40+ <field name="code_type">base</field>
41+ <field name="tax_amount">100</field>
42+ <field name="apply_on">refund</field>
43+ <field name="code_id" ref="vat_code_base_sale_18"/>
44+ <field name="tax_id" ref="ITAX_18"/>
45+ <field name="amount">100</field>
46+ </record>
47+
48+ <record id="ITAX_18_refund_tax_line" model="account.tax.line.template">
49+ <field name="code_type">tax</field>
50+ <field name="tax_amount">18</field>
51+ <field name="apply_on">refund</field>
52+ <field name="account_id" ref="401110"/>
53+ <field name="code_id" ref="vat_code_igv_receive_18"/>
54+ <field name="tax_id" ref="ITAX_18"/>
55+ <field name="amount">18</field>
56 </record>
57
58 <record id="OTAX_18" model="account.tax.template">
59 <field name="chart_template_id" ref="pe_chart_template"/>
60 <field name="name">IGV 18% Compra</field>
61- <field name="amount">0.180000</field>
62+ <field name="amount">18</field>
63 <field name="type">percent</field>
64 <field name="type_tax_use">purchase</field>
65- <field name="account_collected_id" ref="401110"/>
66- <field name="account_paid_id" ref="401110"/>
67- <field name="base_code_id" ref="vat_code_base_purchase_18"/>
68- <field name="tax_code_id" ref="vat_code_igv_pay_18"/>
69- <field name="ref_base_code_id" ref="vat_code_base_purchase_18"/>
70- <field name="ref_tax_code_id" ref="vat_code_igv_pay_18"/>
71+ </record>
72+
73+ <record id="OTAX_18_invoice_base_line" model="account.tax.line.template">
74+ <field name="code_type">base</field>
75+ <field name="tax_amount">100</field>
76+ <field name="apply_on">invoice</field>
77+ <field name="code_id" ref="vat_code_base_purchase_18"/>
78+ <field name="tax_id" ref="OTAX_18"/>
79+ <field name="amount">100</field>
80+ </record>
81+
82+ <record id="OTAX_18_invoice_tax_line" model="account.tax.line.template">
83+ <field name="code_type">tax</field>
84+ <field name="tax_amount">18</field>
85+ <field name="apply_on">invoice</field>
86+ <field name="account_id" ref="401110"/>
87+ <field name="code_id" ref="vat_code_igv_pay_18"/>
88+ <field name="tax_id" ref="OTAX_18"/>
89+ <field name="amount">18</field>
90+ </record>
91+
92+ <record id="OTAX_18_refund_base_line" model="account.tax.line.template">
93+ <field name="code_type">base</field>
94+ <field name="tax_amount">100</field>
95+ <field name="apply_on">refund</field>
96+ <field name="code_id" ref="vat_code_base_purchase_18"/>
97+ <field name="tax_id" ref="OTAX_18"/>
98+ <field name="amount">100</field>
99+ </record>
100+
101+ <record id="OTAX_18_refund_tax_line" model="account.tax.line.template">
102+ <field name="code_type">tax</field>
103+ <field name="tax_amount">18</field>
104+ <field name="apply_on">refund</field>
105+ <field name="account_id" ref="401110"/>
106+ <field name="code_id" ref="vat_code_igv_pay_18"/>
107+ <field name="tax_id" ref="OTAX_18"/>
108+ <field name="amount">18</field>
109 </record>
110
111 <record id="OTAX_02" model="account.tax.template">
112 <field name="chart_template_id" ref="pe_chart_template"/>
113 <field name="name">Percepción IGV 2%</field>
114- <field name="amount">0.02000</field>
115+ <field name="amount">2</field>
116 <field name="type">percent</field>
117 <field name="type_tax_use">purchase</field>
118- <field name="account_collected_id" ref="401110"/>
119- <field name="account_paid_id" ref="401110"/>
120- <!--field name="base_code_id" ref="vat_code_base_purchase_18"/-->
121- <field name="tax_code_id" ref="vat_code_igv_pay_18"/>
122- <!--field name="ref_base_code_id" ref="vat_code_base_purchase_18"/-->
123- <field name="ref_tax_code_id" ref="vat_code_igv_pay_18"/>
124- </record>
125-
126+ </record>
127+
128+ <record id="OTAX_02_invoice_base_line" model="account.tax.line.template">
129+ <field name="code_type">base</field>
130+ <field name="tax_amount">100</field>
131+ <field name="apply_on">invoice</field>
132+ <!-- field name="code_id" ref="vat_code_base_purchase_18"/ -->
133+ <field name="tax_id" ref="OTAX_02"/>
134+ <field name="amount">100</field>
135+ </record>
136+
137+ <record id="OTAX_02_invoice_tax_line" model="account.tax.line.template">
138+ <field name="code_type">tax</field>
139+ <field name="tax_amount">2</field>
140+ <field name="apply_on">invoice</field>
141+ <field name="account_id" ref="401110"/>
142+ <field name="code_id" ref="vat_code_igv_pay_18"/>
143+ <field name="tax_id" ref="OTAX_02"/>
144+ <field name="amount">2</field>
145+ </record>
146+
147+ <record id="OTAX_02_refund_base_line" model="account.tax.line.template">
148+ <field name="code_type">base</field>
149+ <field name="tax_amount">100</field>
150+ <field name="apply_on">refund</field>
151+ <!-- field name="code_id" ref="vat_code_base_purchase_18"/ -->
152+ <field name="tax_id" ref="OTAX_02"/>
153+ <field name="amount">100</field>
154+ </record>
155+
156+ <record id="OTAX_02_refund_tax_line" model="account.tax.line.template">
157+ <field name="code_type">tax</field>
158+ <field name="tax_amount">2</field>
159+ <field name="apply_on">refund</field>
160+ <field name="account_id" ref="401110"/>
161+ <field name="code_id" ref="vat_code_igv_pay_18"/>
162+ <field name="tax_id" ref="OTAX_02"/>
163+ <field name="amount">2</field>
164+ </record>
165 </data>
166 </openerp>

Subscribers

People subscribed via source and target branches

to all changes: