Jagdish Panchal (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-l10n_in_fix_account-jap into
lp:~openerp-dev/openobject-addons/trunk-l10_in_improvements-mra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-l10n_in_fix_account-jap/+merge/113178
Hello Sir,
l10n_in:
- Add Reserve and Surplus Account and link it to templates.
- Improve Tax name.
- Change reference of Account Tax Code for VAT.
Thanks,
JAP
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-l10n_in_fix_account-jap/+merge/113178
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-l10n_in_fix_account-jap into
lp:~openerp-dev/openobject-addons/trunk-l10_in_improvements-mra.
=== modified file 'l10n_in/l10n_in_private_chart.xml'
--- l10n_in/l10n_in_private_chart.xml 2012-07-02 09:48:25 +0000
+++ l10n_in/l10n_in_private_chart.xml 2012-07-03 09:24:25 +0000
@@ -204,6 +204,17 @@
<field name="note">A formal loan that involves a lien on real estate until the loan is repaid.</field>
</record>
+ <record model="account.account.template" id="a260">
+ <field name="name">Reserve and Surplus Account</field>
+ <field name="code">260</field>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_liability"/>
+ <field name="reconcile" eval="False"/>
+ <field name="parent_id" ref="a20"/>
+ <field name="note">A Reserve and Surplus Account.</field>
+ </record>
+
+
<!-- Tax Account -->
<record model="account.account.template" id="a216">
<field name="name">Sales Tax Payable</field>
@@ -488,7 +499,7 @@
<field name="property_account_payable" ref="a215"/>
<field name="property_account_expense_categ" ref="a540"/>
<field name="property_account_income_categ" ref="a310"/>
- <field name="property_reserve_and_surplus_account" ref="a310"/>
+ <field name="property_reserve_and_surplus_account" ref="a260"/>
</record>
=== modified file 'l10n_in/l10n_in_private_tax_template.xml'
--- l10n_in/l10n_in_private_tax_template.xml 2012-07-02 11:33:37 +0000
+++ l10n_in/l10n_in_private_tax_template.xml 2012-07-03 09:24:25 +0000
@@ -83,11 +83,11 @@
<field name="account_paid_id" ref="a217"/>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
@@ -103,11 +103,11 @@
<field name="account_paid_id" ref="a217"/>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
@@ -122,9 +122,9 @@
<field name="account_collected_id" ref="a217"/>
<field name="account_paid_id" ref="a217"/>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
@@ -138,9 +138,9 @@
<field name="account_collected_id" ref="a217"/>
<field name="account_paid_id" ref="a217"/>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
@@ -154,9 +154,9 @@
<field name="account_collected_id" ref="a217"/>
<field name="account_paid_id" ref="a217"/>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_private"/>
</record>
@@ -164,7 +164,7 @@
<!-- Exice Duty -->
<record id="exice_duty_private_main" model="account.tax.template">
- <field name="name">Excise Duty - 10%</field>
+ <field name="name">Excise Duty - 10.30%</field>
<field name="include_base_amount" eval="True"/>
<field name="amount">0.10</field>
<field name="type">percent</field>
@@ -205,7 +205,7 @@
<record id="service_private_main" model="account.tax.template">
<field name="type_tax_use">all</field>
- <field name="name">Service Tax - 12%</field>
+ <field name="name">Service Tax - 12.30%</field>
<field name="include_base_amount" eval="True"/>
<field name="amount">0.12</field>
<field name="type">percent</field>
=== modified file 'l10n_in/l10n_in_public_chart.xml'
--- l10n_in/l10n_in_public_chart.xml 2012-07-02 11:33:37 +0000
+++ l10n_in/l10n_in_public_chart.xml 2012-07-03 09:24:25 +0000
@@ -178,7 +178,7 @@
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="p20000"/>
</record>
-
+
<record model="account.account.template" id="p24500">
<field name="name">Unearned Revenues</field>
<field name="code">24500</field>
@@ -259,8 +259,8 @@
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="p27000"/>
- </record>
-
+ </record>
+
<!-- Tax Account -->
<record model="account.account.template" id="p24600">
@@ -299,6 +299,15 @@
<field name="parent_id" ref="p20000"/>
</record>
+ <record model="account.account.template" id="p24950">
+ <field name="name">Reserve and Surplus Account</field>
+ <field name="code">24950</field>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_liability"/>
+ <field name="reconcile" eval="False"/>
+ <field name="parent_id" ref="p20000"/>
+ </record>
+
<!-- Profit And Loss Account -->
<record model="account.account.template" id="p3">
@@ -572,7 +581,7 @@
<field name="property_account_payable" ref="p21000"/>
<field name="property_account_expense_categ" ref="p41010"/>
<field name="property_account_income_categ" ref="p31010"/>
- <field name="property_reserve_and_surplus_account" ref="p96000"/>
+ <field name="property_reserve_and_surplus_account" ref="p24950"/>
</record>
</data>
=== modified file 'l10n_in/l10n_in_public_tax_template.xml'
--- l10n_in/l10n_in_public_tax_template.xml 2012-07-02 11:33:37 +0000
+++ l10n_in/l10n_in_public_tax_template.xml 2012-07-03 09:24:25 +0000
@@ -81,11 +81,11 @@
<field name="type_tax_use">all</field>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -101,11 +101,11 @@
<field name="type_tax_use">all</field>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -121,11 +121,11 @@
<field name="type_tax_use">all</field>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -141,11 +141,11 @@
<field name="type_tax_use">all</field>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -161,11 +161,11 @@
<field name="type_tax_use">all</field>
<field name="base_code_id" ref="vat_code_base_tax_sale"/>
<field name="base_sign">1</field>
- <field name="tax_code_id" ref="vat_code_payable"/>
+ <field name="tax_code_id" ref="vat_code_tax_rec"/>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
<field name="ref_base_sign">1</field>
- <field name="ref_tax_code_id" ref="vat_code_payable"/>
+ <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -174,7 +174,7 @@
<!-- Service Tax -->
<record id="service_public_main" model="account.tax.template">
- <field name="name">Service Tax - 12%</field>
+ <field name="name">Service Tax - 12.30%</field>
<field name="account_collected_id" ref="p24700"/>
<field name="account_paid_id" ref="p24700"/>
<field name="include_base_amount" eval="True"/>
@@ -214,7 +214,7 @@
<!-- Excise duty -->
<record id="exice_public_main" model="account.tax.template">
- <field name="name">Excise Duty - 10%</field>
+ <field name="name">Excise Duty - 10.30%</field>
<field name="account_collected_id" ref="p24900"/>
<field name="account_paid_id" ref="p24900"/>
<field name="include_base_amount" eval="True"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
