Skip to content

fix: fix to fetch customers and billing email in PSOA (backport #27363) #46122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 1 commit into from
Closed

fix: fix to fetch customers and billing email in PSOA (backport #27363) #46122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,15 @@
}
],
"links": [],
<<<<<<< HEAD
"modified": "2022-10-17 17:47:08.662475",
=======
"modified": "2021-09-06 21:00:45.732505",
>>>>>>> a58e309297 (fix: fix to fetch customers and billing email in PSOA (#27363))
"modified_by": "Administrator",
"module": "Accounts",
"name": "Process Statement Of Accounts",
"naming_rule": "Set by user",
"owner": "Administrator",
"permissions": [
{
Expand Down
20 changes: 20 additions & 0 deletions erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,15 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
billing_email = get_customer_emails(customer.name, 1, billing_and_primary=False)

if int(primary_mandatory):
<<<<<<< HEAD
if primary_email == "":
continue
=======
if (primary_email == ''):
continue
elif (billing_email == '') and (primary_email == ''):
continue
>>>>>>> a58e309297 (fix: fix to fetch customers and billing email in PSOA (#27363))

customer_list.append(
{
Expand All @@ -257,12 +264,20 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):

@frappe.whitelist()
def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=True):
<<<<<<< HEAD
"""Returns first email from Contact Email table as a Billing email
when Is Billing Contact checked
and Primary email- email with Is Primary checked"""

billing_email = frappe.db.sql(
"""
=======
""" Returns first email from Contact Email table as a Billing email
when Is Billing Contact checked
and Primary email- email with Is Primary checked """

billing_email = frappe.db.sql("""
>>>>>>> a58e309297 (fix: fix to fetch customers and billing email in PSOA (#27363))
SELECT
email.email_id
FROM
Expand All @@ -279,6 +294,7 @@ def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=Tr
link.link_doctype='Customer'
and link.link_name=%s
and contact.is_billing_contact=1
<<<<<<< HEAD
{mcond}
ORDER BY
contact.creation desc
Expand All @@ -287,6 +303,10 @@ def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=Tr
),
customer_name,
)
=======
ORDER BY
contact.creation desc""", customer_name)
>>>>>>> a58e309297 (fix: fix to fetch customers and billing email in PSOA (#27363))

if len(billing_email) == 0 or (billing_email[0][0] is None):
if billing_and_primary:
Expand Down
Loading