Khushi Rawat
bd795f5546
fix: resolve conflict
2025-11-28 17:26:33 +05:30
Navin S R
c12a560c63
fix: use posting_date instead of bill_date from purchase invoice
...
(cherry picked from commit 145d40dec8
2025-11-28 11:49:33 +00:00
Khushi Rawat
188c633d6e
Merge pull request #50544 from aerele/asset-repair-pi-status
...
fix: prevent pi status from changing on asset repair
2025-11-24 23:28:33 +05:30
El-Shafei H.
475eada727
fix: add missing translate function
...
(cherry picked from commit 56def01240
2025-11-24 07:39:09 +00:00
ravibharathi656
3f2081b440
fix: prevent pi status from changing on asset repair
2025-11-18 11:09:25 +05:30
Pugazhendhi Velu
2db91ee67e
fix(asset repair): validate pi status
2025-11-17 14:06:26 +00:00
Pugazhendhi Velu
623a0a932e
fix: add cancelled option in status field
2025-11-17 13:09:38 +00:00
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
khushi8112
3d7827731b
fix: create GL entries via hooks only for submitted assets
...
(cherry picked from commit 33690975f6
2025-11-03 09:21:58 +00:00
khushi8112
ee5e4eccec
fix: set default value for as zero for additional asset cost
2025-10-23 22:51:30 +05:30
khushi8112
a82fa8c26b
fix: use correct field name
2025-10-23 20:45:08 +05:30
khushi8112
97147a484d
fix: resolve conflicts
2025-10-23 19:09:30 +05:30
khushi8112
d8eddbfd03
fix: set status to Draft for auto-created assets from Purchase Receipt
...
(cherry picked from commit 20c2cb40d1
2025-10-23 13:03:17 +00:00
khushi8112
02ebde43bf
refactor: Ensure flag cleanup with try-finally to prevent state corruption
2025-10-14 16:32:32 +05:30
khushi8112
6d5f2b5024
fix: skip auto-cancel of depreciation for components during asset capitalization
2025-10-14 15:19:07 +05:30
ravibharathi656
1ea6e1db12
fix: fixed asset register showing opening entries
...
(cherry picked from commit c9d98eb4f0
2025-10-10 05:44:27 +00:00
Khushi Rawat
38e1ca1362
fix: resolve conflict
2025-10-08 12:53:25 +05:30
ravibharathi656
4ec5b28fd2
fix(asset movement): clear custodian if not present
...
(cherry picked from commit 323d8eaccd
2025-10-08 07:05:10 +00:00
l0gesh29
ed1c270398
fix: exclude opening entries
...
(cherry picked from commit 3773f56b0b
2025-10-06 21:40:58 +00:00
Khushi Rawat
09bcff13ad
Merge pull request #49522 from KerollesFathy/clear-custodian-when-asset-take-backed
...
fix: clear asset custodian when asset take back from employee without assign to another employee
2025-10-02 22:16:35 +05:30
Khushi Rawat
e81b85b241
chore: resolve conflict
2025-09-30 21:02:39 +05:30
rahulgupta8848
0eb76f4d2c
feat: validating asset scrap date ( #43093 )
...
* feat: validating asset scrap date
* refactor: refactorization of scrap asset function
---------
Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com ”>
(cherry picked from commit e07bc5af41
2025-09-30 21:02:15 +05:30
mergify[bot]
bce22cb27b
fix: project accounting dimension and gl posting date column width (backport #49563 ) ( #49591 )
...
fix: project accounting dimension and gl posting date column width (#49563 )
* fix: add width for posting_date
* fix: add project field for missing doctype
* fix: remove allow_on_submit to align with cost center
(cherry picked from commit 9fc17e0e3alogeshperiyasamy24@gmail.com >
2025-09-17 17:33:02 +05:30
KerollesFathy
97765ce8bd
fix: correct grammatical errors in asset movement validation messages
...
(cherry picked from commit 5f083d55b5
2025-09-15 06:26:45 +00:00
KerollesFathy
edd3f5da1c
fix: correct typo in asset movement purpose validation
...
(cherry picked from commit 56da3bd2e4
2025-09-15 06:26:45 +00:00
KerollesFathy
4bc76be130
refactor: optimize asset location and custodian update logic to avoid multiple updates
2025-09-10 19:01:14 +03:00
KerollesFathy
f4cdb49126
fix: clear asset custodian when asset take back from employee without assign to another employee
2025-09-10 18:27:39 +03:00
khushi8112
da039e5bf0
chore: remove print statement
2025-09-05 01:58:20 +05:30
khushi8112
845d3464b4
fix: depreciate asset with remaining amount when depreciation amount exceeds current asset value
2025-09-05 01:54:56 +05:30
khushi8112
94cd4549c6
fix: set value for asset owner company field
...
(cherry picked from commit a24f1d056b
2025-08-26 09:06:48 +00:00
ravibharathi656
f231b1e32f
fix(asset): handle None in depreciation value
2025-08-26 13:33:26 +05:30
l0gesh29
1af8ab2a3b
fix(asset): prevent translation function shadowing in make_journal_entry
...
(cherry picked from commit 5e82de1b71
2025-08-18 09:26:40 +00:00
Khushi Rawat
9c5dacd977
refactor: validate linked purchase docs before field usage
...
(cherry picked from commit 4a48b13715
2025-08-13 11:49:35 +00:00
Rehan Ansari
4187e60b07
fix: add validation for draft PR/PI in Asset
...
(cherry picked from commit 4cf481cca8
2025-08-13 11:49:35 +00:00
khushi8112
e1121d1c68
chore: format code
...
(cherry picked from commit a33bcb47b3
2025-08-06 11:44:55 +00:00
khushi8112
5224b6677d
fix: fetch revaluated asset value for all the assets
...
(cherry picked from commit 67ec4fa477
2025-08-06 11:44:55 +00:00
Khushi Rawat
3760ff8a7a
Merge pull request #48977 from frappe/mergify/bp/version-15-hotfix/pr-48968
...
fix: validate asset before submitting depreciation schedule (backport #48968 )
2025-08-05 16:28:03 +05:30
Khushi Rawat
4a8465df90
chore: resolved conflicts
2025-08-05 16:05:54 +05:30
Khushi Rawat
78857cd798
fix: add missing parentheses
...
(cherry picked from commit a60db40fd2
2025-08-05 10:26:31 +00:00
Ernesto Ruiz
2c9ee7ae14
chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py
...
(cherry picked from commit 803180d5de
2025-08-05 10:26:31 +00:00
Ernesto Ruiz
4a5e0b181f
chore: add translation function on remarks in make_journal_entry in asset.py
...
(cherry picked from commit 119904e44f
2025-08-05 10:26:31 +00:00
Khushi Rawat
35f826c499
chore: remove duplicate code
2025-08-05 15:54:11 +05:30
Khushi Rawat
4f14651a42
chore: resolved conflicts
2025-08-05 15:06:57 +05:30
khushi8112
497247d89a
chore: fetch docstatus to validate
...
(cherry picked from commit d6fb99916e
2025-08-05 09:32:29 +00:00
khushi8112
37eaa07192
fix: validate if journal entry linked to schedule is in draft
...
(cherry picked from commit d5edca2022
2025-08-05 09:32:28 +00:00
khushi8112
9d8cb2f57c
fix: submit depreciation schedule only for submitted asset
...
(cherry picked from commit a4628c2024
2025-08-05 09:32:28 +00:00
khushi8112
eec327c02b
fix: use maintenance_status filter for indicators
...
(cherry picked from commit 1b674a1051
2025-08-05 09:32:22 +00:00
khushi8112
106f7ea112
test: test asset status after sales invoice creation and cancellation
2025-07-30 13:51:34 +05:30
Khushi Rawat
21bdf6ef14
Merge pull request #48840 from khushi8112/finance-books-issue-when-asset-splitting
...
fix: finance books issue when asset splitting
2025-07-29 18:01:37 +05:30
khushi8112
bc1d3ea017
chore: remove print statement
2025-07-29 17:43:21 +05:30
