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

6945 Commits

Author SHA1 Message Date
ruthra kumar
7ddbfa10c9
Merge pull request #39161 from ruthra-kumar/allow_sales_invoice_in_bank_reconciliation 
refactor: allow sales invoice in Bank Reconciliation tool
 2024-01-08 10:31:31 +05:30
ruthra kumar
4bd437b59d
Merge pull request #39165 from ruthra-kumar/bug_in_payment_entry_outstanding_reference 
fix: incorrect outstanding amt validation on advance as liability
 2024-01-08 10:14:15 +05:30
Raffael Meyer
07b605a287
fix: make Dr/Cr in CoA translatable (#39033) 
* fix: make Dr/Cr in CoA translatable

* fix: german translations
 2024-01-05 23:33:42 +05:30
ruthra kumar
4cc3c1b765 fix: incorrect outstanding amt validation on advance as liability 2024-01-05 20:42:38 +05:30
ruthra kumar
b69cdeb4a6 refactor: allow sales invoice in Bank Reconciliation tool 2024-01-05 16:13:49 +05:30
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
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
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
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
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
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
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
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
Deepesh Garg
55147781f3
Merge pull request #38807 from deepeshgarg007/canada_demo 
fix(demo): Demo setup for Canadian COA
 2023-12-17 14:05:07 +05:30
Deepesh Garg
c9fd182268 fix(demo): Demo setup for canadian COA 2023-12-17 13:36:58 +05:30
barredterra
4d75159247 chore: consistent naming for German CoA files 2023-12-16 21:27:38 +01:00
barredterra
baa1978128 feat: remove german CoA "SKR04 ohne Kontonummern" 
To the best of my knwoledge, this is outdated, unused and not maintained.
 2023-12-16 21:27:09 +01:00
barredterra
259f313af7 fix: groups for current accounts in German CoAs 2023-12-16 21:11:54 +01:00
Deepesh Garg
863116f1cd
Merge pull request #37232 from GursheenK/make-against-field-dynamic 
fix: make GL and JV against fields dynamic links
 2023-12-16 22:27:50 +05:30
ruthra kumar
c68ad73c6e
Merge pull request #38717 from ruthra-kumar/7101_payment_reconciiation_bug 
fix: fetch exc rate of multi currency journals on reconciliation
 2023-12-14 09:35:12 +05:30
ruthra kumar
1b3ba25220 fix: fetch exc rate of multi currency journals 2023-12-13 16:39:42 +05:30
ruthra kumar
d4ac57704c
Merge pull request #38685 from ruthra-kumar/get_list_for_virtual_child_doctypes 
refactor: add `get_list` for virtual child doctypes
 2023-12-12 14:40:43 +05:30
ruthra kumar
15c90551b6 refactor: add get_list for virtual child doctypes 2023-12-12 13:36:03 +05:30
ruthra kumar
0acd0f50c5
Merge pull request #38679 from ruthra-kumar/refactor_repost_test 
refactor(test): repost utility deletion flag test
 2023-12-12 12:43:58 +05:30
ruthra kumar
acb6e8e120 refactor(test): update repost settings before test case 2023-12-12 11:39:55 +05:30
ruthra kumar
ccff588563 refactor: increase limit and remove explicit call to start_repost 2023-12-12 11:30:33 +05:30
ruthra kumar
a97b3db749 refactor: remove explicit commit on repost 2023-12-12 10:34:51 +05:30
ruthra kumar
cc15f695b4 refactor(test): repost utility deletion flag test 2023-12-12 10:24:24 +05:30
Raffael Meyer
6ad298adfc
fix: typo in unittest (#38673) 2023-12-12 09:55:15 +05:30