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

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

Browse Source
This commit is contained in:
Anand Doshi 2012-02-14 11:40:41 +05:30
commit d758a83791
5 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
erpnext/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
View File

@ -3,35 +3,35 @@
# These values are common in all dictionaries
{
'creation': '2011-03-30 11:03:20',
'creation': '2011-03-29 14:57:52',
'docstatus': 0,
'modified': '2011-03-29 14:26:16',
'modified_by': 'Administrator',
'owner': 'dhanalekshmi@webnotestech.com'
'modified': '2012-02-14 11:04:22',
'modified_by': u'Administrator',
'owner': u'dhanalekshmi@webnotestech.com'
},
# These values are common for all Search Criteria
{
'add_col': '`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) AS "Pending Quantity To Receive"\n(`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0)) * `tabPO Detail`.purchase_rate AS "Pending Amount To Receive"',
'add_cond': '`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) > 0 \n`tabPurchase Order`.status != "Stopped"',
'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,PO Detail\x01Indent No,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Description,PO Detail\x01Quantity,PO Detail\x01UOM,PO Detail\x01Received Qty',
'criteria_name': 'Pending PO Items To Receive',
'description': 'Pending PO Items To Receive',
'doc_type': 'PO Detail',
'add_col': u'`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) AS "Pending Quantity To Receive"\n(`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0)) * `tabPO Detail`.purchase_rate AS "Pending Amount To Receive"',
'add_cond': u'`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) > 0 \n`tabPurchase Order`.status != "Stopped"',
'columns': u'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,PO Detail\x01Indent No,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Description,PO Detail\x01Quantity,PO Detail\x01UOM,PO Detail\x01Received Qty',
'criteria_name': u'Pending PO Items To Receive',
'description': u'Pending PO Items To Receive',
'doc_type': u'PO Detail',
'doctype': 'Search Criteria',
'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
'module': 'Buying',
'filters': u"{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
'module': u'Buying',
'name': '__common__',
'page_len': 50,
'parent_doc_type': 'Purchase Order',
'sort_by': '`tabPurchase Order`.`name`',
'sort_order': 'DESC',
'standard': 'Yes'
'parent_doc_type': u'Purchase Order',
'sort_by': u'`tabPurchase Order`.`name`',
'sort_order': u'DESC',
'standard': u'Yes'
},
# Search Criteria, pending_po_items_to_receive
{
'doctype': 'Search Criteria',
'name': 'pending_po_items_to_receive'
'name': u'pending_po_items_to_receive'
}
]

11
erpnext/patches/jan_mar_2012/account_type_patch.py Normal file
View File

@ -0,0 +1,11 @@
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)')
""")

5
erpnext/patches/patch_list.py
View File

@ -70,4 +70,9 @@ patch_list = [
'patch_file': 'map_conversion_rate',
'description': "Maps conversion rate in doctype mappers PO-PR and PO-PV"
},
{
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'account_type_patch',
'description': 'mentioed account type for some tax accounts'
}
]

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

@ -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:

4
erpnext/utilities/doctype/trash_control/trash_control.py
View File

@ -26,7 +26,7 @@ class DocType:
# -----------
def get_masters(self):
mlist = []
res = sql("select distinct t1.name from tabDocType t1, tabDocPerm t2 where ifnull(t1.allow_trash, 0) = 1 and (ifnull(t2.write, 0) = 1 or ifnull(t2.create, 0) = 1) and t2.role in %s and t2.parent = t1.name and t1.module not in ('DocType','Application Internal','Recycle Bin','Development','Testing','Testing System','Test') ORDER BY t1.name" % cstr(tuple(webnotes.user.get_roles())))
res = sql("select distinct t1.name from tabDocType t1, tabDocPerm t2 where ifnull(t1.allow_trash, 0) = 1 and (ifnull(t2.write, 0) = 1 or ifnull(t2.create, 0) = 1) and t2.role in (%s) and t2.parent = t1.name and t1.module not in ('DocType','Application Internal','Recycle Bin','Development','Testing','Testing System','Test') ORDER BY t1.name" % ("'"+"', '".join(webnotes.user.get_roles())+"'"))
for r in res:
mlist.append(r[0])
return mlist
@ -56,4 +56,4 @@ class DocType:
for r in arg[k]:
sql("update `tab%s` set docstatus = 0, modified = '%s', trash_reason = '' where name = '%s'" % (k, now(), r))
dt_obj = get_obj(k,r)
if hasattr(dt_obj, 'on_restore'): dt_obj.on_restore()
if hasattr(dt_obj, 'on_restore'): dt_obj.on_restore()