nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-03-29 12:16:17 +05:30
committed by GitHub
parent d1f9444be7
commit a8831351e3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,11 +297,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
let d = locals[cdt][cdn]; let d = locals[cdt][cdn];
return { return {
filters: { filters: {
<<<<<<< HEAD
docstatus: 1,
=======
docstatus: ["<", 2], docstatus: ["<", 2],
>>>>>>> 0c1a8e9c58 (fix: incorrect condition)
inspection_type: inspection_type, inspection_type: inspection_type,
reference_name: doc.name, reference_name: doc.name,
item_code: d.item_code item_code: d.item_code