Merge pull request #23789 from marination/dialog-cleanup
chore: Get Items From Dialog cleanup (Buying)
This commit is contained in:
commit
d967ad6b5b
@ -99,6 +99,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
|
||||
target: me.frm,
|
||||
setters: {
|
||||
supplier: me.frm.doc.supplier || undefined,
|
||||
schedule_date: undefined
|
||||
},
|
||||
get_query_filters: {
|
||||
docstatus: 1,
|
||||
@ -107,16 +108,16 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
|
||||
this.frm.add_custom_button(__('Purchase Receipt'), function() {
|
||||
erpnext.utils.map_current_doc({
|
||||
method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
|
||||
source_doctype: "Purchase Receipt",
|
||||
target: me.frm,
|
||||
date_field: "posting_date",
|
||||
setters: {
|
||||
supplier: me.frm.doc.supplier || undefined,
|
||||
posting_date: undefined
|
||||
},
|
||||
get_query_filters: {
|
||||
docstatus: 1,
|
||||
@ -125,7 +126,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
|
||||
is_return: 0
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
|
||||
|
||||
|
@ -199,7 +199,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
},
|
||||
|
||||
quotation_btn: function() {
|
||||
@ -223,7 +223,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
},
|
||||
|
||||
delivery_note_btn: function() {
|
||||
@ -251,7 +251,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
|
||||
};
|
||||
}
|
||||
});
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
},
|
||||
|
||||
tc_name: function() {
|
||||
@ -812,10 +812,10 @@ frappe.ui.form.on('Sales Invoice', {
|
||||
if (cint(frm.doc.docstatus==0) && cur_frm.page.current_view_name!=="pos" && !frm.doc.is_return) {
|
||||
frm.add_custom_button(__('Healthcare Services'), function() {
|
||||
get_healthcare_services_to_invoice(frm);
|
||||
},"Get items from");
|
||||
},"Get Items From");
|
||||
frm.add_custom_button(__('Prescriptions'), function() {
|
||||
get_drugs_to_invoice(frm);
|
||||
},"Get items from");
|
||||
},"Get Items From");
|
||||
}
|
||||
}
|
||||
else {
|
||||
@ -1080,7 +1080,7 @@ var get_drugs_to_invoice = function(frm) {
|
||||
description:'Quantity will be calculated only for items which has "Nos" as UoM. You may change as required for each invoice item.',
|
||||
get_query: function(doc) {
|
||||
return {
|
||||
filters: {
|
||||
filters: {
|
||||
patient: dialog.get_value("patient"),
|
||||
company: frm.doc.company,
|
||||
docstatus: 1
|
||||
|
@ -299,7 +299,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
|
||||
if(me.values) {
|
||||
me.values.sub_con_rm_items.map((row,i) => {
|
||||
if (!row.item_code || !row.rm_item_code || !row.warehouse || !row.qty || row.qty === 0) {
|
||||
frappe.throw(__("Item Code, warehouse, quantity are required on row" + (i+1)));
|
||||
frappe.throw(__("Item Code, warehouse, quantity are required on row {0}", [i+1]));
|
||||
}
|
||||
})
|
||||
me._make_rm_stock_entry(me.dialog.fields_dict.sub_con_rm_items.grid.get_selected_children())
|
||||
@ -366,7 +366,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
|
||||
per_ordered: ["<", 99.99],
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
|
||||
this.frm.add_custom_button(__('Supplier Quotation'),
|
||||
function() {
|
||||
@ -382,7 +382,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
|
||||
status: ["!=", "Stopped"],
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
|
||||
this.frm.add_custom_button(__('Update rate as per last purchase'),
|
||||
function() {
|
||||
|
@ -217,13 +217,15 @@ erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.e
|
||||
source_doctype: "Material Request",
|
||||
target: me.frm,
|
||||
setters: {
|
||||
company: me.frm.doc.company
|
||||
schedule_date: undefined,
|
||||
status: undefined
|
||||
},
|
||||
get_query_filters: {
|
||||
material_request_type: "Purchase",
|
||||
docstatus: 1,
|
||||
status: ["!=", "Stopped"],
|
||||
per_ordered: ["<", 99.99]
|
||||
per_ordered: ["<", 99.99],
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get Items From"));
|
||||
@ -236,32 +238,40 @@ erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.e
|
||||
source_doctype: "Opportunity",
|
||||
target: me.frm,
|
||||
setters: {
|
||||
company: me.frm.doc.company
|
||||
party_name: undefined,
|
||||
opportunity_from: undefined,
|
||||
status: undefined
|
||||
},
|
||||
get_query_filters: {
|
||||
status: ["not in", ["Closed", "Lost"]],
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get Items From"));
|
||||
|
||||
// Get items from open Material Requests based on supplier
|
||||
this.frm.add_custom_button(__('Possible Supplier'), function() {
|
||||
// Create a dialog window for the user to pick their supplier
|
||||
var d = new frappe.ui.Dialog({
|
||||
var dialog = new frappe.ui.Dialog({
|
||||
title: __('Select Possible Supplier'),
|
||||
fields: [
|
||||
{fieldname: 'supplier', fieldtype:'Link', options:'Supplier', label:'Supplier', reqd:1},
|
||||
{fieldname: 'ok_button', fieldtype:'Button', label:'Get Items from Material Requests'},
|
||||
]
|
||||
});
|
||||
|
||||
// On the user clicking the ok button
|
||||
d.fields_dict.ok_button.input.onclick = function() {
|
||||
var btn = d.fields_dict.ok_button.input;
|
||||
var v = d.get_values();
|
||||
if(v) {
|
||||
$(btn).set_working();
|
||||
{
|
||||
fieldname: 'supplier',
|
||||
fieldtype:'Link',
|
||||
options:'Supplier',
|
||||
label:'Supplier',
|
||||
reqd:1,
|
||||
description: __("Get Items from Material Requests against this Supplier")
|
||||
}
|
||||
],
|
||||
primary_action_label: __("Get Items"),
|
||||
primary_action: (args) => {
|
||||
if(!args) return;
|
||||
dialog.hide();
|
||||
|
||||
erpnext.utils.map_current_doc({
|
||||
method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_item_from_material_requests_based_on_supplier",
|
||||
source_name: v.supplier,
|
||||
source_name: args.supplier,
|
||||
target: me.frm,
|
||||
setters: {
|
||||
company: me.frm.doc.company
|
||||
@ -273,11 +283,11 @@ erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.e
|
||||
per_ordered: ["<", 99.99]
|
||||
}
|
||||
});
|
||||
$(btn).done_working();
|
||||
d.hide();
|
||||
dialog.hide();
|
||||
}
|
||||
}
|
||||
d.show();
|
||||
});
|
||||
|
||||
dialog.show();
|
||||
}, __("Get Items From"));
|
||||
|
||||
// Get Suppliers
|
||||
|
@ -37,16 +37,18 @@ erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.ext
|
||||
source_doctype: "Material Request",
|
||||
target: me.frm,
|
||||
setters: {
|
||||
company: me.frm.doc.company
|
||||
schedule_date: undefined,
|
||||
status: undefined
|
||||
},
|
||||
get_query_filters: {
|
||||
material_request_type: "Purchase",
|
||||
docstatus: 1,
|
||||
status: ["!=", "Stopped"],
|
||||
per_ordered: ["<", 99.99]
|
||||
per_ordered: ["<", 99.99],
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
|
||||
this.frm.add_custom_button(__("Request for Quotation"),
|
||||
function() {
|
||||
@ -58,16 +60,16 @@ erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.ext
|
||||
source_doctype: "Request for Quotation",
|
||||
target: me.frm,
|
||||
setters: {
|
||||
company: me.frm.doc.company,
|
||||
transaction_date: null
|
||||
},
|
||||
get_query_filters: {
|
||||
supplier: me.frm.doc.supplier
|
||||
supplier: me.frm.doc.supplier,
|
||||
company: me.frm.doc.company
|
||||
},
|
||||
get_query_method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_rfq_containing_supplier"
|
||||
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -66,7 +66,7 @@ erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
});
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
} else if (this.frm.doc.docstatus === 1) {
|
||||
this.frm.add_custom_button(__('Create Maintenance Visit'), function() {
|
||||
frappe.model.open_mapped_doc({
|
||||
|
@ -62,7 +62,7 @@ erpnext.maintenance.MaintenanceVisit = frappe.ui.form.Controller.extend({
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
this.frm.add_custom_button(__('Warranty Claim'),
|
||||
function() {
|
||||
erpnext.utils.map_current_doc({
|
||||
@ -78,7 +78,7 @@ erpnext.maintenance.MaintenanceVisit = frappe.ui.form.Controller.extend({
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
this.frm.add_custom_button(__('Sales Order'),
|
||||
function() {
|
||||
erpnext.utils.map_current_doc({
|
||||
@ -94,7 +94,7 @@ erpnext.maintenance.MaintenanceVisit = frappe.ui.form.Controller.extend({
|
||||
order_type: me.frm.doc.order_type,
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
},
|
||||
});
|
||||
|
@ -276,7 +276,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
|
||||
var me = this;
|
||||
this.frm.add_custom_button(__("Product Bundle"), function() {
|
||||
erpnext.buying.get_items_from_product_bundle(me.frm);
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
},
|
||||
|
||||
shipping_address: function(){
|
||||
|
@ -116,7 +116,7 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"), "btn-default");
|
||||
}, __("Get Items From"), "btn-default");
|
||||
}
|
||||
|
||||
this.toggle_reqd_lead_customer();
|
||||
|
@ -236,7 +236,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
|
||||
status: ["!=", "Lost"]
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
|
||||
this.order_type(doc);
|
||||
|
@ -151,7 +151,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
|
||||
project: me.frm.doc.project || undefined,
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -90,7 +90,7 @@ frappe.ui.form.on('Material Request', {
|
||||
make_custom_buttons: function(frm) {
|
||||
if (frm.doc.docstatus==0) {
|
||||
frm.add_custom_button(__("Bill of Materials"),
|
||||
() => frm.events.get_items_from_bom(frm), __("Get items from"));
|
||||
() => frm.events.get_items_from_bom(frm), __("Get Items From"));
|
||||
}
|
||||
|
||||
if (frm.doc.docstatus == 1 && frm.doc.status != 'Stopped') {
|
||||
@ -147,7 +147,7 @@ frappe.ui.form.on('Material Request', {
|
||||
|
||||
if (frm.doc.docstatus===0) {
|
||||
frm.add_custom_button(__('Sales Order'), () => frm.events.get_items_from_sales_order(frm),
|
||||
__("Get items from"));
|
||||
__("Get Items From"));
|
||||
}
|
||||
|
||||
if (frm.doc.docstatus == 1 && frm.doc.status == 'Stopped') {
|
||||
@ -173,7 +173,8 @@ frappe.ui.form.on('Material Request', {
|
||||
source_doctype: "Sales Order",
|
||||
target: frm,
|
||||
setters: {
|
||||
customer: frm.doc.customer || undefined
|
||||
customer: frm.doc.customer || undefined,
|
||||
delivery_date: undefined,
|
||||
},
|
||||
get_query_filters: {
|
||||
docstatus: 1,
|
||||
@ -280,8 +281,7 @@ frappe.ui.form.on('Material Request', {
|
||||
fieldname:'default_supplier',
|
||||
fieldtype: 'Link',
|
||||
options: 'Supplier',
|
||||
description: __('Select a Supplier from the Default Suppliers of the items below. \
|
||||
On selection, a Purchase Order will be made against items belonging to the selected Supplier only.'),
|
||||
description: __('Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only.'),
|
||||
get_query: () => {
|
||||
return{
|
||||
query: "erpnext.stock.doctype.material_request.material_request.get_default_supplier_query",
|
||||
|
@ -128,6 +128,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
|
||||
target: me.frm,
|
||||
setters: {
|
||||
supplier: me.frm.doc.supplier,
|
||||
schedule_date: undefined
|
||||
},
|
||||
get_query_filters: {
|
||||
docstatus: 1,
|
||||
@ -136,7 +137,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
|
||||
company: me.frm.doc.company
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
|
||||
if(this.frm.doc.docstatus == 1 && this.frm.doc.status!="Closed") {
|
||||
|
@ -225,7 +225,7 @@ frappe.ui.form.on('Stock Entry', {
|
||||
docstatus: 1
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
|
||||
frm.add_custom_button(__('Material Request'), function() {
|
||||
erpnext.utils.map_current_doc({
|
||||
@ -240,7 +240,7 @@ frappe.ui.form.on('Stock Entry', {
|
||||
status: ["not in", ["Transferred", "Issued"]]
|
||||
}
|
||||
})
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
if (frm.doc.docstatus===0 && frm.doc.purpose == "Material Issue") {
|
||||
frm.add_custom_button(__('Expired Batches'), function() {
|
||||
@ -263,7 +263,7 @@ frappe.ui.form.on('Stock Entry', {
|
||||
}
|
||||
}
|
||||
});
|
||||
}, __("Get items from"));
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
|
||||
frm.events.show_bom_custom_button(frm);
|
||||
@ -282,7 +282,7 @@ frappe.ui.form.on('Stock Entry', {
|
||||
},
|
||||
|
||||
stock_entry_type: function(frm){
|
||||
frm.remove_custom_button('Bill of Materials', "Get items from");
|
||||
frm.remove_custom_button('Bill of Materials', "Get Items From");
|
||||
frm.events.show_bom_custom_button(frm);
|
||||
frm.trigger('add_to_transit');
|
||||
},
|
||||
@ -425,9 +425,9 @@ frappe.ui.form.on('Stock Entry', {
|
||||
show_bom_custom_button: function(frm){
|
||||
if (frm.doc.docstatus === 0 &&
|
||||
['Material Issue', 'Material Receipt', 'Material Transfer', 'Send to Subcontractor'].includes(frm.doc.purpose)) {
|
||||
frm.add_custom_button(__('Bill of Materials'), function() {
|
||||
frm.events.get_items_from_bom(frm);
|
||||
}, __("Get items from"));
|
||||
frm.add_custom_button(__('Bill of Materials'), function() {
|
||||
frm.events.get_items_from_bom(frm);
|
||||
}, __("Get Items From"));
|
||||
}
|
||||
},
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user