From 65dfd099471ce660a76b3674677ff04461107853 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Wed, 4 Oct 2017 13:21:44 +0100 Subject: [PATCH 1/3] fix wrong variable name (#11050) --- erpnext/hr/doctype/process_payroll/process_payroll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py index 55c0cce59f..0e329a7c19 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.py +++ b/erpnext/hr/doctype/process_payroll/process_payroll.py @@ -284,7 +284,7 @@ class ProcessPayroll(Document): }) # Deductions - for acc, amt in deductions.items(): + for acc, amount in deductions.items(): payable_amount -= flt(amount, precision) accounts.append({ "account": acc, From 1e2c554e61dc750c17d18f89073bf5b219f8af61 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 4 Oct 2017 17:52:49 +0530 Subject: [PATCH 2/3] [Fix] Stock entry multi uom batch validation issue (#11049) --- erpnext/stock/doctype/batch/batch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 043dc73d37..c58a98d7c8 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -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): '''Automatically select `batch_no` for outgoing items in item table''' 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') warehouse = d.get(warehouse_field, None) if has_batch_no and warehouse and qty > 0: From 54c725dcd19d4fa947202f485a37c2bc59abc0f8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 4 Oct 2017 18:35:19 +0600 Subject: [PATCH 3/3] bumped to version 9.0.9 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index ef1e4ed921..1a7ddd2374 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '9.0.8' +__version__ = '9.0.9' def get_default_company(user=None): '''Get default company for user'''