Merge pull request #15309 from frappe/hub-multiuser
fix: Revert skeleton in Sidebar
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 27bb8b9..45b25f6 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
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'''
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index cdbe95b..b02126f 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -35,7 +35,7 @@
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)
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 038fb44..4eb99c5 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -146,15 +146,6 @@
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");