mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-06 23:10:26 +00:00
f5610e29be
* fix: improved the conditions for determining voucher subtypes (cherry picked from commit00eee16190) * fix: patch (cherry picked from commitd76cc21086) # Conflicts: # erpnext/patches.txt * test: test voucher subtype for sales invoice (cherry picked from commitad6cc352f1) * chore: resolve conflict * fix: NoneType while updating ordered_qty in SO for removed items (cherry picked from commit442cdd7ce4) * refactor: add "margin_type" and "margin_rate_or_amount" to no copy (cherry picked from commit70f090c1ec) * 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 commit0399ccc51e) 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 commitadba1168c1) 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 commit42dcdcde1a) 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>