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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-12-26 18:34:16 +05:30
commit 9e16697702
2 changed files with 2 additions and 2 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.0.0' __version__ = '10.0.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/assets/doctype/asset/asset.js
View File

@ -175,7 +175,7 @@ frappe.ui.form.on('Asset', {
"item_code": frm.doc.item_code, "item_code": frm.doc.item_code,
"company": frm.doc.company "company": frm.doc.company
}, },
method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice", method: "erpnext.assets.doctype.asset.asset.make_sales_invoice",
callback: function(r) { callback: function(r) {
var doclist = frappe.model.sync(r.message); var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name); frappe.set_route("Form", doclist[0].doctype, doclist[0].name);