[frappe] PR #36069 GursheenK/purchase-sales-register-with-PE/JE
See https://github.com/frappe/erpnext/pull/36069
Date: 2023-07-27T18:06:33+00:00
- Merge pull request #36069 from GursheenK/purchase-sales-register-with-PE/JE
- fix: PE in sales register
- fix: additional query cols for sales register
- fix: additional query cols for gst itemised registers
- fix: gst itemised registers for india compliance api call
- fix: running balance after sorting
- fix: check gl entry status using is_cancelled
- chore: change column format for report
- fix: exclude cancelled gl entries for opening balance
- fix: filter by party in opening row calculation
- test: purchase register and ledger view
- chore: fix typo
- fix: show additional table cols from india compliance api call
- refactor: filter accounting dimensions using qb
- fix: modify rows and columns for ledger view
- chore: remove debugging print statements
- fix: filtering through accounting dimensions
- refactor: move fn to fetch advance taxes to utils & use qb
- refactor: use qb to fetch PE JV and Inv
- fix: linting issues
- fix: validate party filter for fetching payments
- feat: fetch JV with PE
- fix: fetch cost center for PE
- refactor: move repeating code to common controller
- feat: fetch PE along with SI
- refactor: use single qb query for PE and PI
- feat: add check for fetching PE along with Invoice details in Purchase Register
Diagnostics
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_values_for_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:24:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:26:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:55:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:56:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: 44493707e26c28b354055e0975b3bf61f45d6f5c
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_values_for_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:24:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:26:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:55:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:56:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: d7ffad1dd395a6a073f18eaa7d004cbc44d5bb19
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_values_for_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:25:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:27:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:56:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:57:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:14:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/sales_register/sales_register.py:26:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:28:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:79:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:80:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: cbef6c30c3f87f212e2dbfd0c89b2fc276404fbb
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:25:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:27:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:56:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:57:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:26:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:28:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:63:6: F821 undefined name 'get_values_for_columns'
erpnext/accounts/report/sales_register/sales_register.py:79:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:80:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/utils.py:2:1: F401 'frappe.utils.get_table_name' imported but unused
pre-commit failed for source commit: 9c87997dae1c3ebc483ae82cc70365d597b1a3c4
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:25:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:27:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:56:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:57:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:26:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:28:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:63:6: F821 undefined name 'get_values_for_columns'
erpnext/accounts/report/sales_register/sales_register.py:79:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:80:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: d5aa0e325ee868b81c65dee5545fa0ae4de4f8f3
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:30:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:32:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:61:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:62:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:31:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:33:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:69:6: F821 undefined name 'get_values_for_columns'
erpnext/accounts/report/sales_register/sales_register.py:85:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:86:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/utils.py:2:1: F401 'frappe.utils.get_table_name' imported but unused
pre-commit failed for source commit: 7650b0073a271c8f4799992a205f4da1c66e6e2e
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:30:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:34:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:63:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/purchase_register/purchase_register.py:64:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:31:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:35:41: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:71:6: F821 undefined name 'get_values_for_columns'
erpnext/accounts/report/sales_register/sales_register.py:87:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:88:15: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/utils.py:2:1: F401 'frappe.utils.get_table_name' imported but unused
pre-commit failed for source commit: 1e8b8b5b297622c3e9fcb70e58ac0c30f580048d
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:13:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:32:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:14:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/sales_register/sales_register.py:33:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:90:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:91:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: 6c11ca1b75adeceaef9f3b65205886c3e824119d
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:14:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:34:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:15:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/sales_register/sales_register.py:35:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:92:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:93:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: f5027fdcaf6051441f0803263f92d701f2a004b2
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:14:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:35:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:15:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/sales_register/sales_register.py:36:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:94:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:95:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: bf08aa7529145053d3c80a3213a255d5e8b0f44a
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/purchase_register.py:14:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/purchase_register/purchase_register.py:36:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:15:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/sales_register/sales_register.py:37:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:99:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:100:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: c973e3c746739fc5f69eb663bff9dfbe6290fbd3
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:15:1: F401 'erpnext.accounts.report.utils.get_query_columns' imported but unused
erpnext/accounts/report/sales_register/sales_register.py:37:39: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:98:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:99:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: 944244ceffdb7bde9ca3bddb0901d0b07a0a2ea5
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:114:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:115:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: c084fe6b3fa061e55b1b3bf1e6849f94364530ec
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:106:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:107:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: 0d89bfacdbff88d5072297c7578a310650df40db
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:106:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:107:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: a93d7633d47083087748d6189b5a44e302619403
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/purchase_register/test_purchase_register.py:6:1: F401 'frappe.utils.getdate' imported but unused
pre-commit failed for source commit: 1c033ce6355c16784bbb162c8f46a0e0910dbdb3
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:106:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:107:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: db49d53aafb6e50aa70f736d6cc3f8df965e02b1
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:106:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:107:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: b1818137e7f4cdc145e2d84a8247af27c93c975a
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:106:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:107:15: F821 undefined name 'additional_query_columns'
pre-commit failed for source commit: 3db6ac5ac9bf7793add28509bf67fc2e80d204d9
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/report/sales_register/sales_register.py:106:6: F821 undefined name 'additional_query_columns'
erpnext/accounts/report/sales_register/sales_register.py:107:15: F821 undefined name 'additional_query_columns'
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-36069
# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease