Commit Graph

54752 Commits

Author SHA1 Message Date
Sagar Vora
0e026b9ccd fix: handle returns as well 2025-10-17 19:21:24 +05:30
Sagar Vora
0968f435d2 test: some tests to ensure correct discount mapping 2025-10-17 17:32:16 +05:30
Sagar Vora
f4f79d99e4 fix: validate that discount amount cannot exceed total before discount 2025-10-17 17:06:03 +05:30
Sagar Vora
feb62102d9 fix: ensure that additional discount amount is not mapped repeatedly 2025-10-17 17:06:03 +05:30
rohitwaghchaure
36d422fbb5 Merge pull request #50123 from rohitwaghchaure/fixed-better-validation-message
fix: validation for negative batch
2025-10-17 11:36:31 +05:30
Rohit Waghchaure
f9c8f27586 fix: validation for negative batch 2025-10-17 08:52:41 +05:30
Diptanil Saha
7bd5461704 Merge pull request #50141 from diptanilsaha/fix_st_51018
fix(point-of-sale): render payment methods only when payment component is visible
2025-10-17 01:42:22 +05:30
diptanilsaha
7dc4306640 fix(point-of-sale): render payment methods only payment component is visible 2025-10-17 01:26:31 +05:30
Diptanil Saha
182c9fd966 fix: added exception handling on service level agreement apply hook (#50096)
* fix: added exception handling on service level agreement apply hook

* Revert "fix: added exception handling on service level agreement apply hook"

This reverts commit dae93aa96f.

* fix: Ignore missing SLA table during install/uninstall

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
2025-10-15 13:27:07 +00:00
rohitwaghchaure
afcd1d68f0 Merge pull request #50113 from rohitwaghchaure/fixed-support-50958
fix: adjustment entry
2025-10-15 15:57:55 +05:30
Rohit Waghchaure
c0851abaee fix: adjustment entry 2025-10-15 15:17:59 +05:30
Yash Chaubey
4ede97ae2b perf: optimize company monthly sales query using date range (#48942)
* perf: optimize company monthly sales query using date range instead of DATE_FORMAT

* perf: optimize company monthly sales query using date range
2025-10-15 12:46:02 +05:30
rohitwaghchaure
1fc5af67be Merge pull request #50095 from aerele/support-50163
fix: preview stock ledger for manual serial and batch values
2025-10-15 11:17:15 +05:30
Mihir Kandoi
3af5a83301 fix(stock): remove filter from query (#50104) 2025-10-14 23:55:43 +05:30
Mihir Kandoi
fa8a988454 Merge pull request #50013 from aerele/refactor/transporter-filter-buying
refactor: add supplier filter in buying
2025-10-14 23:40:52 +05:30
Mihir Kandoi
e0adbb2c01 fix: handle flt conversion for prev_ordered_qty (#50078)
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com>
2025-10-14 23:39:14 +05:30
Mihir Kandoi
e9538f6d64 fix(stock): remove filter from query 2025-10-14 23:37:45 +05:30
Mihir Kandoi
270520a9fc fix: source warehouse validation in manufacturing entry during subcon… (#50101)
fix: source warehouse validation in manufacturing entry during subcontracting inward
2025-10-14 20:30:31 +05:30
Mihir Kandoi
3fd5aace0a fix: source warehouse validation in manufacturing entry during subcontracting inward 2025-10-14 20:08:22 +05:30
Akhil Narang
f8b50d3ffa fix: sanitize projects field in tasks webform (#50089)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-10-14 13:07:59 +00:00
Kavin
c5f68d0b27 fix: preview stock ledger for manual serial and batch values 2025-10-14 17:14:22 +05:30
rohitwaghchaure
2a7e4c68e5 Merge pull request #50080 from rohitwaghchaure/fixed-stock-query
perf: optimize sql query
2025-10-14 17:13:07 +05:30
Khushi Rawat
cc3660635f Merge pull request #50033 from rehanrehman389/filter-sales-team
fix: filter sales team to show only active individual salespersons
2025-10-14 17:08:56 +05:30
rohitwaghchaure
df1e49ffb4 fix: negative error not throw for backdated entry (#50091) 2025-10-14 17:08:43 +05:30
Rohit Waghchaure
88a947ff4e fix: negative error not throw for backdated entry 2025-10-14 16:48:38 +05:30
Mihir Kandoi
ab0ee8809d Merge pull request #50090 from mihir-kandoi/restore_customer_field
fix: restore customer field
2025-10-14 16:27:41 +05:30
Mihir Kandoi
cf97c1db38 fix: add delivery warehouse filter 2025-10-14 16:08:50 +05:30
Mihir Kandoi
ae816d0c1d fix: restore customer field 2025-10-14 16:02:58 +05:30
Rohit Waghchaure
e7b64175fd perf: optimize sql query 2025-10-14 15:03:42 +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
Kavin
77c35ef47f fix: handle flt conversion for prev_ordered_qty 2025-10-14 13:35:06 +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