[MERGE] l10n_in: Merge JAP branch for l10n_in

bzr revid: mra@tinyerp.com-20120703103416-8dlz31d5l5ll4iss
This commit is contained in:
Mustufa Rangwala (OpenERP)
2012-07-03 16:04:16 +05:30
4 changed files with 84 additions and 64 deletions
+17 -6
View File
@@ -204,11 +204,22 @@
<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>
<field name="code">216</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="True"/>
<field name="parent_id" ref="a20"/>
@@ -217,7 +228,7 @@
<record model="account.account.template" id="a217">
<field name="name">VAT Payable</field>
<field name="code">217</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="True"/>
<field name="parent_id" ref="a20"/>
@@ -226,7 +237,7 @@
<record model="account.account.template" id="a218">
<field name="name">Service Tax Payable</field>
<field name="code">218</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="True"/>
<field name="parent_id" ref="a20"/>
@@ -235,7 +246,7 @@
<record model="account.account.template" id="a219">
<field name="name">Exice Duty Payable</field>
<field name="code">219</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="True"/>
<field name="parent_id" ref="a20"/>
@@ -487,8 +498,8 @@
<field name="property_account_receivable" ref="a120"/>
<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_account_income_categ" ref="a311"/>
<field name="property_reserve_and_surplus_account" ref="a260"/>
</record>
+25 -25
View File
@@ -7,7 +7,7 @@
Sale Tax -->
<record id="sales_private" model="account.tax.template">
<field name="name">Sale Tax - 15%</field>
<field name="name">Sale Tax-15%</field>
<field name="price_include" eval="0"/>
<field name="amount">0.15</field>
<field name="type">percent</field>
@@ -23,7 +23,7 @@
</record>
<record id="sales_private_main" model="account.tax.template">
<field name="name">Sale Tax - 12%</field>
<field name="name">Sale Tax-12%</field>
<field name="price_include" eval="0"/>
<field name="amount">0.12</field>
<field name="type">percent</field>
@@ -39,7 +39,7 @@
</record>
<record id="sales_private_main_4" model="account.tax.template">
<field name="name">Sale Tax - 4%</field>
<field name="name">Sale Tax-4%</field>
<field name="price_include" eval="0"/>
<field name="amount">0.04</field>
<field name="type">percent</field>
@@ -57,7 +57,7 @@
<!-- Purchase tax -->
<record id="purchase_tax_public" model="account.tax.template">
<field name="name">Purchase Tax - 15%</field>
<field name="name">Purchase Tax-15%</field>
<field name="account_collected_id" ref="a216"/>
<field name="account_paid_id" ref="a216"/>
<field name="price_include" eval="0"/>
@@ -74,7 +74,7 @@
<!-- vat -->
<record id="vat_private_main" model="account.tax.template">
<field name="name">VAT - 5% (4% VAT + 1% Add. Tax.)</field>
<field name="name">VAT-5%(4% VAT+1% Add. Tax.)</field>
<field name="price_include" eval="0"/>
<field name="amount">0.05</field>
<field name="type">percent</field>
@@ -83,18 +83,18 @@
<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"/>
</record>
<record id="vat_private_main_tax" model="account.tax.template">
<field name="name">VAT - 15% (12.5% VAT + 2.5% Add. Tax.)</field>
<field name="name">VAT-15%(12.5% VAT+2.5% Add. Tax.)</field>
<field name="price_include" eval="0"/>
<field name="amount">0.15</field>
<field name="type">percent</field>
@@ -103,18 +103,18 @@
<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"/>
</record>
<record id="vat_private_tax" model="account.tax.template">
<field name="name">VAT - 8%</field>
<field name="name">VAT-8%</field>
<field name="price_include" eval="0"/>
<field name="amount">0.08</field>
<field name="type">percent</field>
@@ -122,15 +122,15 @@
<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>
<record id="vat_private_tax_10" model="account.tax.template">
<field name="name">VAT - 10%</field>
<field name="name">VAT-10%</field>
<field name="price_include" eval="0"/>
<field name="amount">0.10</field>
<field name="type">percent</field>
@@ -138,15 +138,15 @@
<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>
<record id="vat_private_tax_12" model="account.tax.template">
<field name="name">VAT - 12.5%</field>
<field name="name">VAT-12.5%</field>
<field name="price_include" eval="0"/>
<field name="amount">12.5</field>
<field name="type">percent</field>
@@ -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>
@@ -184,7 +184,7 @@
</record>
<record id="exice_private_duty_parent" model="account.tax.template">
<field name="name">Excise Duty - 2%</field>
<field name="name">Excise Duty-2%</field>
<field name="amount">0.02</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
@@ -193,7 +193,7 @@
</record>
<record id="exice_private_duty" model="account.tax.template">
<field name="name">Excise Duty - 1%</field>
<field name="name">Excise Duty-1%</field>
<field name="amount">0.01</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</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>
@@ -220,7 +220,7 @@
</record>
<record id="service_private_tax_parent" model="account.tax.template">
<field name="name">Service Tax - %2</field>
<field name="name">Service Tax-%2</field>
<field name="amount">0.02</field>
<field name="type">percent</field>
<field name="type_tax_use">all</field>
@@ -229,7 +229,7 @@
</record>
<record id="service_private_tax" model="account.tax.template">
<field name="name">Service Tax - %1</field>
<field name="name">Service Tax-%1</field>
<field name="amount">0.01</field>
<field name="type">percent</field>
<field name="type_tax_use">all</field>
+17 -8
View File
@@ -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,14 +259,14 @@
<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">
<field name="name">Sales Tax Payable</field>
<field name="code">24600</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="p20000"/>
@@ -275,7 +275,7 @@
<record model="account.account.template" id="p24800">
<field name="name">VAT Payable</field>
<field name="code">24800</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="p20000"/>
@@ -284,7 +284,7 @@
<record model="account.account.template" id="p24900">
<field name="name">Exice Duty Payable</field>
<field name="code">24900</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="p20000"/>
@@ -293,12 +293,21 @@
<record model="account.account.template" id="p24700">
<field name="name">Service Tax Payable</field>
<field name="code">24700</field>
<field name="type">payable</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_payable"/>
<field name="reconcile" eval="False"/>
<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>
+25 -25
View File
@@ -6,7 +6,7 @@
<!-- Sales Tax -->
<record id="sales_tax_public_main" model="account.tax.template">
<field name="name">Sale Tax - 15%</field>
<field name="name">Sale Tax-15%</field>
<field name="account_collected_id" ref="p24600"/>
<field name="account_paid_id" ref="p24600"/>
<field name="price_include" eval="0"/>
@@ -21,7 +21,7 @@
</record>
<record id="sales_tax_public" model="account.tax.template">
<field name="name">Sale Tax - 12%</field>
<field name="name">Sale Tax-12%</field>
<field name="account_collected_id" ref="p24600"/>
<field name="account_paid_id" ref="p24600"/>
<field name="price_include" eval="0"/>
@@ -36,7 +36,7 @@
</record>
<record id="sales_tax_public_4" model="account.tax.template">
<field name="name">Sale Tax - 4%</field>
<field name="name">Sale Tax-4%</field>
<field name="account_collected_id" ref="p24600"/>
<field name="account_paid_id" ref="p24600"/>
<field name="price_include" eval="0"/>
@@ -53,7 +53,7 @@
<!-- Purchase tax -->
<record id="purchase_tax_public" model="account.tax.template">
<field name="name">Purchase Tax - 15%</field>
<field name="name">Purchase Tax-15%</field>
<field name="account_collected_id" ref="p24600"/>
<field name="account_paid_id" ref="p24600"/>
<field name="price_include" eval="0"/>
@@ -72,7 +72,7 @@
<!-- VAT -->
<record id="vat_public_main" model="account.tax.template">
<field name="name">VAT - 5% (4% VAT + 1% Add. Tax.)</field>
<field name="name">VAT-5%(4% VAT+1% Add. Tax.)</field>
<field name="account_collected_id" ref="p24800"/>
<field name="account_paid_id" ref="p24800"/>
<field name="price_include" eval="0"/>
@@ -81,18 +81,18 @@
<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"/>
</record>
<record id="vat_public_main_tax" model="account.tax.template">
<field name="name">VAT - 15% (12.5% VAT + 2.5% Add. Tax.)</field>
<field name="name">VAT-15% (12.5% VAT + 2.5% Add. Tax.)</field>
<field name="account_collected_id" ref="p24800"/>
<field name="account_paid_id" ref="p24800"/>
<field name="price_include" eval="0"/>
@@ -101,18 +101,18 @@
<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"/>
</record>
<record id="vat_public_tax" model="account.tax.template">
<field name="name">VAT - 8%</field>
<field name="name">VAT-8%</field>
<field name="account_collected_id" ref="p24800"/>
<field name="account_paid_id" ref="p24800"/>
<field name="price_include" eval="0"/>
@@ -121,18 +121,18 @@
<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"/>
</record>
<record id="vat_public_tax_10" model="account.tax.template">
<field name="name">VAT - 10%</field>
<field name="name">VAT-10%</field>
<field name="account_collected_id" ref="p24800"/>
<field name="account_paid_id" ref="p24800"/>
<field name="price_include" eval="0"/>
@@ -141,18 +141,18 @@
<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"/>
</record>
<record id="vat_public_tax_12" model="account.tax.template">
<field name="name">VAT - 12.5%</field>
<field name="name">VAT-12.5%</field>
<field name="account_collected_id" ref="p24800"/>
<field name="account_paid_id" ref="p24800"/>
<field name="price_include" eval="0"/>
@@ -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"/>
@@ -194,7 +194,7 @@
</record>
<record id="service_tax_parent" model="account.tax.template">
<field name="name">Service Tax - %2</field>
<field name="name">Service Tax-%2</field>
<field name="amount">0.02</field>
<field name="type">percent</field>
<field name="type_tax_use">all</field>
@@ -203,7 +203,7 @@
</record>
<record id="service_tax" model="account.tax.template">
<field name="name">Service Tax - %1</field>
<field name="name">Service Tax-%1</field>
<field name="amount">0.01</field>
<field name="type">percent</field>
<field name="type_tax_use">all</field>
@@ -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"/>
@@ -234,7 +234,7 @@
</record>
<record id="exice_duty_parent" model="account.tax.template">
<field name="name">Excise Duty - %2</field>
<field name="name">Excise Duty-%2</field>
<field name="amount">0.02</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
@@ -243,7 +243,7 @@
</record>
<record id="exice_duty" model="account.tax.template">
<field name="name">Excise Duty - 1%</field>
<field name="name">Excise Duty-1%</field>
<field name="amount">0.01</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>