diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py
index f97bda7fb89..a7105d9d278 100644
--- a/addons/l10n_in/__init__.py
+++ b/addons/l10n_in/__init__.py
@@ -27,6 +27,6 @@
#
##############################################################################
-import installer
+import l10n_in_installer
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 630d99ca8db..3c635082f7f 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -36,9 +36,9 @@ Indian accounting chart and localization.
],
"demo_xml": [],
"update_xml": [
- "account_tax_code_template.xml",
+ "l10n_in_tax_code_template.xml",
"l10n_in_wizard.xml",
- "installer_view.xml",
+ "l10n_in_installer_view.xml",
],
"auto_install": False,
"installable": True,
diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml
deleted file mode 100644
index 90e6264398f..00000000000
--- a/addons/l10n_in/account_tax.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
- PPn (10%)(10.0%)
- 0.100000
- percent
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/l10n_in/account_tax_code.xml b/addons/l10n_in/account_tax_code.xml
deleted file mode 100644
index bec870dd426..00000000000
--- a/addons/l10n_in/account_tax_code.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
- Tax balance to pay
-
-
-
- Tax Due (Tax to pay)
-
-
-
-
- Tax payable
-
-
-
-
- Tax bases
-
-
-
- Base of taxed sales
-
-
-
-
-
- Base of taxed purchases
-
-
-
-
-
diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/l10n_in_installer.py
similarity index 95%
rename from addons/l10n_in/installer.py
rename to addons/l10n_in/l10n_in_installer.py
index 83a63fba122..01c9395eb58 100644
--- a/addons/l10n_in/installer.py
+++ b/addons/l10n_in/l10n_in_installer.py
@@ -43,20 +43,20 @@ class l10n_installer(osv.osv_memory):
for chart in self.read(cr, uid, ids, context=context):
if chart['charts'] =='l10n_in' and chart['company_type']=='public_company':
- acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml'))
+ acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_chart.xml'))
tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None)
acc_file_path.close()
- tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_tax_template.xml'))
+ tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_tax_template.xml'))
tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None)
tax_file_path.close()
elif chart['charts'] =='l10n_in' and chart['company_type']=='partnership_private_company':
- acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml'))
+ acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_chart.xml'))
tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None)
acc_file_path.close()
- tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_firm_tax_template.xml'))
+ tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_tax_template.xml'))
tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None)
tax_file_path.close()
diff --git a/addons/l10n_in/installer_view.xml b/addons/l10n_in/l10n_in_installer_view.xml
similarity index 100%
rename from addons/l10n_in/installer_view.xml
rename to addons/l10n_in/l10n_in_installer_view.xml
diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
similarity index 74%
rename from addons/l10n_in/l10n_in_partnership_private_chart.xml
rename to addons/l10n_in/l10n_in_private_chart.xml
index 6e2a764d64f..dcb705c113e 100644
--- a/addons/l10n_in/l10n_in_partnership_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -4,7 +4,7 @@
-
+
Partnership/Private Firm Chart of Account
0
view
@@ -13,197 +13,234 @@
-
+
Balance Sheet
1
view
-
+
-
+
Assets
10
view
-
+
-
+
Cash
101
liquidity
-
+
Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited.
-
+
Accounts Receivable
120
receivable
-
+
Amounts owed to the company for services performed or products sold but not yet paid for.
-
+
Merchandise Inventory
140
other
-
+
Cost of merchandise purchased but has not yet been sold.
-
+
Supplies
150
other
-
+
Cost of supplies that have not yet been used. Supplies that have been used are recorded in Supplies Expense.
-
+
Prepaid Insurance
160
other
-
+
Cost of insurance that is paid in advance and includes a future accounting period.
-
+
Land
170
other
-
+
Cost to acquire and prepare land for use by the company.
-
+
Buildings
175
other
-
+
Cost to purchase or construct buildings for use by the company.
-
+
Accumulated Depreciation - Buildings
178
other
-
+
Amount of the buildings' cost that has been allocated to Depreciation Expense since the time the building was acquired.
-
+
Equipment
180
other
-
+
Cost to acquire and prepare equipment for use by the company.
-
+
Accumulated Depreciation - Equipment
188
other
-
+
Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired.
-
+
Liabilities
20
view
-
+
-
+
Notes Payable
210
other
-
+
The amount of principal due on a formal written promise to pay. Loans from banks are included in this account.
-
+
Accounts Payable
215
payable
-
+
Amount owed to suppliers who provided goods and services to the company but did not require immediate payment in cash.
-
+
Wages Payable
220
other
-
+
Amount owed to employees for hours worked but not yet paid.
-
+
Interest Payable
230
other
-
+
Amount owed for interest on Notes Payable up until the date of the balance sheet. This is computed by multiplying the amount of the note times the effective interest rate times the time period.
-
+
Unearned Revenues
240
other
-
+
Amounts received in advance of delivering goods or providing services. When the goods are delivered or services are provided, this liability amount decreases.
-
+
Mortgage Loan Payable
250
other
-
+
A formal loan that involves a lien on real estate until the loan is repaid.
-
-
+
+
+
+
+ Sales Tax Payable
+ 216
+ payable
+
+
+
+
+
+
+ VAT Payable
+ 217
+ payable
+
+
+
+
+
+
+ Service Tax Payable
+ 218
+ payable
+
+
+
+
+
+
+ Exice Duty Payable
+ 219
+ payable
+
+
+
+
+
@@ -212,7 +249,7 @@
view
-
+
-
+
Profit And Loss
3
view
-
+
-
+
Income
30
view
-
+
-
+
Operating Revenue Accounts
31
view
-
+
-
+
Service Revenues
310
other
-
+
Amounts earned from providing services to clients, either for cash or on credit. When a service is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase.
-
+
Product Sales
311
other
-
+
Sales of product account
-
+
Non-Operating Revenue and Gains
80
view
-
+
-
+
Interest Revenues
810
other
-
+
Interest and dividends earned on bank accounts, investments or notes receivable. This account is increased when the interest is earned and either Cash or Interest Receivable is also increased.
-
+
Gain on Sale of Assets
811
other
-
+
Occurs when the company sells one of its assets (other than inventory) for more than the asset's book value.
-
+
Expense
50
view
-
+
-
+
Operating Expense Accounts
51
view
-
+
-
+
Salaries Expense
500
other
-
+
Expenses incurred for the work performed by salaried employees during the accounting period. These employees normally receive a fixed amount on a weekly, monthly, or annual basis.
-
+
Wages Expense
510
other
-
+
Expenses incurred for the work performed by non-salaried employees during the accounting period. These employees receive an hourly rate of pay.
-
+
Supplies Expense
540
other
-
+
Cost of supplies used up during the accounting period.
-
+
Rent Expense
560
other
-
+
Cost of occupying rented facilities during the accounting period.
-
+
Utilities Expense
570
other
-
+
Costs for electricity, heat, water, and sewer that were used during the accounting period.
-
+
Telephone Expense
576
other
-
+
Cost of telephone used during the current accounting period.
-
+
Advertising Expense
610
other
-
+
Costs incurred by the company during the accounting period for ads, promotions, and other selling and expenses (other than salaries).
-
+
Depreciation Expense
750
other
-
+
Cost of long-term assets allocated to expense during the current accounting period.
-
+
Non-Operating Expenses and Losses
90
view
@@ -430,13 +467,13 @@
-
+
Loss on Sale of Assets
960
other
-
+
Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value.
@@ -444,14 +481,14 @@
India - Chart of Accounts for Partnership/Private Firm
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/l10n_in/l10n_in_private_firm_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml
similarity index 53%
rename from addons/l10n_in/l10n_in_private_firm_tax_template.xml
rename to addons/l10n_in/l10n_in_private_tax_template.xml
index 5bff8157884..e95a9bc48e1 100644
--- a/addons/l10n_in/l10n_in_private_firm_tax_template.xml
+++ b/addons/l10n_in/l10n_in_private_tax_template.xml
@@ -2,117 +2,90 @@
-
-
-
- Sales Tax Payable
- 216
- payable
-
-
-
-
-
-
- VAT Payable
- 217
- payable
-
-
-
-
-
-
- Service Tax Payable
- 218
- payable
-
-
-
-
-
-
- Exice Duty Payable
- 219
- payable
-
-
-
-
-
+
- Sale Tax - 15%
Sale Tax - 15%
0.15
percent
sale
-
-
-
-
-
-
+
+
+
+
+
+
- Sale Tax -12%
Sale Tax - 12%
0.12
percent
sale
-
-
-
-
-
-
+
+
+
+
+
+
+
+ Sale Tax - 4%
+
+ 0.04
+ percent
+ sale
+
+
+
+
+
+
+
+
+
+
- Purchase Tax - 15%
Purchase Tax - 15%
-
-
+
+
0.15
percent
purchase
-
+
-
+
-
-
- VAT - 5%
- VAT - 5%
+ VAT - 5% (4% VAT + 1% Add. Tax.)
0.05
percent
all
-
-
-
+
+
+
1
1
-
+
1
1
@@ -121,19 +94,18 @@
- VAT - 15%
- VAT - 15%
+ VAT - 15% (12.5% VAT + 2.5% Add. Tax.)
0.15
percent
all
-
-
-
+
+
+
1
1
-
+
1
1
@@ -142,17 +114,48 @@
- VAT - 8%
VAT - 8%
- 0.8
+ 0.08
percent
all
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+ VAT - 10%
+
+ 0.10
+ percent
+ all
+
+
+
+
+
+
+
+
+
+
+
+ VAT - 12.5%
+
+ 12.5
+ percent
+ all
+
+
+
+
+
@@ -161,29 +164,27 @@
- Exice Duty - 10.30%
- Excise Duty
+ Excise Duty - 10%
0.10
percent
sale
-
-
-
+
+
+
1
-
+
1
-
+
1
-
+
1
-
+
- Excise duty -10% -%2
- Excise Duty - %2
+ Excise Duty - 2%
0.02
percent
sale
@@ -192,7 +193,6 @@
- Excise duty - 10% - %1
Excise Duty - 1%
0.01
percent
@@ -205,23 +205,21 @@
all
- Service - 12%
- Service Tax
+ Service Tax - 12%
0.12
percent
-
-
-
-
-
-
+
+
+
+
+
+
- Service - 12% - %2
Service Tax - %2
0.02
percent
@@ -231,7 +229,6 @@
- Service - 12% - 1%
Service Tax - %1
0.01
percent
diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
similarity index 68%
rename from addons/l10n_in/l10n_in_public_firm_chart.xml
rename to addons/l10n_in/l10n_in_public_chart.xml
index 9e72ec9569c..1b9bf1fc298 100644
--- a/addons/l10n_in/l10n_in_public_firm_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -5,7 +5,7 @@
-
+
Public Firm Chart of Account
0
view
@@ -14,529 +14,565 @@
-
+
Balance Sheet
1
view
-
+
-
+
Assets
10
view
-
+
-
+
Current Assets
10000
view
-
+
-
+
Cash - Regular Checking
10100
liquidity
-
+
-
+
Cash - Payroll Checking
10200
liquidity
-
+
-
+
Petty Cash Fund
10600
liquidity
-
+
-
+
Accounts Receivable
12100
receivable
-
+
-
+
Allowance for Doubtful Accounts
12500
other
-
+
-
+
Inventory
13100
other
-
+
-
+
Supplies
14100
other
-
+
-
+
Prepaid Insurance
15300
other
-
+
-
+
Liabilities
20
view
-
+
-
+
Current Liabilities
20000
view
-
+
-
+
Notes Payable - Credit Line #1
20100
other
-
+
-
+
Notes Payable - Credit Line #2
20200
other
-
+
-
+
Accounts Payable
21000
payable
-
+
-
+
Wages Payable
22100
other
-
+
-
+
Interest Payable
23100
other
-
+
-
+
Unearned Revenues
24500
other
-
+
-
+
Long-term Liabilities
25000
view
-
+
-
+
Mortgage Loan Payable
25100
other
-
+
-
+
Bonds Payable
25600
other
-
+
-
+
Discount on Bonds Payable
25650
other
-
+
-
+
Stockholders' Equity
27000
view
-
+
-
+
Common Stock, No Par
27100
other
-
+
-
+
Retained Earnings
27500
other
-
+
-
+
Treasury Stock
29500
other
-
+
-
-
-
+
+
+
+
+ Sales Tax Payable
+ 24600
+ payable
+
+
+
+
+
+
+ VAT Payable
+ 24800
+ payable
+
+
+
+
+
+
+ Exice Duty Payable
+ 24900
+ payable
+
+
+
+
+
+
+ Service Tax Payable
+ 24700
+ payable
+
+
+
+
+
-
+
Profit And Loss
3
view
-
+
-
+
Income
30
view
-
+
-
+
Operating Revenues
30000
view
-
+
-
+
Sales - Division #1, Product Line 010
31010
other
-
+
-
+
Sales - Division #1, Product Line 022
31022
other
-
+
-
+
Sales - Division #2, Product Line 015
32015
other
-
+
-
+
Sales - Division #3, Product Line 110
33110
other
-
+
-
+
Non-Operating Revenue and Gains
90000
view
-
+
-
+
Gain on Sale of Assets
91800
other
-
+
-
+
Expense
40
view
-
+
-
+
Cost of Goods Sold
40000
view
-
+
-
+
COGS - Division #1, Product Line 010
41010
other
-
+
-
+
COGS - Division #1, Product Line 022
41022
other
-
+
-
+
COGS - Division #2, Product Line 015
42015
other
-
+
-
+
COGS - Division #3, Product Line 110
43110
other
-
+
-
+
Marketing Expenses
50000
view
-
+
-
+
Marketing Dept. Salaries
50100
other
-
+
-
+
Marketing Dept. Payroll Taxes
50150
other
-
+
-
+
Marketing Dept. Supplies
50200
other
-
+
-
+
Marketing Dept. Telephone
50600
other
-
+
-
+
Payroll Dept. Expenses
59000
view
-
+
-
+
Payroll Dept. Salaries
59100
other
-
+
-
+
Payroll Dept. Payroll Taxes
59150
other
-
+
-
+
Payroll Dept. Supplies
59200
other
-
+
-
+
Payroll Dept. Telephone
59600
other
-
+
-
+
Non-Operating Expenses and Losses
96000
view
-
+
-
+
Loss on Sale of Assets
96100
other
-
+
India - Chart of Accounts for Public Firm
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/l10n_in/l10n_in_public_firm_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
similarity index 53%
rename from addons/l10n_in/l10n_in_public_firm_tax_template.xml
rename to addons/l10n_in/l10n_in_public_tax_template.xml
index c597fe260f4..0d2427af93a 100644
--- a/addons/l10n_in/l10n_in_public_firm_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -3,93 +3,66 @@
-
-
-
- Sales Tax Payable
- 24600
- payable
-
-
-
-
-
-
- VAT Payable
- 24800
- payable
-
-
-
-
-
-
- Exice Duty Payable
- 24900
- payable
-
-
-
-
-
-
- Service Tax Payable
- 24700
- payable
-
-
-
-
-
-
- Sale Tax - 15%
Sale Tax - 15%
-
-
+
+
0.15
percent
sale
-
-
-
-
+
+
+
+
- Sale Tax - 12%
Sale Tax - 12%
-
-
+
+
0.12
percent
sale
-
-
-
-
+
+
+
+
+
+
+
+
+ Sale Tax - 4%
+
+
+
+ 0.04
+ percent
+ sale
+
+
+
+
- Purchase Tax - 15%
Purchase Tax - 15%
-
-
+
+
0.15
percent
purchase
-
+
-
+
@@ -99,19 +72,18 @@
- VAT - 5%
- VAT - 5%
-
-
+ VAT - 5% (4% VAT + 1% Add. Tax.)
+
+
0.05
percent
all
-
+
1
1
-
+
1
1
@@ -120,19 +92,18 @@
- VAT - 15%
- VAT - 15%
-
-
+ VAT - 15% (12.5% VAT + 2.5% Add. Tax.)
+
+
0.15
percent
all
-
+
1
1
-
+
1
1
@@ -141,51 +112,88 @@
- VAT - 8%
VAT - 8%
-
-
+
+
0.08
percent
all
-
+
1
1
-
+
1
1
-
+
+
+ VAT - 10%
+
+
+
+ 0.10
+ percent
+ all
+
+ 1
+
+ 1
+
+ 1
+
+ 1
+
+
+
+
+
+ VAT - 12.5%
+
+
+
+ 12.5
+ percent
+ all
+
+ 1
+
+ 1
+
+ 1
+
+ 1
+
+
+
+
- Service - 12%
- Service Tax
-
-
+ Service Tax - 12%
+
+
0.12
percent
all
-
+
1
-
+
1
-
+
1
-
+
1
- Service - 12% - 2%
Service Tax - %2
0.02
percent
@@ -195,7 +203,6 @@
- Service - 12% - 1%
Service Tax - %1
0.01
percent
@@ -207,28 +214,26 @@
- Excise duty - 10%
- Excise Duty
-
-
+ Excise Duty - 10%
+
+
0.10
percent
sale
-
+
1
-
+
1
-
+
1
-
+
1
-
+
- Excise duty - 10% - 2%
Excise Duty - %2
0.02
percent
@@ -238,7 +243,6 @@
- Excise duty - 10% - 1%
Excise Duty - 1%
0.01
percent
diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
similarity index 81%
rename from addons/l10n_in/account_tax_code_template.xml
rename to addons/l10n_in/l10n_in_tax_code_template.xml
index 1d8e5ed3b70..94217d79c3c 100644
--- a/addons/l10n_in/account_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -12,13 +12,13 @@
-
- Tax Due (Tax to pay)
+
+ Tax Received
- Tax Payable
+ Tax Paid
@@ -28,12 +28,12 @@
-
+
Base of Taxed Sales
-
+
Base of Taxed Purchases