From 836aa5a1e68f081d0fa76e14cd788567d85cfedb Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 26 Jun 2019 11:35:53 +0530 Subject: [PATCH 1/6] fix: attendance gantt view --- erpnext/hr/doctype/attendance/attendance_calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/attendance/attendance_calendar.js b/erpnext/hr/doctype/attendance/attendance_calendar.js index b21afe5eaee..104f09d69ff 100644 --- a/erpnext/hr/doctype/attendance/attendance_calendar.js +++ b/erpnext/hr/doctype/attendance/attendance_calendar.js @@ -2,8 +2,8 @@ // For license information, please see license.txt frappe.views.calendar["Attendance"] = { field_map: { - "start": "date", - "end": "date", + "start": "attendance_date", + "end": "attendance_date", "id": "name", "docstatus": 1 }, From a6a617122526e2d33324e931bb9afbfb6a5289ea Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 26 Jun 2019 13:30:54 +0530 Subject: [PATCH 2/6] fix: Don't append None values in against_account (#18032) --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index ca94b52c532..e06db8f4bc6 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -487,7 +487,7 @@ class SalesInvoice(SellingController): """Set against account for debit to account""" against_acc = [] for d in self.get('items'): - if d.income_account not in against_acc: + if d.income_account and d.income_account not in against_acc: against_acc.append(d.income_account) self.against_income_account = ','.join(against_acc) From f269b66f39d9963a20f5e624a850f3424e9424e1 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 26 Jun 2019 13:39:52 +0530 Subject: [PATCH 3/6] fix: returned qty issue while making sales invoice from dn if same item added multiple times (#18074) --- erpnext/stock/doctype/delivery_note/delivery_note.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 23f7ed1889d..04f0c1c9a1e 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -443,7 +443,12 @@ def make_sales_invoice(source_name, target_doc=None): def get_pending_qty(item_row): pending_qty = item_row.qty - invoiced_qty_map.get(item_row.name, 0) - returned_qty = flt(returned_qty_map.get(item_row.item_code, 0)) + + returned_qty = 0 + if returned_qty_map.get(item_row.item_code) > 0: + returned_qty = flt(returned_qty_map.get(item_row.item_code, 0)) + returned_qty_map[item_row.item_code] -= pending_qty + if returned_qty: if returned_qty >= pending_qty: pending_qty = 0 @@ -451,6 +456,7 @@ def make_sales_invoice(source_name, target_doc=None): else: pending_qty -= returned_qty returned_qty = 0 + return pending_qty, returned_qty doc = get_mapped_doc("Delivery Note", source_name, { From e2ddc82637d433ab03ced7e9ce8cc756437e2d20 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Wed, 26 Jun 2019 16:13:52 +0550 Subject: [PATCH 4/6] bumped to version 11.1.40 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a06efa0ff75..8c18da086ec 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.39' +__version__ = '11.1.40' def get_default_company(user=None): '''Get default company for user''' From beca677276e0b5b143cd6d1d08efa8529663f60c Mon Sep 17 00:00:00 2001 From: karthikeyan5 Date: Wed, 26 Jun 2019 17:11:14 +0530 Subject: [PATCH 5/6] fix(item): fixing broken patch item_barcode_childtable_migrate --- erpnext/patches/v10_0/item_barcode_childtable_migrate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py index c16f3554b30..ec9c6c3b760 100644 --- a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py +++ b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py @@ -7,8 +7,9 @@ import frappe def execute(): - if frappe.get_all("Item Barcode", limit=1): return frappe.reload_doc("stock", "doctype", "item_barcode") + if frappe.get_all("Item Barcode", limit=1): return + if "barcode" not in frappe.db.get_table_columns("Item"): return items_barcode = frappe.db.sql("select name, barcode from tabItem where barcode is not null", as_dict=True) frappe.reload_doc("stock", "doctype", "item") From 23251d9e4d29e102ba3ad2c6fc983ae5c89fe9a6 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 26 Jun 2019 17:48:50 +0600 Subject: [PATCH 6/6] bumped to version 11.1.41 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 8c18da086ec..ce107235f50 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.40' +__version__ = '11.1.41' def get_default_company(user=None): '''Get default company for user'''