nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 04:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh
2019-05-22 22:24:17 +05:30
parent 723ed07642 9ff39e2d1b
commit ffd37769d4
2 changed files with 2 additions and 2 deletions
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__ = '11.1.32' __version__ = '11.1.33'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/public/js/controllers/transaction.js
View File

@@ -1121,7 +1121,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
return { return {
"items": this._get_item_list(item), "items": this._get_item_list(item),
"customer": me.frm.doc.customer || me.frm.doc.party_name, "customer": me.frm.doc.customer || me.frm.doc.party_name,
"quotation_to": me.doc.frm.quotation_to, "quotation_to": me.frm.doc.quotation_to,
"customer_group": me.frm.doc.customer_group, "customer_group": me.frm.doc.customer_group,
"territory": me.frm.doc.territory, "territory": me.frm.doc.territory,
"supplier": me.frm.doc.supplier, "supplier": me.frm.doc.supplier,