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>
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>
* 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>
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>
make_advance_gl_entries -> add_advance_gl_entries -> add_advance_gl_for_reference
'make_advance_gl_entries' - main method thats builds and post GL
entries for all or one specific reference based on parameters
'add_advance_gl_entries' - build GL map for all or one specific
reference. Return an array of dict.
'add_advance_gl_for_reference' - utility function to build gl
entries. returns dict.
(cherry picked from commit 5fc19dab54a2672ec131dbf97974b2bde277aa76)
with `Advance as Liability`, partial reconciliation should not post
duplicate ledger entries for same reference
(cherry picked from commit 3263f2023c0a6ceabfbdd1eeb5202843d4532b76)
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>
* fix(ux): make `basic_rate` field read-only based on purpose
(cherry picked from commit abc7d3002467946984be5b41d79024da92047dd3)
* fix(ux): make PR `rate` field read-only having PO ref
(cherry picked from commit ae294ee4702fa8e0367c07c881d632811beb67ae)
* fix(ux): make PI `rate` field read-only having PR ref
(cherry picked from commit 3d4156cc7d90522f37f4c91e4ccf4145412109a9)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
