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

chore: fixed conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-06-01 22:14:46 +05:30
committed by GitHub
parent 54cbc91166
commit 897722c35f
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/public/js/controllers/transaction.js
View File

@@ -2506,18 +2506,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
method: "erpnext.controllers.stock_controller.check_item_quality_inspection", method: "erpnext.controllers.stock_controller.check_item_quality_inspection",
args: { args: {
doctype: this.frm.doc.doctype, doctype: this.frm.doc.doctype,
<<<<<<< HEAD
items: this.frm.doc.items
=======
docstatus: this.frm.doc.docstatus, docstatus: this.frm.doc.docstatus,
items: this.frm.doc.items, items: this.frm.doc.items,
>>>>>>> c6a88ab1d2 (fix(stock): allow to create quality inspection after purchase/delivery)
}, },
freeze: true, freeze: true,
callback: function (r) { callback: function (r) {
<<<<<<< HEAD
r.message.forEach(item => {
=======
if (r.message.length == 0) { if (r.message.length == 0) {
let type = inspection_type === "Incoming" ? "Purchase" : "Delivery"; let type = inspection_type === "Incoming" ? "Purchase" : "Delivery";
let fieldname = let fieldname =
@@ -2536,7 +2529,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
r.message.forEach((item) => { r.message.forEach((item) => {
>>>>>>> e003fe4de0 (fix(stock): add warning message to notify the user to configure the inspection)
if (me.has_inspection_required(item)) { if (me.has_inspection_required(item)) {
let dialog_items = dialog.fields_dict.items; let dialog_items = dialog.fields_dict.items;
dialog_items.df.data.push({ dialog_items.df.data.push({