fix: remove bad defaults (#38986)
Child tables can't have a default.
(cherry picked from commit b71b0d5997)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix : correct logic for overlap error (#38967)
fixing overlap error logic with taking care of sequential time job cards in overlap job card list
(cherry picked from commit fe77b9d633)
Co-authored-by: VihangT <151990347+VihangT@users.noreply.github.com>
fix: incorrect qty in serial batch bundle against pick list (#38964)
(cherry picked from commit 47ee801d37)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: min order qty optional in production plan (#38956)
* fix: min order qty optional in production plan
* fix: test cases
(cherry picked from commit b09c9354fb)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: not able to import serial batch bundle using csv (#38950)
(cherry picked from commit d00f6672a8)
# Conflicts:
# erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
* chore: fixed conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: do not make serial batch bundle for zero qty (#38949)
(cherry picked from commit 06d6220a2a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(ux): make PI Item rate field editable
(cherry picked from commit eb5bb9f9a9)
* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit cb9114442b)
* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit b1ba210332)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: reset the incoming rate on changing of the warehouse (#38925)
(cherry picked from commit 161ae1edd1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* feat: provision to update items in Stock Reservation dialog
(cherry picked from commit 9471d8fff9)
* fix(ux): show row index and field label while selecting the Sales Order Item
(cherry picked from commit 00261094c8)
* feat: provision to add items in Stock Reservation dialog
(cherry picked from commit 8d5045ef4c)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: do not reset the basic rate for the material receipt stock entry (#38896)
(cherry picked from commit 98bfcc4c75)
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 c2f692a4e4)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a6ab53236e)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
fix: set `fg-itm-qty` based on `qty` instead of the other way round
(cherry picked from commit a99d0a65b0)
Co-authored-by: Gughan Ravikumar <gughanrk@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 2184e8ef58)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 5e68b7e3a6)
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 23042dfc3c)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 32a608f948)
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 fb5090fd3f)
# 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 71e833c3f2)
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 8d79365e0d)
Co-authored-by: Ankush Menat <ankush@frappe.io>
