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:
Rushabh Mehta 2016-07-27 15:19:58 +05:30
commit e26a42dc7a
2 changed files with 3 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.0.6' __version__ = '7.0.7'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
View File

@ -20,7 +20,7 @@ def execute():
from `tabStock Ledger Entry` sle from `tabStock Ledger Entry` sle
where sle.warehouse in (%s) and creation > '2016-05-01' where sle.warehouse in (%s) and creation > '2016-05-01'
and not exists(select name from `tabGL Entry` and not exists(select name from `tabGL Entry`
where account=sle.warehosue and voucher_type=sle.voucher_type and voucher_no=sle.voucher_no) where account=sle.warehouse and voucher_type=sle.voucher_type and voucher_no=sle.voucher_no)
order by sle.posting_date""" % order by sle.posting_date""" %
', '.join(['%s']*len(warehouses)), tuple(warehouses)) ', '.join(['%s']*len(warehouses)), tuple(warehouses))
@ -47,4 +47,4 @@ def set_warehouse_for_stock_account(warehouse_account):
else: else:
warehouse_account.remove(account) warehouse_account.remove(account)
return warehouse_account return warehouse_account