nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: usage of in_list

Browse Source 
(cherry picked from commit d238751e6b)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/public/js/controllers/accounts.js
#	erpnext/public/js/controllers/buying.js
#	erpnext/public/js/controllers/transaction.js
#	erpnext/public/js/utils/sales_common.js
#	erpnext/templates/form_grid/item_grid.html
This commit is contained in:
barredterra
2024-03-19 12:03:36 +01:00
committed by Mergify
parent 93fe136386
commit 7f2a54d95b
22 changed files with 1120 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/templates/form_grid/item_grid.html
View File

@@ -17,8 +17,13 @@
title = "Warehouse",
actual_qty = (frm.doc.doctype==="Sales Order"
? doc.projected_qty : doc.actual_qty);
<<<<<<< HEAD
if(flt(frm.doc.per_delivered) < 100
&& in_list(["Sales Order Item", "Delivery Note Item"], doc.doctype)) {
=======
if(flt(frm.doc.per_delivered, 2) < 100
&& ["Sales Order Item", "Delivery Note Item"].includes(doc.doctype)) {
>>>>>>> d238751e6b (refactor: usage of in_list)
if(actual_qty != undefined) {
if(actual_qty >= doc.qty) {
var color = "green";