* chore: Update user manual link (#34478)
* chore: Update user manual link (#34478)
(cherry picked from commit be723bb9d4)
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
* chore: Update version
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* chore: Update version
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
---------
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: Overallocation of 'qty' from Cr Notes to Parent Invoice
Cr Notes 'qty' are overallocated to parent invoice, when there are
mulitple instances of same item in Invoice.
(cherry picked from commit e2f19c6a14)
* refactor: Ignore linked Cr Notes in Report output
(cherry picked from commit d0715a82eb)
* test: Gross Profit report output for Cr notes
2 New test cases added.
1. Standalone Cr notes will be reported as normal Invoices
2. Cr notes against an Invoice will not overallocate qty if there are
multiple instances of same item
(cherry picked from commit cc61daeec4)
* fix: incorrect depr schedules after asset repair [v13] (#34520)
* fix: incorrect schedule after repair for WDV and DD
* chore: only fix schedules for assets with calc_depr true
* fix: incorrect schedule after repair for straight line and manual
* refactor: calc depr in asset repair and if statement (#34526)
refactor: minor asset repair of calc depr and if statement
* fix(client): Amount calculation for 0 qty debit notes (#34455)
fix(client): Amount calculation for 0 qty debit notes (#34455)
fix(client): Amount calculaton for 0 qty debit notes
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit ee6c107d58)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
* fix: german translations (#34312)
fix: german translations (#34312)
fix: some german translations
(cherry picked from commit 59c2e7ec3e)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: exchange gain/loss GL's should be removed if advance is cancelled (#34529)
* fix: report GL for invoice when advance has different exchange rate
If deferred revenue/expense is enabled for any item, don't repost.
* test: cancelling advance should remove exchange gain/loss
If there are no deferred revenue/expense cancelling advance should
cancel the exchange gain/loss booked due to different exchange rates
of payment and its linked invoice
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
fix: Total row in trail balance report (#34395)
* fix: Total row in trail balance report
* fix: Calculate total after preparing opening and closing
(cherry picked from commit c6999fc687)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Use customer name instead of name(id) in PSOA (#34412)
(cherry picked from commit fa776d2987)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Revert "fix: Default sales team not getting set" (#34376)
Revert "fix: Default sales team not getting set (#34284)"
This reverts commit 7d0199d743.
(cherry picked from commit 9a8f8e8b7d)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 42bda6e37b)
Revert "fix: Default sales team not getting set" (#34376)
Revert "fix: Default sales team not getting set (#34284)"
This reverts commit 7d0199d743.
(cherry picked from commit 9a8f8e8b7d)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
