rohitwaghchaure
08caa7cfa1
fix: Data too long for column 'serial_no' at row 1 ( #40098 )
2024-02-26 18:49:56 +05:30
Nabin Hait
66bf6e4041
Merge pull request #39983 from nabinhait/asset-cancel-deletion
...
fix: Issues regarding asset cancellation and deletion
2024-02-21 11:14:27 +05:30
Nabin Hait
17f85de6fb
fix: Issues regarding asset cancellation and deletion
2024-02-20 18:10:34 +05:30
Rohit Waghchaure
c1e869f040
test: fixed test cases
2024-02-05 19:39:58 +05:30
Rohit Waghchaure
9fafc83632
fix: use old serial / batch fields to make serial batch bundle
2024-02-04 18:32:19 +05:30
Nabin Hait
06f48c678b
fix: fetch correct quantity and amount for grouped asset
2024-01-25 16:18:54 +05:30
Nabin Hait
ca02dfa652
Merge pull request #39498 from nabinhait/asset-cancellation-fix
...
fix: cancellation of asset/asset capitalization
2024-01-25 11:36:19 +05:30
barredterra
806696a003
fix: typos
2024-01-24 02:59:52 +01:00
Nabin Hait
1a686cb66d
fix: Use db_set to set a value in on_cancel
2024-01-23 12:46:15 +05:30
Nabin Hait
31592b8f3a
fix: cancellation of asset/asset capitalization
2024-01-23 12:42:54 +05:30
mergify[bot]
6efa92de70
Merge branch 'develop' into composite-asset-using-asset
2024-01-17 12:20:05 +00:00
Nabin Hait
2adb710751
Merge pull request #39427 from nabinhait/test-fix333
...
fix: Asset module tests
2024-01-17 17:21:47 +05:30
Nabin Hait
97f69986ff
fix: Asset module tests
2024-01-17 16:39:39 +05:30
Nabin Hait
5df40661d2
fix: composite asset capitalization using asset components
2024-01-17 16:17:53 +05:30
Deepesh Garg
120bfdf33d
Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting
2024-01-17 12:33:07 +05:30
Nabin Hait
9f2b62dd1c
Merge pull request #39386 from nabinhait/asset-capitalisation-calcellation
...
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
2024-01-17 12:14:15 +05:30
Nabin Hait
efe9f6656f
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
2024-01-15 17:54:47 +05:30
Nabin Hait
22bd6a54b2
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months
2024-01-15 16:54:19 +05:30
Deepesh Garg
1a67d7d95f
Revert "refactor: use both fields to store against values"
...
This reverts commit 09439334cae6a7306dad8e54a9f81f9ffa483f8b.
2024-01-14 11:22:50 +05:30
Deepesh Garg
0f9734ae37
Revert "fix: split expected jv entries for scrap asset"
...
This reverts commit 291a4991246b5a53491066eb46efda0de2a8002f.
2024-01-14 11:19:46 +05:30
Deepesh Garg
beb169cf75
Revert "fix: asset capitalization tests"
...
This reverts commit 952e8cf60ca138ddb5941221421d87c2d00800c4.
2024-01-14 11:09:28 +05:30
Deepesh Garg
93ff84bf56
Revert "fix: remove multiple accounts from against in capitalization"
...
This reverts commit f705bf2efe7bf079bb9b8af200f4c8cadfddd4ee.
2024-01-14 11:06:01 +05:30
Deepesh Garg
498c9c7955
Revert "fix: set against type in asset"
...
This reverts commit 6e1565c32c41a5d8bb5cffc4a74c861b0592ece6.
2024-01-14 11:04:51 +05:30
Nabin Hait
c1922ea5de
Merge pull request #39052 from anandbaburajan/asset_wdv_india_dev
...
fix: asset WDV depreciation calc according to IT act [dev]
2024-01-10 12:17:09 +05:30
Nabin Hait
01f507ebcb
Merge pull request #39238 from nabinhait/asset-purchase-amount
...
fix: Set asset purchase amount based on qty and valuation_rate
2024-01-10 11:31:30 +05:30
Ankush Menat
bb18ae82cf
refactor: use db.get_single_value
2024-01-09 21:57:50 +05:30
Nabin Hait
135e19d0aa
fix: Set asset purchase amount based on qty and valuation_rate
2024-01-09 12:51:57 +05:30
Nabin Hait
eab22eb282
fix: Introduced company field to show amounts in company currency
2024-01-08 16:35:45 +05:30
Nabin Hait
c34f09c503
fix: Purchase date and amount is not mandatory for composite asset creation
2024-01-05 17:38:51 +05:30
Nabin Hait
fe43dab4d7
fix: improved validation message
2024-01-05 17:12:08 +05:30
mergify[bot]
3fb7886418
fix: Creating Asset Activity while Importing Asset (backport #39113 ) ( #39156 )
...
fix: Creating Asset Activity while Importing Asset (#39113 )
* fix: import asset not working on activity
* chore: fix linting issue in asset_activity.py
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 5e4693763ae7f8dde2013093d926d6abd39fd174)
Co-authored-by: Aulia Bismar <auliabismar@yahoo.com>
2024-01-05 10:50:49 +05:30
anandbaburajan
026824880d
fix: asset WDV depreciation calc according to IT act
2024-01-01 00:23:19 +05:30
Anand Baburajan
283763dfb2
chore: additional_asset_cost field ( #38904 )
2023-12-21 16:52:25 +05:30
Anand Baburajan
d370c60a6c
feat: total_asset_cost field ( #38879 )
2023-12-20 19:02:32 +05:30
Deepesh Garg
863116f1cd
Merge pull request #37232 from GursheenK/make-against-field-dynamic
...
fix: make GL and JV against fields dynamic links
2023-12-16 22:27:50 +05:30
Anand Baburajan
e7984b3ef9
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 ( #38696 )
...
fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
2023-12-12 20:53:37 +05:30
barredterra
eb9ee3f79b
refactor: simplify conditional logic
...
Command: `sourcery review --fix --enable de-morgan .`
2023-12-05 11:22:55 +01:00
Ankush Menat
63313eef6f
feat: enable automatic type annotations ( #38452 )
2023-11-30 08:23:48 +00:00
Gursheen Anand
ef8e4191cd
fix: set cwip account before asset tests
2023-11-29 18:25:52 +05:30
Gursheen Anand
96f31847b2
fix: set cwip account for company before tests
2023-11-29 16:04:36 +05:30
Gursheen Kaur Anand
4a047fefb8
Merge branch 'develop' into make-against-field-dynamic
2023-11-29 12:30:20 +05:30
Anand Baburajan
fe5fc5bd3a
feat: shift depreciation for assets ( #38327 )
...
* feat: shift depreciation for assets
* chore: create new asset depr schedule on shift change
* refactor: move create_depr_schedule to after_insert
* fix: args in get_depreciation_amount test
* refactor: rename shift adjustment to shift allocation
* chore: asset shift factor doctype and auto allocate shift diff
* chore: use check instead of depr type, and add tests
* chore: make linter happy
* chore: give permissions to accounts users
2023-11-29 12:14:12 +05:30
Deepesh Garg
add238c892
fix: debit credit mismatch in multi-currecy asset purchase receipt ( #38342 )
...
* fix: Debit credit mimatch in multicurrecy asset purchase receipt
* test: multi currency purchase receipt
* chore: update init files
* test: roolback
2023-11-28 08:21:45 +05:30
Gursheen Kaur Anand
01f133f8c8
Merge branch 'develop' into make-against-field-dynamic
2023-11-24 15:23:44 +05:30
Anand Baburajan
816b1b6bd5
fix: don't depreciate assets with no schedule on scrapping ( #38276 )
...
fix: don't depreciate non-depreciable assets on scrapping
2023-11-23 13:48:46 +05:30
Anand Baburajan
9903049c7a
fix: set default asset quantity as 1 [dev] ( #38223 )
...
* fix: make default asset quantity as 1
* fix: get rate_of_depreciation from asset category for asset auto-creation
* chore: create asset depr schedules on PR submit, not asset submit
* fix: set default asset quantity as 1
* chore: move patch from v15 to v14
2023-11-20 22:27:16 +05:30
Anand Baburajan
6e0362dee8
chore: change read only condition of asset quantity field ( #38111 )
...
chore: change read only condition of asset quantity
2023-11-15 17:58:37 +05:30
Gursheen Anand
09439334ca
refactor: use both fields to store against values
2023-11-08 12:57:00 +05:30
Gursheen Anand
291a499124
fix: split expected jv entries for scrap asset
2023-11-08 00:46:52 +05:30
Gursheen Kaur Anand
6280031722
Merge branch 'develop' into make-against-field-dynamic
2023-11-06 17:06:03 +05:30
