refactor: set query filters for dimensions
This commit is contained in:
parent
ff60ec85b8
commit
ad8475cb8b
@ -95,6 +95,8 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
|
|||||||
this.frm.change_custom_button_type(__('Allocate'), null, 'default');
|
this.frm.change_custom_button_type(__('Allocate'), null, 'default');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.frm.trigger("set_query_for_dimension_filters");
|
||||||
|
|
||||||
// check for any running reconciliation jobs
|
// check for any running reconciliation jobs
|
||||||
if (this.frm.doc.receivable_payable_account) {
|
if (this.frm.doc.receivable_payable_account) {
|
||||||
this.frm.call({
|
this.frm.call({
|
||||||
@ -125,6 +127,25 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
set_query_for_dimension_filters() {
|
||||||
|
frappe.call({
|
||||||
|
method: "erpnext.accounts.doctype.payment_reconciliation.payment_reconciliation.get_queries_for_dimension_filters",
|
||||||
|
args: {
|
||||||
|
company: this.frm.doc.company,
|
||||||
|
},
|
||||||
|
callback: (r) => {
|
||||||
|
if (!r.exc && r.message) {
|
||||||
|
r.message.forEach(x => {
|
||||||
|
this.frm.set_query(x.fieldname, () => {
|
||||||
|
return {
|
||||||
|
'filters': x.filters
|
||||||
|
};
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
company() {
|
company() {
|
||||||
this.frm.set_value('party', '');
|
this.frm.set_value('party', '');
|
||||||
|
|||||||
@ -813,3 +813,20 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
|
|||||||
@erpnext.allow_regional
|
@erpnext.allow_regional
|
||||||
def adjust_allocations_for_taxes(doc):
|
def adjust_allocations_for_taxes(doc):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@frappe.whitelist()
|
||||||
|
def get_queries_for_dimension_filters(company: str = None):
|
||||||
|
dimensions_with_filters = []
|
||||||
|
for d in get_dimensions()[0]:
|
||||||
|
filters = {}
|
||||||
|
meta = frappe.get_meta(d.document_type)
|
||||||
|
if meta.has_field("company") and company:
|
||||||
|
filters.update({"company": company})
|
||||||
|
|
||||||
|
if meta.is_tree:
|
||||||
|
filters.update({"is_group": 0})
|
||||||
|
|
||||||
|
dimensions_with_filters.append({"fieldname": d.fieldname, "filters": filters})
|
||||||
|
|
||||||
|
return dimensions_with_filters
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user