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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2016-11-10 11:25:33 +05:30
commit 176577b549
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.1.9' __version__ = '7.1.10'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

5
erpnext/patches/v7_0/set_base_amount_in_invoice_payment_table.py
View File

@ -6,7 +6,8 @@ def execute():
si_list = frappe.db.sql(""" si_list = frappe.db.sql("""
select distinct parent select distinct parent
from `tabSales Invoice Payment` from `tabSales Invoice Payment`
where docstatus!=2 and amount != 0 and base_amount = 0 where docstatus!=2 and parenttype = 'Sales Invoice'
and amount != 0 and base_amount = 0
""") """)
count = 0 count = 0
@ -20,4 +21,4 @@ def execute():
count +=1 count +=1
if count % 200 == 0: if count % 200 == 0:
frappe.db.commit() frappe.db.commit()