[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
index efc3eb4..46b7201 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -5,14 +5,13 @@
frappe.listview_settings['Sales Invoice'] = {
add_fields: ["customer", "customer_name", "grand_total", "outstanding_amount", "due_date", "company",
"currency"],
- filters: [["outstanding_amount", ">", "0"]],
get_indicator: function(doc) {
if(doc.outstanding_amount==0) {
- return [__("Paid"), "green", "oustanding_amount,=,0"]
+ return [__("Paid"), "green", "outstanding_amount,=,0"]
} else if (doc.outstanding_amount > 0 && doc.due_date > frappe.datetime.get_today()) {
- return [__("Unpaid"), "orange", "oustanding_amount,>,0|due_date,>,Today"]
+ return [__("Unpaid"), "orange", "outstanding_amount,>,0|due_date,>,Today"]
} else if (doc.outstanding_amount > 0 && doc.due_date <= frappe.datetime.get_today()) {
- return [__("Overdue"), "red", "oustanding_amount,>,0|due_date,<=,Today"]
+ return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<=,Today"]
}
},
right_column: "grand_total_export"
diff --git a/erpnext/patches/v5_0/update_item_name_in_bom.py b/erpnext/patches/v5_0/update_item_name_in_bom.py
index 56472f8..6b56232 100644
--- a/erpnext/patches/v5_0/update_item_name_in_bom.py
+++ b/erpnext/patches/v5_0/update_item_name_in_bom.py
@@ -7,6 +7,7 @@
frappe.reload_doc("manufacturing", "doctype", "bom")
frappe.reload_doc("manufacturing", "doctype", "bom_item")
frappe.reload_doc("manufacturing", "doctype", "bom_explosion_item")
+ frappe.reload_doc("manufacturing", "doctype", "bom_operation")
frappe.db.sql("""update `tabBOM` as bom set bom.item_name = \
( select item.item_name from `tabItem` as item where item.name = bom.item)""")
diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js
index bf10c15..001da28 100644
--- a/erpnext/public/js/transaction.js
+++ b/erpnext/public/js/transaction.js
@@ -793,8 +793,13 @@
show_item_wise_taxes: function() {
if(this.frm.fields_dict.other_charges_calculation) {
- $(this.get_item_wise_taxes_html())
- .appendTo($(this.frm.fields_dict.other_charges_calculation.wrapper).empty());
+ var html = this.get_item_wise_taxes_html();
+ if (html) {
+ this.frm.toggle_display("other_charges_calculation", true);
+ $(this.frm.fields_dict.other_charges_calculation.wrapper).html(html);
+ } else {
+ this.frm.toggle_display("other_charges_calculation", false);
+ }
}
},