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

Subscribers

People subscribed via source and target branches

to all changes: