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 : 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 fe77b9d633dcd168bef6f7c106ec1bd6d1a6591c)
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 47ee801d373058a2739c2fd42d971d624c42d5a7)
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 b09c9354fb621c4283d6ebde91f3d061ea88f7f6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: not able to import serial batch bundle using csv (#38950)
(cherry picked from commit d00f6672a8d9db1e28f9a86ff8efbedcdc95c41a)
# 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 06d6220a2aa2f7855db2c2f985d046280e26f13a)
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: reset the incoming rate on changing of the warehouse (#38925)
(cherry picked from commit 161ae1edd1ebcafd14d7a302ad1adde238e43426)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* feat: provision to update items in Stock Reservation dialog
(cherry picked from commit 9471d8fff94f84a627957c5ff2c7f8f1ed53a098)
* fix(ux): show row index and field label while selecting the Sales Order Item
(cherry picked from commit 00261094c8ce0663f953b73ae17a5e7f3f494b59)
* feat: provision to add items in Stock Reservation dialog
(cherry picked from commit 8d5045ef4caf695dbfdc087b78c8f68a79976813)
---------
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 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>
