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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2013-07-23 15:31:57 +05:30
parent 48a0bd3eda ed69892a0a
commit 64a9d0ccef
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
selling/doctype/sales_common/sales_common.js
View File

@@ -112,6 +112,14 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
}
});
}
if(this.frm.fields_dict.sales_team && this.frm.fields_dict.sales_team.grid.get_field("sales_person")) {
this.frm.set_query("sales_person", "sales_team", function() {
return {
filters: { is_group: "No" }
};
});
}
},
refresh: function(doc) {
@@ -189,6 +197,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
barcode: item.barcode,
warehouse: item.warehouse,
doctype: me.frm.doc.doctype,
parentfield: item.parentfield,
customer: me.frm.doc.customer,
currency: me.frm.doc.currency,
conversion_rate: me.frm.doc.conversion_rate,
@@ -287,13 +296,13 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
warehouse: function(doc, cdt, cdn) {
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && (item.warehouse || item.reserved_warehouse)) {
if(item.item_code && item.warehouse) {
this.frm.call({
method: "selling.utils.get_available_qty",
child: item,
args: {
item_code: item.item_code,
warehouse: item.warehouse || item.reserved_warehouse,
warehouse: item.warehouse,
},
});
}

18
selling/doctype/sales_order/sales_order.js
View File

@@ -97,11 +97,21 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
tc_name: function() {
this.get_terms();
},
reserved_warehouse: function(doc, cdt, cdn) {
this.warehouse(doc, cdt, cdn);
},
reserved_warehouse: function(doc, cdt, cdn) {
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && item.reserved_warehouse) {
this.frm.call({
method: "selling.utils.get_available_qty",
child: item,
args: {
item_code: item.item_code,
warehouse: item.reserved_warehouse,
},
});
}
},
make_material_request: function() {
wn.model.open_mapped_doc({
method: "selling.doctype.sales_order.sales_order.make_material_request",