Merge branch 'latest' of github.com:webnotes/erpnext into latest

This commit is contained in:
Anand Doshi
2012-02-16 12:08:10 +05:30
5 changed files with 29 additions and 26 deletions

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: