feat: include payments in purchase / sales register report #36069
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #36069 +/- ##
===========================================
+ Coverage 64.20% 64.26% +0.05%
===========================================
Files 785 785
Lines 60703 60952 +249
===========================================
+ Hits 38975 39169 +194
- Misses 21728 21783 +55
|
There was a problem hiding this comment.
This can be enhanced further to show a holistic ledger view for Supplier and Customer
- Maybe rename the check to "Show Ledger View" instead of "Include Payments"
- Show opening balances on the first row
- Few columns might have to be hidden and rearranged and added as well
- A balance column should be added
- Show invoice and payment amount in separate columns (Invoice and Payments)
- Hide columns like Supplier/Customer Group, Purchase Order, Receipt, Currency, Rounded total, and Outstanding Amount which are common for a specific party - Skip the total row for this view (there is a parameter that can be passed for this)
| return query | ||
|
|
||
|
|
||
| def get_opening_row(party_type, party, from_date, company): |
There was a problem hiding this comment.
Also, check for the party in this (query), multiple parties use the same account so this will fetch balance for all parties. Also add a check for cancelled entries, should not pull any cancelled entries
| {"fieldname": "currency", "label": _("Currency"), "fieldtype": "Data", "width": 80}, | ||
| ] | ||
| else: | ||
| columns += [ |
There was a problem hiding this comment.
Convert these columns to the new format as well?
| {"fieldname": "currency", "label": _("Currency"), "fieldtype": "Data", "width": 80}, | ||
| ] | ||
| if not include_payments: | ||
| columns += [ |
There was a problem hiding this comment.
Convert to new column format?
erpnext/accounts/report/utils.py
Outdated
| return payment_entries | ||
|
|
||
|
|
||
| def get_conditions(filters, query, docs, payments=False): |
There was a problem hiding this comment.
Instead of docs, we can make this more explicit, which would be easier to read and understand. Instead of docs parameter, we can pass the doctype which would be either Sales, Purchase Invoice, or Payment or Journal entry.
child_doc can be an optional parameter and docs[2] (Sales Invoice Payment) can be hard coded since its already inside the Sales Invoice if block
erpnext/accounts/report/utils.py
Outdated
| (gle.account.isin(party_account)) | ||
| & (gle.party == party) | ||
| & (gle.posting_date < from_date) | ||
| & (gle.docstatus == 1) |
There was a problem hiding this comment.
check for field is_cancelled = 0, docstatus won't help here
|
"Opening" label is not visible in the Sales Register report. While viewing the Purchase Register report saw a mismatch in the balance column 
GST Itemised Sales and Purchase Register also affected by this |
No payment entries were fetched even though there were payments in the specified period |
GursheenK
added
backport version-14-hotfix
Added the feature to enable fetching Payment Entries & Journal Entries along with Purchase/Sales Invoice details in Purchase/Sales Register Reports.
The
Include Paymentscheckbox alters the flow in the following manner -Issue #34764
no-docs