Doğancan
|
e43c357c08
|
fix: translate in js
(cherry picked from commit 25faec5662)
|
2024-09-19 03:27:14 +00:00 |
|
Khushi Rawat
|
ea7c82c6a3
|
chore: resolved conflicts
|
2024-08-15 13:12:38 +05:30 |
|
Khushi Rawat
|
47a9325177
|
chore: linters check
(cherry picked from commit 0d42793397)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
|
2024-08-14 09:07:34 +00:00 |
|
Khushi Rawat
|
db319f95f1
|
fix: removed extra filter condition
(cherry picked from commit 6fa29376a0)
|
2024-08-14 09:07:34 +00:00 |
|
Khushi Rawat
|
450b3f338e
|
fix: set up filters for dimensions
(cherry picked from commit 2fd8de2f76)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
|
2024-08-14 09:07:34 +00:00 |
|
Khushi Rawat
|
8df1079618
|
fix: fixed depreciation calculation as per income tax act
|
2024-08-05 18:04:06 +05:30 |
|
Khushi Rawat
|
4d6a71ab4b
|
fix: fetch expence account from asset category
|
2024-07-04 01:45:01 +05:30 |
|
Khushi Rawat
|
a2ee4631cc
|
fix: asset value correction in fixed asset register (#41943)
|
2024-06-25 16:04:20 +05:30 |
|
Raffael Meyer
|
aa38f69a67
|
Merge pull request #40543 from frappe/mergify/bp/version-14-hotfix/pr-40542
|
2024-06-18 12:51:55 +02:00 |
|
Nabin Hait
|
eb418e8659
|
fix: Update depreciation schedule via asset repair (#41344)
* fix: Update depreciation schedule via asset repair
* fix: test cases related to modified depreciation schedule
|
2024-05-29 11:07:03 +05:30 |
|
Akhil Narang
|
4d34b1ead7
|
refactor(treewide): formatting and ruff fixes, + manually enabled F401
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-04-10 17:13:31 +05:30 |
|
Nabin Hait
|
10d760089e
|
fix: Get pro-rata depr amount based on correct days
|
2024-04-07 14:08:45 +05:30 |
|
Nabin Hait
|
cfe5f009f6
|
fix: show currency symbol in base currency in fixed asset register report
(cherry picked from commit 8b6220efd8)
|
2024-04-02 10:27:56 +00:00 |
|
barredterra
|
7f2a54d95b
|
refactor: usage of in_list
(cherry picked from commit d238751e6b)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
# erpnext/buying/doctype/purchase_order/purchase_order.js
# erpnext/public/js/controllers/accounts.js
# erpnext/public/js/controllers/buying.js
# erpnext/public/js/controllers/transaction.js
# erpnext/public/js/utils/sales_common.js
# erpnext/templates/form_grid/item_grid.html
|
2024-03-19 11:12:58 +00:00 |
|
Nabin Hait
|
c1428a5655
|
Merge pull request #40246 from nabinhait/depreciation-asset-sale
fix: Book depreciation until the asset disposal date and removed unwanted commits
|
2024-03-13 13:17:18 +05:30 |
|
Nabin Hait
|
43a6a00912
|
Merge pull request #40125 from nabinhait/document-modified-error
fix: Reload document on cancel to avoid document modified error
|
2024-03-13 13:17:05 +05:30 |
|
Nabin Hait
|
b5f0576a1b
|
Merge pull request #40122 from nabinhait/remove-capitalized-in
fix: Patch to remove cancelled asset capitalization from asset
|
2024-03-13 13:16:29 +05:30 |
|
Nabin Hait
|
34c3e75d5c
|
fix: convert str to date
|
2024-03-12 12:16:41 +05:30 |
|
Nabin Hait
|
ac0dd5083f
|
fix: linter issues
|
2024-03-12 12:10:55 +05:30 |
|
Nabin Hait
|
668a93128b
|
fix: linter issues
|
2024-03-12 12:02:23 +05:30 |
|
Nabin Hait
|
5fcf8c588a
|
fix: Book depreciation until the asset disposal date and removed unwanted commits
|
2024-03-12 11:56:47 +05:30 |
|
Ankush Menat
|
4c629d31c6
|
style: format js files
|
2024-03-11 11:03:58 +05:30 |
|
Nabin Hait
|
c7ed854850
|
fix: Reload document on cancel to avoid document modified error
|
2024-02-26 14:49:32 +05:30 |
|
Nabin Hait
|
23e256aedf
|
fix: Patch to remove cancelled asset capitalization from asset
|
2024-02-26 12:53:06 +05:30 |
|
Nabin Hait
|
46762ead05
|
Merge pull request #39982 from nabinhait/asset-capitalization-cancel
fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists
|
2024-02-20 18:30:14 +05:30 |
|
Nabin Hait
|
5b9905f27a
|
fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists
|
2024-02-20 17:54:58 +05:30 |
|
Nabin Hait
|
a4fbea3722
|
fix: linter issue
|
2024-02-20 12:31:34 +05:30 |
|
Nabin Hait
|
e99485bfa7
|
fix: linter issues
|
2024-02-20 12:24:36 +05:30 |
|
Nabin Hait
|
963ddac528
|
fix: Adjust amount in last row due to rounding
|
2024-02-20 12:24:36 +05:30 |
|
Nabin Hait
|
abceb1b611
|
fix: linter issue
|
2024-02-20 12:21:12 +05:30 |
|
Nabin Hait
|
24386006d6
|
fix: cancel asset capitalization
|
2024-02-12 11:44:41 +05:30 |
|
Nabin Hait
|
f2d094d1ab
|
fix: Handling circular linking while cancelling asset capitalization
|
2024-02-08 15:51:29 +05:30 |
|
Nabin Hait
|
1dacb79441
|
fix: fetch correct quantity and amount for grouped asset
(cherry picked from commit 06f48c678b)
|
2024-01-25 10:51:48 +00:00 |
|
Nabin Hait
|
941f8824e5
|
fix: linter issue
|
2024-01-25 11:40:44 +05:30 |
|
Nabin Hait
|
f604798a45
|
fix: asset module test cases
|
2024-01-19 16:59:52 +05:30 |
|
Nabin Hait
|
b840eb90eb
|
fix: Asset Depreciation WDV as per Income Tax Act
|
2024-01-18 19:06:41 +05:30 |
|
Nabin Hait
|
ac6020a940
|
fix: composite asset capitalization using asset components
(cherry picked from commit 5df40661d2)
|
2024-01-17 15:35:56 +00:00 |
|
Nabin Hait
|
4edb73d398
|
fix: resolved merge conflict
|
2024-01-17 17:36:42 +05:30 |
|
Nabin Hait
|
1dff96057c
|
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
(cherry picked from commit efe9f6656f)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
|
2024-01-17 06:44:52 +00:00 |
|
Nabin Hait
|
cc07213faa
|
Merge pull request #39189 from frappe/mergify/bp/version-14-hotfix/pr-39163
fix: Purchase information is not required for creating a composite asset (backport #39163)
|
2024-01-10 12:15:43 +05:30 |
|
Nabin Hait
|
0379ea5086
|
Merge pull request #39277 from frappe/mergify/bp/version-14-hotfix/pr-39238
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)
|
2024-01-10 12:14:24 +05:30 |
|
Nabin Hait
|
b529883897
|
fix: resolved conflict
|
2024-01-10 12:01:32 +05:30 |
|
Nabin Hait
|
41e384326e
|
fix: Set asset purchase amount based on qty and valuation_rate
(cherry picked from commit 135e19d0aa)
|
2024-01-10 06:03:03 +00:00 |
|
Nabin Hait
|
0f6477a253
|
fix: Purchase date and amount is not mandatory for composite asset creation
(cherry picked from commit c34f09c503)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
|
2024-01-08 06:52:33 +00:00 |
|
Nabin Hait
|
580e9f6e10
|
fix: improved validation message
(cherry picked from commit fe43dab4d7)
|
2024-01-08 06:52:32 +00:00 |
|
anandbaburajan
|
1cbe1e894d
|
fix: asset WDV depreciation calc according to IT act
|
2023-12-31 23:34:15 +05:30 |
|
mergify[bot]
|
3b9feffc00
|
chore: additional_asset_cost field (backport #38904) (#38905)
* chore: additional_asset_cost field (#38904)
(cherry picked from commit 283763dfb2)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
* chore: resolve conflicts in asset.py
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
|
2023-12-21 16:56:32 +05:30 |
|
mergify[bot]
|
8169c7de0d
|
feat: total_asset_cost field (backport #38879) (#38886)
* feat: total_asset_cost field (#38879)
(cherry picked from commit d370c60a6c)
# Conflicts:
# erpnext/assets/doctype/asset/asset.json
# erpnext/assets/doctype/asset/asset.py
# erpnext/patches.txt
* chore: resolve conflicts in asset.json
* chore: resolve conflicts in asset.py
* chore: resolve conflicts in patches.txt
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
|
2023-12-20 22:57:37 +05:30 |
|
Anand Baburajan
|
753a1b511d
|
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38697)
fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
|
2023-12-12 20:53:44 +05:30 |
|
Sherin KR
|
14b908f8ab
|
fix: validate finance_books table length in asset (#38584)
|
2023-12-05 14:44:59 +05:30 |
|