mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-25 04:53:01 +00:00
fix: remove territory from all Purchase Partner reports
Purchase Order, Purchase Invoice, and Purchase Receipt have no territory field. Removed it from the base query SELECT, the common filters loop, the column definitions, and the JS filter inputs in Purchase Partner Commission Summary and Transaction Summary reports. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -42,11 +42,5 @@ frappe.query_reports["Purchase Partner Commission Summary"] = {
|
||||
fieldtype: "Link",
|
||||
options: "Supplier",
|
||||
},
|
||||
{
|
||||
fieldname: "territory",
|
||||
label: __("Territory"),
|
||||
fieldtype: "Link",
|
||||
options: "Territory",
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
@@ -87,7 +87,6 @@ class PurchasePartnerSummaryReport:
|
||||
.select(
|
||||
self.dt.name,
|
||||
self.dt.supplier,
|
||||
self.dt.territory,
|
||||
Field(self.date_field, "posting_date", table=self.dt),
|
||||
self.dt.purchase_partner,
|
||||
self.dt.commission_rate,
|
||||
@@ -106,7 +105,7 @@ class PurchasePartnerSummaryReport:
|
||||
pass
|
||||
|
||||
def _apply_common_filters(self):
|
||||
for field in ["company", "supplier", "territory", "purchase_partner"]:
|
||||
for field in ["company", "supplier", "purchase_partner"]:
|
||||
if self.filters.get(field):
|
||||
self.query = self.query.where(Field(field, table=self.dt) == self.filters.get(field))
|
||||
|
||||
@@ -146,12 +145,9 @@ class PurchasePartnerSummaryReport:
|
||||
|
||||
class PurchasePartnerCommissionSummaryReport(PurchasePartnerSummaryReport):
|
||||
def prepare_columns(self):
|
||||
self.make_column(
|
||||
_(self.filters.get("doctype")), "name", "Link", options=self.filters.get("doctype")
|
||||
)
|
||||
self.make_column(_(self.filters.get("doctype")), "name", "Link", options=self.filters.get("doctype"))
|
||||
self.make_column(_("Supplier"), "supplier", "Link", options="Supplier")
|
||||
self.make_column(_("Currency"), "currency", "Data", 80, hidden=1)
|
||||
self.make_column(_("Territory"), "territory", "Link", 100, "Territory")
|
||||
self.make_column(self.date_label, "posting_date", "Date")
|
||||
self.make_column(_("Amount"), "amount", "Currency", 120, "currency")
|
||||
self.make_column(_("Purchase Partner"), "purchase_partner", "Link", options="Purchase Partner")
|
||||
|
||||
@@ -42,12 +42,6 @@ frappe.query_reports["Purchase Partner Transaction Summary"] = {
|
||||
fieldtype: "Link",
|
||||
options: "Supplier",
|
||||
},
|
||||
{
|
||||
fieldname: "territory",
|
||||
label: __("Territory"),
|
||||
fieldtype: "Link",
|
||||
options: "Territory",
|
||||
},
|
||||
{
|
||||
fieldname: "item_group",
|
||||
label: __("Item Group"),
|
||||
|
||||
@@ -19,12 +19,9 @@ def execute(filters=None):
|
||||
|
||||
class PurchasePartnerTransactionSummaryReport(PurchasePartnerSummaryReport):
|
||||
def prepare_columns(self):
|
||||
self.make_column(
|
||||
_(self.filters.get("doctype")), "name", "Link", options=self.filters.get("doctype")
|
||||
)
|
||||
self.make_column(_(self.filters.get("doctype")), "name", "Link", options=self.filters.get("doctype"))
|
||||
self.make_column(_("Supplier"), "supplier", "Link", options="Supplier")
|
||||
self.make_column(_("Currency"), "currency", "Data", 80, hidden=1)
|
||||
self.make_column(_("Territory"), "territory", "Link", 100, "Territory")
|
||||
self.make_column(self.date_label, "posting_date", "Date")
|
||||
self.make_column(_("Item Code"), "item_code", "Link", 100, "Item")
|
||||
self.make_column(_("Item Group"), "item_group", "Link", 100, "Item Group")
|
||||
|
||||
Reference in New Issue
Block a user