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

Merge pull request #3298 from nabinhait/develop

Browse Source 
party model patch fix
This commit is contained in:
Nabin Hait 2015-05-20 14:34:42 +05:30
commit 390df6626b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/patches/v4_2/party_model.py
View File

@ -96,15 +96,16 @@ def set_party_in_jv_and_gl_entry(receivable_payable_accounts):
frappe.db.commit() frappe.db.commit()
def delete_individual_party_account(): def delete_individual_party_account():
frappe.db.sql("""delete from `tabAccount` acc frappe.db.sql("""delete from `tabAccount`
where ifnull(acc.master_type, '') in ('Customer', 'Supplier') where ifnull(master_type, '') in ('Customer', 'Supplier')
and ifnull(acc.master_name, '') != '' and ifnull(master_name, '') != ''
and not exists(select gle.name from `tabGL Entry` gle where gle.account = acc.name)""") and not exists(select gle.name from `tabGL Entry` gle
where gle.account = tabAccount.name);""")
accounts_not_deleted = frappe.db.sql_list("""select name from `tabAccount` acc accounts_not_deleted = frappe.db.sql_list("""select tabAccount.name from `tabAccount`
where ifnull(acc.master_type, '') in ('Customer', 'Supplier') where ifnull(master_type, '') in ('Customer', 'Supplier')
and ifnull(acc.master_name, '') != '' and ifnull(master_name, '') != ''
and exists(select gle.name from `tabGL Entry` gle where gle.account = acc.name)""") and exists(select gle.name from `tabGL Entry` gle where gle.account = tabAccount.name)""")
if accounts_not_deleted: if accounts_not_deleted:
print "Accounts not deleted: " + "\n".join(accounts_not_deleted) print "Accounts not deleted: " + "\n".join(accounts_not_deleted)