9453 Commits

Author SHA1 Message Date
mergify[bot]
f8625f3eb7
fix: not able to cancel sales invoice (backport #38979) (#38980)
fix: not able to cancel sales invoice (#38979)

(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-28 11:21:51 +05:30
mergify[bot]
76c6b501f9
fix: use Stock Qty while getting POS Reserved Qty (backport #38962) (#38965)
fix: use `Stock Qty` while getting `POS Reserved Qty`

(cherry picked from commit 722310641700ce767cc2dd132e5ee41610d2e525)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-27 15:31:58 +05:30
mergify[bot]
f704ccbb59
fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate (backport #38942) (#38944)
* fix(ux): make PI Item rate field editable

(cherry picked from commit eb5bb9f9a99e54be71c7ae5e24235b5b44692444)

* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit cb9114442b936f03c9c975900282b3b9db62e453)

* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit b1ba2103323c8bfe066c288b4c285cf1f3c5b20b)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-26 14:45:05 +05:30
mergify[bot]
a8f3f2343d
chore: fixup broken JSON files (backport #38915) (#38917)
chore: fixup broken JSON files (#38915)

(cherry picked from commit 2dc49c834a0cab620465fafa555d239092107864)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-22 07:41:00 +05:30
mergify[bot]
308c6ffb4f
perf: Drop unused/duplicate/sub-optimal indexes (backport #38884) (#38913)
perf: Drop unused/duplicate/sub-optimal indexes (#38884)

* ci: enable more checks

* perf: Drop unused/duplicate indexes

(cherry picked from commit 787333896c3710d16b1fa72432db0fe59c74dfa8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-21 21:39:20 +05:30
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
mergify[bot]
02ceee6669
fix: not able to make inter-company po from so (backport #38826) (backport #38828) (#38833)
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>
(cherry picked from commit 32a608f94848564806d6254d11c6c0655fbcaa9a)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:31:28 +05:30
ruthra kumar
5a807af505 refactor: ignore ERR journals in Statment of Accounts
(cherry picked from commit 39ef75e2d0f18aa8d7434297be596b9223aa7910)
2023-12-18 10:26:30 +00:00
barredterra
58de9913b9 fix: groups for current accounts in German CoAs
(cherry picked from commit 259f313af75c3cbdcc1af75a8e7d2ad1a3a90c0c)
2023-12-17 18:24:07 +00:00
Deepesh Garg
7d844411fb fix(demo): Demo setup for canadian COA
(cherry picked from commit c9fd1822681420868923fd53aa1df3e3c776a4a6)
2023-12-17 08:35:53 +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
Dany Robert
77dba4834c fix(pe): show split alert only on splitting 2023-12-15 16:08:48 +01:00
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
ruthra kumar
aa5e16e681 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

(cherry picked from commit 5eeb650dfd3ab4b20f49bacefc43d98cb856c3f3)
2023-12-15 07:44:08 +00:00
Gursheen Anand
bf8a2d0e3a fix: skip jvs against bank accounts
(cherry picked from commit f7b2380ec1cbe5e58755f88ca08cb052b92e05c7)
2023-12-15 07:29:30 +00:00
ruthra kumar
b1b157aa19 refactor: handle bank transaction in foreign currency
(cherry picked from commit 74a0d6408a2082a2a039cd55547e56206e7c70bd)
2023-12-15 05:51:44 +00:00
ruthra kumar
e7e5727015 refactor: exc rate on foreign currency JE from Bank Reconciliation
(cherry picked from commit 89f484282a90516c117c31624fb2cc5eab6fb840)
2023-12-15 05:51:43 +00:00
ruthra kumar
f55b561ff9 fix: fetch exc rate of multi currency journals
(cherry picked from commit 1b3ba25220ca4ef96df5416331ee2f78376da64a)
2023-12-14 04:06:48 +00:00
ruthra kumar
965126df83
Merge pull request #38678 from frappe/mergify/bp/version-15-hotfix/pr-38673
fix: typo in unittest (backport #38673)
2023-12-12 17:35:22 +05:30
ruthra kumar
92b5c80a4a refactor: add get_list for virtual child doctypes
(cherry picked from commit 15c90551b68f5cee549a1b53e564012b394e37cb)
2023-12-12 09:12:39 +00:00
ruthra kumar
522113ba98 refactor(test): update repost settings before test case
(cherry picked from commit acb6e8e1209b7ac97e0503ad89d9f52b8a8e28d5)
2023-12-12 07:16:51 +00:00
ruthra kumar
6469526c26 refactor: increase limit and remove explicit call to start_repost
(cherry picked from commit ccff58856390aa56e1ae104a9c53712fb774b704)
2023-12-12 07:16:50 +00:00
ruthra kumar
122e6902ed refactor: remove explicit commit on repost
(cherry picked from commit a97b3db749b2850659c733d0cddebfc92fb38cb8)
2023-12-12 07:16:50 +00:00
ruthra kumar
64d93cec66 refactor(test): repost utility deletion flag test
(cherry picked from commit cc15f695b428945fa1e3d3f29a3e9cbdb46853d4)
2023-12-12 07:16:50 +00:00
Raffael Meyer
14ee13c77e fix: typo in unittest (#38673)
(cherry picked from commit 6ad298adfcac1932a7e0b37b8cab3bfdfcffd32a)
2023-12-12 04:26:54 +00:00
mergify[bot]
aa66ee64ec
fix: only highest eligible coupon applied (#38416)
fix: only highest eligible coupon applied (#38416)

* fix: application of pricing rule when coupon is used

(cherry picked from commit d34787cf6d37c479f00ac1c9bc529b544d95dab1)

Co-authored-by: sandratridz <102575830+sandratridz@users.noreply.github.com>
2023-12-07 10:34:11 +05:30
mergify[bot]
4b76cc46a1
fix: split_invoices_based_on_payment_terms (backport #37859) (#38488)
* refactor: `split_invoices_based_on_payment_terms`

- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first

(cherry picked from commit 6bd56d2d5f62814eb2f777934ed894bc5709e947)

* test: `get_outstanding_reference_documents` (triggered via UI)

(cherry picked from commit 162c0497d1db69e3af5f142459e3a875f03962af)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* fix: Alert message and make sure invoice due dates are different for effective test

- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.

(cherry picked from commit 56ac3424d22b68bbc551913133803686431d1694)

* style: Remove spaces introduced via merge conflict

(cherry picked from commit 4b4b176fcf99241bf17067989ebc850b2de24bcb)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* fix: Re-add no.of rows split in alert message

(cherry picked from commit 1fc5844025d97de150195b94070b0c4061378992)

* fix: Merge conflicts in tests

---------

Co-authored-by: marination <maricadsouza221197@gmail.com>
2023-12-06 18:01:42 +05:30
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
ruthra kumar
ee87c2a211 refactor: ingore on JE cancel as well
(cherry picked from commit 1a5d56977e158d27210a2bfeeaa9075cb7094875)
2023-12-05 06:34:14 +00:00
ruthra kumar
c83c97f466 refactor: ignore unreconcile doc on PI cancel/delete
(cherry picked from commit 4ca84eadb607263f8432698ff61c4acfd2f0363b)
2023-12-05 06:34:14 +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
ruthra kumar
b8b8c02bf9 chore: resolve conflict 2023-12-04 12:16:41 +05:30
ruthra kumar
bcbf5da905 refactor: virtual doctype methods
(cherry picked from commit 9c7b19e0b7732189c9db12e2c67b12a67fe562b3)
2023-12-04 06:31:08 +00:00
ruthra kumar
f6d481de89 refactor: convert payment reconciliation tool to virtual doctype
(cherry picked from commit 3a51a3f37ecd70c13cee558a0b882d06e812a21c)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
2023-12-04 06:31:07 +00:00
ruthra kumar
0b64daf497
Merge pull request #38540 from frappe/mergify/bp/version-15-hotfix/pr-38220
fix: exclude `invoice_doctypes` from party advance (backport #38220)
2023-12-04 11:19:03 +05:30
Dany Robert
927538f776 fix: exclude invoice_doctypes from party advance
(cherry picked from commit f34ffc20620de442b1a0c9f3d0eb4eb0ff689831)
2023-12-04 05:31:50 +00:00
ruthra kumar
246dd74ba4 fix: incorrectly treating normal payment as advance (#38437)
fix: treating normal payment as advance
(cherry picked from commit dd39da0b77f73dc9006c036b960b63404cc2c2f5)
2023-12-04 04:39:16 +00:00
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping (#38209)
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407bc04225f0bb7c144284078a314f430)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2023-12-04 09:36:52 +05:30
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
ruthra kumar
4baf7960dd fix: remove hardcoded, implicit rounding loss allowance
(cherry picked from commit 64266c4d3826e19b293f522bfb4cbbb305f817b7)
2023-12-03 11:14:26 +00:00
mergify[bot]
0a29dbe09e
fix: don't consider cancelled entries (#38401)
* fix: don't consider cancelled entries

(cherry picked from commit adfcdb3b652aa98db96b466371788f28ab8d26b7)

* refactor: get outstanding journal entry using query builder

(cherry picked from commit ff27cccff42f9f4cd54aa6071a71687d5183091a)

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2023-12-02 20:07:26 +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
mergify[bot]
c797c533ed
fix: validation error has not throw for the batch (backport #38494) (#38502)
fix: validation error has not throw for the batch (#38494)

* fix: validation error has not throw for the batch

* chore: fix test cases

(cherry picked from commit 5e9016ffab34df9609a75a7cbbaabbb37e7159d6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-01 21:46:35 +05:30