5124 Commits

Author SHA1 Message Date
Rohit Waghchaure
8816b2740a fix: permission issue for the BIN
(cherry picked from commit 6e4d4a55cd70964d8ab8870105591abaa1b17b9e)
2024-01-16 10:22:22 +00:00
rohitwaghchaure
c548c57207
Merge pull request #39365 from frappe/mergify/bp/version-15-hotfix/pr-39359
fix: added item group in stock reco (backport #39359)
2024-01-14 11:24:00 +05:30
Rohit Waghchaure
eec6c25f9e fix: added item group in stock reco
(cherry picked from commit 116ff8241caeb98df28c91143a076dfa9e3179d6)
2024-01-14 04:58:42 +00:00
Rohit Waghchaure
bf4e514cde chore: removed extra field 2024-01-14 10:21:38 +05:30
s-aga-r
ca18853785 fix: SBB Total Qty validation for SE
(cherry picked from commit c20241fcb5d7269c08c38f51c92bf73289650708)
2024-01-12 15:30:36 +00:00
rohitwaghchaure
049864e7a2
Merge pull request #39342 from frappe/mergify/bp/version-15-hotfix/pr-38970
fix: use local attribute range in multiple item variant dialog (backport #38970)
2024-01-12 20:57:14 +05:30
Rohit Waghchaure
50fe4191d3 fix: added indexing to improve performance
(cherry picked from commit ac81323fec7287a986feaf7ba496395bf3f6a424)
2024-01-12 13:10:47 +00:00
Gursheen Anand
04c96ddc6c fix: use child table values instead of global min max
(cherry picked from commit 43fed29514c0d839312f33e1d7d490ae73d9830f)
2024-01-12 13:08:31 +00:00
rohitwaghchaure
484db65797
Merge pull request #39315 from frappe/mergify/bp/version-15-hotfix/pr-39215
fix: incorrect percentage received in purchase invoice (backport #39215)
2024-01-11 15:14:44 +05:30
Rohit Waghchaure
758b9b8a81 fix: incorrect percentage received in purchase invoice
(cherry picked from commit 8d2c78867e1d563aafa740b3dc5f8a4fae68e52f)
2024-01-11 09:21:41 +00:00
Rohit Waghchaure
7ca8e49b38 fix: circular dependency error while deleting QC
(cherry picked from commit 7cc324e31ebf533b0ffde8a2a3c4013756959d7a)
2024-01-11 09:20:42 +00:00
Nabin Hait
38c1350018
Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr-39191
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191)
2024-01-10 12:14:45 +05:30
Nabin Hait
24cfcf36e4
Merge pull request #39276 from frappe/mergify/bp/version-15-hotfix/pr-39238
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)
2024-01-10 12:14:10 +05:30
Nabin Hait
0c0be03e90
Merge pull request #39218 from frappe/mergify/bp/version-15-hotfix/pr-39214
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214)
2024-01-10 12:12:32 +05:30
Nabin Hait
87d1b0f476 fix: Ignore asset qty and status validation while cancelling LCV
(cherry picked from commit e9d36242ce3e09ee423f917eede2275bded10d6d)
2024-01-10 06:04:19 +00:00
Nabin Hait
f0070b4046 fix: Set asset purchase amount based on qty and valuation_rate
(cherry picked from commit 135e19d0aab3b1f4ae2361b327c579468d71d6d6)
2024-01-10 06:03:01 +00:00
mergify[bot]
78c65f27b0
fix: Duplicate Closing Stock Balance (backport #39262) (#39264)
fix: Duplicate Closing Stock Balance

(cherry picked from commit b15795392bdf8165e7ddfb60451353ebefa177d2)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-09 20:37:38 +05:30
Nabin Hait
50300b9be6 fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog
(cherry picked from commit c14986f9e6e617b67e97c8d25843a4dc33b77dcf)
2024-01-08 16:07:23 +00:00
mergify[bot]
672e6d6d06
fix: duplicate entry for serial / batch creation (backport #39188) (#39192)
fix: duplicate entry for serial / batch creation (#39188)

(cherry picked from commit b96c063c93532b8910b910b04750b3de367954cc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-08 14:21:04 +05:30
mergify[bot]
f3882a854f
fix: don't set rate for non-stock item in Internal Transfer (backport #39140) (#39169)
* fix: don't set rate for non-stock item in Internal Transfer

(cherry picked from commit e1b0fffd0c934d376562e3ba8707b38426ea09a1)

* test: internal transfer for non-stock item

(cherry picked from commit 57b6a987034522266caca853d4ee26316526e526)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-06 11:03:24 +05:30
mergify[bot]
82b96d3688
fix: inventory dimension negative stock validation (backport #39149) (#39151)
fix: inventory dimension negative stock validation (#39149)

(cherry picked from commit bae7c6496402466df3af15c6bffcf51b97ae2037)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-05 05:04:28 +05:30
mergify[bot]
b192ddd13b
feat: provision to close SCO (backport #39127) (#39144)
* feat: provision to close SCO

(cherry picked from commit 5e2669f4b6e8ed917cc8e882b49a4a617a854464)

* fix: don't allow to submit/cancel SCR against a closed SCO

(cherry picked from commit 9e973476b2a925d4557b3a6b17517e46d652ac20)

* fix: don't allow to submit/cancel SE against a closed SCO

(cherry picked from commit 5bc2035bd082001e2552138a5df55554f2e6f8de)

* fix(ux): filter closed SCO in `Get Items From` dialog

(cherry picked from commit bb839b2924c2dd4c2a06b087d7624ca7aac08f04)

* fix: don't close PO on SCO close

(cherry picked from commit 0d01bd8a5a49f5bba80ef797d5823f762e0fc86a)

* fix: update qty on SCO status change

(cherry picked from commit 245effcccd3866bac2974023d37cd48b89849aeb)

* fix: don't allow to reopen SCO if PO is closed

(cherry picked from commit 784b6dcfea2aa9eb3fe557bb4f87cdc1f7341560)

* fix: auto close and reopen SCO based on PO status

(cherry picked from commit 0819675fce1cffe3a930fe2cbd015998e4e7c00d)

* fix(text): test_update_status

(cherry picked from commit cdd5441435ee448d3efb2155a93865ec29bbf8ab)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-04 17:22:58 +05:30
mergify[bot]
2db1e1a737
fix: serial / batch barcode scanner (backport #39114) (#39143)
fix: serial / batch barcode scanner (#39114)

(cherry picked from commit f09e2130a1a3ca999247f89f76c20efcc003b450)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-04 16:02:29 +05:30
mergify[bot]
2e0abbd274
fix: on cancellation of document cancel the serial and batch bundle (backport #39076) (#39082)
fix: on cancellation of document cancel the serial and batch bundle (#39076)

(cherry picked from commit 6e5484ea031027de4e6a897b02bd0f2e7b8adda9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-02 13:28:43 +05:30
mergify[bot]
8ad7fafe2a
fix(DX): capture tracebacks with context (backport #39060) (#39063)
fix(DX): capture tracebacks with context (#39060)

(cherry picked from commit 510fdf7bf651788e549184c23d89c2387c1c2f10)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-01 13:12:07 +05:30
mergify[bot]
89d1069472
fix: non stock uom validation for serial and batch (backport #39018) (#39026)
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>
2023-12-29 20:54:49 +05:30
mergify[bot]
3a7506ecbc
fix: work order with multi level, fetch operting cost from sub-assembly (backport #38992) (#39028)
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>
2023-12-29 20:54:26 +05:30
mergify[bot]
d2580be4fd
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>
2023-12-28 18:22:14 +05:30
mergify[bot]
4e2304818b
feat: Merge taxes from mapped docs (#38346)
feat: Merge taxes from mapped docs (#38346)

* feat: Merge taxes from mapped docs

* chore: ci failures

(cherry picked from commit 9b1c22250f1da37a563ba0885fbbd732b176816c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-12-28 08:28:02 +05:30
mergify[bot]
5874be0f79
fix: incorrect qty in serial batch bundle against pick list (backport #38964) (#38966)
fix: incorrect qty in serial batch bundle against pick list (#38964)

(cherry picked from commit 47ee801d373058a2739c2fd42d971d624c42d5a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-27 14:06:55 +05:30
mergify[bot]
0e48ef7ace
fix: not able to import serial batch bundle using csv (backport #38950) (#38955)
* 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>
2023-12-26 16:29:34 +05:30
mergify[bot]
a41cf62437
fix: do not make serial batch bundle for zero qty (backport #38949) (#38954)
fix: do not make serial batch bundle for zero qty (#38949)

(cherry picked from commit 06d6220a2aa2f7855db2c2f985d046280e26f13a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-26 15:39:00 +05:30
mergify[bot]
f704ccbb59
fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate (backport #38942) (#38944)
* 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>
2023-12-26 14:45:05 +05:30
mergify[bot]
8f643f0df8
fix: Reserved Stock report (backport #38922) (#38924)
* chore: improve `Allowed Qty` error msg

(cherry picked from commit 1a1629196d0daedef3db4f73191e21321689306d)

* fix: `Reserved Stock` report

(cherry picked from commit a5d5223c0e7f85a64f70288ec6e0048864b2ffd7)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-22 16:45:40 +05:30
mergify[bot]
308c6ffb4f
perf: Drop unused/duplicate/sub-optimal indexes (backport #38884) (#38913)
perf: Drop unused/duplicate/sub-optimal indexes (#38884)

* ci: enable more checks

* perf: Drop unused/duplicate indexes

(cherry picked from commit 787333896c3710d16b1fa72432db0fe59c74dfa8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-21 21:39:20 +05:30
mergify[bot]
eabb956aca
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (backport #38897) (#38901)
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (#38897)

* fix: reposting not fixing valuation rate for sales return using movin… (#38895)

fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe9694fdd6e8265869c6943e42f889ac41)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 07175367d8158355e5f699c7c66a2a6743a85c29)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 15:44:50 +05:30
mergify[bot]
f6eb2b521d
fix: do not reset the basic rate for the material receipt stock entry (backport #38896) (#38899)
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>
2023-12-21 14:22:53 +05:30
mergify[bot]
d65be69c4c
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (backport #38863) (#38866)
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863)

* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62393ee1e96969cca38a4ce0c07993dce7e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4057682c878bd6abffa63e7343ba33bd220bc88c)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 19:13:08 +05:30
mergify[bot]
5ec75fb6df
fix: if not budget then don't validate (backport #38861) (#38865)
fix: if not budget then don't validate (#38861)

(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 18:30:36 +05:30
mergify[bot]
7320440b61
fix: item variant with manufacturer (backport #38845) (backport #38847) (#38851)
fix: item variant with manufacturer (backport #38845) (#38847)

* fix: item variant with manufacturer (#38845)

(cherry picked from commit e0c8ff10daeed0829266aea9142805f68ceedb2b)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4aa960b744c289b0cda9acfae7911b1ef6ffe5d6)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 15:17:54 +05:30
mergify[bot]
4bd1a5f955
fix: not able to cancel SCR with Batch (backport #38817) (backport #38821) (#38829)
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>
2023-12-18 18:13:15 +05:30
mergify[bot]
6ad75e72e6
perf: index return_against on delivery note (backport #38827) (#38832)
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>
2023-12-18 18:09:42 +05:30
mergify[bot]
8990c48e7b
fix: serial and batch bundle return not working (backport #38754) (#38806)
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>
2023-12-17 18:02:31 +05:30
mergify[bot]
18bd330a59
fix: incorrect available qty for backdated stock reco with batch (backport #37858) (#38811)
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>
2023-12-17 17:41:51 +05:30
mergify[bot]
703be50bc7
fix(ux): don't override Item Name and Description in MR (backport #38720) (#38763)
fix(ux): don't override Item Name and Description in MR

(cherry picked from commit 726ac6bda1ee3b25c1d62b312d96aa32466ba11e)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-15 11:58:20 +05:30
mergify[bot]
1dcb065c64
fix: barcode scanning for the stock entry (backport #38716) (#38718)
fix: barcode scanning for the stock entry (#38716)

(cherry picked from commit 13cba5068bd1d09bff4204a64a74999876566b6b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-13 18:32:48 +05:30
mergify[bot]
a75081b8c0
fix: negative batch issue (backport #38688) (#38694)
fix: negative batch issue (#38688)

(cherry picked from commit 69d7a640ee7da732d7983ecdd2574acfbc711fa1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-12 16:41:26 +05:30
mergify[bot]
dd07ecad45
fix: not able to make serial and batch using csv import (backport #38659) (#38662)
fix: not able to make serial and batch using csv import (#38659)

(cherry picked from commit 89a0e9c2453ba4eef4158477db537771cdc9ed70)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-11 11:29:25 +05:30
mergify[bot]
b0675f6490
fix: auto delete draft serial and batch bundle (backport #38637) (#38654)
fix: auto delete draft serial and batch bundle (#38637)

(cherry picked from commit 89326bd657217b82e14675ebb464b87214332eec)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-10 16:45:03 +05:30
mergify[bot]
ce2bd15872
fix: serial and batch bundle permission (backport #38618) (#38619)
fix: serial and batch bundle permission (#38618)

(cherry picked from commit 231ab83562cd972ebc7663e1a86f82080e3b27cd)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-07 18:36:31 +05:30