From a243873ab04d24d5662d4eab8636fdcb5189a93f Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 18 Jul 2024 15:34:02 +0530 Subject: [PATCH] chore: remove stale UI code related to repost (cherry picked from commit fe46e1d0899724efdbbdd32881be62112b97c11c) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js --- .../accounts/doctype/purchase_invoice/purchase_invoice.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index c29ec5fd12f..e51bd10082e 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -59,6 +59,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. this.show_stock_ledger(); } +<<<<<<< HEAD if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) { this.frm.set_intro(__("Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update.")); this.frm.add_custom_button(__('Repost Accounting Entries'), @@ -80,6 +81,10 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. if(!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0){ if(doc.on_hold) { +======= + if (!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0) { + if (doc.on_hold) { +>>>>>>> fe46e1d089 (chore: remove stale UI code related to repost) this.frm.add_custom_button( __('Change Release Date'), function() {me.change_release_date()},