Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mentioed account type for some tax/chargeable account

Browse Source
This commit is contained in:
Nabin Hait 2012-02-16 10:55:05 +05:30
parent 470e18a380
commit da1f48b96e
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/patches/jan_mar_2012/account_type_patch.py
View File

@ -2,10 +2,8 @@ def execute():
import webnotes
webnotes.conn.sql("""update `tabAccount`
set account_type = 'Chargeable'
where account_name in ('CENVAT Capital Goods', 'CENVAT Service Tax', 'CENVAT Service Tax Cess 1', 'CENVAT Service Tax Cess 2')
""")
webnotes.conn.sql("""update tabAccount
set account_type = 'Tax'
where account_name in ('P L A', 'P L A - Cess Portion', 'VAT', 'TDS (Advertisement)', 'TDS (Commission)',
'TDS (Contractor)', 'TDS (Interest)', 'TDS (Rent)', 'TDS (Salary)')
where account_name in ('CENVAT Capital Goods', 'CENVAT Service Tax', 'CENVAT Service Tax Cess 1', 'CENVAT Service Tax Cess 2',
'P L A', 'P L A - Cess Portion', 'VAT', 'TDS (Advertisement)', 'TDS (Commission)', 'TDS (Contractor)', 'TDS (Interest)',
'TDS (Rent)', 'TDS (Salary)')
""")

20
erpnext/setup/doctype/company/company.py
View File

@ -108,8 +108,8 @@ class DocType:
['Excise Duty 14','Tax Assets','Ledger','No','Tax','Debit',self.doc.name,'14.00'],
['Excise Duty Edu Cess 2','Tax Assets','Ledger','No','Tax','Debit',self.doc.name,'2.00'],
['Excise Duty SHE Cess 1','Tax Assets','Ledger','No','Tax','Debit',self.doc.name,'1.00'],
['P L A','Tax Assets','Ledger','No','Tax','Debit',self.doc.name,''],
['P L A - Cess Portion','Tax Assets','Ledger','No','Tax','Debit',self.doc.name,''],
['P L A','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''],
['P L A - Cess Portion','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''],
['Edu. Cess on Excise','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'2.00'],
['Edu. Cess on Service Tax','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'2.00'],
['Edu. Cess on TDS','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'2.00'],
@ -121,14 +121,14 @@ class DocType:
['SHE Cess on Excise','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'1.00'],
['SHE Cess on Service Tax','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'1.00'],
['SHE Cess on TDS','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'1.00'],
['Professional Tax','Duties and Taxes','Ledger','No','','Credit',self.doc.name,''],
['VAT','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,''],
['TDS (Advertisement)','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,''],
['TDS (Commission)','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,''],
['TDS (Contractor)','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,''],
['TDS (Interest)','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,''],
['TDS (Rent)','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,''],
['TDS (Salary)','Duties and Taxes','Ledger','No','Tax','Credit',self.doc.name,'']
['Professional Tax','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['VAT','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['TDS (Advertisement)','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['TDS (Commission)','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['TDS (Contractor)','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['TDS (Interest)','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['TDS (Rent)','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,''],
['TDS (Salary)','Duties and Taxes','Ledger','No','Chargeable','Credit',self.doc.name,'']
]
# load common account heads
for d in acc_list_common: