rohitwaghchaure
|
b0fc21b8ed
|
Merge pull request #53244 from frappe/mergify/bp/version-16-hotfix/pr-53239
fix: validation for cancellation (backport #53239)
|
2026-03-09 13:40:52 +05:30 |
|
Rohit Waghchaure
|
8f02184c80
|
fix: validation for cancellation
(cherry picked from commit 8de272a8a1)
|
2026-03-09 07:49:38 +00:00 |
|
Mihir Kandoi
|
ddb441359e
|
Merge pull request #53241 from frappe/mergify/bp/version-16-hotfix/pr-53234
fix(manufacturing): show returned qty in progress bar (backport #53234)
|
2026-03-09 12:42:16 +05:30 |
|
Sudharsanan11
|
38e5d295c7
|
feat(manufacturing): show disassembled qty in progress bar
(cherry picked from commit ae9ff767fa)
|
2026-03-09 07:04:47 +00:00 |
|
Sudharsanan11
|
f853ef9fec
|
fix(manufacturing): show returned qty in progress bar
(cherry picked from commit 8027f5aafd)
|
2026-03-09 07:04:47 +00:00 |
|
MochaMind
|
1131313d20
|
chore: update POT file (#53232)
|
2026-03-08 19:43:22 +01:00 |
|
ruthra kumar
|
1a52fa2a03
|
Merge pull request #53229 from frappe/mergify/bp/version-16-hotfix/pr-53227
refactor: party type and party filter for comparison report (backport #53227)
|
2026-03-08 05:50:03 +05:30 |
|
ruthra kumar
|
42b4fe2f68
|
refactor: party type and party filter for comparison report
(cherry picked from commit b6f9c0844e)
|
2026-03-07 12:50:03 +00:00 |
|
rohitwaghchaure
|
aaa29a3ce8
|
Merge pull request #53219 from frappe/mergify/bp/version-16-hotfix/pr-53218
fix: HRMS test cases failing due to validation in item (backport #53218)
|
2026-03-06 18:51:07 +05:30 |
|
Rohit Waghchaure
|
10538d58ad
|
fix: HRMS test cases failing due to validation in item
(cherry picked from commit 6702506f58)
|
2026-03-06 12:24:59 +00:00 |
|
Khushi Rawat
|
716645ea1d
|
Merge pull request #52999 from khushi8112/pr-52968
refactor: assets module form cleanup (backport #52393)
|
2026-03-06 15:09:26 +05:30 |
|
Khushi Rawat
|
3aeee125a4
|
Merge branch 'version-16-hotfix' into pr-52968
|
2026-03-06 14:46:32 +05:30 |
|
ruthra kumar
|
12ccc3881b
|
fix: add clear demo data in sidebar (backport #53177) (#53197)
fix: add clear demo data in sidebar
(cherry picked from commit 6603005822)
Co-authored-by: sokumon <sohamkulkarns9@gmail.com>
|
2026-03-06 14:12:42 +05:30 |
|
rohitwaghchaure
|
b510f78510
|
Merge pull request #53208 from frappe/mergify/bp/version-16-hotfix/pr-53200
fix: stock balance report qty (backport #53200)
|
2026-03-06 13:14:55 +05:30 |
|
rohitwaghchaure
|
a02aa9eb05
|
Merge pull request #53204 from frappe/mergify/bp/version-16-hotfix/pr-52549
feat: option to enable serial / batch feature (backport #52549)
|
2026-03-06 13:07:31 +05:30 |
|
Rohit Waghchaure
|
699a683b8e
|
fix: stock balance report qty
(cherry picked from commit a15e5fdc4e)
|
2026-03-06 07:15:46 +00:00 |
|
rohitwaghchaure
|
0685a9241e
|
chore: fix conflicts
Remove merge conflict markers and update patch list.
|
2026-03-06 12:44:55 +05:30 |
|
Rohit Waghchaure
|
93a597410e
|
feat: option to enable serial / batch features
(cherry picked from commit 82c3da5b1e)
# Conflicts:
# erpnext/patches.txt
|
2026-03-06 06:48:17 +00:00 |
|
sokumon
|
8e8a7b2686
|
fix: add clear demo data in sidebar
(cherry picked from commit 6603005822)
|
2026-03-05 18:14:18 +00:00 |
|
mergify[bot]
|
83f2fadbcf
|
fix(help): escape query (backport #53192) (#53195)
fix(help): escape query (#53192)
(cherry picked from commit 702adda000)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
|
2026-03-05 18:40:54 +05:30 |
|
rohitwaghchaure
|
fff9750f48
|
Merge pull request #53181 from frappe/mergify/bp/version-16-hotfix/pr-52745
fix: balance qty for inv dimension (backport #52745)
|
2026-03-05 14:26:49 +05:30 |
|
rohitwaghchaure
|
fdf0d6611d
|
Merge pull request #53182 from frappe/mergify/bp/version-16-hotfix/pr-52956
feat: organization desktop icon (backport #52956)
|
2026-03-05 14:26:35 +05:30 |
|
Rohit Waghchaure
|
e89aaca870
|
feat: organization desktop icon
(cherry picked from commit 4e9a2a327f)
|
2026-03-05 08:36:29 +00:00 |
|
Rohit Waghchaure
|
fb17a00fb6
|
fix: balance qty for inv dimension
(cherry picked from commit a3eafe5b18)
|
2026-03-05 08:20:20 +00:00 |
|
rohitwaghchaure
|
96f7eb1194
|
Merge pull request #53178 from frappe/mergify/bp/version-16-hotfix/pr-53170
chore: New org icon (backport #53170)
|
2026-03-05 13:49:12 +05:30 |
|
jacob-salvi
|
1938a56164
|
chore: new organisation icon
(cherry picked from commit 6f93210b9b)
|
2026-03-05 08:10:14 +00:00 |
|
jacob-salvi
|
f97e0f8c9c
|
chore: new accounting icons
(cherry picked from commit 728c678cf9)
|
2026-03-05 08:10:14 +00:00 |
|
Nishka Gosalia
|
f410bfcea6
|
Merge pull request #53175 from frappe/mergify/bp/version-16-hotfix/pr-52924
|
2026-03-05 12:17:40 +05:30 |
|
Jatin3128
|
6793c1455c
|
Merge pull request #53174 from frappe/mergify/bp/version-16-hotfix/pr-52138
feat(selling-settings): add checkbox to fetch payment terms (backport #52138)
|
2026-03-05 12:12:08 +05:30 |
|
Nishka Gosalia
|
4386af1df7
|
refactor: project module form cleanup
(cherry picked from commit 3c9f520e68)
|
2026-03-05 06:28:05 +00:00 |
|
SowmyaArunachalam
|
92003df7f9
|
test: test payment terms with backdated entries
(cherry picked from commit 8aae46a25e)
|
2026-03-05 06:20:47 +00:00 |
|
SowmyaArunachalam
|
b2f695310c
|
fix: fetch payment terms from quotation
(cherry picked from commit 99ed1c34f3)
|
2026-03-05 06:20:47 +00:00 |
|
SowmyaArunachalam
|
3b7410f2d3
|
fix: set default to 1
(cherry picked from commit 8b9e02fd44)
|
2026-03-05 06:20:47 +00:00 |
|
SowmyaArunachalam
|
80c20531aa
|
fix: handle payment terms template when disabled
(cherry picked from commit f23dc07914)
|
2026-03-05 06:20:46 +00:00 |
|
SowmyaArunachalam
|
8f26168a55
|
test: enable automatically_fetch_payment_terms_from_quotation
(cherry picked from commit 5611e9168e)
|
2026-03-05 06:20:46 +00:00 |
|
SowmyaArunachalam
|
1470a79a1b
|
fix: consider payment term only when enabled
(cherry picked from commit b1149fe950)
|
2026-03-05 06:20:46 +00:00 |
|
SowmyaArunachalam
|
f7dd730bc3
|
feat(selling-settings): add checkbox to recalculate payment date
(cherry picked from commit 70b401e610)
|
2026-03-05 06:20:46 +00:00 |
|
Nishka Gosalia
|
f428663f0d
|
Merge pull request #53171 from frappe/mergify/bp/version-16-hotfix/pr-52415
fix(project template): clear subject when task is empty (backport #52415)
|
2026-03-05 11:49:59 +05:30 |
|
ravibharathi656
|
2ccf8d050f
|
fix(task): allow is_template field in quick entry
(cherry picked from commit 7801dd5353)
|
2026-03-05 06:01:44 +00:00 |
|
ravibharathi656
|
c8560fa0d3
|
fix(project template): clear subject when task is empty
(cherry picked from commit c1431105f4)
|
2026-03-05 06:01:43 +00:00 |
|
Mihir Kandoi
|
c3d8918ee4
|
Merge pull request #53167 from frappe/mergify/bp/version-16-hotfix/pr-53166
fix: WO produced qty should be calculated using finished item child t… (backport #53166)
|
2026-03-04 20:50:06 +05:30 |
|
Mihir Kandoi
|
78fa2c5477
|
fix: WO produced qty should be calculated using finished item child table transfer qty
(cherry picked from commit 5fead1d17a)
|
2026-03-04 15:04:39 +00:00 |
|
Mihir Kandoi
|
0aa63e0ae9
|
Merge pull request #53165 from frappe/mergify/bp/version-16-hotfix/pr-53157
fix: disallow all actions on job card if work order is closed (backport #53157)
|
2026-03-04 17:11:10 +05:30 |
|
Khushi Rawat
|
b984f5f1b0
|
Merge pull request #53163 from frappe/mergify/bp/version-16-hotfix/pr-53154
fix: skip asset sale processing for internal transfer invoices (backport #53154)
|
2026-03-04 17:01:07 +05:30 |
|
Mihir Kandoi
|
57aab56baa
|
fix: disallow all actions on job card if work order is closed
(cherry picked from commit ee19c32c3a)
|
2026-03-04 11:21:53 +00:00 |
|
khushi8112
|
12cfd8e052
|
fix: skip asset sale processing for internal transfer invoices
(cherry picked from commit 9cb3dad079)
|
2026-03-04 11:07:25 +00:00 |
|
Nishka Gosalia
|
0361ee0444
|
Merge pull request #53159 from frappe/mergify/bp/version-16-hotfix/pr-53156
fix: updating costing based on employee change in timesheet (backport #53156)
|
2026-03-04 16:35:18 +05:30 |
|
Nishka Gosalia
|
d251c94ea3
|
fix: updating costing based on employee change in timesheet
(cherry picked from commit e37d4a6f7c)
|
2026-03-04 10:43:09 +00:00 |
|
mergify[bot]
|
76a6ff9026
|
Merge pull request #53096 from frappe/mergify/bp/version-16-hotfix/pr-52838
fix: correct fields being updated on material request and purchase or… (backport #52838)
|
2026-03-04 07:23:39 +00:00 |
|
Nishka Gosalia
|
bf774527fb
|
Merge pull request #53151 from frappe/mergify/bp/version-16-hotfix/pr-53147
|
2026-03-04 12:34:31 +05:30 |
|