Mihir Kandoi
9139994686
fix: skip PO items with invoice-created receipts in billing repair patch
...
A Purchase Receipt row created from a Purchase Invoice carries both
purchase_order_item and purchase_invoice_item, and its billed_amt is pinned
to the row amount by update_billing_status. Redistributing the PO-invoiced
pool over such rows zeroes the invoice-created receipt and flips it from
Completed to To Bill, so the repair leaves those PO Items untouched.
(cherry picked from commit ace4230f97
2026-08-11 18:28:19 +05:30
Mihir Kandoi
fa733e691b
fix(stock): repair duplicated purchase receipt billing
...
(cherry picked from commit 8b7e04eae1
2026-08-11 18:28:19 +05:30
Mihir Kandoi
675901d801
Merge pull request #58023 from frappe/mergify/bp/version-16-hotfix/pr-58020
...
fix(setup): fetch driver address by supplier link (backport #58020 )
2026-08-11 15:31:19 +05:30
Mihir Kandoi
62a851bebb
fix(setup): fetch driver address by supplier link
...
(cherry picked from commit 3ffb888d26
2026-08-11 09:48:17 +00:00
Mihir Kandoi
c8614d42ae
Merge pull request #58017 from mihir-kandoi/backport-58016-v16
...
fix: preserve original operation idx in manually created Job Cards (backport #58016 )
2026-08-11 14:20:32 +05:30
Mihir Kandoi
fee003a82d
fix: preserve original operation idx in manually created Job Cards
...
The Create Job Card dialog on Work Order lists only pending operations,
so the row idx sent to make_job_card is the dialog's position, not the
Work Order Operation idx. create_job_card stamped that dialog idx into
operation_row_id, and get_required_items then matched raw materials of
whichever operation held that idx originally.
Resolve idx server-side from the Work Order Operation row that
get_operation_details already looks up by name.
Fixes https://github.com/frappe/erpnext/issues/57985
2026-08-11 14:08:20 +05:30
Mihir Kandoi
2764ebe686
Merge pull request #58012 from mihir-kandoi/backport-58003-version-16-hotfix
...
fix(selling): bill re-delivered sales order quantities (backport #58003 )
2026-08-11 14:01:46 +05:30
Mihir Kandoi
a5f0b6605e
chore(selling): annotate make_sales_invoice arguments
2026-08-11 13:49:52 +05:30
Mihir Kandoi
3d134bdd60
Merge pull request #58014 from frappe/mergify/bp/version-16-hotfix/pr-58009
...
fix: require material transfer before job card start and completion (backport #58009 )
2026-08-11 13:48:01 +05:30
Mihir Kandoi
4ee276d3db
fix: keep job card actions visible for corrective job cards
...
Corrective job cards regenerate required items but are exempt from the
transfer gate on the server; mirror that exemption in materials_ready.
(cherry picked from commit e9533495fc
2026-08-11 08:02:27 +00:00
Mihir Kandoi
94e4c53b8b
test: job card start and completion blocked until material transfer
...
(cherry picked from commit c95705dc64
2026-08-11 08:02:27 +00:00
Mihir Kandoi
a7f75de1aa
fix: require material transfer before job card start and completion
...
When the work order transfers material against Job Card, the Start Job
and Complete Job actions (and the whitelisted start_timer and
complete_job_card methods behind them) accepted work before any
Material Transfer for Manufacture existed; the transfer gate only fired
on job card submission.
Run validate_transfer_qty on both actions, and drop the finished_good
escape in materials_ready so the dashboard hides the buttons while
transfer is pending. Job cards that skip material transfer, corrective
job cards, and work orders transferring against Work Order are exempt,
as on submit.
(cherry picked from commit 808b2e2984
2026-08-11 08:02:26 +00:00
Mihir Kandoi
0440c971b2
test(selling): cover invoicing after returns and re-deliveries
2026-08-11 13:26:01 +05:30
Mihir Kandoi
6fb09b1e21
fix(selling): bill re-delivered sales order quantities
2026-08-11 13:26:01 +05:30
Mihir Kandoi
4229161f4f
Merge pull request #58007 from frappe/codex/backport-57963-version-16
...
fix(manufacturing): correct nested BOM Explorer quantities
2026-08-11 13:25:00 +05:30
Mihir Kandoi
fb877515ca
fix(manufacturing): avoid child BOM cache lookups
2026-08-11 13:13:03 +05:30
Mihir Kandoi
b4929e2737
fix(manufacturing): correct nested BOM quantities
2026-08-11 13:00:13 +05:30
Mihir Kandoi
b75146445b
Merge pull request #58002 from frappe/mergify/bp/version-16-hotfix/pr-57997
...
fix: keep item code searchable when a barcode matches the same text (backport #57997 )
2026-08-11 12:42:51 +05:30
Kaushal Shriwas
60eab30bab
chore: resolve backport conflict in bom.py
2026-08-11 12:23:00 +05:30
Mihir Kandoi
d315c15cee
Merge pull request #57999 from frappe/mergify/bp/version-16-hotfix/pr-57972
...
refactor: drop redundant time_in_mins assignment in workstation complete_job (backport #57972 )
2026-08-11 12:21:38 +05:30
Kaushal Shriwas
062976123a
test(manufacturing): cover BOM item search when item code collides with a barcode
...
(cherry picked from commit 23024d1ea9
2026-08-11 06:43:20 +00:00
Kaushal Shriwas
87c4009572
fix(manufacturing): keep item code searchable when a barcode matches the same text
...
(cherry picked from commit bf5d506637
2026-08-11 06:43:20 +00:00
Mihir Kandoi
631cc2c218
refactor: drop redundant time_in_mins assignment in complete_job
...
(cherry picked from commit 3cffeb68e3
2026-08-11 06:39:43 +00:00
pandiyan
822e6d8924
fix: convert hours to minutes in workstation complete_job
...
`time_diff_in_hours` returns hours, so `time_in_mins` needs `* 60`, not
`/ 60`. Matches `Job Card.validate_time_log_row`.
No behaviour change: the `doc.save()` on the next line runs Job Card's
`validate`, which recomputes `time_in_mins` correctly before the row is
written. This only stops the expression from reading as a bug.
(cherry picked from commit 422a9161dd
2026-08-11 06:39:43 +00:00
Jatin3128
ee5316ecd0
fix: keep source rate on re-fetch when maintain same rate is enabled (backport #57479 ) ( #57792 )
...
* fix: keep source rate on re-fetch when maintain same rate is enabled (#57479 )
* fix: type-annotate get_item_details arguments
---------
Co-authored-by: test <test@test.com >
2026-08-11 11:00:00 +05:30
mergify[bot]
fea1ec867e
refactor(queries): using frappe.get_query in get_filtered_child_rows (backport #57991 ) ( #57993 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-08-10 19:45:16 +00:00
mergify[bot]
4a2163ebf8
fix: preserve custom title on new JV (backport #57987 ) ( #57989 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
Co-authored-by: rehanrehman389 <rehanrehman389@gmail.com >
2026-08-10 22:03:49 +05:30
mergify[bot]
0a9b632925
fix: field validation and perm checks on get_stock_reservation_entries_for_voucher (backport #57968 ) ( #57970 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-08-10 09:36:20 +00:00
ruthra kumar
737404c9aa
Merge pull request #57831 from aerele/backport-57140-v16
...
fix: clear deferred revenue/expense fields on uncheck (backport #57140 )
2026-08-10 15:04:26 +05:30
Pandiyan P
2b020c2fcf
fix: re-check future sle before queuing repost on submit ( #57664 ) ( #57961 )
...
* test: cover both repost branches and the no-repost case
* fix: queue repost for entries backdated by a concurrent submit
---------
(cherry picked from commit 399ff463ccnareshkannashanmugam@gmail.com >
2026-08-10 14:03:16 +05:30
mergify[bot]
a4d9411345
fix: skip incoming rate calc when serial no qty is zero (backport #57427 ) ( #57957 )
...
fix: skip incoming rate calc when serial no qty is zero (#57427 )
(cherry picked from commit a25decfa50140623894+Shllokkk@users.noreply.github.com >
2026-08-10 12:11:58 +05:30
Khushi Rawat
2287e345da
Merge pull request #57953 from frappe/mergify/bp/version-16-hotfix/pr-57822
...
fix: keep asset repair downtime in sync with entered dates (backport #57822 )
2026-08-10 12:02:36 +05:30
Shllokkk
4f3eef92f0
test: assert asset repair downtime recalculates on date change
...
(cherry picked from commit 8269f8a362
2026-08-10 06:21:07 +00:00
Shllokkk
ca5418e2c9
fix: keep asset repair downtime in sync with entered dates
...
(cherry picked from commit 4406bb9068
2026-08-10 06:21:07 +00:00
mergify[bot]
dff4ec6a74
fix: escape customer_details on lead creation from appointment (backport #57947 ) ( #57949 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2026-08-09 19:25:49 +00:00
Shllokkk
02f8328d1a
Merge pull request #57946 from frappe/mergify/bp/version-16-hotfix/pr-57927
...
fix: reflect in-invoice receivable credits in Sales Register ledger view (backport #57927 )
2026-08-09 23:58:24 +05:30
Shllokkk
09c0110352
test: cover POS-paid invoice in Sales Register ledger view
...
(cherry picked from commit 45a9294476
2026-08-09 18:09:41 +00:00
Shllokkk
a90907fda6
fix: reflect in-invoice receivable settlements in Sales Register ledger view
...
(cherry picked from commit 40c356d166
2026-08-09 18:09:41 +00:00
Mihir Kandoi
d2678902ec
Merge pull request #57937 from frappe/mergify/bp/version-16-hotfix/pr-57689
...
feat(job_card): print quantities with their stock uom (backport #57689 )
2026-08-09 23:14:13 +05:30
Mihir Kandoi
94c81965a7
test(manufacturing): cover job card UOM backfill
2026-08-09 23:02:58 +05:30
Mihir Kandoi
8310b56f32
chore: resolve conflict
2026-08-09 22:56:02 +05:30
Mihir Kandoi
6e4a7fba7e
Merge pull request #57930 from frappe/mergify/bp/version-16-hotfix/pr-57895
...
fix: track semi finished goods production flow (backport #57895 )
2026-08-09 22:47:52 +05:30
Mihir Kandoi
5c38e43758
chore: update backport after dependent merges
2026-08-09 22:36:10 +05:30
Mihir Kandoi
b4fbbe51e8
Merge pull request #57934 from frappe/mergify/bp/version-16-hotfix/pr-57688
...
refactor(job_card): make the completion dialog say what it asks for (backport #57688 )
2026-08-09 22:32:25 +05:30
Mihir Kandoi
e42a59c5d4
Merge pull request #57933 from frappe/mergify/bp/version-16-hotfix/pr-57687
...
fix(job_card): reject a completion split that cannot add up (backport #57687 )
2026-08-09 22:31:48 +05:30
Mihir Kandoi
cc07918f06
Merge pull request #57936 from frappe/mergify/bp/version-16-hotfix/pr-57686
...
fix(job_card): leave the pending qty out of the job card's own output (backport #57686 )
2026-08-09 22:12:24 +05:30
Mihir Kandoi
66aa97f7fe
chore: update backport after dependent merges
2026-08-09 22:02:11 +05:30
Mihir Kandoi
4e8c2c7d37
Merge pull request #57935 from frappe/mergify/bp/version-16-hotfix/pr-57685
...
fix(job_card): apply the completion dialog's qty to manufacture (backport #57685 )
2026-08-09 21:59:06 +05:30
Mihir Kandoi
816e21cf60
Merge pull request #57931 from frappe/mergify/bp/version-16-hotfix/pr-57684
...
fix(job_card): require the previous operation to be manufactured (backport #57684 )
2026-08-09 21:58:48 +05:30
Mihir Kandoi
317dd18ce5
fix(manufacturing): align quantity split rounding
2026-08-09 21:43:00 +05:30
