fix: do not reset the basic rate for the material receipt stock entry (#38896)
(cherry picked from commit 98bfcc4c758b61f714c53ea0f00246731a30fdaf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: allow to set rate manually for service item in BOM (backport #38880) (#38882)
fix: allow to set rate manually for service item in BOM (#38880)
(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a6ab53236e08cb57fc8a45496ee4c9ccfbc53e10)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
fix: local reference error in BOM (#38850)
fix: local reference error
(cherry picked from commit ae353398d96746e9e89640b586d1bbd6afbbce77)
Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com>
perf: use estimated rows instead of actual rows (#38830)
(cherry picked from commit 9983283f95753e7523cf30cc258df0572f88081d)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: set `fg-itm-qty` based on `qty` instead of the other way round
(cherry picked from commit a99d0a65b028b05b5c3bcb46a48a16771d00861f)
Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com>
fix: if not budget then don't validate (#38861)
(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: on closed unreserved the production plan qty (backport #38848) (#38859)
fix: on closed unreserved the production plan qty (#38848)
(cherry picked from commit 2184e8ef58379f53ef8f1d069afa26e64796b073)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 5e68b7e3a6cea0001ad1275300a019c0db9e8e13)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.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: not able to cancel SCR with Batch (backport #38817) (#38821)
* fix: not able to cancel SCR with Batch (#38817)
(cherry picked from commit fb5090fd3f23ada507fe8abc5a899f4b06e48d7e)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
* chore: fix test case
* chore: fix test case
* chore: fix test case
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 71e833c3f2323873953c3ad7ab4a9403ebbdeb0a)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
perf: index `return_against` on delivery note (#38827)
There's a multi-column index but that's useful IFF all parts of column
are part of query.
return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
(cherry picked from commit 8d79365e0ddef42e788f97c668a64c479a803617)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: serial and batch bundle return not working (#38754)
* fix: serial and batch bundle return not working
* test: added test case for delivery note return against denormalized serial no
(cherry picked from commit 0743289925d0866a16373c05cfb81825b58e35ba)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: incorrect available qty for backdated stock reco with batch (#37858)
* fix: incorrect available qty for backdated stock reco with batch
* test: added test case
(cherry picked from commit d4c0dbfacc7e99da6cba2c5d389f0a662490b0eb)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: Reset SLA on issue doesn't work (#38789)
This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.
(cherry picked from commit fa1c7b663c2e3f433190d29017eaebbe15d4c604)
Co-authored-by: Ankush Menat <ankush@frappe.io>
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error
(cherry picked from commit 5eeb650dfd3ab4b20f49bacefc43d98cb856c3f3)
