mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 08:24:47 +00:00
chore: remove stale UI code related to repost
(cherry picked from commit fe46e1d089)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
This commit is contained in:
@@ -59,6 +59,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
|
|||||||
this.show_stock_ledger();
|
this.show_stock_ledger();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) {
|
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.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'),
|
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.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0){
|
||||||
if(doc.on_hold) {
|
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(
|
this.frm.add_custom_button(
|
||||||
__('Change Release Date'),
|
__('Change Release Date'),
|
||||||
function() {me.change_release_date()},
|
function() {me.change_release_date()},
|
||||||
|
|||||||
Reference in New Issue
Block a user