nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into customer-login

Browse Source
This commit is contained in:
Anand Doshi
2013-09-03 16:42:21 +05:30
parent ddb7c8048e 4263344cd2
commit 0e23929740
134 changed files with 281 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/pos_setting/pos_setting.js
View File

@@ -70,5 +70,5 @@ cur_frm.fields_dict["expense_account"].get_query = function(doc) {
}
cur_frm.fields_dict.user.get_query = function(doc,cdt,cdn) {
return{ query:"controllers.queries.profile_query"}
return{ query:"core.doctype.profile.profile.profile_query"}
}

1
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -80,7 +80,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
source_doctype: "Delivery Note",
get_query: function() {
var filters = {
docstatus: 1,
company: cur_frm.doc.company
};
if(cur_frm.doc.customer) filters["customer"] = cur_frm.doc.customer;