From bd0c05bf94f6214243d6c9b275f0e841ace7a3c0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 13 Feb 2012 14:48:34 +0530 Subject: [PATCH] Mentioned account type in default accounts --- .../jan_mar_2012/account_type_patch.py | 11 ++++++++ erpnext/setup/doctype/company/company.py | 26 +++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 erpnext/patches/jan_mar_2012/account_type_patch.py diff --git a/erpnext/patches/jan_mar_2012/account_type_patch.py b/erpnext/patches/jan_mar_2012/account_type_patch.py new file mode 100644 index 0000000000..870abe3c46 --- /dev/null +++ b/erpnext/patches/jan_mar_2012/account_type_patch.py @@ -0,0 +1,11 @@ +def execute(): + import webnotes + webnotes.conn.sql("""update `tabAccount` + set account_type = 'Chargeable' + where 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 name in ('P L A', 'P L A - Cess Portion', 'VAT', 'TDS (Advertisement)', 'TDS (Commission)', + 'TDS (Contractor)', 'TDS (Interest)', 'TDS (Rent)', 'TDS (Salary)') + """) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index a163870a6a..1b06374045 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -95,11 +95,11 @@ class DocType: ] acc_list_india = [ - ['CENVAT Capital Goods','Tax Assets','Ledger','No','','Debit',self.doc.name,''], + ['CENVAT Capital Goods','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], ['CENVAT','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], - ['CENVAT Service Tax','Tax Assets','Ledger','No','','Debit',self.doc.name,''], - ['CENVAT Service Tax Cess 1','Tax Assets','Ledger','No','','Debit',self.doc.name,''], - ['CENVAT Service Tax Cess 2','Tax Assets','Ledger','No','','Debit',self.doc.name,''], + ['CENVAT Service Tax','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], + ['CENVAT Service Tax Cess 1','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], + ['CENVAT Service Tax Cess 2','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], ['CENVAT Edu Cess','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], ['CENVAT SHE Cess','Tax Assets','Ledger','No','Chargeable','Debit',self.doc.name,''], ['Excise Duty 4','Tax Assets','Ledger','No','Tax','Debit',self.doc.name,'4.00'], @@ -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','','Debit',self.doc.name,''], - ['P L A - Cess Portion','Tax Assets','Ledger','No','','Debit',self.doc.name,''], + ['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,''], ['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'], @@ -122,13 +122,13 @@ class DocType: ['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','','Credit',self.doc.name,''], - ['TDS (Advertisement)','Duties and Taxes','Ledger','No','','Credit',self.doc.name,''], - ['TDS (Commission)','Duties and Taxes','Ledger','No','','Credit',self.doc.name,''], - ['TDS (Contractor)','Duties and Taxes','Ledger','No','','Credit',self.doc.name,''], - ['TDS (Interest)','Duties and Taxes','Ledger','No','','Credit',self.doc.name,''], - ['TDS (Rent)','Duties and Taxes','Ledger','No','','Credit',self.doc.name,''], - ['TDS (Salary)','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,''] ] # load common account heads for d in acc_list_common: