Skip to content

Commit

Permalink
Merge pull request #33537 from ruthra-kumar/sales_partner_in_ar_report
Browse files Browse the repository at this point in the history
refactor: Sales Partner column in AR and AR Summary Report
  • Loading branch information
ruthra-kumar authored Jan 6, 2023
2 parents f4a1218 + ee94127 commit 51b082b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
12 changes: 10 additions & 2 deletions erpnext/accounts/report/accounts_receivable/accounts_receivable.py
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ def add_customer_filters(
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"))
)
)

Expand Down Expand Up @@ -869,10 +869,15 @@ def is_invoice(self, ple):
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:
Expand Down Expand Up @@ -973,6 +978,9 @@ def get_columns(self):
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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ def set_party_details(self, row):
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(
Expand Down Expand Up @@ -160,6 +163,10 @@ def get_columns(self):
)
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"),
Expand Down

0 comments on commit 51b082b

Please sign in to comment.