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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-10-04 18:05:20 +05:30
commit fc712aea32
3 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

@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '9.0.8' __version__ = '9.0.9'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/hr/doctype/process_payroll/process_payroll.py
View File

@ -284,7 +284,7 @@ class ProcessPayroll(Document):
}) })
# Deductions # Deductions
for acc, amt in deductions.items(): for acc, amount in deductions.items():
payable_amount -= flt(amount, precision) payable_amount -= flt(amount, precision)
accounts.append({ accounts.append({
"account": acc, "account": acc,

2
erpnext/stock/doctype/batch/batch.py
View File

@ -103,7 +103,7 @@ def split_batch(batch_no, item_code, warehouse, qty, new_batch_id = None):
def set_batch_nos(doc, warehouse_field, throw = False): def set_batch_nos(doc, warehouse_field, throw = False):
'''Automatically select `batch_no` for outgoing items in item table''' '''Automatically select `batch_no` for outgoing items in item table'''
for d in doc.items: for d in doc.items:
qty = d.get('stock_qty') or d.get('qty') or 0 qty = d.get('stock_qty') or d.get('transfer_qty') or d.get('qty') or 0
has_batch_no = frappe.db.get_value('Item', d.item_code, 'has_batch_no') has_batch_no = frappe.db.get_value('Item', d.item_code, 'has_batch_no')
warehouse = d.get(warehouse_field, None) warehouse = d.get(warehouse_field, None)
if has_batch_no and warehouse and qty > 0: if has_batch_no and warehouse and qty > 0: