Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anuja Pawar 2021-09-09 19:37:52 +05:30 committed by GitHub
parent 8b4c57ee09
commit a58e309297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
View File

@ -219,6 +219,7 @@
}, },
{ {
"default": "1", "default": "1",
"description": "A customer must have primary contact email.",
"fieldname": "primary_mandatory", "fieldname": "primary_mandatory",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Send To Primary Contact" "label": "Send To Primary Contact"
@ -286,10 +287,11 @@
} }
], ],
"links": [], "links": [],
"modified": "2021-05-21 11:14:22.426672", "modified": "2021-09-06 21:00:45.732505",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Statement Of Accounts", "name": "Process Statement Of Accounts",
"naming_rule": "Set by user",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

30
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@ -196,7 +196,10 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
primary_email = customer.get('email_id') or '' primary_email = customer.get('email_id') or ''
billing_email = get_customer_emails(customer.name, 1, billing_and_primary=False) billing_email = get_customer_emails(customer.name, 1, billing_and_primary=False)
if billing_email == '' or (primary_email == '' and int(primary_mandatory)): if int(primary_mandatory):
if (primary_email == ''):
continue
elif (billing_email == '') and (primary_email == ''):
continue continue
customer_list.append({ customer_list.append({
@ -208,10 +211,29 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
@frappe.whitelist() @frappe.whitelist()
def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=True): def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=True):
""" 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(""" billing_email = frappe.db.sql("""
SELECT c.email_id FROM `tabContact` AS c JOIN `tabDynamic Link` AS l ON c.name=l.parent SELECT
WHERE l.link_doctype='Customer' and l.link_name=%s and c.is_billing_contact=1 email.email_id
order by c.creation desc""", customer_name) FROM
`tabContact Email` AS email
JOIN
`tabDynamic Link` AS link
ON
email.parent=link.parent
JOIN
`tabContact` AS contact
ON
contact.name=link.parent
WHERE
link.link_doctype='Customer'
and link.link_name=%s
and contact.is_billing_contact=1
ORDER BY
contact.creation desc""", customer_name)
if len(billing_email) == 0 or (billing_email[0][0] is None): if len(billing_email) == 0 or (billing_email[0][0] is None):
if billing_and_primary: if billing_and_primary: