From e32e0bc8fac4bae0bbec5045b1b1bc0df7a47eb0 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Mon, 31 Oct 2022 19:01:54 +0530
Subject: [PATCH] fix: Reset advance paid amount on Oreder cancel and amend

(cherry picked from commit 92f37ca111504eb3aa7092ec61db4513f24b2c61)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
---
 .../doctype/purchase_order/purchase_order.js  | 28 +++++++++++++++++++
 .../doctype/sales_order/sales_order.js        |  5 ++++
 2 files changed, 33 insertions(+)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index b6f5ff92191..1944b08e800 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -84,7 +84,35 @@ frappe.ui.form.on("Purchase Order", {
 				});
 			}, __('Create'));
 		}
+<<<<<<< HEAD
 	}
+=======
+	},
+
+	onload: function(frm) {
+		set_schedule_date(frm);
+		if (!frm.doc.transaction_date){
+			frm.set_value('transaction_date', frappe.datetime.get_today())
+		}
+
+		erpnext.queries.setup_queries(frm, "Warehouse", function() {
+			return erpnext.queries.warehouse(frm.doc);
+		});
+
+		// On cancel and amending a purchase order with advance payment, reset advance paid amount
+		if (frm.is_new()) {
+			frm.set_value("advance_paid", 0)
+		}
+	},
+
+	apply_tds: function(frm) {
+		if (!frm.doc.apply_tds) {
+			frm.set_value("tax_withholding_category", '');
+		} else {
+			frm.set_value("tax_withholding_category", frm.supplier_tds);
+		}
+	},
+>>>>>>> 92f37ca111 (fix: Reset advance paid amount on Oreder cancel and amend)
 });
 
 frappe.ui.form.on("Purchase Order Item", {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 213909b9b99..1a40725552d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -95,6 +95,11 @@ frappe.ui.form.on("Sales Order", {
 			return query;
 		});
 
+		// On cancel and amending a sales order with advance payment, reset advance paid amount
+		if (frm.is_new()) {
+			frm.set_value("advance_paid", 0)
+		}
+
 		frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
 	},