nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues 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

2
erpnext/accounts/general_ledger.py
View File

@@ -93,7 +93,7 @@ def validate_total_debit_credit(total_debit, total_credit):
def validate_account_for_auto_accounting_for_stock(gl_map):
if gl_map[0].voucher_type=="Journal Voucher":
aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
where account_type = 'Warehouse' and ifnull(master_name, '')!=''""")]
where account_type = 'Warehouse' and ifnull(warehouse, '')!=''""")]
for entry in gl_map:
if entry.account in aii_accounts: