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

1763 Commits

Author SHA1 Message Date
ruthra kumar
cbaa617d20 refactor(perf): replace account subquery with 'in' condition 
(cherry picked from commit a517125d64a48b61a9b2d943b3a01bfe8ae87f41)
 2024-01-01 10:13:51 +00:00
mergify[bot]
d85dad7198
feat: group by Asset in Asset Depreciations and Balances report (backport #38923) (#39066) 
feat: group by Asset in Asset Depreciations and Balances report (#38923)

feat: group by asset in asset depreciations and balances report
(cherry picked from commit a9576f0cf6c7c2eb0711c3c8ffb0e1095c6da69e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2024-01-01 15:05:04 +05:30
mergify[bot]
e5d73c780b
feat: voucher subtype for general ledger (#38822) 
* feat: voucher subtype for general ledger (#38822)

* feat: add voucher subtype column to gle

* feat: add logic to set voucher subtypes

* feat: fetch voucher subtype in ledger report

* fix: order of conditions

(cherry picked from commit 47f7b65058e860e91c58dd12da6e48bd70ae60f6)

# Conflicts:
#	erpnext/accounts/doctype/gl_entry/gl_entry.json

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-01 13:30:29 +05:30
ruthra kumar
1b399e83be
Merge pull request #38995 from ruthra-kumar/undefined_error_in_consolidated_report 
fix: undefined error in consolidated financial report
 2023-12-28 17:42:18 +05:30
ruthra kumar
49f93f9fa1 fix: undefined error in consolidated financial report 2023-12-28 17:36:00 +05:30
ruthra kumar
a3cecb892a test: profit and loss report output 
(cherry picked from commit 855561729544770d77106bc1e4e4a964884377ea)
 2023-12-28 10:54:27 +00:00
ruthra kumar
7c7c3c932f fix: incorrect total when Accumulating values 
(cherry picked from commit d54f8318fba2b60eaad4a93a811a5b569c3344dc)
 2023-12-28 10:54:27 +00:00
Devin Slauenwhite
2d9a0a8e2e fix(test): expect account currency when party account is specified. 
(cherry picked from commit a09241e3c763882a0a0e06b21ccaa0b06f60bc75)
 2023-12-20 07:05:32 +00:00
Devin Slauenwhite
32d3d4e571 fix: use party account currency when party account is specified 
(cherry picked from commit c7b961ffa27c611a1e0a45750b38f1f23b0b0c7f)
 2023-12-20 07:05:32 +00:00
ruthra kumar
88b3811c5d
Merge pull request #38839 from pps190/backport/version-15/37746 
feat: in_party_currency option for AR/AP reports (backport  #37746)
 2023-12-20 12:25:11 +05:30
Dany Robert
ffb6d65910 test: partial payment for pos invoice 
(cherry picked from commit 877262891235b21447c5b74684fb7173910427e1)
 2023-12-19 05:33:15 +00:00
Dany Robert
cff9e47162 fix: wrong paid and cn amount on pos invoice 
(cherry picked from commit 5cb5e09dbbac878906023c07423d5d8233279790)
 2023-12-19 05:33:15 +00:00
Richard Case
dc9b4de976 chore: update tests 2023-12-18 18:13:27 +00:00
Richard Case
a65bc77b02 feat: in_party_currency option for AR/AP reports 2023-12-18 18:13:15 +00:00
ruthra kumar
5a807af505 refactor: ignore ERR journals in Statment of Accounts 
(cherry picked from commit 39ef75e2d0f18aa8d7434297be596b9223aa7910)
 2023-12-18 10:26:30 +00:00
Deepesh Garg
57f7933a4b
Merge pull request #38771 from frappe/mergify/bp/version-15-hotfix/pr-38767 
fix: skip JVs against bank accounts in tax report (#38767)
 2023-12-16 22:28:55 +05:30
ljain112
4ed86dbff2 fix: show bill_date and bill_no in Purchase Register 
(cherry picked from commit f53ba178a8b0909373c378db31d01928c576ee89)
 2023-12-15 14:25:03 +00:00
Gursheen Anand
bf8a2d0e3a fix: skip jvs against bank accounts 
(cherry picked from commit f7b2380ec1cbe5e58755f88ca08cb052b92e05c7)
 2023-12-15 07:29:30 +00:00
Gursheen Kaur Anand
bfe2b923e1
Merge pull request #38572 from frappe/mergify/bp/version-15-hotfix/pr-38556 
fix(minor): financial statements period end date (backport #38556)
 2023-12-05 22:02:27 +05:30
ruthra kumar
3779943221 fix: sql error while filtering on finance book in GL 
(cherry picked from commit b1d9f3132d69df010e4f8f6e5d24b187823c2d8b)
 2023-12-05 09:11:40 +00:00
Gursheen Anand
dbdb971e10 fix: limit end date to current date 
(cherry picked from commit ab6e92aae129653f13e54728d8d3a8c88dcda6cb)
 2023-12-05 05:54:49 +00:00
mergify[bot]
0aa96f783d
fix: don't update previous doc on rate change (backport #38493) (#38524) 
* fix: don't update previous doc on rate change

(cherry picked from commit 68f5dd3e7b836c71f73cef210fcb4d72dc58e557)

* fix: `linter`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-03 23:20:53 +05:30
mergify[bot]
185b715d43
feat: add customer group filter in sales register (#38365) 
feat: add customer group filter in sales register

(cherry picked from commit 5a97fa633631a3cb7dd0f4f7305cde293fd80ce2)

Co-authored-by: Nandhinidevi123 <nandhini.devi@thirvusoft.in>
 2023-12-02 19:50:35 +05:30
Gursheen Anand
f120dc56c2 fix: show party instead of party name where naming series not set 
(cherry picked from commit b27af6b5c85a99d22060ac85b9ba37893317bfbb)
 2023-12-01 12:35:00 +00:00
mergify[bot]
8819d6c173
add supplier group filter in purchase register (backport #38421) (#38483) 
add supplier group filter in purchase register (#38421)

* add supplier group field in purchase register

* Update purchase_register.js

(cherry picked from commit e2a519464b3214b0a6594498dc86bc3af15197c3)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
 2023-12-01 11:51:09 +05:30
ruthra kumar
f44bb0df50 refactor: use flt on outstanding on AR/AP summary report 
(cherry picked from commit e4bdd3a28d7fa29b0460ad6661ff39a219c1fc5c)
 2023-11-30 10:55:51 +00:00
Gursheen Anand
573c4d2bfc chore: fix imports for renamed report 
(cherry picked from commit aee2e12f3944ae4db2dd77a31d0c544c1bacb65a)
 2023-11-28 12:53:53 +00:00
ruthra kumar
8564d58afe refactor: handle rounding loss on AR/AP reports 
(cherry picked from commit 592ce45da7659dcf4ca148f5924dbe0d783956bf)
 2023-11-27 06:22:52 +00:00
ruthra kumar
c2cb86b40a refactor: add substring logic in ar/ap report 
(cherry picked from commit a9bf906545dc7c89613c7f6211c35e62b8d7b989)
 2023-11-20 04:38:26 +00:00
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings 
(cherry picked from commit 97090ff3679104d77a031f29d4acafb8b7ac1580)
 2023-11-20 04:38:26 +00:00
ruthra kumar
c9674683d1 fix: add revaluation journal filter in Payable report 
(cherry picked from commit 134201794ace2863c02458b3e1797da816802d06)
 2023-11-17 10:01:35 +05:30
ruthra kumar
d71d5a2981 refactor: add revaluation journal checkbox in AR/AP summary reports 
(cherry picked from commit 95edd82638c5cb5aabefd871966d558f51095f94)
 2023-11-13 07:52:12 +00:00
ruthra kumar
fb71a6e787 fix: new logic for handling revaluation journals 
(cherry picked from commit 1d8fcd66e6ca6d17a274a8b18699b40a7ac93e1a)
 2023-11-10 11:18:59 +05:30
Deepesh Garg
1b103faf05
Merge pull request #38007 from frappe/mergify/bp/version-15-hotfix/pr-37828 
fix: payments irrespective of party types (backport #37828)
 2023-11-09 14:06:14 +05:30
vishal
b1714ec21d fix: minor change added to test_case 
(cherry picked from commit 30402033bc06296a32ffaf98fd28f18974be2248)
 2023-11-09 07:35:38 +00:00
vishal
848efe8047 feat(accounts_receivable): test_case added for multi-select customer group 
(cherry picked from commit de445b32f5a13d115ce3f49c190f23b1efdf6632)
 2023-11-09 07:35:38 +00:00
vishal
24be04427c fix: minor issue 
(cherry picked from commit b60c57a97dee1ab1a2b1654d4cc2d146e0141ff2)
 2023-11-09 07:35:38 +00:00
vishal
fff294fb37 feat: multi-select customer group in AR Report 
(cherry picked from commit 8903c1bc6f24c4e0187f05739887ac6f4af6a7b6)
 2023-11-09 07:35:38 +00:00
Gursheen Anand
74983910bc chore: linting issues 
(cherry picked from commit 84f0d1ff1ff231f0388033d2304d977b07411253)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
ced6d004fb refactor: move common util for fetching party types using account type 
(cherry picked from commit 4867ca353c1ba199844830eb539d9dca5455949b)
 2023-11-09 06:46:32 +00:00
mergify[bot]
b3562bdb87
fix: asset depreciation ledger (backport #37991) (#37993) 
fix: asset depreciation ledger (#37991)

* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'

(cherry picked from commit 9a171db97f67f88fad1589016afb4e808571d04c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-08 22:52:16 +05:30
ruthra kumar
fc3d303b82 fix: typo in AR report 
(cherry picked from commit 67e74d03edb5bd3190a44df811a30b2b130eeb39)
 2023-11-06 14:57:21 +00:00
ruthra kumar
796b1aa694 refactor(test): for ledger comparision report 
(cherry picked from commit 639f427d6d31c7d018033c2110c478f8e6ea8ce4)
 2023-11-03 07:23:25 +00:00
ruthra kumar
8d66848f9d refactor: better output on gl and pl comparison report 
(cherry picked from commit 539f0251d95d80055112d72e54af9571bea987dc)
 2023-11-03 07:23:25 +00:00
ruthra kumar
1e218c12a0 refactor: group only by voucher flag in AR/AP report 
(cherry picked from commit 23beb46d15a2b96601e1f20a68dee06d7e5f0c49)
 2023-11-03 07:00:57 +00:00
ruthra kumar
e9bf48df9c refactor: checkbox to toggle remarks in General Ledger 
(cherry picked from commit 8fa677b8e8c6e4e65193ad0be7c0a6d5b4f1769e)
 2023-11-01 15:50:12 +00:00
Gursheen Anand
e51e5b36e2 feat: add cols for supplier inv details 
(cherry picked from commit 6d5ccde864e373b787d781c583b85a26ed2d40e9)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
80dddb40ae chore: linting issues 
(cherry picked from commit 75441017c6629f81104409b892db56bb9c1bf1dd)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
06bb1a3208 fix: sort by section code 
(cherry picked from commit 4471ad581e1c3d220468f42170a09739a46dcc21)
 2023-11-01 08:40:19 +00:00
Gursheen Anand
aa19055899 chore: change column order 
(cherry picked from commit 7ecc0d5a04b6c8cd8b97256d8c0e4bdb12494d5d)
 2023-11-01 08:40:19 +00:00