5086 Commits

Author SHA1 Message Date
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
mergify[bot]
deef6ea66a
chore: minor code cleanup (backport #38615) (#38616)
chore: minor code cleanup (#38615)

(cherry picked from commit f45dd740c58f34fad6e981d689c587815fba6625)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-07 15:36:21 +05:30
mergify[bot]
88d2a8d668
fix: scan for serial or batch in bundle (backport #38534) (#38552)
fix: scan for serial or batch in bundle (#38534)

(cherry picked from commit c8693cdf37ba9e91bf47d89de69aafc2fde5e6ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-04 15:24:28 +05:30
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping (#38209)
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407bc04225f0bb7c144284078a314f430)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2023-12-04 09:36:52 +05:30
mergify[bot]
c797c533ed
fix: validation error has not throw for the batch (backport #38494) (#38502)
fix: validation error has not throw for the batch (#38494)

* fix: validation error has not throw for the batch

* chore: fix test cases

(cherry picked from commit 5e9016ffab34df9609a75a7cbbaabbb37e7159d6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-01 21:46:35 +05:30
mergify[bot]
2d9ba88870
fix(ux): make valuation field read only when it can't be modified (backport #38450) (#38464)
* fix(ux): make `basic_rate` field read-only based on purpose

(cherry picked from commit abc7d3002467946984be5b41d79024da92047dd3)

* fix(ux): make PR `rate` field read-only having PO ref

(cherry picked from commit ae294ee4702fa8e0367c07c881d632811beb67ae)

* fix(ux): make PI `rate` field read-only having PR ref

(cherry picked from commit 3d4156cc7d90522f37f4c91e4ccf4145412109a9)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 17:30:35 +05:30
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454)
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 14:43:16 +05:30
mergify[bot]
7005d51af3
feat: auto create PR on SCR submission (backport #38290) (#38428)
* feat: add field `Action on Purchase Order Submission`

(cherry picked from commit 628ea42b63217fcf64c9803fdfdad09c610b00c3)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: auto create SCO on PO submission

(cherry picked from commit 9ec6f1e1d63ccb8087cb3f95c6a100b02d22ba79)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: add field `Action on Subcontracting Receipt Submission`

(cherry picked from commit 762906f24023af3f0fdba70c5dbf61951f45dd68)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* chore: notify user on SCO creation

(cherry picked from commit 745e3bfb733bdbce034b9b1fb3cd83a502a423a7)

* feat: add field `Purchase Order Item` in SCO Service Item

(cherry picked from commit 45d5cff47d7fc53fcf710afac281907ba9ab9e00)

* fix: hold PO item ref in SCO Service Item

(cherry picked from commit 7e4dd33ab0da2800fdb4aeb89ef9d183bff19d4d)

* feat: add field `Purchase Order Item` in SCO Item

(cherry picked from commit a2ede7d6d5241665d996447a1c9e2d1447190066)

* fix: maintain PO and PO Item ref in SCR Item

(cherry picked from commit e1cea2578151ee0f43e1809a7f99d2e90bf774a6)

* feat: auto create PR on SCR submission

(cherry picked from commit 040cc8d22f700a1823425d1534b91d50289d2489)

* feat: add `Purchase Order` link in SCR connections

(cherry picked from commit ca8a5b45ba58b62cd661dae508af9b0e26ff7973)

* feat: add `Subcontracting Receipt` link in PO connections

(cherry picked from commit 98cba5ed30ed2c8f5191d7cfaac54b16997cf09e)

* fix: dont show `View` button on cancelled SCR

(cherry picked from commit dd80d3b9b94c970d5070e1a5fac03cf9f1fbc455)

* fix: use checkbox instead of select field

(cherry picked from commit d366a91d9eae52175cd7f10f8a77b96dc09bfd00)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: Subcontracting Receipt ref in Purchase Receipt

(cherry picked from commit d891bd7fac1ab9e46a94959dedcc45e18ac69de5)

* feat: SCR Item ref in PR Item

(cherry picked from commit 37b3ac795284c0ee9593753ececcfe4871e538a4)

* feat: provision to create PR from SCR

(cherry picked from commit 8052103197112d2e1abe7ac35a831267ad9549b7)

* chore: PR ref in SCR connections

(cherry picked from commit 096a2c8cd0afafb28e916a5c9e92ef1eb041e0a3)

* fix: map warehouses in return SCR

(cherry picked from commit 874766a82f1b31a55b8d5c9c998896748ad49cdf)

* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return

(cherry picked from commit 7145b040f12a62be9f0ac945c69ac221debd7c03)

* chore: `linter`

(cherry picked from commit 857f2b5a014b4d14d21bca793ea569f8bdc1c398)

* test: auto create SCO on PO submit

(cherry picked from commit 68585f6f2b05e0b8dc3429741950ef31bbc42e17)

* test: auto create PR on SCR submit

(cherry picked from commit 7b0cd03f88a7052460438ee70390799fae5c336c)

* fix(test): `test_auto_create_purchase_receipt`

(cherry picked from commit 3da0aa6a0b21c775e5356ae7d359f7378f190d92)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 12:11:05 +05:30
mergify[bot]
b9f26ae849
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342)
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342)

* fix: Debit credit mimatch in multicurrecy asset purchase receipt

* test: multi currency purchase receipt

* chore: update init files

* test: roolback

(cherry picked from commit add238c892364ce25f3e7483cb5fd295f9666a56)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-11-29 09:06:34 +05:30
mergify[bot]
b65c22579d
fix: serial no status (backport #38391) (#38397)
fix: serial no status (#38391)

(cherry picked from commit 592fc81260779ec42b35c88c6b8de19a598911d0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-28 18:31:23 +05:30
mergify[bot]
3cbe59902a
fix(ux): Sales Order Stock Reservation Dialog (backport #38261) (#38344)
* fix(ux): no need to select rows to reserve the stock

(cherry picked from commit 9c889b37fb3e6572043c7a28706e43d051e2ff46)

* fix: use field `sales_order_item` instead `name`

(cherry picked from commit 73586fd9b2f9392d18f65a063b14ef2de2629615)

* fix(ux): no need to select rows to unreserve the stock

(cherry picked from commit 2a41da94d443dee51e615b395d18ad161d4e87fc)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-26 22:25:51 +05:30
Gursheen Anand
3d46b323b3 fix: skip disabled bundles for non-report utils
(cherry picked from commit 362f377f6127e9262ab7829a427d0a2051a77b2f)
2023-11-24 04:30:38 +00:00
Gursheen Anand
fb517e823f fix: filter bundle items based on disabled check
(cherry picked from commit 874774fe6c81c854fb3ade03e93f003c0fc8dd8a)
2023-11-24 04:30:38 +00:00
mergify[bot]
c60aaa799a
fix: set asset's valuation_rate according to asset quantity (backport #38254) (#38256)
fix: set asset's valuation_rate according to asset quantity (#38254)

(cherry picked from commit e2bb4e2baa9059afb27f685beb88172a615097a4)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-21 22:57:34 +05:30
mergify[bot]
ed7b845a55
fix: valuation rate for FG item for subcontracting receipt (backport #38244) (#38245)
fix: valuation rate for FG item for subcontracting receipt (#38244)

(cherry picked from commit 5c308a4f9aa1a27cbd216addbe495b9bf69735b1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-21 14:53:03 +05:30
mergify[bot]
3f57a7e9f0
fix: TypeError in Subcontracting Receipt (backport #38200) (#38208)
fix: TypeError in Subcontracting Receipt

(cherry picked from commit f6e93f084aadf82f444edb112cc9832b53294b15)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-20 12:40:41 +05:30
barredterra
a492e574de fix: update modified timestamp
Was missing in 434c2a1815f27c59de5cd94528bc371593bdd402
2023-11-18 15:44:59 +01:00
PatrickDenis-stack
00b9c2326c fix: attributes were mandatory for manufacturers
(cherry picked from commit 434c2a1815f27c59de5cd94528bc371593bdd402)
2023-11-18 14:39:01 +00:00
Deepesh Garg
d51237195a
fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123)
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
2023-11-16 13:38:10 +05:30
mergify[bot]
28e6e5d910
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094) (#38097)
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094)

fix: valuation rate for the subcontracting receipt supplied items with batch
(cherry picked from commit 3e77c0b5644c28ed9b4eef22b228fdc4a1283020)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-14 21:15:44 +05:30
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095) (#38099)
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5d45a3bf0136ca3fc24a828b008aeee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-14 20:11:19 +05:30
mergify[bot]
a8749977e1
fix: Not able to save subcontracting receipt (#38085)
fix: Not able to save subcontracting receipt (#38085)

(cherry picked from commit e769e750ec712872a8fd28c533d1f02444e351a9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-14 15:57:36 +05:30
mergify[bot]
99b7cdb5be
fix: make item field read-only in batch (backport #38010) (#38034)
fix: make item field read-only in batch

(cherry picked from commit 779260fb497d6ac8000a89b7b762145c58e84471)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-11 10:48:09 +05:30
mergify[bot]
b23fa1f5dd
fix: make adjustment entry using stock reconciliation (backport #37995) (#38009)
fix: make adjustment entry using stock reconciliation (#37995)

fix: do adjustment entry using stock reconciliation
(cherry picked from commit a8216b9727401bfb6900f15447ab935756d7f353)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-09 13:14:32 +05:30
mergify[bot]
d74f0ef586
fix: ignore Stock Reservation for future dated PR (backport #37979) (#37990)
fix: ignore Stock Reservation for future dated PR

(cherry picked from commit 33eedb97dcb531cc8e14813d742266f2c5168fac)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-08 22:20:51 +05:30
mergify[bot]
3c843c7261
chore: typo in Stock Entry enqueue msg (backport #37970) (#37973)
chore: typo in `Stock Entry` enqueue msg

(cherry picked from commit ee60fa940cdcd6c2bd6c47d875e055275535d216)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-07 21:18:01 +05:30
mergify[bot]
df90fd7b35
feat: reserved production plan sub assembly items (backport #37884) (#37927)
feat: reserved production plan sub assembly items (#37884)

(cherry picked from commit 34d3eb88b39ffb437fc111ed03527f2c3c4baf9b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-06 11:33:12 +05:30
ruthra kumar
61573f2645 refactor(test): enable billed amt update on Sales Return(Cr Note)
(cherry picked from commit 0c5bdbdcf3fd408b793c755900ba7e3bf958d482)
2023-11-06 03:11:52 +00:00
mergify[bot]
e0b0b6bb7d
fix: consider reserved stock while cancelling a stock transaction (backport #37754) (#37906)
* fix: consider reserved serial nos while cancelling a stock transaction

(cherry picked from commit d9e284366d6c67ebd41b914b248c6ac94e973b7e)

* fix: consider reserved batches while cancelling a stock transaction

(cherry picked from commit e1a87a802d18f1fb33c3d9f1066da0cb7b3d4210)

* feat: add field `reserved_stock` in Bin

(cherry picked from commit 98d6cdd53c98b2244031f6b55a7658f1b21b7337)

* feat: maintain `Reserved Stock` in Bin

(cherry picked from commit f52916a2c360dd6befdd1f3dcc6c184cc181662b)

* fix: consider reserved stock while cancelling a stock transaction

(cherry picked from commit 73b65ac82ec11698605720bf37437fab853f3120)

* fix(test): `test_stock_reservation_against_sales_order`

(cherry picked from commit 10242235bc6bb9081abd4b8c48c23541e33ae646)

* chore: patch to set reserved stock in Bin

(cherry picked from commit 1f88b1ef84c826fc35ce3d60a562a3fe8a75b9f2)

* fix: qty based check for stock reservation of serial-batch items based on qty

(cherry picked from commit 9231706227977951cb69d765f77793f47a6f5c77)

* test: add test case for stock stock reservation

(cherry picked from commit 54b323e557f605294e8bcdd9eddf2fd4dd66ab38)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-04 17:02:43 +05:30
mergify[bot]
847dd9e671
fix: TypeError in PR for non-stock item (backport #37819) (#37842)
* fix: `TypeError` in PR for non-stock item

(cherry picked from commit 028b3e2fbf52cdb7561e8d63b54d5918b5bc8af4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-03 11:56:12 +05:30
Rohit Waghchaure
618a9ee49b chore: fix test cases 2023-11-02 14:45:28 +05:30
Rohit Waghchaure
b96be67a1f fix: remove voucher type and no for Item and Warehouse based reposting
(cherry picked from commit 0104897d693ca98796536eac7a9edadc58c64fff)
2023-11-02 07:57:52 +00:00
mergify[bot]
c8791108de
refactor: update fields label and remove unused fields from BIN (backport #37827) (#37830)
* refactor: rearrange fields and update label

(cherry picked from commit ec1a7869f82c9bb3d5e12e8a9dc695823e502a4a)

* refactor: remove unused fields `fcfs_rate` and `ma_rate` from Bin

(cherry picked from commit f0a1f4ac7cb9362e8dfe05179533fe4ad00d061e)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-01 16:41:16 +05:30
mergify[bot]
98a7c170a0
fix: indexing on Delivery Note Item (backport #37766) (#37778)
fix: indexing on Delivery Note Item (#37766)

fix: added indexing on Delivery Note Item
(cherry picked from commit 056b74b162ed58dd979cd9748129752fb8cab242)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-31 14:31:29 +05:30
mergify[bot]
18e40dd032
refactor: remove extraneous disabled filters (backport #37732) (#37749)
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f84979e12b8091492be7eddbf0caa56)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
2023-10-30 09:57:32 +05:30
mergify[bot]
4819fde8c5
fix: typo in function name and msg (backport #37722) (#37741)
fix: typo in function name and msg

(cherry picked from commit 48c66b68abe5573c477cbbdc49af22dbde1ea2db)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-29 12:28:42 +05:30
mergify[bot]
5c46d7452e
fix(minor): set tax values for item variants (backport #37674) (#37739)
* fix: copy all child fields to item variant

(cherry picked from commit 5deba1b6f9b03ce5d078d624e339f6b0209a1555)

* fix: only update if variant table empty

(cherry picked from commit d436a407390c0e0d89c66445539bbb95784be7eb)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
2023-10-29 12:16:05 +05:30
mergify[bot]
4034c16cde
chore: fixed test cases related to Internal Transfer (backport #37659) (#37733)
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a49012329d33fd4ecea70988fbfbfce566f)

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-28 13:31:29 +05:30
mergify[bot]
b03c65f21d
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (backport #37721) (#37731)
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721)

(cherry picked from commit fd78f868e1aed2bdb3baa47927f37b239e16a174)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-28 11:10:46 +05:30