Commit Graph

54721 Commits

Author SHA1 Message Date
Mihir Kandoi
3fd5aace0a fix: source warehouse validation in manufacturing entry during subcontracting inward 2025-10-14 20:08:22 +05:30
Mihir Kandoi
f2b948a483 feat: subcontracting inward (#47728)
* feat: subcontracting inward

* feat: stock reservation

* feat: subcontracting delivery

* feat: all remaining stuff

* fix: linter errors

* fix: patch

* fix: modify stock entry type validation

* fix: customer provided item cost field mandatory validation

* fix: failing tests

* fix: failing tests

* fix: subcontracting controlller

* refactor: semi final

* refactor: final

* chore: resolve conflicts

* refactor: changes requested

* fix: reservation transfer of extra qty

* fix: consider add cost for customer provided rate field

* test: create test data

* test: subcontracted sales order (partial)

* test: fin

* fix: do not add self RM in DN created from SI

* fix: failing test case

* fix: conflicting function name

* refactor: final changes

* fix: more bugs

* perf: various and major performance improvements

* fix: consider warehouse as well in all queries

* fix: same item code with diff warehouse in manufacture entry

* refactor: readability

* fix: frontend validations

* perf: replace query inside loop with single query

* fix: set additional item flag to true when extra customer provided item is received

* fix: bugs found by coderabbit

* fix: more coderabbit bugs

* fix: add validation to disallow cancellation of manufacturing entry

* perf: use cached values wherever it makes sense

* test: fix redundant insert to child tables

* fix: consider SI return of billed self RM

* fix: bug found by coderabbit

---------

Co-authored-by: Mihir Kandoi <mihirkandoi@Mihirs-MacBook-Air.local>
2025-10-14 15:00:49 +05:30
Mihir Kandoi
9772ca75c4 Merge pull request #50004 from aerele/delivery-note-return 2025-10-14 14:49:04 +05:30
Mihir Kandoi
b452724c1a Merge pull request #50079 from mihir-kandoi/gh-50066
chore: replace broken links with correct ones
2025-10-14 14:26:53 +05:30
Mihir Kandoi
224317d1c9 Merge pull request #49960 from aerele/support-50220
Fix/Support 50220
2025-10-14 14:18:36 +05:30
Kavin
1c586697c7 fix: handle multi uom in reserved qty for production plan 2025-10-14 14:00:59 +05:30
Mihir Kandoi
11be07086f chore: replace broken links with correct ones 2025-10-14 13:55:14 +05:30
rohitwaghchaure
9c014c7ba4 Merge pull request #50072 from aerele/support-50647
fix: swap warehouse labels for return entry
2025-10-14 13:35:33 +05:30
rohitwaghchaure
5cd62ad236 Merge pull request #50073 from aerele/support-50395
fix(stock-entry): fetch empty batch for finished item
2025-10-14 13:34:33 +05:30
rohitwaghchaure
10014b9b79 Merge pull request #50065 from rohitwaghchaure/aerele-support-48884
fix(stock-reconciliation): include inventory dimensions in duplicate validation
2025-10-14 13:32:15 +05:30
rohitwaghchaure
08bd3b348f Merge pull request #50070 from rohitwaghchaure/fixed-support-50227
fix: performance issue by adding index
2025-10-14 13:31:30 +05:30
venkat102
74a7ddf66d fix(stock-entry): fetch empty batch for finished item 2025-10-14 13:19:37 +05:30
Kavin
f0c3f0d0be fix: swap warehouse labels for return entry 2025-10-14 13:14:39 +05:30
Rohit Waghchaure
1afc75b15a fix: performance issue by adding index 2025-10-14 13:02:56 +05:30
rohitwaghchaure
9ccc55decc Merge pull request #50027 from rohitwaghchaure/fixed-reset-raw-materials
fix: reset raw materials considering not available batches
2025-10-14 12:48:43 +05:30
rohitwaghchaure
70c6461cad Merge pull request #50061 from rohitwaghchaure/fixed-support-50717
fix: do reposting of first transfer entry based on item-wh combination
2025-10-14 12:47:55 +05:30
Mihir Kandoi
3d7ac166b7 Merge pull request #49445 from aerele/production-plan-item-filter
fix(production plan): filter sales orders by item
2025-10-14 12:02:05 +05:30
Rohit Waghchaure
c95465cba1 fix: duplicate serial nos 2025-10-14 12:01:46 +05:30
Mihir Kandoi
9b3b2102f8 Merge pull request #49891 from rehanrehman389/fix/empty-create-button
fix: prevent empty Create dropdown when In Process
2025-10-14 11:58:04 +05:30
Mihir Kandoi
ff94438563 Merge pull request #50058 from matteoarosti/fix/warehouse-source-reference
fix: warehouse source reference in production report
2025-10-14 11:52:08 +05:30
Rohit Waghchaure
2f25b445ab fix: do reposting of first transfer entry based on item-wh combination 2025-10-14 11:48:42 +05:30
ruthra kumar
d3014447b6 Merge pull request #50003 from frappe/cache_deletion_check
perf: Only check transaction deletion record once during req/job
2025-10-14 10:05:23 +05:30
matteo.arosti
451651e350 fix: warehouse source reference in production report 2025-10-14 00:27:27 +02:00
El-Shafei H.
6cacead726 fix(Supplier Quotation Comparison): add a missing translate function (#49497)
* Update supplier_quotation_comparison.py

* refactor: text cleaning
2025-10-13 23:58:57 +05:30
akhilakr113
2d8513de4e fix: extend quotation filters to exclude 'Ordered' quotations in 'Get Items From' on Sales Order (#50029)
* feat: show item name in update items dialog for sales and purchase order

* feat: remove the ordered quotation from listing the quotation in sales order get items from

* chore: remove this pr from this
2025-10-13 23:45:26 +05:30
Mihir Kandoi
992027fe89 Merge pull request #50025 from thomasantony12/dev-batch_order_fix
fix: Batch ordering based on the method mentioned in settings
2025-10-13 19:45:41 +05:30
rohitwaghchaure
4eb045d927 Merge pull request #50047 from vorasmit/compex-fetch-rm-items
fix: enhance sub-assembly item handling in raw material request calculations
2025-10-13 19:36:07 +05:30
Mihir Kandoi
1717a7c983 refactor: move value inline 2025-10-13 19:26:34 +05:30
Rohit Waghchaure
ec1636db12 fix: reset raw materials considering not available batches 2025-10-13 17:29:52 +05:30
rohitwaghchaure
2de4b2ea56 Merge pull request #50048 from rohitwaghchaure/fixed-unhide-field
fix: show qty in popup while making additional transfer entry
2025-10-13 17:27:43 +05:30
Rohit Waghchaure
b08e0014f7 fix: show qty in popup while making additional transfer entry 2025-10-13 16:46:42 +05:30
Smit Vora
f912c8419a fix: enhance sub-assembly item handling in raw material request calculations 2025-10-13 16:16:01 +05:30
Khushi Rawat
f757adc7f7 Merge pull request #50040 from khushi8112/add-composite-indexes-advance-payment-ledger
perf: add composite indexes to Advance Payment Ledger Entry
2025-10-13 16:07:07 +05:30
rohitwaghchaure
df65fbbc4a Merge pull request #50043 from rohitwaghchaure/fixed-delivered-qty-in-sre
fix: delivered qty in reservation entry
2025-10-13 15:32:40 +05:30
khushi8112
59bd35c64d fix: revert unrelated manual modified timestamp change 2025-10-13 15:15:48 +05:30
Kavin
af8aa153bf fix: sum quantity instead of requried BOM quantity 2025-10-13 15:13:37 +05:30
Rohit Waghchaure
bd03bcdcb2 fix: delivered qty in reservation entry 2025-10-13 14:52:04 +05:30
khushi8112
7fcf277055 perf: add composite indexes to Advance Payment Ledger Entry table 2025-10-13 13:56:30 +05:30
ruthra kumar
1e2bcde0f5 Merge pull request #50017 from aerele/service_stop_date_comparison
fix(deferred revenue): validate service stop date
2025-10-13 12:37:15 +05:30
Diptanil Saha
f23d6911f3 Merge pull request #50034 from diptanilsaha/gh_49941
fix: set default roles on Role Profiles during reinstallation
2025-10-13 12:06:34 +05:30
l0gesh29
fd9167f2af fix: add GROUP BY for dn_detail and convert SQL query to QB 2025-10-13 11:22:29 +05:30
diptanilsaha
12c1b8a910 fix: set default roles on role_profile during reinstallation 2025-10-13 02:20:48 +05:30
Khushi Rawat
f4c37f1f20 Merge pull request #49508 from khushi8112/print-format-for-sales-invoice
feat: print format for sales invoice
2025-10-12 20:06:53 +05:30
MochaMind
a799af7f9f fix: sync translations from crowdin (#49959) 2025-10-12 16:10:52 +02:00
MochaMind
f697679b37 chore: update POT file (#50030) 2025-10-12 16:03:02 +02:00
khushi8112
f14b3ed723 refactor: add permission check and minor fixes 2025-10-12 19:22:26 +05:30
thomasantony12
fab7f9ee53 chore: use get_single_value instead of get_cached_doc 2025-10-12 18:05:29 +05:30
khushi8112
6e07aac5b7 fix: add filter query for address field 2025-10-12 13:11:04 +05:30
khushi8112
a4fe0fb809 refactor: use query builder to set company address 2025-10-12 13:11:04 +05:30
khushi8112
533257c4f3 refactor: use get_value to improve performance 2025-10-12 13:11:04 +05:30