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

feat: (get_items_from) filter material request item in purchase order (#27449)

Browse Source
This commit is contained in:
Saqib 2021-09-13 12:13:43 +05:30 committed by GitHub
parent d743c41b54
commit 7292f5476d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -425,7 +425,10 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
status: ["!=", "Stopped"], status: ["!=", "Stopped"],
per_ordered: ["<", 100], per_ordered: ["<", 100],
company: me.frm.doc.company company: me.frm.doc.company
} },
allow_child_item_selection: true,
child_fielname: "items",
child_columns: ["item_code", "qty"]
}) })
}, __("Get Items From")); }, __("Get Items From"));

5
erpnext/public/js/utils.js
View File

@ -709,6 +709,9 @@ erpnext.utils.map_current_doc = function(opts) {
setters: opts.setters, setters: opts.setters,
get_query: opts.get_query, get_query: opts.get_query,
add_filters_group: 1, add_filters_group: 1,
allow_child_item_selection: opts.allow_child_item_selection,
child_fieldname: opts.child_fielname,
child_columns: opts.child_columns,
action: function(selections, args) { action: function(selections, args) {
let values = selections; let values = selections;
if(values.length === 0){ if(values.length === 0){
@ -716,7 +719,7 @@ erpnext.utils.map_current_doc = function(opts) {
return; return;
} }
opts.source_name = values; opts.source_name = values;
opts.setters = args; opts.args = args;
d.dialog.hide(); d.dialog.hide();
_map(); _map();
}, },

13
erpnext/stock/doctype/material_request/material_request.py
View File

@ -6,10 +6,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json
import frappe import frappe
from frappe import _, msgprint from frappe import _, msgprint
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.utils import cstr, flt, get_link_to_form, getdate, new_line_sep, nowdate from frappe.utils import cstr, flt, get_link_to_form, getdate, new_line_sep, nowdate
from six import string_types
from erpnext.buying.utils import check_on_hold_or_closed_status, validate_for_items from erpnext.buying.utils import check_on_hold_or_closed_status, validate_for_items
from erpnext.controllers.buying_controller import BuyingController from erpnext.controllers.buying_controller import BuyingController
@ -269,7 +272,10 @@ def update_status(name, status):
material_request.update_status(status) material_request.update_status(status)
@frappe.whitelist() @frappe.whitelist()
def make_purchase_order(source_name, target_doc=None): def make_purchase_order(source_name, target_doc=None, args={}):
if isinstance(args, string_types):
args = json.loads(args)
def postprocess(source, target_doc): def postprocess(source, target_doc):
if frappe.flags.args and frappe.flags.args.default_supplier: if frappe.flags.args and frappe.flags.args.default_supplier:
@ -284,7 +290,10 @@ def make_purchase_order(source_name, target_doc=None):
set_missing_values(source, target_doc) set_missing_values(source, target_doc)
def select_item(d): def select_item(d):
return d.ordered_qty < d.stock_qty filtered_items = args.get('filtered_children', [])
child_filter = d.name in filtered_items if filtered_items else True
return d.ordered_qty < d.stock_qty and child_filter
doclist = get_mapped_doc("Material Request", source_name, { doclist = get_mapped_doc("Material Request", source_name, {
"Material Request": { "Material Request": {