l0gesh29
3f490f11d5
fix: include cost_center and project upon accounting dimension fetch
...
(cherry picked from commit 4680295303 )
2025-11-10 17:47:07 +00:00
Diptanil Saha
b545b69e4b
Merge pull request #50444 from frappe/mergify/bp/version-15-hotfix/pr-50361
...
fix: reset billing and shipping address when company changes (backport #50361 )
2025-11-10 20:59:05 +05:30
Pugazhendhi Velu
73b8a294cf
fix: reset billing and shipping address when company changes
...
(cherry picked from commit 0510f7e13f )
2025-11-10 15:08:13 +00:00
ruthra kumar
b5485dc909
Merge pull request #50393 from frappe/mergify/bp/version-15-hotfix/pr-50340
...
fix: ignore Department doctype (backport #50340 )
2025-11-10 16:37:43 +05:30
rohitwaghchaure
5ed4fea3e3
Merge pull request #50431 from aerele/fix/reserved-stock-negative
...
fix(stock): ignore current voucher in reserved stock validation
2025-11-10 15:57:37 +05:30
Kavin
b8ec3ae23a
fix: Nonetype error if reserved stock is not present
2025-11-10 14:51:35 +05:30
Kavin
0e7f9711e1
fix(stock): ignore current voucher in reserved stock validation
2025-11-10 14:29:04 +05:30
rohitwaghchaure
3cad1304a0
Merge pull request #50427 from frappe/mergify/bp/version-15-hotfix/pr-50374
...
fix: add validation to reject empty readings (backport #50374 )
2025-11-10 14:04:23 +05:30
ruthra kumar
9dc1f5f649
Merge pull request #50405 from frappe/mergify/bp/version-15-hotfix/pr-50326
...
fix: validate is_group for parent task (backport #50326 )
2025-11-10 12:58:34 +05:30
ruthra kumar
df6ca3af57
chore: resolve conflicts
2025-11-10 12:43:05 +05:30
ruthra kumar
95db1677e2
Merge pull request #50408 from aerele/support-52573
...
fix: check warehouse account before accessing
2025-11-10 12:39:14 +05:30
ruthra kumar
ca9f1b6c7b
Merge pull request #50429 from frappe/mergify/bp/version-15-hotfix/pr-50423
...
fix(buying): fetch Cost Center from Project (backport #50423 )
2025-11-10 12:35:29 +05:30
barredterra
e8e26a91bb
fix(buying): fetch Cost Center from Project
...
(cherry picked from commit bdabcb081a )
2025-11-10 07:03:04 +00:00
Pugazhendhi Velu
dc88f7b30b
refactor: add default reading value when creating a quality inspection
...
(cherry picked from commit 63fb9f55e7 )
2025-11-10 05:38:42 +00:00
Pugazhendhi Velu
ac0375fc2e
fix: add validation to reject empty readings
...
(cherry picked from commit 405d901514 )
2025-11-10 05:38:42 +00:00
rohitwaghchaure
5bb2e8a8ff
Merge pull request #50401 from aerele/support-52103
...
fix: handle partial dn against reserved stock
2025-11-07 20:53:43 +05:30
rohitwaghchaure
3989a7ede6
Merge pull request #50412 from frappe/mergify/bp/version-15-hotfix/pr-50411
...
fix: removed the validation (backport #50411 )
2025-11-07 19:16:37 +05:30
Kavin
ef719fe729
test: add test for partial dn against reserved stock
2025-11-07 19:09:23 +05:30
Kavin
9d979e34ab
fix: handle partial dn against reserved stock
2025-11-07 19:09:11 +05:30
Rohit Waghchaure
080e9a3d73
fix: removed the validation
...
(cherry picked from commit 10131333b2 )
2025-11-07 12:33:11 +00:00
Kavin
79b3af6d3e
fix: check warehouse account before accessing
2025-11-07 15:49:59 +05:30
Patrick Eißler
29c976e9ae
fix(Timesheet): don't use billing_hours for costing amount ( #50394 )
2025-11-07 13:26:44 +05:30
Pugazhendhi Velu
635fe427fe
refactor(task): use get_link_to_form for validation error messages
...
(cherry picked from commit 4cf02b4d78 )
2025-11-07 07:28:59 +00:00
Pugazhendhi Velu
dc5b8367c5
test: add test for parent task is_group validation
...
(cherry picked from commit 291f0c7161 )
# Conflicts:
# erpnext/projects/doctype/task/test_task.py
2025-11-07 07:28:59 +00:00
Pugazhendhi Velu
3380deab02
fix: validate is_group for parent task
...
(cherry picked from commit ed1a1099cb )
# Conflicts:
# erpnext/projects/doctype/task/task.py
2025-11-07 07:28:59 +00:00
Diptanil Saha
8e199af118
Merge pull request #50403 from frappe/mergify/bp/version-15-hotfix/pr-50402
...
fix: trends report total mismatch with group by filters (backport #50402 )
2025-11-07 12:50:49 +05:30
diptanilsaha
7e3f30baad
fix: trends report total mismatch with group filters
...
(cherry picked from commit f7d09f8760 )
2025-11-07 07:03:51 +00:00
rethik
32182d7cc7
fix: ignore Department doctype
...
(cherry picked from commit fff6f1fb23 )
2025-11-06 11:14:55 +00:00
ruthra kumar
4f02677d6f
Merge pull request #50387 from frappe/mergify/bp/version-15-hotfix/pr-50364
...
fix: hide total row in general ledger report (backport #50364 )
2025-11-06 16:02:53 +05:30
Pugazhendhi Velu
56bb88d281
fix: hide total row in general ledger report
...
(cherry picked from commit ef38b26a73 )
2025-11-06 10:11:46 +00:00
Khushi Rawat
124a0fe45d
Merge pull request #50379 from frappe/mergify/bp/version-15-hotfix/pr-50367
...
fix: set company before creating asset movement to avoid permission error (backport #50367 )
2025-11-06 10:03:20 +05:30
rehansari26
3fad90ebb9
fix: set company before creating asset movement to avoid permission error
...
(cherry picked from commit 8c49c9e500 )
2025-11-05 21:50:22 +00:00
Khushi Rawat
99b6dc508e
Merge pull request #50377 from frappe/mergify/bp/version-15-hotfix/pr-50342
...
feat: add asset name column (backport #50342 )
2025-11-06 01:29:57 +05:30
Khushi Rawat
7d593dd3db
fix: resolve conflict
2025-11-06 00:51:41 +05:30
Rehan Ansari
c48647100f
feat: add asset name column
...
(cherry picked from commit f3eda02972 )
# Conflicts:
# erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
2025-11-05 18:52:50 +00:00
ruthra kumar
c54d995354
Merge pull request #50368 from frappe/mergify/bp/version-15-hotfix/pr-50144
...
refactor: period closing voucher to handle large data volumes (backport #50144 )
2025-11-05 17:42:52 +05:30
ruthra kumar
5c6cc1ea2a
chore: resolve conflicts
2025-11-05 17:27:14 +05:30
ruthra kumar
e09ee63d32
refactor: add paused to select option
...
(cherry picked from commit fca7abf4d6 )
2025-11-05 11:28:44 +00:00
ruthra kumar
d8e5075424
refactor: minor changes on status
...
1. set to 'In Progress' on start of both legacy and new controller
2. force delete to avoid permission issues
3. default to 1hr timeout
(cherry picked from commit 9c13edc0b9 )
2025-11-05 11:28:43 +00:00
ruthra kumar
d5a36fe8aa
refactor: enable legacy controller by default for pcv
...
(cherry picked from commit fe39ce03bb )
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
2025-11-05 11:28:43 +00:00
ruthra kumar
10df192275
chore: progress bar
...
(cherry picked from commit 0b88f98a86 )
2025-11-05 11:28:43 +00:00
ruthra kumar
4ebddc591f
chore: remove scaffolding
...
(cherry picked from commit 191c0e65a1 )
2025-11-05 11:28:42 +00:00
ruthra kumar
5cc6a1771d
refactor: abort processing of all tasks upon cancellation
...
(cherry picked from commit 090e155fd0 )
2025-11-05 11:28:42 +00:00
ruthra kumar
29e8801b7f
refactor: more changes
...
1. 'Accounts Manager' has access to submit, cancel and delete
2. cancel and delete operation of PCV is linked with Proces PCV
(cherry picked from commit cae1237859 )
2025-11-05 11:28:42 +00:00
ruthra kumar
d94000fecf
refactor: smaller methods
...
(cherry picked from commit fa3bd6f5a7 )
2025-11-05 11:28:42 +00:00
ruthra kumar
5071cad161
refactor: utility to consolidate results from all dates
...
(cherry picked from commit 7406d83260 )
2025-11-05 11:28:41 +00:00
ruthra kumar
0151f5f191
refactor: utility to convert tuple key to str
...
(cherry picked from commit 5b464ae4c1 )
2025-11-05 11:28:41 +00:00
ruthra kumar
d139db296a
refactor: cleanup and for better readability
...
(cherry picked from commit 653ae84b3e )
2025-11-05 11:28:41 +00:00
ruthra kumar
3406e44b03
refactor: make Accounts Closing Balance as well
...
(cherry picked from commit 6e32769e37 )
2025-11-05 11:28:41 +00:00
ruthra kumar
449fa05d7d
refactor: store closing balance for Balnace sheet accounts
...
(cherry picked from commit 09e37bc98c )
2025-11-05 11:28:40 +00:00