Mihir Kandoi
32d5cedafc
Merge pull request #52486 from frappe/mergify/bp/version-16-hotfix/pr-52000
...
fix: Added validation for quality inspection in job card (backport #52000 )
2026-02-06 14:49:10 +05:30
Nishka Gosalia
ece8d00415
fix: test cases
2026-02-06 14:34:08 +05:30
Khushi Rawat
c171b9a184
Merge pull request #52492 from frappe/mergify/bp/version-16-hotfix/pr-52491
...
fix: apply composite asset logic only in draft (backport #52491 )
2026-02-06 13:10:24 +05:30
khushi8112
d2387a3af8
fix: apply composite asset logic only in draft
...
(cherry picked from commit ee501e884a
2026-02-06 07:36:31 +00:00
rohitwaghchaure
79e0e07446
Merge pull request #52482 from frappe/mergify/bp/version-16-hotfix/pr-52476
...
fix: stock reservation created against job card (backport #52476 )
2026-02-06 12:52:43 +05:30
Mihir Kandoi
4caca08b90
Merge pull request #52488 from frappe/mergify/bp/version-16-hotfix/pr-52219
...
fix: enabling skip delivery option for order type maintenance (backport #52219 )
2026-02-06 12:44:47 +05:30
Mihir Kandoi
738cb6847e
Merge pull request #52484 from frappe/mergify/bp/version-16-hotfix/pr-52475
...
fix: do not show update stock flag unneccessarily (backport #52475 )
2026-02-06 12:28:36 +05:30
Nishka Gosalia
7a78e9705c
fix: enabling skip delivery option for order type maintenance
...
(cherry picked from commit 1a22e3cb61
2026-02-06 06:40:03 +00:00
Nishka Gosalia
a1ec68cd1e
fix: Added validation for quality inspection in job card
...
(cherry picked from commit 46b4cf3add
2026-02-06 06:38:32 +00:00
Mihir Kandoi
4847a76cb8
chore: resolve conflicts
2026-02-06 12:00:47 +05:30
Mihir Kandoi
f56c6f93a1
chore: resolve conflicts
2026-02-06 12:00:23 +05:30
Mihir Kandoi
c0c6cc58ed
fix: do not show update stock flag unneccessarily
...
(cherry picked from commit 5fb5b7b30e
2026-02-06 06:27:46 +00:00
rohitwaghchaure
8c372faf50
chore: fix linter issue
...
Removed duplicate import of get_bom_items_as_dict from BOM module.
2026-02-06 11:29:45 +05:30
Diptanil Saha
ae4cf27f4f
Merge pull request #52471 from frappe/mergify/bp/version-16-hotfix/pr-51621
...
feat(accounts): expand Journal Entry Template to support dimensions and party (backport #51621 )
2026-02-06 11:07:27 +05:30
Rohit Waghchaure
305483e074
fix: stock reservation created against job card
...
(cherry picked from commit dca2cfd009
2026-02-05 23:05:19 +00:00
rohitwaghchaure
86dd2e786c
Merge pull request #52474 from frappe/mergify/bp/version-16-hotfix/pr-52467
...
fix: operation status and bom validation (backport #52467 )
2026-02-05 21:06:23 +05:30
Rohit Waghchaure
11222653ce
fix: operation status and bom validation
...
(cherry picked from commit 95baf953a8
2026-02-05 14:16:38 +00:00
Nikhil Kothari
d06a46ae85
feat(accounts): expand Journal Entry Template to support dimensions and party ( #51621 )
...
* feat(accounts): expand Journal Entry Template to support dimensions and party
* fix: do not update standard row values
(cherry picked from commit ef44528ba5
2026-02-05 12:55:13 +00:00
rohitwaghchaure
8c536df5f2
Merge pull request #52428 from frappe/mergify/bp/version-16-hotfix/pr-52422
...
fix: not able to complete job card (backport #52422 )
2026-02-05 17:05:16 +05:30
rohitwaghchaure
4dec567421
Merge pull request #52461 from frappe/mergify/bp/version-16-hotfix/pr-52459
...
fix: stock balance report issue (backport #52459 )
2026-02-05 15:49:58 +05:30
rohitwaghchaure
1d24abf5dd
chore: fix issue
2026-02-05 15:02:47 +05:30
Rohit Waghchaure
62616ad9e1
fix: stock balance report issue
...
(cherry picked from commit 7e584dd84a
2026-02-05 09:20:01 +00:00
Jatin3128
6bffdbce56
Merge pull request #52455 from frappe/mergify/bp/version-16-hotfix/pr-52438
...
fix(balance sheet): removed the extra labels from the chart (backport #52438 )
2026-02-05 13:39:41 +05:30
Jatin3128
6a9a28b4ae
fix(balance sheet): removed the extra labels from the chart
...
(cherry picked from commit a64b5f2c5d
2026-02-05 07:54:14 +00:00
Mihir Kandoi
66d0ab6380
Merge pull request #52454 from frappe/mergify/bp/version-16-hotfix/pr-52452
...
fix: process loss error incorrectly thrown even when semi FG BOM does… (backport #52452 )
2026-02-05 13:15:53 +05:30
ruthra kumar
5913d5f14e
Merge pull request #52351 from frappe/mergify/bp/version-16-hotfix/pr-52346
...
fix: move company field to first position in sales invoice, purchase … (backport #52346 )
2026-02-05 13:11:28 +05:30
Mihir Kandoi
4a7ffce320
fix: process loss error incorrectly thrown even when semi FG BOM does not have any process loss
...
(cherry picked from commit 99ddc36c26
2026-02-05 07:27:41 +00:00
Mihir Kandoi
64d82a811f
Merge pull request #52446 from frappe/mergify/bp/version-16-hotfix/pr-52445
...
fix: item code is tuple with operation id (backport #52445 )
2026-02-05 12:12:35 +05:30
Mihir Kandoi
9d14c0b60e
fix: item code is tuple with operation id
...
(cherry picked from commit 481deee4b2
2026-02-05 06:29:11 +00:00
ruthra kumar
0a285523a8
Merge pull request #52426 from frappe/mergify/bp/version-16-hotfix/pr-51990
...
refactor: use https over http while saving website link (backport #51990 )
2026-02-05 11:30:16 +05:30
ruthra kumar
ce695ebdd0
refactor: patch partner_website for old data
...
(cherry picked from commit 8db29b0a81
2026-02-05 11:00:58 +05:30
Mihir Kandoi
9f31910226
Merge pull request #52441 from frappe/mergify/bp/version-16-hotfix/pr-52416
...
fix(stock): update target field attribute (backport #52416 )
2026-02-05 10:40:29 +05:30
Pandiyan37
f8405e4ca4
test(stock): testcase for different inventory dimension
...
(cherry picked from commit 21d0ee8db1
2026-02-05 04:54:39 +00:00
Pandiyan37
96dfecf0d5
fix(stock): update target field attribute
...
(cherry picked from commit 7e08154217
2026-02-05 04:54:38 +00:00
Mihir Kandoi
b5b8032ce0
Merge pull request #52430 from frappe/mergify/bp/version-16-hotfix/pr-52427
2026-02-04 20:17:43 +05:30
archielister
5298e26a11
fix for obtaining bom_no
...
(cherry picked from commit e4df0a393a
2026-02-04 14:33:24 +00:00
Rohit Waghchaure
c5ff534d58
fix: not able to complete job card
...
(cherry picked from commit 175fe9279c
2026-02-04 13:13:27 +00:00
Mihir Kandoi
1dc44691db
Merge pull request #52421 from frappe/mergify/bp/version-16-hotfix/pr-51773
...
fix(manufacturing): refactor production analytics report (backport #51773 )
2026-02-04 18:06:40 +05:30
ruthra kumar
91043de352
refactor: scrub http and use https in sales partner
...
(cherry picked from commit 8cf31548f2
2026-02-04 12:32:42 +00:00
Sudharsanan11
b99ca486d7
fix(manufacturing): fix chart period keys
...
(cherry picked from commit 27091e5168
2026-02-04 17:51:53 +05:30
Sudharsanan11
b1b75eca3d
fix(manufacturing): handle None value for actual_end_date
...
(cherry picked from commit 16f09141da
2026-02-04 17:51:53 +05:30
Mihir Kandoi
33305550b7
Merge pull request #52408 from frappe/mergify/bp/version-16-hotfix/pr-52383
...
fix: rate comparison in stock reco (backport #52383 )
2026-02-04 17:42:06 +05:30
Mihir Kandoi
e86ab97b7e
chore: add line in the end so linter check passes
2026-02-04 17:26:01 +05:30
Mihir Kandoi
64a7956a4a
fix: return None instead of 0 if valuation rate is falsy
...
(cherry picked from commit e8d1e9d946
2026-02-04 06:48:33 +00:00
Mihir Kandoi
1f78f45aee
fix: rate comparison in stock reco
...
(cherry picked from commit f1b4fe12a2
2026-02-04 06:48:32 +00:00
rohitwaghchaure
4a7e2742ec
Merge pull request #52388 from frappe/mergify/bp/version-16-hotfix/pr-51422
...
fix: merge taxes in purchase receipt when get items from multiple purchase invoices (backport #51422 )
2026-02-03 22:53:40 +05:30
rohitwaghchaure
55d5d6535b
Merge pull request #52391 from frappe/mergify/bp/version-16-hotfix/pr-51898
...
fix: group item wise tax details by tax row (backport #51898 )
2026-02-03 22:52:37 +05:30
rohitwaghchaure
b8ac04fb54
Merge branch 'version-16' into version-16-hotfix
2026-02-03 22:50:07 +05:30
ravibharathi656
45e4c04830
fix: group item wise tax details by tax row
...
(cherry picked from commit 57bd1facf5
2026-02-03 15:38:48 +00:00
NaviN
d80c8d14b0
fix: merge taxes in purchase receipt when get items from multiple purchase invoices ( #51422 )
...
* fix: merge taxes in purchase receipt when get items from multiple purchase invoices
* fix: make merge tax configurable
* chore: follow standard merge taxes method
* chore: follow standard merge taxes method
(cherry picked from commit 6fde0a6261
2026-02-03 15:34:03 +00:00
