mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 00:14:50 +00:00
chore: remove stale code from sales invoice
(cherry picked from commit f3fda9ce98)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
This commit is contained in:
@@ -49,6 +49,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
|
|||||||
|
|
||||||
this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);
|
this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);
|
||||||
|
|
||||||
|
<<<<<<< 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 needs to be reposted. Please click on 'Repost' button to update."));
|
this.frm.set_intro(__("Accounting entries for this invoice needs 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'),
|
||||||
@@ -68,6 +69,8 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
|
|||||||
}).removeClass('btn-default').addClass('btn-warning');
|
}).removeClass('btn-default').addClass('btn-warning');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> f3fda9ce98 (chore: remove stale code from sales invoice)
|
||||||
if (this.frm.doc.is_return) {
|
if (this.frm.doc.is_return) {
|
||||||
this.frm.return_print_format = "Sales Invoice Return";
|
this.frm.return_print_format = "Sales Invoice Return";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user