mergify[bot]
6cffba9a71
Merge pull request #50713 from frappe/mergify/bp/version-15-hotfix/pr-50712
2025-11-24 07:17:43 +00:00
Pugazhendhi Velu
5b60fbbd30
fix: apply precision for scrap items amount
...
(cherry picked from commit 9194e6350a
2025-11-24 05:08:42 +00:00
Pugazhendhi Velu
2678694c5f
fix(manufacturing): apply precision for bom amount and rm_cost_per_qty
...
(cherry picked from commit 57f9353d90
2025-11-24 05:08:42 +00:00
mergify[bot]
c85ce55f27
Merge pull request #50631 from frappe/mergify/bp/version-15-hotfix/pr-50629
...
fix: process loss % can be negative (backport #50629 )
2025-11-19 11:30:39 +00:00
Mihir Kandoi
015f946a14
fix: add filter company and status to job card employee
...
(cherry picked from commit 3ca3a6d9bb
2025-11-19 10:42:32 +00:00
Mihir Kandoi
2550b44db8
chore: resolve conflicts
2025-11-19 12:38:47 +05:30
Mihir Kandoi
5b1674018b
fix: redundant message on bom save
...
(cherry picked from commit 074f07694f
2025-11-19 07:06:11 +00:00
Kavin
81a16286a1
fix: unintended backported depends_on expression ( #50529 )
...
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com >
2025-11-18 10:07:26 +02:00
Pugazhendhi Velu
9012a72185
fix: change fieldtype from link to data for document_type in production plan summary
...
(cherry picked from commit 462deb3755
2025-11-11 04:41:26 +00:00
rohitwaghchaure
668ec641c1
Merge pull request #50290 from rohitwaghchaure/fixed-github-50262
...
fix: job card timer
2025-10-31 14:33:23 +05:30
Rohit Waghchaure
053765a466
fix: job card timer
2025-10-31 14:06:22 +05:30
Rohit Waghchaure
afe42ee3e9
fix: allow bulk edit for bill of material items
...
(cherry picked from commit 1f74e06791
2025-10-29 12:51:38 +00:00
Abdeali Chharchhoda
5798409f69
fix: add message for missing purchase orders in production plan
2025-10-27 15:09:22 +05:30
Abdeali Chharchhoda
8b2be43897
chore: remove print statement
...
(cherry picked from commit 1ad4dc9066
2025-10-22 08:14:24 +00:00
mergify[bot]
b67b29200c
fix: prevent empty Create dropdown when In Process (backport #49891 ) ( #50063 )
2025-10-14 17:49:27 +05:30
mergify[bot]
fd72b55852
Merge pull request #50081 from frappe/mergify/bp/version-15-hotfix/pr-49960
...
Fix/Support 50220 (backport #49960 )
2025-10-14 12:12:14 +00:00
Mihir Kandoi
5909b0e1a2
Merge pull request #50064 from frappe/mergify/bp/version-15-hotfix/pr-49445
...
fix(production plan): filter sales orders by item (backport #49445 )
2025-10-14 12:20:56 +05:30
ravibharathi656
20c2809437
fix(production plan): filter sales orders by item
...
(cherry picked from commit bfff945fb1
2025-10-14 06:32:58 +00:00
matteo.arosti
db93e50f16
fix: warehouse source reference in production report
...
(cherry picked from commit 451651e350
2025-10-14 06:22:44 +00:00
Smit Vora
75d14985e0
chore: resolve conflicts
2025-10-13 19:45:04 +05:30
Smit Vora
467fcea728
fix: enhance sub-assembly item handling in raw material request calculations
...
(cherry picked from commit f912c8419a
2025-10-13 14:06:34 +00:00
KerollesFathy
07c3755f31
fix(manufacturing): prevent KeyError in BOM Creator when sub-assembly reused
...
Ensure missing (fg_item, fg_reference_id) keys are initialized in
production_item_wise_rm before appending items. This avoids crashes
when the same sub-assembly is referenced under multiple parents.
(cherry picked from commit 4f8b2e520a
2025-10-07 05:27:18 +00:00
rohitwaghchaure
bf39ae6db0
Merge pull request #49856 from frappe/mergify/bp/version-15-hotfix/pr-49806
...
fix: validate transfer_qty based on overproduction wo percentage (backport #49806 )
2025-10-02 22:43:52 +05:30
Kavin
0fec34e886
test: test overproduction allowed qty in wo
...
(cherry picked from commit b527d38bfa
2025-10-02 14:36:24 +00:00
Kavin
a5ed9fdc67
fix: add default scrap warehouse in wo
...
(cherry picked from commit 7e51346946
2025-10-02 14:35:22 +00:00
rohitwaghchaure
0fb5f75e93
chore: fix conflicts
...
Removed the test for additional material transfer in work orders.
2025-09-30 18:43:38 +05:30
Kavin
f548f0b231
test: required_qty clamping in manufacture entry
...
(cherry picked from commit 34d2c8d9c2
2025-09-30 12:28:34 +00:00
Kavin
7ee82813fd
fix: use sales_order from data instead of doc
...
(cherry picked from commit 9f9120451b
2025-09-30 11:06:48 +00:00
mergify[bot]
1a4ea07b78
fix: add option for currency field (backport #49572 ) ( #49594 )
...
fix: add option for currency field (#49572 )
(cherry picked from commit e0299e1cbdlogeshperiyasamy24@gmail.com >
2025-09-17 17:33:15 +05:30
Mihir Kandoi
43e9ab9cd1
refactor: PR 49320
...
(cherry picked from commit 991413608b
2025-09-03 08:50:57 +00:00
Mihir Kandoi
7bb180e5da
fix: source warehouse in manufacture entry and reqd prop of scrap warehouse
...
(cherry picked from commit fe0722c4f1
2025-08-26 16:01:30 +00:00
Rohit Waghchaure
7a04bf85bc
chore: convert message to toast notification
...
(cherry picked from commit fc71001110
2025-08-14 05:06:00 +00:00
mergify[bot]
15e8fa3189
Merge pull request #49081 from frappe/mergify/bp/version-15-hotfix/pr-49068
...
fix(job-card): Add filter to item_code query for scrap_items to exclude disabled (backport #49068 )
2025-08-11 10:25:21 +05:30
mergify[bot]
964f9275dc
feat: add non-negative constraint to batch size and sub operation time fields (backport #48948 ) ( #48991 )
...
* feat: add non-negative constraint to batch size and sub operation time fields
(cherry picked from commit f4722d3b24kerolles.f@outlook.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2025-08-05 11:19:46 +00:00
mergify[bot]
84e91e0c7c
feat: Add non-negative constraint to completed qty fields in job card and time log (backport #48946 ) ( #48989 )
...
* feat: Add non-negative constraint to completed qty fields in job card and time log
(cherry picked from commit c30665fda7kerolles.f@outlook.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2025-08-05 11:06:43 +00:00
mergify[bot]
5de5a8bfd5
fix: prevent negative values in BOM fields ( #48520 , #48662 ) (backport #48696 ) ( #48897 )
...
* fix: prevent negative values in BOM fields (#48520 , #48662 ) (#48696 )
* fix: prevent negative values in BOM fields (#48520 , #48662 )
* fix: applied non_negative validation using Desk UI for BOM fields
(cherry picked from commit 3a80e116e8101823906+Vishist16@users.noreply.github.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2025-07-31 15:42:23 +00:00
Diptanil Saha
184cabdcb0
chore: resolve conflict
2025-07-29 21:02:04 +05:30
Ayush Chaudhari
f8ea431551
fix: change modified timestamp so migrations work
...
(cherry picked from commit c18d565d3e
2025-07-29 15:30:28 +00:00
Mihir Kandoi
d7a9c7b161
Merge pull request #48828 from frappe/mergify/bp/version-15-hotfix/pr-48700
...
fix: prevent negative scrap quantity in Job Card (#48545 ) (backport #48700 )
2025-07-29 14:26:05 +05:30
mergify[bot]
e1d7ec906f
feat: Add non-negative constraint to workstation cost fields (backport #48557 ) ( #48826 )
...
* feat: Add non-negative constraint to workstation cost fields
(cherry picked from commit a2bb55757092a12d7feakerolles.f@outlook.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2025-07-29 08:53:25 +00:00
Vishist Singh Solanki
ae945b2e6f
fix: prevent negative scrap quantity in Job Card ( #48545 )
...
(cherry picked from commit 94ec76545c
2025-07-29 07:57:54 +00:00
Shreyas Sojitra
23180dad42
fix: create job card for selected operations only
...
(cherry picked from commit 27e5344188
2025-07-25 04:36:33 +00:00
ravibharathi656
e68370359f
fix(production plan): add company filter to sub assembly warehouse
...
(cherry picked from commit 1728a95111
2025-07-21 14:27:40 +00:00
mergify[bot]
a139cd4b5e
fix: job card linter error (backport #47561 ) ( #48695 )
...
* fix: job card linter error (#47561 )
(cherry picked from commit 4174269091kandoimihir@gmail.com >
(cherry picked from commit 4794e7acff
2025-07-18 16:01:34 +00:00
Mihir Kandoi
9501149bd8
Revert "fix: job card linter error (backport #47561 ) ( #48695 )"
...
This reverts commit 4794e7acff
2025-07-18 21:26:28 +05:30
mergify[bot]
4794e7acff
fix: job card linter error (backport #47561 ) ( #48695 )
...
* fix: job card linter error (#47561 )
(cherry picked from commit 4174269091kandoimihir@gmail.com >
2025-07-18 21:26:21 +05:30
Mihir Kandoi
2b42848376
feat: consider process less when calculating pending qty in work order
...
(cherry picked from commit 74c4ca68e5
2025-07-18 10:24:04 +00:00
Mihir Kandoi
89660c9070
fix: use planned_qty instead of pending_qty to check if WO should be created against PP
...
(cherry picked from commit b11bf8eb79
2025-07-09 15:56:34 +00:00
mergify[bot]
fdd79c7677
feat(BOM): improve tree display with item_name and qty (backport #48176 ) ( #48494 )
...
Co-authored-by: Patrick Eißler <77415730+PatrickDEissler@users.noreply.github.com >
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2025-07-09 14:13:24 +02:00
mergify[bot]
6b41dc2fed
fix: make labels in error message translatable (backport #48327 ) ( #48436 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
fix: make labels in error message translatable (#48327 )
2025-07-07 22:36:48 +02:00
