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

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas 2015-05-20 16:35:40 +05:30
commit 815cb8959a
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '5.0.5' __version__ = '5.0.6'

2
erpnext/hooks.py
View File

@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors"
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "5.0.5" app_version = "5.0.6"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

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)

2
setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "5.0.5" version = "5.0.6"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()