727 Commits

Author SHA1 Message Date
GangaManoj
4311936b7d fix: Edit dates and frequency of depreciation 2021-11-24 05:21:31 +05:30
GangaManoj
6ec5a19063 fix: Test if clear_depreciation_schedule() works for multiple finance books 2021-11-24 03:23:02 +05:30
GangaManoj
33a0b1db2c fix: Retain depreciation schedule rows that are linked with JEs while clearing the schedule 2021-11-24 03:16:17 +05:30
GangaManoj
f455de2924 fix: Test if multiple Depreciation Schedules are set up for multiple Finance Books 2021-11-23 23:26:32 +05:30
GangaManoj
60d82d913c fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-11-23 23:07:27 +05:30
GangaManoj
a36713cd2d fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-11-23 21:03:03 +05:30
GangaManoj
d406775d1a fix: Check root_type of Depreciation Expense Account 2021-11-23 20:21:24 +05:30
Ganga Manoj
2e01b40465
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-23 02:41:04 +05:30
GangaManoj
475d8394e4 fix: Clear Depreciation Schedule entries that aren't linked with Journal Entries before modifying the schedule 2021-11-22 21:51:32 +05:30
Ganga Manoj
624e58d1de
fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28443) 2021-11-22 11:36:35 +05:30
GangaManoj
059d1f3b74 fix: Rename loop variable 2021-11-19 05:35:41 +05:30
GangaManoj
a4043c035d fix: Prevent clearing of Depreciation Schedule on adding more than one Finance Book 2021-11-19 05:27:06 +05:30
GangaManoj
cb93cc972d fix: Check all ancestors and not just the root node 2021-11-17 05:22:43 +05:30
GangaManoj
62fbbe8915 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-11-17 04:59:59 +05:30
GangaManoj
8fc31e3cea fix: Make Depreciation Entry posting more flexible 2021-11-17 04:58:13 +05:30
GangaManoj
aa34780265 fix: Filter Depreciation Expense Account by root type 2021-11-17 04:57:40 +05:30
Saqib
950261d860
Merge branch 'develop' into serialized-item-consumption 2021-11-16 15:59:53 +05:30
GangaManoj
1393f97ad5 fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair 2021-11-11 18:48:23 +05:30
GangaManoj
4668bb4be0 feat: Add 'Add Serial No' button in the Stock Items table 2021-11-11 18:42:25 +05:30
GangaManoj
abb535540a fix: Rename item to item_code 2021-11-11 18:41:16 +05:30
GangaManoj
1aed8c4b2f feat: Add Serial No field 2021-11-11 18:40:38 +05:30
Saif Ur Rehman
13f8edd43f Merge remote-tracking branch 'upstream/develop' into asset-capitalization
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
2021-11-09 12:17:17 +05:00
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Saif Ur Rehman
85d1a237ce fix(Asset Capitalization): Reverse depreciation on cancel 2021-11-04 14:15:47 +05:00
Saif Ur Rehman
dc3c27fd1b fix(Asset Capitalization): update code for changes in depreciation logic 2021-11-04 13:47:33 +05:00
Saif Ur Rehman
2d9da22721 Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/assets/doctype/asset/test_asset.py
#	erpnext/assets/workspace/assets/assets.json
2021-11-04 12:48:33 +05:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region 2021-11-02 17:47:44 +05:30
GangaManoj
f047c6ffc8 fix: Test for WDV 2021-11-02 16:43:31 +05:30
Ganga Manoj
15e9b5170d
fix: Make status filter optional (#28126) 2021-10-29 18:07:11 +05:30
GangaManoj
06c505ddc2 fix: Linters 2021-10-27 05:23:01 +05:30
GangaManoj
9e7022830e fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0 2021-10-25 01:34:42 +05:30
GangaManoj
0b8cb5dd47 fix: Add missing digit 2021-10-15 04:56:00 +05:30
GangaManoj
fdeb273fa0 fix: Sider issues 2021-10-15 04:53:23 +05:30
GangaManoj
60aae4423d fix: Add missing digit 2021-10-15 04:03:30 +05:30
GangaManoj
371b621364 fix: Compare date strings 2021-10-15 04:02:27 +05:30
GangaManoj
e9d310a13e fix: Format tests 2021-10-15 01:45:53 +05:30
Ganga Manoj
5a0289a810
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 22:37:07 +05:30
GangaManoj
968be70bd1 fix: Remove PR creation from all tests in TestDepreciationBasics 2021-10-14 22:33:35 +05:30
GangaManoj
09215a9781 fix: Remove PR creation from all tests for Depreciation Methods 2021-10-14 22:32:55 +05:30
GangaManoj
4bf01bb4b7 fix: Move Purchase Receipt creation to setUpClass 2021-10-14 22:32:54 +05:30
Saqib
1f70dd6e98
fix: value_after_depreciation calculation (#27954) 2021-10-14 16:23:12 +05:30
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +05:30
GangaManoj
e8986df3ca fix: Move test for Finance Books to Depreciation test suite 2021-10-13 21:36:10 +05:30
GangaManoj
83ec9879ee fix: Add test to validate available_for_use_date 2021-10-13 21:21:50 +05:30
GangaManoj
749d1b6ee6 fix: Enable cwip accounting 2021-10-13 20:49:07 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
GangaManoj
a7ec007dcf fix: Add tests to validate item 2021-10-12 01:33:46 +05:30
GangaManoj
d8aaf3d389 fix: Add tests to validate Asset values 2021-10-12 01:07:11 +05:30