mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-28 17:34:47 +00:00
fix: Incorrect filters in Voucher Child Table of Land Cost Voucher DocType (#49500)
* fix: company filter in receipt_document in landed cost voucher * refactor: use strict equality
This commit is contained in:
@@ -5,31 +5,6 @@ frappe.provide("erpnext.stock");
|
|||||||
|
|
||||||
erpnext.landed_cost_taxes_and_charges.setup_triggers("Landed Cost Voucher");
|
erpnext.landed_cost_taxes_and_charges.setup_triggers("Landed Cost Voucher");
|
||||||
erpnext.stock.LandedCostVoucher = class LandedCostVoucher extends erpnext.stock.StockController {
|
erpnext.stock.LandedCostVoucher = class LandedCostVoucher extends erpnext.stock.StockController {
|
||||||
setup() {
|
|
||||||
var me = this;
|
|
||||||
this.frm.fields_dict.purchase_receipts.grid.get_field("receipt_document").get_query = function (
|
|
||||||
doc,
|
|
||||||
cdt,
|
|
||||||
cdn
|
|
||||||
) {
|
|
||||||
var d = locals[cdt][cdn];
|
|
||||||
|
|
||||||
var filters = [
|
|
||||||
[d.receipt_document_type, "docstatus", "=", "1"],
|
|
||||||
[d.receipt_document_type, "company", "=", me.frm.doc.company],
|
|
||||||
];
|
|
||||||
|
|
||||||
if (d.receipt_document_type == "Purchase Invoice") {
|
|
||||||
filters.push(["Purchase Invoice", "update_stock", "=", "1"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!me.frm.doc.company) frappe.msgprint(__("Please enter company first"));
|
|
||||||
return {
|
|
||||||
filters: filters,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
refresh() {
|
refresh() {
|
||||||
var help_content = `<br><br>
|
var help_content = `<br><br>
|
||||||
<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
|
<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
|
||||||
@@ -158,15 +133,19 @@ frappe.ui.form.on("Landed Cost Voucher", {
|
|||||||
setup_queries(frm) {
|
setup_queries(frm) {
|
||||||
frm.set_query("receipt_document", "purchase_receipts", (doc, cdt, cdn) => {
|
frm.set_query("receipt_document", "purchase_receipts", (doc, cdt, cdn) => {
|
||||||
var d = locals[cdt][cdn];
|
var d = locals[cdt][cdn];
|
||||||
if (d.receipt_document_type === "Stock Entry") {
|
var filters = [
|
||||||
return {
|
[d.receipt_document_type, "docstatus", "=", 1],
|
||||||
filters: {
|
[d.receipt_document_type, "company", "=", frm.doc.company],
|
||||||
docstatus: 1,
|
];
|
||||||
company: frm.doc.company,
|
|
||||||
purpose: ["in", ["Manufacture", "Repack"]],
|
if (d.receipt_document_type === "Purchase Invoice") {
|
||||||
},
|
filters.push(["Purchase Invoice", "update_stock", "=", 1]);
|
||||||
};
|
} else if (d.receipt_document_type === "Stock Entry") {
|
||||||
|
filters.push(["Stock Entry", "purpose", "in", ["Manufacture", "Repack"]]);
|
||||||
}
|
}
|
||||||
|
return {
|
||||||
|
filters: filters,
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
frm.set_query("vendor_invoice", "vendor_invoices", (doc, cdt, cdn) => {
|
frm.set_query("vendor_invoice", "vendor_invoices", (doc, cdt, cdn) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user