From 3e6663d47ed5ee970dd2725efa930c8ea6818486 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 5 Nov 2018 14:01:59 +0530 Subject: [PATCH 1/7] fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice (#15820) --- erpnext/stock/doctype/serial_no/serial_no.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index 3d1979dd812..e04343dc42f 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -81,9 +81,9 @@ class SerialNo(StockController): self.purchase_date = purchase_sle.posting_date self.purchase_time = purchase_sle.posting_time self.purchase_rate = purchase_sle.incoming_rate - if purchase_sle.voucher_type == "Purchase Receipt": + if purchase_sle.voucher_type in ("Purchase Receipt", "Purchase Invoice"): self.supplier, self.supplier_name = \ - frappe.db.get_value("Purchase Receipt", purchase_sle.voucher_no, + frappe.db.get_value(purchase_sle.voucher_type, purchase_sle.voucher_no, ["supplier", "supplier_name"]) # If sales return entry @@ -253,8 +253,8 @@ def has_duplicate_serial_no(sn, sle): status = False if sn.purchase_document_no: - if sle.voucher_type in ['Purchase Receipt', 'Stock Entry'] and \ - sn.delivery_document_type not in ['Purchase Receipt', 'Stock Entry']: + if sle.voucher_type in ['Purchase Receipt', 'Stock Entry', "Purchase Invoice"] and \ + sn.delivery_document_type not in ['Purchase Receipt', 'Stock Entry', "Purchase Invoice"]: status = True if status and sle.voucher_type == 'Stock Entry' and \ From 1b2ceadc93e3e8b8e4e06cdd55f2505b91de954e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 5 Nov 2018 16:04:04 +0530 Subject: [PATCH 2/7] [Fix] Asset date validation (#15887) * [Fix] Asset date validation * Update asset.py --- erpnext/assets/doctype/asset/asset.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 69977767017..a38b40bc60b 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -85,8 +85,17 @@ class Asset(AccountsController): elif not self.finance_books: frappe.throw(_("Enter depreciation details")) - if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(nowdate()): - frappe.throw(_("Available-for-use Date is entered as past date")) + if self.is_existing_asset: + return + + date = nowdate() + docname = self.purchase_receipt or self.purchase_invoice + if docname: + doctype = 'Purchase Receipt' if self.purchase_receipt else 'Purchase Invoice' + date = frappe.db.get_value(doctype, docname, 'posting_date') + + if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(date): + frappe.throw(_("Available-for-use Date should be after purchase date")) def make_depreciation_schedule(self): if self.depreciation_method != 'Manual': From 614b042ed37fa6b408b8fe059935a45abd8359e3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 6 Nov 2018 11:48:51 +0530 Subject: [PATCH 3/7] fix(encoding): Fixed encoding issue in financial statements --- erpnext/accounts/report/financial_statements.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index d030f5f706f..1d382484e91 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -1,7 +1,9 @@ +# -*- coding: utf-8 -*- + # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt - +from __future__ import unicode_literals import re from past.builtins import cmp @@ -342,7 +344,7 @@ def set_gl_entries_by_account( accounts = frappe.db.sql_list("""select name from `tabAccount` where lft >= %s and rgt <= %s""", (root_lft, root_rgt)) additional_conditions += " and account in ('{}')"\ - .format("', '".join([frappe.safe_encode(frappe.db.escape(d)) for d in accounts])) + .format("', '".join([frappe.db.escape(d) for d in accounts])) gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year, debit_in_account_currency, credit_in_account_currency, account_currency from `tabGL Entry` where company=%(company)s From 9eafe8c23e4f314ceb99bf329b0bc08f12b63184 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 6 Nov 2018 13:28:18 +0530 Subject: [PATCH 4/7] Update financial_statements.py --- erpnext/accounts/report/financial_statements.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index 1d382484e91..db733dd1e10 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -402,7 +402,6 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters): def get_cost_centers_with_children(cost_centers): if not isinstance(cost_centers, list): - cost_centers = frappe.safe_encode(cost_centers) cost_centers = [d.strip() for d in cost_centers.strip().split(',') if d] all_cost_centers = [] From a97a520aa85fdf31e0a753993d638361973841f6 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 6 Nov 2018 11:02:04 +0000 Subject: [PATCH 5/7] bumped to version 10.1.68 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 7461fda9f7d..7c307b760bc 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__ = '10.1.67' +__version__ = '10.1.68' def get_default_company(user=None): '''Get default company for user''' From 56bf39bfea43cedf58618123de774ef7053b9e60 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 6 Nov 2018 16:32:29 +0530 Subject: [PATCH 6/7] [Fix] Patch --- erpnext/patches/v11_0/update_department_lft_rgt.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/patches/v11_0/update_department_lft_rgt.py b/erpnext/patches/v11_0/update_department_lft_rgt.py index 5a8837ee2c3..b2f407b18ef 100644 --- a/erpnext/patches/v11_0/update_department_lft_rgt.py +++ b/erpnext/patches/v11_0/update_department_lft_rgt.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import frappe from frappe import _ from frappe.utils.nestedset import rebuild_tree From 675636cd031b5df8422b7e71c67090c1f496a7b5 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 6 Nov 2018 11:13:36 +0000 Subject: [PATCH 7/7] bumped to version 11.0.3-beta.19 --- erpnext/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 38738d25dd4..2005147e7bf 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.18' +staging_version = '11.0.3-beta.19' error_report_email = "support@erpnext.com"