Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add supplier group filter in purchase register (backport #38421) (#38483)

Browse Source 
add supplier group filter in purchase register (#38421)

* add supplier group field in purchase register

* Update purchase_register.js

(cherry picked from commit e2a519464b3214b0a6594498dc86bc3af15197c3)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
This commit is contained in:
mergify[bot] 2023-12-01 11:51:09 +05:30 committed by GitHub
parent 8e57862a1c
commit 8819d6c173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -189,6 +189,7 @@
"additional_info_section", "additional_info_section",
"is_internal_supplier", "is_internal_supplier",
"represents_company", "represents_company",
"supplier_group",
"column_break_147", "column_break_147",
"inter_company_invoice_reference", "inter_company_invoice_reference",
"is_old_subcontracting_flow", "is_old_subcontracting_flow",
@ -1598,13 +1599,20 @@
"fieldtype": "Check", "fieldtype": "Check",
"label": "Use Transaction Date Exchange Rate", "label": "Use Transaction Date Exchange Rate",
"read_only": 1 "read_only": 1
},
{
"fetch_from": "supplier.supplier_group",
"fieldname": "supplier_group",
"fieldtype": "Link",
"label": "Supplier Group",
"options": "Supplier Group"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-11-03 15:47:30.319200", "modified": "2023-11-29 15:35:44.697496",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",
@ -1667,4 +1675,4 @@
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "title", "title_field": "title",
"track_changes": 1 "track_changes": 1
} }

6
erpnext/accounts/report/purchase_register/purchase_register.js
View File

@ -22,6 +22,12 @@ frappe.query_reports["Purchase Register"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Supplier" "options": "Supplier"
}, },
{
"fieldname":"supplier_group",
"label": __("Supplier Group"),
"fieldtype": "Link",
"options": "Supplier Group"
},
{ {
"fieldname":"company", "fieldname":"company",
"label": __("Company"), "label": __("Company"),

2
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@ -407,6 +407,8 @@ def get_invoices(filters, additional_query_columns):
if filters.get("supplier"): if filters.get("supplier"):
query = query.where(pi.supplier == filters.supplier) query = query.where(pi.supplier == filters.supplier)
if filters.get("supplier_group"):
query = query.where(pi.supplier_group == filters.supplier_group)
query = get_conditions(filters, query, "Purchase Invoice") query = get_conditions(filters, query, "Purchase Invoice")