schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-11-08 10:39:21 +05:30
parent e32e0bc8fa
commit 4f76ed1c68
1 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,11 @@ frappe.ui.form.on("Purchase Order", {
erpnext.queries.setup_queries(frm, "Warehouse", function() { erpnext.queries.setup_queries(frm, "Warehouse", function() {
return erpnext.queries.warehouse(frm.doc); 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) { apply_tds: function(frm) {
@@ -84,35 +89,7 @@ frappe.ui.form.on("Purchase Order", {
}); });
}, __('Create')); }, __('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", { frappe.ui.form.on("Purchase Order Item", {