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

1782 Commits

Author SHA1 Message Date
mergify[bot]
1822325f34
feat: Period-wise closing entries for TB (#39712) 
feat: Period-wise closing entries for TB (#39712)

(cherry picked from commit 6e6c818084ee3fbbb2d44a58acb5c78c9f5b61ac)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-05 14:34:33 +05:30
ruthra kumar
72c95d31d1 refactor(test): use party with USD billing currency 
(cherry picked from commit beff566c8267104b97f7e4b80c36715e4eb91832)
 2024-02-01 10:41:39 +00:00
ruthra kumar
1ee15f65a8 test: ignore_err filter out in General Ledger 
(cherry picked from commit affca3a519c626a2c3273a82f00ee1579853b0e1)
 2024-02-01 10:41:39 +00:00
ruthra kumar
0a235584ad refactor: move ignore ERR filters from SOA to General Ledger 
(cherry picked from commit c077eda64e8b57011c42fbf7b4fe41af9ab2bc2f)
 2024-02-01 10:41:39 +00:00
mergify[bot]
a83f3106f3
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588) 
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)
 2024-01-28 13:48:55 +05:30
ruthra kumar
10488520e7 test: future payment with foreign currency 
(cherry picked from commit 7b37389115cd10aac154c292e7b34fcefd4d7ba2)
 2024-01-27 07:23:17 +00:00
ruthra kumar
9e15a3c981 refactor: do currency conversion on future amount columns 
(cherry picked from commit 0de4197c886f6dfa500c0b3f1869c13cc3807aaf)
 2024-01-27 07:23:16 +00:00
Gursheen Anand
9a0834987c fix: party field in pdf html 
(cherry picked from commit b2d9380596dd8ca134777148337ef039f10cc2ca)
 2024-01-22 09:51:29 +00:00
David Arnold
b388adcb2e fix: use most reliable section reference per report line 
(cherry picked from commit b5be17c6dfc9ab10e9eb57669f697fbb5576489c)
 2024-01-21 08:14:55 +00:00
Gursheen Kaur Anand
ddb84d9036 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622f29a83c98179c0b5048a29e61ce243)
 2024-01-20 12:29:27 +00:00
Gursheen Anand
86f3f62e00 fix: linting issue 
(cherry picked from commit 99b94af49ffd34bccb76b73c2f06187540444a44)
 2024-01-18 10:45:49 +00:00
ruthra kumar
80956b7956 fix: possible typerror in utils.js 
and remove unwanted debugging statements

(cherry picked from commit 60b26ad8b262752e7d491b3fe21b398c0928bfaf)
 2024-01-15 15:16:51 +00:00
ruthra kumar
b43f70325c fix: incorrect sql error if account name has '%' 
(cherry picked from commit 641c3de0caf3dd542a353edd78c8c18f686b8cae)
 2024-01-15 04:10:40 +00:00
ruthra kumar
04037b7e38 fix: broken dimension filters in Sales/Purchase register 
(cherry picked from commit 7b3f9386d7af54181a59c42e9e07ee3d6f54903e)
 2024-01-11 11:20:43 +00:00
ruthra kumar
16269b0730 fix: possible key error on Financial ratios report 2024-01-08 11:50:13 +05:30
ruthra kumar
9e1b443857 fix: ignore cancelled payments in Sales/Purchase Register 
(cherry picked from commit 0f1be03faf96aaf83063e28dc57a5e016944683c)
 2024-01-04 05:45:52 +00:00
Deepesh Garg
458064f8a1
feat: Against voucher filter in General Ledger (#39102) 2024-01-03 10:51:34 +05:30
ruthra kumar
21f90011bc fix: select options should dynamically load dimensions 
(cherry picked from commit 1a9e091d12f9149638f3774b9def0fa80370b59b)
 2024-01-01 12:08:10 +00:00
ruthra kumar
9fdf5c8091 fix: undefined error in Budget Variance and Profitability report 
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones -  Project and Cost Center

(cherry picked from commit 92bc962f60adb3967a2ef378511822d53ff2f4a8)
 2024-01-01 12:08:10 +00:00
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