refactor: Sales Partner column in AR and AR Summary Report
This commit is contained in:
parent
40769998c6
commit
ee94127974
@ -810,7 +810,7 @@ class ReceivablePayableReport(object):
|
||||
self.ple.party.isin(
|
||||
qb.from_(self.customer)
|
||||
.select(self.customer.name)
|
||||
.where(self.customer.default_sales_partner == self.filters.get("payment_terms_template"))
|
||||
.where(self.customer.default_sales_partner == self.filters.get("sales_partner"))
|
||||
)
|
||||
)
|
||||
|
||||
@ -869,10 +869,15 @@ class ReceivablePayableReport(object):
|
||||
def get_party_details(self, party):
|
||||
if not party in self.party_details:
|
||||
if self.party_type == "Customer":
|
||||
fields = ["customer_name", "territory", "customer_group", "customer_primary_contact"]
|
||||
|
||||
if self.filters.get("sales_partner"):
|
||||
fields.append("default_sales_partner")
|
||||
|
||||
self.party_details[party] = frappe.db.get_value(
|
||||
"Customer",
|
||||
party,
|
||||
["customer_name", "territory", "customer_group", "customer_primary_contact"],
|
||||
fields,
|
||||
as_dict=True,
|
||||
)
|
||||
else:
|
||||
@ -973,6 +978,9 @@ class ReceivablePayableReport(object):
|
||||
if self.filters.show_sales_person:
|
||||
self.add_column(label=_("Sales Person"), fieldname="sales_person", fieldtype="Data")
|
||||
|
||||
if self.filters.sales_partner:
|
||||
self.add_column(label=_("Sales Partner"), fieldname="default_sales_partner", fieldtype="Data")
|
||||
|
||||
if self.filters.party_type == "Supplier":
|
||||
self.add_column(
|
||||
label=_("Supplier Group"),
|
||||
|
@ -121,6 +121,9 @@ class AccountsReceivableSummary(ReceivablePayableReport):
|
||||
if row.sales_person:
|
||||
self.party_total[row.party].sales_person.append(row.sales_person)
|
||||
|
||||
if self.filters.sales_partner:
|
||||
self.party_total[row.party]["default_sales_partner"] = row.get("default_sales_partner")
|
||||
|
||||
def get_columns(self):
|
||||
self.columns = []
|
||||
self.add_column(
|
||||
@ -160,6 +163,10 @@ class AccountsReceivableSummary(ReceivablePayableReport):
|
||||
)
|
||||
if self.filters.show_sales_person:
|
||||
self.add_column(label=_("Sales Person"), fieldname="sales_person", fieldtype="Data")
|
||||
|
||||
if self.filters.sales_partner:
|
||||
self.add_column(label=_("Sales Partner"), fieldname="default_sales_partner", fieldtype="Data")
|
||||
|
||||
else:
|
||||
self.add_column(
|
||||
label=_("Supplier Group"),
|
||||
|
Loading…
x
Reference in New Issue
Block a user