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

Merge branch 'version-11' into version-11-hotfix

Browse Source
This commit is contained in:
Nabin Hait
2019-12-09 18:08:05 +05:30
parent c4756e938f 0f70f20ec5
commit a8d2916e61
2 changed files with 7 additions and 1 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 frappe.utils import getdate
__version__ = '11.1.66'
__version__ = '11.1.68'
def get_default_company(user=None):
'''Get default company for user'''

6
erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
View File

@@ -27,6 +27,12 @@ frappe.ui.form.on("Purchase Receipt", {
}
});
frm.set_query("taxes_and_charges", function() {
return {
filters: {'company': frm.doc.company }
}
});
},
onload: function(frm) {
erpnext.queries.setup_queries(frm, "Warehouse", function() {