nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2023-10-07 15:21:50 +05:30
committed by GitHub
parent 24b1100c8f
commit 3f59518d01
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,19 +95,7 @@ def get_statement_dict(doc, get_statement_dict=False):
[res, ageing] if get_statement_dict else get_html(doc, filters, entry, col, res, ageing) [res, ageing] if get_statement_dict else get_html(doc, filters, entry, col, res, ageing)
) )
<<<<<<< HEAD
if not bool(statement_dict):
return False
elif consolidated:
result = "".join(list(statement_dict.values()))
return get_pdf(result, {"orientation": doc.orientation})
else:
for customer, statement_html in statement_dict.items():
statement_dict[customer] = get_pdf(statement_html, {"orientation": doc.orientation})
return statement_dict
=======
return statement_dict return statement_dict
>>>>>>> 67f878ff8c (refactor: separate function for statement dict)
def set_ageing(doc, entry): def set_ageing(doc, entry):