From 12b4096e687866c1d48513bcd359034f63bf8bbd Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 31 Aug 2018 16:54:59 +0530 Subject: [PATCH 1/3] [Minor] Don't validate on cancelled budgest --- erpnext/accounts/doctype/budget/budget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py index d025583b51..da3f142f5b 100644 --- a/erpnext/accounts/doctype/budget/budget.py +++ b/erpnext/accounts/doctype/budget/budget.py @@ -33,7 +33,7 @@ class Budget(Document): select b.name, ba.account from `tabBudget` b, `tabBudget Account` ba where - ba.parent = b.name and b.company = %s and %s=%s and + ba.parent = b.name and b.docstatus < 2 and b.company = %s and %s=%s and b.fiscal_year=%s and b.name != %sand ba.account in (%s) """ % ('%s', budget_against_field, '%s', '%s', '%s', ','.join(['%s'] * len(accounts))), (self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts), as_dict=1) From bb88e964a4cc9fe9b4dc9006fe27a56d3e1f99a7 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Mon, 3 Sep 2018 13:01:12 +0530 Subject: [PATCH 2/3] Remove unnecessary code (#15296) --- erpnext/selling/sales_common.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index e062f4916f..aa5b3ba498 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -145,15 +145,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ this.set_gross_profit(item); }, - discount_amount: function(doc, cdt, cdn) { - var item = frappe.get_doc(cdt, cdn); - if(!item.price_list_rate) { - item.discount_amount = 0.0; - } else { - this.price_list_rate(doc, cdt, cdn); - } - }, - commission_rate: function() { this.calculate_commission(); refresh_field("total_commission"); From 4bd562d669d141e1c648e0c59540172dca467b96 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 3 Sep 2018 17:30:15 +0600 Subject: [PATCH 3/3] bumped to version 10.1.51 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index e977b612cf..7be524a539 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.50' +__version__ = '10.1.51' def get_default_company(user=None): '''Get default company for user'''