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

9625 Commits

Author SHA1 Message Date
Raffael Meyer
68c0e188e8
fix: remove parent_field parameter from calls to rebuild_tree (#39146) 
fix: remove parent_field parameter from calls to rebuild_tree

The parent_field parameter became redundant with https://github.com/frappe/frappe/pull/24107
 2024-01-04 18:12:41 +05:30
Deepesh Garg
e2cf1ea73e
Merge pull request #39125 from ruthra-kumar/ignore_cancelled_payment_in_sales_register 
fix: ignore cancelled payments in Sales/Purchase Register
 2024-01-04 11:14:25 +05:30
Deepesh Garg
5b1571879c fix: flaky demo test case 2024-01-04 10:48:01 +05:30
ruthra kumar
0f1be03faf fix: ignore cancelled payments in Sales/Purchase Register 2024-01-03 20:57:01 +05:30
Ankush Menat
e84c9f7c51
fix(UX): dont override framework's permission check messages (#39118) 2024-01-03 20:10:19 +05:30
Ankush Menat
6401908f41
fix: Ignore UP on "allowed to transact with" (#39103) 
If a customer is allowed to transact with some company it usually
doesn't imply that customer is somehow "linked with" that company.
 2024-01-03 11:15:34 +05:30
Deepesh Garg
beee98da6d
feat: Against voucher filter in General Ledger (#39100) 2024-01-03 10:03:27 +05:30
ruthra kumar
60c33ac3e6
Merge pull request #39097 from ruthra-kumar/make_loyalty_program_editable 
refactor: flag to control loyalty point creation at invoice level
 2024-01-03 09:46:43 +05:30
ruthra kumar
1bc74bde29 refactor: flag to control loyalty point creation at invoice level 2024-01-02 17:26:39 +05:30
Rushabh Mehta
4e28b5a199 fix(minor): Rename "ERPNext Settings" to "Settings" and remove "ERPNext Integrations" workspace 2024-01-02 15:27:41 +05:30
ruthra kumar
d048644327
Merge pull request #39067 from ruthra-kumar/fix_undefined_error_in_budget_variance_report 
fix: undefined error in Budget Variance and Profitability report
 2024-01-01 17:37:07 +05:30
ruthra kumar
1a9e091d12 fix: select options should dynamically load dimensions 2024-01-01 17:32:33 +05:30
ruthra kumar
1b0d9643cd
Merge pull request #39023 from ruthra-kumar/refactor_customer_ledger_summary 
refactor(perf): replace account subquery with 'in' condition
 2024-01-01 15:42:24 +05:30
ruthra kumar
92bc962f60 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
 2024-01-01 15:30:35 +05:30
Anand Baburajan
a9576f0cf6
feat: group by Asset in Asset Depreciations and Balances report (#38923) 
feat: group by asset in asset depreciations and balances report
 2024-01-01 15:03:21 +05:30
Ankush Menat
510fdf7bf6
fix(DX): capture tracebacks with context (#39060) 2024-01-01 13:10:03 +05:30
Anand Baburajan
0346f47c1d
fix: take quantity into account when setting asset's gross purchase amt (#39056) 
fix: take quantity into account when setting asset's gross purchase amount
 2024-01-01 11:24:42 +05:30
Deepesh Garg
3f9693b31f
fix: GL values in transaction currency via JV (#38914) 2023-12-31 20:00:03 +05:30
rohitwaghchaure
0c6de4ecb2
fix: non stock uom validation for serial and batch (#39018) 
* fix: non stock uom validation for serial and batch

* test: delivery note for batch with non stock uom
 2023-12-29 16:50:01 +05:30
ruthra kumar
a517125d64 refactor(perf): replace account subquery with 'in' condition 2023-12-29 14:57:16 +05:30
Gursheen Kaur Anand
b7f283b2f0
feat: skip disabled accounts in COA (#38551) 
* feat: skip disabled accounts in coa

* fix: add parameter to other tree doctype utils
 2023-12-29 12:55:37 +05:30
rohitwaghchaure
f983e09f92
fix: purchase return without item code not working (#39014) 2023-12-29 12:06:04 +05:30
Deepesh Garg
3b4b2275de
fix: Multiple subscription fixes (#39005) 2023-12-29 08:25:38 +05:30
Deepesh Garg
bbee9b5637
fix: Opening balance in bank reconciliation tool (#38977) 2023-12-28 17:50:16 +05:30
ruthra kumar
915d864166
Merge pull request #38969 from ruthra-kumar/bug_in_p_l_report 
fix: incorrect net profit in Profit and Loss Statement
 2023-12-28 16:23:21 +05:30
ruthra kumar
8555617295 test: profit and loss report output 2023-12-28 15:56:35 +05:30
Ankush Menat
b71b0d5997
fix: remove bad defaults (#38986) 
Child tables can't have a default.
 2023-12-28 08:45:40 +00:00
rohitwaghchaure
a117ef3cb8
fix: not able to cancel sales invoice (#38979) 2023-12-28 11:14:27 +05:30
Raffael Meyer
33b631e395
Merge pull request #38805 from barredterra/remove-unused-coa 2023-12-28 00:06:50 +01:00
ruthra kumar
12560e2407
Merge pull request #38496 from ruthra-kumar/bisect_accounting_reports 
feat: utility to debug financial reports
 2023-12-27 17:54:36 +05:30
ruthra kumar
0890b414b1 chore: resolve linter issues 2023-12-27 17:31:34 +05:30
ruthra kumar
d54f8318fb fix: incorrect total when Accumulating values 2023-12-27 16:50:07 +05:30
s-aga-r
705ae7da14
Merge pull request #38962 from s-aga-r/FIX-38781 
fix: use `Stock Qty` while getting `POS Reserved Qty`
 2023-12-27 12:50:37 +05:30
s-aga-r
7223106417 fix: use Stock Qty while getting POS Reserved Qty 2023-12-27 10:32:13 +05:30
barredterra
5a5758423e Merge remote-tracking branch 'upstream/develop' into remove-unused-coa 2023-12-26 16:06:43 +01:00
s-aga-r
e560029736
Merge pull request #38942 from s-aga-r/FIX-38151-2 
fix(ux): make PR and PI Item rate field readonly based on `Maintain Same Rate`
 2023-12-26 10:20:34 +05:30
s-aga-r
cb9114442b fix(ux): make PI Item rate field readonly based on Maintain Same Rate 2023-12-25 22:29:17 +05:30
s-aga-r
eb5bb9f9a9 fix(ux): make PI Item rate field editable 2023-12-25 22:05:02 +05:30
Gursheen Kaur Anand
47f7b65058
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
 2023-12-24 16:13:31 +05:30
Ankush Menat
2dc49c834a
chore: fixup broken JSON files (#38915) 2023-12-22 07:36:27 +05:30
Ankush Menat
787333896c
perf: Drop unused/duplicate/sub-optimal indexes (#38884) 
* ci: enable more checks

* perf: Drop unused/duplicate indexes
 2023-12-21 20:09:10 +05:30
ruthra kumar
80e69210db
Merge pull request #38838 from pps190/fix-use-party-account-currency 
fix: use party account currency when party account is specified
 2023-12-20 12:29:04 +05:30
ruthra kumar
dd6c192695
Merge pull request #38797 from rtdany10/ar-credit-note-fix 
fix: wrong paid and cn amount on pos invoice
 2023-12-19 11:02:01 +05:30
Dany Robert
8772628912 test: partial payment for pos invoice 2023-12-19 10:00:51 +05:30
Devin Slauenwhite
a09241e3c7 fix(test): expect account currency when party account is specified. 2023-12-18 19:09:25 +00:00
Devin Slauenwhite
c7b961ffa2 fix: use party account currency when party account is specified 2023-12-18 18:03:53 +00:00
mergify[bot]
32a608f948
fix: not able to make inter-company po from so (backport #38826) (#38828) 
fix: not able to make inter-company po from so (#38826)

(cherry picked from commit 23042dfc3c0d02374c5710ed679731b1910f9b9a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-18 18:13:47 +05:30
ruthra kumar
b5f3013005
Merge pull request #38820 from ruthra-kumar/ignore_err_in_statements 
refactor: ignore ERR journals in Statment of Accounts
 2023-12-18 15:55:11 +05:30
ruthra kumar
39ef75e2d0 refactor: ignore ERR journals in Statment of Accounts 2023-12-18 13:39:26 +05:30
Raffael Meyer
42813d38c3
Merge pull request #38803 from barredterra/group-current-accounts 2023-12-17 19:23:01 +01:00