Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,618 Commits 3 Branches 0 Tags
Commit Graph

1701 Commits

Author SHA1 Message Date
Gursheen Anand
b3f6d991b5 fix: duplicate acc dimension in test 2023-07-19 12:02:26 +05:30
Gursheen Anand
dd37f6cbd6 fix: show tax withholding category details for customers 2023-07-19 11:51:45 +05:30
Deepesh Garg
cfae52a40a
fix: Opening balance in TB report (#36171) 2023-07-18 12:26:19 +05:30
Gursheen Anand
1e1e4b93c1 fix: divide offsetting amount for multiple dimensions 2023-07-18 12:12:24 +05:30
Gursheen Anand
4004427892 test: TB report balanced whenfiltered using acc dimension 2023-07-17 17:57:03 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30
Deepesh Garg
f0d4c4c180 Merge branch 'develop' of https://github.com/frappe/erpnext into eslint 2023-07-15 20:29:14 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
Deepesh Garg
297c7e833c
fix: Opening entries showing up incorrectly in TB report (#36135) 
* fix: Opening entries showing up incorrectly in TB report

* chore: Linting Issue
 2023-07-14 18:39:37 +05:30
Gursheen Anand
a93d7633d4 test: purchase register and ledger view 2023-07-14 17:16:39 +05:30
Gursheen Anand
b8a83f57b7 chore: fix typo 2023-07-14 16:25:58 +05:30
Gursheen Anand
0d89bfacdb fix: show additional table cols from india compliance api call 2023-07-14 13:03:22 +05:30
Gursheen Anand
c084fe6b3f refactor: filter accounting dimensions using qb 2023-07-14 11:05:50 +05:30
Gursheen Anand
944244ceff fix: modify rows and columns for ledger view 2023-07-14 10:50:12 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes (#36117) 2023-07-14 10:28:36 +05:30
Gursheen Anand
21c993a7b3 fix: clear accounting dimension value when based on field changes 2023-07-12 20:32:08 +05:30
Gursheen Anand
c973e3c746 chore: remove debugging print statements 2023-07-12 17:40:27 +05:30
Gursheen Anand
bf08aa7529 fix: filtering through accounting dimensions 2023-07-12 17:17:58 +05:30
Gursheen Anand
f5027fdcaf refactor: move fn to fetch advance taxes to utils & use qb 2023-07-12 16:42:58 +05:30
Gursheen Kaur Anand
596a14e34f
feat: add project filter in reports importing financial statements js file (#36097) 
feat: add project filter in financial statements js file
 2023-07-12 15:49:17 +05:30
Gursheen Anand
6c11ca1b75 refactor: use qb to fetch PE JV and Inv 2023-07-12 14:43:18 +05:30
Gursheen Anand
1e8b8b5b29 fix: linting issues 2023-07-12 11:14:03 +05:30
Gursheen Kaur Anand
1094319e3e
Merge branch 'develop' into purchase-sales-register-with-PE/JE 2023-07-12 11:00:35 +05:30
Gursheen Anand
dd8c3d5462 feat: filter based on accounting dimension in profitability analysis 2023-07-12 10:00:18 +05:30
HarryPaulo
2268f7db43 fix: paid_amount when the group is mode of payment 2023-07-11 11:35:37 -03:00
Gursheen Anand
7650b0073a fix: validate party filter for fetching payments 2023-07-11 15:18:28 +05:30
Gursheen Anand
d5aa0e325e feat: fetch JV with PE 2023-07-11 14:47:23 +05:30
Gursheen Anand
9c87997dae fix: fetch cost center for PE 2023-07-10 19:12:19 +05:30
Gursheen Anand
cbef6c30c3 refactor: move repeating code to common controller 2023-07-10 18:39:35 +05:30
Gursheen Anand
d7ffad1dd3 feat: fetch PE along with SI 2023-07-10 18:07:55 +05:30
Gursheen Anand
44493707e2 refactor: use single qb query for PE and PI 2023-07-10 14:37:33 +05:30
Gursheen Anand
4f0aa54c09 feat: add check for fetching PE along with Invoice details in Purchase Register 2023-07-10 13:38:30 +05:30
Deepesh Garg
4d07e20b05
fix: Opening balance in presentation currency in Trial Balance report (#36036) 2023-07-09 20:16:12 +05:30
mergify[bot]
98281341b9
fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (backport #36004) (#36005) 
* fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004)

(cherry picked from commit 937e1fb0245af291789ccd88f168d0402d9a00d8)

# Conflicts:
#	erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py

* chore: resolving conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-04 22:46:00 +05:30
Deepesh Garg
0a17c78a36
fix: Share ledger showing cancelled docs (#35993) 2023-07-04 17:49:07 +05:30
Sagar Vora
30e4052a76
feat(accounts): standardize additional columns implementation for sales/purchase reports (#36000) 2023-07-04 17:41:30 +05:30
Deepesh Garg
be5cb1aa17
Merge pull request #35943 from GursheenK/company-specific-proj-filtering 
fix: project filtering based on company in P&L Report
 2023-06-30 20:01:24 +05:30
Gursheen Anand
84d4888f5f fix: make company field mandatory in project doctype 2023-06-30 12:54:45 +05:30
Gursheen Anand
ce252a0d45 fix: show projects with no company value set 2023-06-30 12:42:19 +05:30
Gursheen Anand
904ca746a6 fix: project filtering in P&L Report 2023-06-30 12:11:23 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module (#35522) 
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
 2023-06-30 11:02:49 +05:30
Deepesh Garg
06821f9781
Merge pull request #35904 from GursheenK/voucher-wise-balance-report 
feat: add voucher-wise balance report for unequal dr/cr GL entries
 2023-06-29 09:07:45 +05:30
mergify[bot]
e832455790
perf: improve item wise register reports (backport #35908) (#35911) 
perf: improve item wise register reports (#35908)

(cherry picked from commit 33ee01174bb909ee46bb3d714d6f94fa0aefe48f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-28 10:25:03 +05:30
Gursheen Anand
6b9f9f9b0e fix: remove debug flag from sql 2023-06-27 21:59:35 +05:30
Gursheen Anand
5d726ef037 feat: add voucher-wise balance report logic 2023-06-27 16:49:28 +05:30
Deepesh Garg
df035f6b19
Merge branch 'develop' into Provision-to-send-Accounts-Receivable-Reports 2023-06-23 15:58:38 +05:30
Gursheen Anand
555c126eb9 fix: add patch for setting default value of report field 2023-06-23 10:52:25 +05:30
phot0n
dcfc86e3af fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report 2023-06-21 16:49:54 +05:30
Gursheen Anand
b3d565c91f feat: Provision to send Accounts Receivable Reports using Process Statement of Accounts 
Issue #35707
 2023-06-19 19:59:24 +05:30