mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-29 14:48:26 +00:00
fix: remove territory from Purchase Person reports
Purchase Order, Purchase Invoice, and Purchase Receipt do not have a territory field (unlike their selling counterparts), causing an Unknown column SQL error. Removed territory from columns, SELECT, and filter conditions in both Commission Summary and Transaction Summary. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -41,11 +41,5 @@ frappe.query_reports["Purchase Person Commission Summary"] = {
|
|||||||
fieldtype: "Link",
|
fieldtype: "Link",
|
||||||
options: "Supplier",
|
options: "Supplier",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
fieldname: "territory",
|
|
||||||
label: __("Territory"),
|
|
||||||
fieldtype: "Link",
|
|
||||||
options: "Territory",
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ def execute(filters=None):
|
|||||||
[
|
[
|
||||||
d.name,
|
d.name,
|
||||||
d.supplier,
|
d.supplier,
|
||||||
d.territory,
|
|
||||||
d.posting_date,
|
d.posting_date,
|
||||||
d.base_net_amount,
|
d.base_net_amount,
|
||||||
d.purchase_person,
|
d.purchase_person,
|
||||||
@@ -55,13 +54,6 @@ def get_columns(filters):
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"width": 140,
|
"width": 140,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"label": _("Territory"),
|
|
||||||
"options": "Territory",
|
|
||||||
"fieldname": "territory",
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"width": 100,
|
|
||||||
},
|
|
||||||
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 100},
|
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 100},
|
||||||
{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120},
|
{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120},
|
||||||
{
|
{
|
||||||
@@ -106,7 +98,6 @@ def get_entries(filters):
|
|||||||
.select(
|
.select(
|
||||||
dt.name,
|
dt.name,
|
||||||
dt.supplier,
|
dt.supplier,
|
||||||
dt.territory,
|
|
||||||
date_field.as_("posting_date"),
|
date_field.as_("posting_date"),
|
||||||
dt.base_net_total.as_("base_net_amount"),
|
dt.base_net_total.as_("base_net_amount"),
|
||||||
pt.commission_rate,
|
pt.commission_rate,
|
||||||
@@ -133,7 +124,7 @@ def get_conditions(dt, pt, filters, date_field):
|
|||||||
elif to_dt:
|
elif to_dt:
|
||||||
conditions.append(date_field.lte(to_dt))
|
conditions.append(date_field.lte(to_dt))
|
||||||
|
|
||||||
for field in ["company", "supplier", "territory"]:
|
for field in ["company", "supplier"]:
|
||||||
if filters.get(field):
|
if filters.get(field):
|
||||||
conditions.append(dt[field].eq(filters.get(field)))
|
conditions.append(dt[field].eq(filters.get(field)))
|
||||||
|
|
||||||
|
|||||||
@@ -54,12 +54,6 @@ frappe.query_reports["Purchase Person-wise Transaction Summary"] = {
|
|||||||
fieldtype: "Link",
|
fieldtype: "Link",
|
||||||
options: "Supplier",
|
options: "Supplier",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
fieldname: "territory",
|
|
||||||
label: __("Territory"),
|
|
||||||
fieldtype: "Link",
|
|
||||||
options: "Territory",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
fieldname: "show_return_entries",
|
fieldname: "show_return_entries",
|
||||||
label: __("Show Return Entries"),
|
label: __("Show Return Entries"),
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ def execute(filters=None):
|
|||||||
[
|
[
|
||||||
d.name,
|
d.name,
|
||||||
d.supplier,
|
d.supplier,
|
||||||
d.territory,
|
|
||||||
d.warehouse,
|
d.warehouse,
|
||||||
d.posting_date,
|
d.posting_date,
|
||||||
d.item_code,
|
d.item_code,
|
||||||
@@ -77,13 +76,6 @@ def get_columns(filters):
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"width": 140,
|
"width": 140,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"label": _("Territory"),
|
|
||||||
"options": "Territory",
|
|
||||||
"fieldname": "territory",
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"width": 140,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"label": _("Warehouse"),
|
"label": _("Warehouse"),
|
||||||
"options": "Warehouse",
|
"options": "Warehouse",
|
||||||
@@ -192,7 +184,6 @@ def get_entries(filters):
|
|||||||
.select(
|
.select(
|
||||||
dt.name,
|
dt.name,
|
||||||
dt.supplier,
|
dt.supplier,
|
||||||
dt.territory,
|
|
||||||
dt[date_field].as_("posting_date"),
|
dt[date_field].as_("posting_date"),
|
||||||
dt_item.item_code,
|
dt_item.item_code,
|
||||||
pt.purchase_person,
|
pt.purchase_person,
|
||||||
@@ -215,7 +206,7 @@ def get_entries(filters):
|
|||||||
def get_conditions(dt, pt, filters, date_field):
|
def get_conditions(dt, pt, filters, date_field):
|
||||||
conditions = []
|
conditions = []
|
||||||
|
|
||||||
for field in ["company", "supplier", "territory"]:
|
for field in ["company", "supplier"]:
|
||||||
if filters.get(field):
|
if filters.get(field):
|
||||||
conditions.append(dt[field].eq(filters[field]))
|
conditions.append(dt[field].eq(filters[field]))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user