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

9921 Commits

Author SHA1 Message Date
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
David Arnold
f73685f4f6
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2023-12-20 12:47:48 +01:00
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
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
Dany Robert
5cb5e09dbb fix: wrong paid and cn amount on pos invoice 2023-12-16 04:35:43 +00:00
David Arnold
c61925598a
fix: translatable strings 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-12-15 18:24:34 +01:00
Raffael Meyer
a9a84cc7d4
Merge pull request #38742 from ljain112/fix-pur-reg 2023-12-15 15:22:19 +01:00
ruthra kumar
0cf9ff0a04
Merge pull request #38766 from ruthra-kumar/7101_only_treat_none 
fix: validation error on reconciling PE to Journals as Invoice
 2023-12-15 13:09:06 +05:30
Gursheen Anand
f7b2380ec1 fix: skip jvs against bank accounts 2023-12-15 12:30:15 +05:30
ruthra kumar
5eeb650dfd fix: validation error on reconciling PE to Journals as Invoice 
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error
 2023-12-15 11:46:12 +05:30
ljain112
f53ba178a8 fix: show bill_date and bill_no in Purchase Register 2023-12-14 12:28:32 +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
Dany Robert
a8949174c8
chore: avoid explicit escaping for precision 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-12-09 09:30:17 +05:30
Raffael Meyer
f99bb61181
Merge pull request #38591 from barredterra/de-morgan 2023-12-06 22:30:03 +01:00
sandratridz
d34787cf6d
fix: only highest eligible coupon applied (#38416) 
* fix: application of pricing rule when coupon is used
 2023-12-06 14:41:02 +05:30
barredterra
eb9ee3f79b refactor: simplify conditional logic 
Command: `sourcery review --fix --enable de-morgan .`
 2023-12-05 11:22:55 +01:00
ruthra kumar
5da3e532c9
Merge pull request #38580 from ruthra-kumar/finance_book_filter_bug_in_general_ledger 
fix: sql error while filtering on finance book in GL
 2023-12-05 14:40:34 +05:30
ruthra kumar
b1d9f3132d fix: sql error while filtering on finance book in GL 2023-12-05 14:06:15 +05:30