fix: on cancellation of document cancel the serial and batch bundle (#39076)
(cherry picked from commit 6e5484ea031027de4e6a897b02bd0f2e7b8adda9)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones - Project and Cost Center
(cherry picked from commit 92bc962f60adb3967a2ef378511822d53ff2f4a8)
feat: group by Asset in Asset Depreciations and Balances report (#38923)
feat: group by asset in asset depreciations and balances report
(cherry picked from commit a9576f0cf6c7c2eb0711c3c8ffb0e1095c6da69e)
Co-authored-by: Anand Baburajan <anandbaburajan@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: work order with multi level, fetch operting cost from sub-assembly (#38992)
(cherry picked from commit 70abedc57ad2147719c23537ab9aaf348d6e9182)
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: auto fetch not working if bundle exists (backport #39002) (#39004)
fix: auto fetch not working if bundle exists (#39002)
(cherry picked from commit b5340c5ec0d418dcf764efa961f743f88b660a24)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2e919344df8cd9018b2fff6d70b49c8db6ba0d8c)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
fix: serial and batch bundle company mandatory error (backport #38994) (#38999)
fix: serial and batch bundle company mandatory error (#38994)
(cherry picked from commit 10074e9980c8f2a1473827c61c888d970da4b73a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit d2580be4fd0a08aeddbdbf9b87d99b71a45d7820)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
fix: auto fetch not working if bundle exists (#39002)
(cherry picked from commit b5340c5ec0d418dcf764efa961f743f88b660a24)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: serial and batch bundle company mandatory error (#38994)
(cherry picked from commit 10074e9980c8f2a1473827c61c888d970da4b73a)
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 (backport #38979) (#38980)
fix: not able to cancel sales invoice (#38979)
(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit f8625f3eb7e60b3985de900f7443864c7dec20e3)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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>
