Skip to content
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

Jump to bottom

feat: include payments in purchase / sales register report #36069

Merged
merged 27 commits into from
Jul 27, 2023
Merged

feat: include payments in purchase / sales register report #36069

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4f0aa54
feat: add check for fetching PE along with Invoice details in Purchas…
GursheenK Jul 10, 2023
4449370
refactor: use single qb query for PE and PI
GursheenK Jul 10, 2023
d7ffad1
feat: fetch PE along with SI
GursheenK Jul 10, 2023
cbef6c3
refactor: move repeating code to common controller
GursheenK Jul 10, 2023
9c87997
fix: fetch cost center for PE
GursheenK Jul 10, 2023
d5aa0e3
feat: fetch JV with PE
GursheenK Jul 11, 2023
7650b00
fix: validate party filter for fetching payments
GursheenK Jul 11, 2023
1094319
Merge branch 'develop' into purchase-sales-register-with-PE/JE
GursheenK Jul 12, 2023
1e8b8b5
fix: linting issues
GursheenK Jul 12, 2023
6c11ca1
refactor: use qb to fetch PE JV and Inv
GursheenK Jul 12, 2023
f5027fd
refactor: move fn to fetch advance taxes to utils & use qb
GursheenK Jul 12, 2023
bf08aa7
fix: filtering through accounting dimensions
GursheenK Jul 12, 2023
c973e3c
chore: remove debugging print statements
GursheenK Jul 12, 2023
944244c
fix: modify rows and columns for ledger view
GursheenK Jul 14, 2023
c084fe6
refactor: filter accounting dimensions using qb
GursheenK Jul 14, 2023
0d89bfa
fix: show additional table cols from india compliance api call
GursheenK Jul 14, 2023
b8a83f5
chore: fix typo
GursheenK Jul 14, 2023
a93d763
test: purchase register and ledger view
GursheenK Jul 14, 2023
2f7b112
fix: filter by party in opening row calculation
GursheenK Jul 19, 2023
33f8f7d
fix: exclude cancelled gl entries for opening balance
GursheenK Jul 21, 2023
1c033ce
chore: change column format for report
GursheenK Jul 21, 2023
59a2a04
fix: check gl entry status using is_cancelled
GursheenK Jul 21, 2023
db49d53
fix: running balance after sorting
GursheenK Jul 24, 2023
e6d66fe
fix: gst itemised registers for india compliance api call
GursheenK Jul 25, 2023
95c6f4d
fix: additional query cols for gst itemised registers
GursheenK Jul 25, 2023
341709a
fix: additional query cols for sales register
GursheenK Jul 25, 2023
b181813
fix: PE in sales register
GursheenK Jul 27, 2023
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
6 changes: 6 additions & 0 deletions erpnext/accounts/report/purchase_register/purchase_register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ frappe.query_reports["Purchase Register"] = {
"label": __("Item Group"),
"fieldtype": "Link",
"options": "Item Group"
},
{
"fieldname": "include_payments",
"label": __("Show Ledger View"),
"fieldtype": "Check",
"default": 0
}
]
}
Expand Down
Loading
Loading