[fix] Serial No query in Warranty Claim
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 4d33f81..f518e9c 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -76,10 +76,9 @@
if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length
&& !(this.frm.doc.__onload ? this.frm.doc.__onload.load_after_mapping : false)) {
this.apply_default_taxes();
- }
-
- if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"] && !this.frm.doc.is_pos) {
- this.calculate_taxes_and_totals();
+ } else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
+ && !this.frm.doc.is_pos) {
+ me.calculate_taxes_and_totals();
}
if(frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "item_code")) {
cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
@@ -102,7 +101,7 @@
me.frm.doc.name);
if(taxes_and_charges_field) {
- frappe.call({
+ return frappe.call({
method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
args: {
"master_doctype": taxes_and_charges_field.options
@@ -110,6 +109,7 @@
callback: function(r) {
if(!r.exc) {
me.frm.set_value("taxes", r.message);
+ me.calculate_taxes_and_totals();
}
}
});
@@ -362,7 +362,7 @@
},
get_exchange_rate: function(from_currency, to_currency, callback) {
- frappe.call({
+ return frappe.call({
method: "erpnext.setup.utils.get_exchange_rate",
args: {
from_currency: from_currency,
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 941a803..9e1c83e 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -51,7 +51,7 @@
var cond = [];
var filter = [
['Serial No', 'docstatus', '!=', 2],
- ['Serial No', 'status', '=', "Delivered"]
+ ['Serial No', 'warehouse', '=', ""]
];
if(doc.item_code) {
cond = ['Serial No', 'item_code', '=', doc.item_code];