Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh 2018-09-03 17:00:15 +05:30
commit fba985d49d
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.50' __version__ = '10.1.51'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/accounts/doctype/budget/budget.py
View File

@ -33,7 +33,7 @@ class Budget(Document):
select select
b.name, ba.account from `tabBudget` b, `tabBudget Account` ba b.name, ba.account from `tabBudget` b, `tabBudget Account` ba
where 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) """ b.fiscal_year=%s and b.name != %sand ba.account in (%s) """
% ('%s', budget_against_field, '%s', '%s', '%s', ','.join(['%s'] * len(accounts))), % ('%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) (self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts), as_dict=1)

9
erpnext/selling/sales_common.js
View File

@ -145,15 +145,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.set_gross_profit(item); 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() { commission_rate: function() {
this.calculate_commission(); this.calculate_commission();
refresh_field("total_commission"); refresh_field("total_commission");