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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-06-18 10:43:07 +05:30
parent f833923f2f
commit 2fabcb0c50
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -6,13 +6,8 @@ frappe.provide("erpnext.accounts.dimensions");
{% include 'erpnext/public/js/controllers/buying.js' %}; {% include 'erpnext/public/js/controllers/buying.js' %};
frappe.ui.form.on("Purchase Order", { frappe.ui.form.on("Purchase Order", {
<<<<<<< HEAD
setup: function(frm) {
=======
setup: function (frm) { setup: function (frm) {
frm.ignore_doctypes_on_cancel_all = ["Unreconcile Payment", "Unreconcile Payment Entries"]; frm.ignore_doctypes_on_cancel_all = ["Unreconcile Payment", "Unreconcile Payment Entries"];
>>>>>>> b618d685c6 (refactor: ignore unreconcile doc for PO and SO on cancel/delete)
if (frm.doc.is_old_subcontracting_flow) { if (frm.doc.is_old_subcontracting_flow) {
frm.set_query("reserve_warehouse", "supplied_items", function() { frm.set_query("reserve_warehouse", "supplied_items", function() {
return { return {

4
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -150,15 +150,11 @@ frappe.ui.form.on("Sales Order", {
frm.set_value("advance_paid", 0) frm.set_value("advance_paid", 0)
} }
<<<<<<< HEAD
frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
=======
frm.ignore_doctypes_on_cancel_all = [ frm.ignore_doctypes_on_cancel_all = [
"Purchase Order", "Purchase Order",
"Unreconcile Payment", "Unreconcile Payment",
"Unreconcile Payment Entries", "Unreconcile Payment Entries",
]; ];
>>>>>>> b618d685c6 (refactor: ignore unreconcile doc for PO and SO on cancel/delete)
}, },
delivery_date: function(frm) { delivery_date: function(frm) {