Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
(cherry picked from commit bd464197c41329ddf3cff50cd3eb876df9c6c382)
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
(cherry picked from commit 2b93be1139bcb963a89c10f261a1dd2c83f01980)
fix: Show timesheet table after fetching data from timesheet
(cherry picked from commit e1ba5878a3c61d44006dbc5f1f269e6a2542583c)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
fix: take quantity into account when setting asset's gross purchase amt (#39056)
fix: take quantity into account when setting asset's gross purchase amount
(cherry picked from commit 0346f47c1d25e1d60de21dd0dc04e8c7c0b23938)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
fix: non stock uom validation for serial and batch (#39018)
* fix: non stock uom validation for serial and batch
* test: delivery note for batch with non stock uom
(cherry picked from commit 0c6de4ecb299daf5359fcd51041942a26f94693d)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: purchase return without item code not working (#39014)
(cherry picked from commit f983e09f92c6fb179e8e8a972b1cb969b40c8fd5)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: remove bad defaults (#38986)
Child tables can't have a default.
(cherry picked from commit b71b0d599775cd445acb555f7df6f849056a7a9b)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: not able to cancel sales invoice (#38979)
(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* 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>
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>
