nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Smit Vora
2025-03-04 16:43:55 +05:30
parent 2221bf1cba
commit 83dcbec86a
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
View File

@@ -66,9 +66,6 @@ frappe.query_reports["Purchase Order Analysis"] = {
width: "80", width: "80",
options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed", "Closed"], options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed", "Closed"],
get_data: function (txt) { get_data: function (txt) {
<<<<<<< HEAD
let status = ["To Bill", "To Receive", "To Receive and Bill", "Completed"];
=======
let status = [ let status = [
"To Pay", "To Pay",
"To Bill", "To Bill",
@@ -77,7 +74,6 @@ frappe.query_reports["Purchase Order Analysis"] = {
"Completed", "Completed",
"Closed", "Closed",
]; ];
>>>>>>> 3b2879d3a1 (fix(report): allow `Closed` purchase orders to be visible)
let options = []; let options = [];
for (let option of status) { for (let option of status) {
options.push({ options.push({

4
erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
View File

@@ -65,9 +65,6 @@ frappe.query_reports["Sales Order Analysis"] = {
options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed", "Closed"], options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed", "Closed"],
width: "80", width: "80",
get_data: function (txt) { get_data: function (txt) {
<<<<<<< HEAD
let status = ["To Bill", "To Deliver", "To Deliver and Bill", "Completed"];
=======
let status = [ let status = [
"To Pay", "To Pay",
"To Bill", "To Bill",
@@ -76,7 +73,6 @@ frappe.query_reports["Sales Order Analysis"] = {
"Completed", "Completed",
"Closed", "Closed",
]; ];
>>>>>>> 2394e76e7d (fix(report): allow `Closed` sales orders to be visible)
let options = []; let options = [];
for (let option of status) { for (let option of status) {
options.push({ options.push({