* fix: improved the conditions for determining voucher subtypes
(cherry picked from commit 00eee16190)
* fix: patch
(cherry picked from commit d76cc21086)
# Conflicts:
# erpnext/patches.txt
* test: test voucher subtype for sales invoice
(cherry picked from commit ad6cc352f1)
* chore: resolve conflict
* fix: NoneType while updating ordered_qty in SO for removed items
(cherry picked from commit 442cdd7ce4)
* refactor: add "margin_type" and "margin_rate_or_amount" to no copy
(cherry picked from commit 70f090c1ec)
* fix: item not set in the batch quick entry form (backport #44028) (#44031)
fix: item not set in the batch quick entry form (#44028)
(cherry picked from commit 0399ccc51e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: calculate percentage received and delivered considering over-receipt and over-delivery (backport #43870) (#44030)
fix: calculate percentage received and delivered considering over-receipt and over-delivery (#43870)
(cherry picked from commit adba1168c1)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* fix: sort by ascending to get the first period closing voucher (backport #44029) (#44035)
fix: sort by ascending to get the first period closing voucher (#44029)
(cherry picked from commit 42dcdcde1a)
Co-authored-by: Venkatesh <47534423+venkat102@users.noreply.github.com>
---------
Co-authored-by: ljain112 <ljain112@gmail.com>
Co-authored-by: Smit Vora <smitvora203@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: bhaveshkumar.j <bhaveshkumar.j@sritindia.com>
Co-authored-by: Ravindu Nethmina <117300601+NethminaHiker360@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Venkatesh <47534423+venkat102@users.noreply.github.com>
fix: valuation rate for sales / purchase return for serial / batch nos (#43925)
(cherry picked from commit 01bb1612da)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: rounding issue of required qty in subcontracting order
* fix: uom issue in test case
* fix: test case
* fix: restored report tests for manufacturing
fix: added validation for UOM must be whole number (#43710)
(cherry picked from commit 4fd4a37dc9)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: allow to change the batch in the subcontracting receipt (#43584)
(cherry picked from commit fc67867a60)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This captures the case of manual modifications to the return and ensures
that by default, the correct return warehouse will be set
(cherry picked from commit fa65291e98)
* fix: multiple issues in Payment Request
* chore: minor changes
* fix: remove bug
* fix: replace `round` with `flt`
* fix: update `set_advance_payment_status()` logic
* fix: removed bug of `set_advance_payment_status`
* fix: changes as per review
* refactor: replace sql query of `matched_payment_requests` to query builder
* fix: replace `locals` with `get_doc` in set_query
* fix: changes during review
* fix: minor review changes
* fix: remove unnecessary code for setting payment entry received amount
* fix: logic for ser payment_request if PE made from transaction
* fix: Use rounded total to make Payment Request from `Sales Invoice` or `Purchase Invoice`
* refactor: enhance logic of `set_open_payment_requests_to_references`
* fix: added one optional arg `created_from_payment_request`
* fix: handle multiple allocation of PR at PE's reference
* fix: logic for PR if outstanding docs fetch
* fix: formatted Link field for `Payment Request` for PE's references
* fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field
* fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field
* chore: format `payment_entry.js` file
* style: Show preview popup of `Payment Request`
* fix: remove minor bug
* fix: add virtual field for Payment Term and Request `outstanding_amount` in PE's reference
* fix: get outstanding amount in PE's reference on realtime
* fix: move allocation of allocated_amount to server side (no change)
* fix: some minor changes to allocation
* fix: Split `Payment Request` if PE is created from PR and there are `Payment Terms`
* fix: minor logic changes
* fix: Allocation of allocated_amount if `paid_amount` is changes
* fix: improve logic of allocation
* fix: set matched payment request if unset
* fix: minor changes
* fix: Allocate single Payment Request if PE created from PR
* fix: improve code logic
* fix: Removed duplication code
* fix: proper message title
* refactor: Rename method of Allocation Amount to References
* refactor: Changing `grand_total` description based on `party_type`
* refactor: update Payment Request
* fix: Remove virtual property of payment_term_oustanding from references
* fix: fetch party account currency for creating payment request
* fix: use transaction currency as base in payment request
* fix: party amount for creating payment entry
* fix: allow for proportional amount paid by bank
* fix: Changed field order in Payment Request
* fix: Minor refactor in Payment Entry Reference table data
* test: Added test cases for allow Payment at `Partially Paid` status for PR
* test: Update partial paid status test case
* test: Update test case for same currency PR
* refactor: Wider the `msgprint` dialog for after save PE
* test: Update PR test cases
* chore: Remove dirty lines
* test: Checking `Advance Payment Status`
* fix: formatting update
* fix: Use `flt` where doing subtraction
* test: PR test case with Payment Term for same currency
* fix: remove redundant `flt`
* test: Add test cases for PR
---------
Co-authored-by: Sagar Vora <sagar@resilient.tech>
fix: last purchase rate not updated from purchase invoice (#42847)
(cherry picked from commit 5b9309cf34)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: Discount and taxes in return document should follow the reference document (#41911)
* fix: Discount and taxes in return document should follow the reference document
* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases
* fix: linter issue
(cherry picked from commit 281198456d)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
fix: inter transfer delivery note issue with batch (#42552)
(cherry picked from commit f620ef20ae)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
