schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deleted master_type, master_name, credit_days, credit_limit fields from account

Browse Source 
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
This commit is contained in:
Nabin Hait
2014-08-27 12:05:48 +05:30
parent fbc3d25d13
commit be8ec39678
21 changed files with 515 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/stock_controller.py
View File

@@ -282,6 +282,6 @@ def get_voucherwise_gl_entries(future_stock_vouchers, posting_date):
return gl_entries
def get_warehouse_account():
warehouse_account = dict(frappe.db.sql("""select master_name, name from tabAccount
where account_type = 'Warehouse' and ifnull(master_name, '') != ''"""))
warehouse_account = dict(frappe.db.sql("""select warehouse, name from tabAccount
where account_type = 'Warehouse' and ifnull(warehouse, '') != ''"""))
return warehouse_account