refactor: change sales invoice button position (#45130)

(cherry picked from commit a0f17f8e73)
This commit is contained in:
Ejaaz Khan
2025-01-07 17:17:59 +05:30
committed by Mergify
parent cac35246f1
commit f654c2d156
2 changed files with 45 additions and 42 deletions

View File

@@ -994,47 +994,51 @@ frappe.ui.form.on("Sales Invoice", {
refresh: function (frm) { refresh: function (frm) {
if (frm.doc.docstatus === 0 && !frm.doc.is_return) { if (frm.doc.docstatus === 0 && !frm.doc.is_return) {
frm.add_custom_button(__("Fetch Timesheet"), function () { frm.add_custom_button(
let d = new frappe.ui.Dialog({ __("Timesheet"),
title: __("Fetch Timesheet"), function () {
fields: [ let d = new frappe.ui.Dialog({
{ title: __("Fetch Timesheet"),
label: __("From"), fields: [
fieldname: "from_time", {
fieldtype: "Date", label: __("From"),
reqd: 1, fieldname: "from_time",
fieldtype: "Date",
reqd: 1,
},
{
fieldtype: "Column Break",
fieldname: "col_break_1",
},
{
label: __("To"),
fieldname: "to_time",
fieldtype: "Date",
reqd: 1,
},
{
label: __("Project"),
fieldname: "project",
fieldtype: "Link",
options: "Project",
default: frm.doc.project,
},
],
primary_action: function () {
const data = d.get_values();
frm.events.add_timesheet_data(frm, {
from_time: data.from_time,
to_time: data.to_time,
project: data.project,
});
d.hide();
}, },
{ primary_action_label: __("Get Timesheets"),
fieldtype: "Column Break", });
fieldname: "col_break_1", d.show();
}, },
{ __("Get Items From")
label: __("To"), );
fieldname: "to_time",
fieldtype: "Date",
reqd: 1,
},
{
label: __("Project"),
fieldname: "project",
fieldtype: "Link",
options: "Project",
default: frm.doc.project,
},
],
primary_action: function () {
const data = d.get_values();
frm.events.add_timesheet_data(frm, {
from_time: data.from_time,
to_time: data.to_time,
project: data.project,
});
d.hide();
},
primary_action_label: __("Get Timesheets"),
});
d.show();
});
} }
if (frm.doc.is_debit_note) { if (frm.doc.is_debit_note) {

View File

@@ -303,11 +303,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
const me = this; const me = this;
if (!this.frm.is_new() && this.frm.doc.docstatus === 0 && frappe.model.can_create("Quality Inspection")) { if (!this.frm.is_new() && this.frm.doc.docstatus === 0 && frappe.model.can_create("Quality Inspection") && this.frm.doc.update_stock) {
this.frm.add_custom_button(__("Quality Inspection(s)"), () => { this.frm.add_custom_button(__("Quality Inspection(s)"), () => {
me.make_quality_inspection(); me.make_quality_inspection();
}, __("Create")); }, __("Create"));
this.frm.page.set_inner_btn_group_as_primary(__('Create'));
} }
const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(this.frm.doc.doctype) const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(this.frm.doc.doctype)