anandbaburajan
1fd73af744
chore: refactor some reports
2022-12-09 00:28:34 +05:30
anandbaburajan
2cd42dbb10
chore: refactor get_finance_book_value_map
2022-12-06 23:16:02 +05:30
anandbaburajan
e7d404a30a
chore: remove finance_book and finance_book_id from depreciation_schedule and refactor some functions
2022-12-06 21:33:20 +05:30
anandbaburajan
8365d6bdb7
fix: refactor reverse_depreciation_entry_made_after_disposal and fix fb bug
2022-12-06 17:58:38 +05:30
anandbaburajan
83ed93fbb6
chore: refactor chart and manual set_accumulated_depreciation logic
2022-12-04 22:45:48 +05:30
anandbaburajan
ca8c827492
chore: refactor schedules in split_asset functions
2022-12-04 19:22:58 +05:30
anandbaburajan
f20238fa3e
chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data
2022-12-01 15:15:32 +05:30
anandbaburajan
827ad01d4f
chore: style
2022-11-30 23:57:26 +05:30
anandbaburajan
25522444b8
fix: use is_last_day_of_the_month in test_scrap_asset
2022-11-30 23:25:40 +05:30
anandbaburajan
96ede2fcf9
fix: bug in new depr schedule
2022-11-29 21:30:23 +05:30
anandbaburajan
7d09440579
chore: more refactoring
2022-11-25 16:49:44 +05:30
anandbaburajan
de17367a36
chore: finish refactoring asset_value_adjustment
2022-11-24 16:16:36 +05:30
anandbaburajan
0e726609f1
fix: precision in asset test_scrap_asset
2022-11-24 15:38:05 +05:30
anandbaburajan
f35b19eac3
chore: renaming functions and variables again, and continuing refactoring AssetValueAdjustment
2022-11-24 15:33:21 +05:30
anandbaburajan
7db66b0916
chore: renaming some functions and variables, and partially refactoring AssetValueAdjustment
2022-11-24 13:02:48 +05:30
anandbaburajan
76f28de7eb
chore: refactor more functions to use new depr schedule
2022-11-23 18:04:54 +05:30
Anand Baburajan
a66d9f8e8e
Merge branch 'develop' into asset_depreciation_schedule
2022-11-17 20:17:21 +05:30
anandbaburajan
218da1217a
fix: add missing commas and brackets
2022-11-17 12:23:38 +05:30
Anand Baburajan
538da9a58e
Merge branch 'develop' into fix_precision_in_asset_tests
2022-11-17 12:17:27 +05:30
anandbaburajan
b5e5d3b3af
fix: precision in asset tests
2022-11-17 12:13:06 +05:30
Ankush Menat
1bd886387b
chore: hardcode doctype
2022-11-17 11:58:35 +05:30
anandbaburajan
417180e6ba
chore: refactor some functions to use new depr schedule
2022-11-14 17:51:11 +05:30
anandbaburajan
ffd41703de
chore: add expected_value_after_useful_life in depr schedule
2022-11-14 14:36:10 +05:30
anandbaburajan
ca3581d055
chore: rename modify_draft_asset_depreciation_schedules
2022-11-14 12:47:48 +05:30
anandbaburajan
ed495dc846
chore: add convert_draft_asset_depreciation_schedules_into_active and fix some bugs
2022-11-14 12:45:49 +05:30
anandbaburajan
97ab7bd36b
chore: remove some unwanted functions in asset
2022-11-11 16:27:29 +05:30
anandbaburajan
710d2452b7
feat: moving, refactoring and adding functions to asset_depreciation_schedule
2022-11-11 16:20:17 +05:30
Anand Baburajan
05d2c7f9ae
Merge branch 'develop' into asset_bill_date_new
2022-11-01 17:45:23 +05:30
anandbaburajan
65e855bfff
fix: pro_rata_amount calculation in assets tests
2022-11-01 12:45:28 +05:30
anandbaburajan
5a274176d3
feat: add asset_depreciation_schedule
2022-11-01 11:45:17 +05:30
anandbaburajan
f322c608cf
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
2022-10-31 12:41:37 +05:30
Hossein Yousefian
54c2ffc36b
fix: Pass project to stock entry items
...
fix: Pass project to stock entry items
2022-10-29 22:24:59 +05:30
Ernesto Ruiz
8f0e63cd27
fix: add translate function on remark text on make_depreciation_entry in asset_value_adjustment.py
2022-10-26 13:56:35 -06:00
Deepesh Garg
601880f1ce
Merge pull request #32454 from AnandBaburajan/fix_test_scrap_asset
...
fix: test_scrap_asset not working on end of month
2022-10-02 17:44:46 +05:30
anandbaburajan
47bd4be71b
fix: test_scrap_asset
2022-10-01 17:04:22 +05:30
anandbaburajan
28952eda87
chore: remove unused function
2022-09-29 15:33:45 +05:30
anandbaburajan
f1169fb213
chore: refactor by just using a filter
2022-09-29 15:32:01 +05:30
anandbaburajan
b734f9d237
chore: refactor by creating is_sold
2022-09-29 08:54:35 +05:30
anandbaburajan
f4bf9c672f
chore: rewrite query using frappe.qb
2022-09-28 18:20:20 +05:30
Anand Baburajan
0618f606b2
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 16:42:21 +05:30
anandbaburajan
a8dd3c3a7c
chore: adding missing asset statuses
2022-09-28 16:39:14 +05:30
anandbaburajan
1725672168
chore: adding missing asset statuses
2022-09-28 16:22:35 +05:30
anandbaburajan
f9f68005a5
fix: asset requiring maintenance sold status
2022-09-28 16:21:31 +05:30
anandbaburajan
c6a7de0e54
chore: add blank lines
2022-09-27 20:43:08 +05:30
anandbaburajan
14e2d31619
test: adding test_asset_with_maintenance_required_status_after_sale
2022-09-27 20:19:01 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-27 15:56:39 +05:30
Maharshi Patel
c760ca2323
fix: Scrap Asset Accounting Dimensions ( #31949 )
...
* fix: Scrap Asset Accounting Dimensions
2022-09-27 15:31:36 +05:30
Deepesh Garg
fac82cf69b
fix: Depreciation posting date only when calculate depreciation is checked
2022-09-18 19:41:05 +05:30
anandbaburajan
43a3400221
fix: fix restore asset value after depreciation
2022-09-15 23:25:04 +05:30
anandbaburajan
5a8b28c194
fix: refactor asset capitilization
2022-09-15 22:52:25 +05:30
anandbaburajan
11ac20e5ee
fix: asset tests
2022-09-15 22:43:18 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Nabin Hait
3457105504
fix: test cases
2022-09-15 11:19:33 +05:30
Nabin Hait
58d430fe3e
feat: Asset Capitalization
...
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 14:56:21 +05:30
Nabin Hait
fefe95052d
fix: resolved merge conflict
2022-09-09 14:40:36 +05:30
Deepesh Garg
c1f6dd46d1
chore: fix against account
2022-08-25 12:10:52 +05:30
Nabin Hait
b4a2eb2e65
fix: gl entries for asset repair
2022-08-24 12:29:15 +05:30
Gavin D'souza
cb73528c9c
test: Use assertSequenceEqual for comparision between Tuple / Lists
...
Use AssertSequence for type agnostic checks
2022-07-25 11:54:49 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Nabin Hait
b26438ccf7
test: Fixed test for WDV method depreciation schedule
2022-07-20 14:27:06 +05:30
Nabin Hait
6c29146c91
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 14:27:06 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
GangaManoj
416d578290
fix: Add missing comma
2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a
test: Test monthly depreciation by Written Down Value method
2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72
fix: Convert string to datetime object
2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1
test: Test if final day of the month is taken if depr_start_date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0
fix: Get last day of the monthif depr posting date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5
fix: Correct pro-rata amount calculation
2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30
fix: Remove misleading comment
2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5
fix: Replace asset life with total no of depreciations
2022-06-23 15:14:31 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
Rucha Mahabal
3fe2ef6790
chore: update import paths for HR
2022-06-15 12:43:45 +05:30
Rucha Mahabal
512c82f76d
chore: Update imports/paths for doctypes moved to erpnext setup module
2022-06-10 15:06:54 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Saqib Ansari
4623a1bc57
fix(test): Item MacBook does not exist
2022-03-31 12:48:00 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Marica
2661cb2c14
Merge pull request #30091 from marination/item-group-filters-listing
...
feat: Include child item group products in Item Group Page & cleanup
2022-03-09 16:46:01 +05:30
Saqib Ansari
17e16247b1
Merge pull request #30114 from nextchamp-saqib/fix-#23231
...
perf(asset): fetch only distinct depreciable assets
2022-03-09 16:41:08 +05:30
marination
7b37a74023
fix: Linter
2022-03-09 16:04:12 +05:30
Deepesh Garg
5526f852e8
Merge branch 'develop' into asset-translates
2022-03-09 14:43:57 +05:30
Saqib Ansari
e6666609e3
Merge branch 'develop' into fix-#23231
2022-03-09 11:08:45 +05:30
Deepesh Garg
816e12dafc
Merge branch 'develop' into mergify/bp/develop/pr-29714
2022-03-08 21:40:00 +05:30
Saqib Ansari
66f20209f6
perf(asset): fetch only distinct depreciable assets
2022-03-08 15:57:54 +05:30
hrzzz
16de29a3cb
fix(translation) - correction for translation
2022-02-25 16:56:23 -03:00
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
Saqib Ansari
8743e39469
fix: sider
...
(cherry picked from commit bc28755978c17d7e85cdc5ffd4a45a629183e2c8)
2022-02-23 03:55:49 +00:00
Saqib Ansari
3dcc3a349e
fix: cannot edit valutaion_rate in asset repair
...
(cherry picked from commit 2aba6c38b36e5fce373800eb129a93eb010c691f)
2022-02-23 03:55:49 +00:00
Saqib Ansari
414c3b8dd2
fix: remove redundant method
...
(cherry picked from commit 57d5a027fb929803ffd62463da3e5b4611b17ff4)
2022-02-23 03:55:48 +00:00
GangaManoj
5d3b65b944
fix: Pass value instead of array
...
(cherry picked from commit e1a9b61103e27099696ae4b186a6575b28c16b06)
2022-02-23 03:55:48 +00:00
GangaManoj
3d6ed4ebde
fix: Fetch valuation rate
...
(cherry picked from commit df71907be453a481a43d2c62a5c076602ab8af07)
2022-02-23 03:55:48 +00:00
Saqib Ansari
780694f6e2
test: number_of_depr_booked = total_number_of_depr
2022-02-21 12:45:52 +05:30
Saqib Ansari
c5808543c8
fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations
2022-02-21 12:41:08 +05:30
Himanshu
319322228a
fix: fetch image form item ( #29523 )
2022-01-31 10:56:00 +05:30
Deepesh Garg
5090959dc1
Merge branch 'develop' of https://github.com/frappe/erpnext into asset_split
2022-01-29 12:12:52 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase
2022-01-21 15:33:13 +05:30
Saqib Ansari
c7e75f9551
Merge pull request #29385 from nextchamp-saqib/asset-fix-depr-fix
...
fix: first depreciation amount in asset
2022-01-21 14:25:43 +05:30
Saqib Ansari
a09259f175
Merge branch 'develop' into grouped-asset-purchase
2022-01-21 14:20:27 +05:30
Saqib Ansari
ae580d116c
fix: failing test cases
2022-01-21 12:19:53 +05:30
Saqib Ansari
0bbde4819b
fix: depreciation amount on selling an asset
2022-01-21 11:44:05 +05:30
Saqib Ansari
60bfead773
fix: first depreciation amount in asset
2022-01-21 11:32:55 +05:30
Saqib Ansari
4390adcaa1
fix: cost center validation of asset
2022-01-20 11:54:14 +05:30
Saqib Ansari
a5643d500e
test: purchase of grouped assets
2022-01-19 15:31:31 +05:30
Saqib Ansari
7d8eef5c4e
fix: cannot set asset quantity for existing assets
2022-01-19 15:31:20 +05:30
Deepesh Garg
4abc7da2c0
chore: Add test case
2022-01-19 14:28:00 +05:30
Deepesh Garg
d37feb8208
feat: Splitting group assets
2022-01-19 10:00:05 +05:30
Saqib Ansari
35a6b58c12
feat: purchase grouped asset
2022-01-18 13:10:23 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Saqib Ansari
11fae15bec
fix(asset): check if fixed asset account is set against company ( #29189 )
2022-01-12 13:23:18 +05:30
Saqib
56bc8a52f4
Merge branch 'develop' into home-onboarding
2021-12-15 10:40:40 +05:30
Saqib Ansari
2137e56947
revert: "fix: expected value after useful life validation"
2021-12-13 22:34:54 +05:30
Saqib
4984513597
Merge pull request #28677 from GangaManoj/fix-adjust-asset-value
...
fix: Fix 'Adjust Asset Value' button
2021-12-13 21:51:09 +05:30
Jannat Patel
74d086ffd1
Merge branch 'develop' into home-onboarding
2021-12-13 17:51:38 +05:30
Ganga Manoj
51c707a0ce
Merge branch 'develop' into fix-adjust-asset-value
2021-12-08 19:20:23 +05:30
Ganga Manoj
539cba1b15
Merge branch 'develop' into fix-clear-depr-schedule
2021-12-08 19:19:33 +05:30
Saqib
b1ba98c129
feat: Make Depreciation Entry posting more flexible ( #28421 )
2021-12-06 11:43:09 +05:30
Saqib Ansari
56df646067
fix(test): test_depr_entry_posting_with_income_account
2021-12-06 11:19:58 +05:30
Saqib
fa42cf796b
Merge branch 'develop' into depreciate-existing-asset
2021-12-02 12:13:12 +05:30
Ganga Manoj
9bc28210c9
fix: Make buttons translatable ( #28679 )
2021-12-02 11:31:38 +05:30
Jannat Patel
a108df8efc
fix: assigned proper form tour to onboarding steps
2021-12-02 11:27:37 +05:30
GangaManoj
4629308d94
fix: Rename function
2021-12-02 01:22:18 +05:30
GangaManoj
5b224f841b
fix: Rename variable
2021-12-02 01:19:35 +05:30
GangaManoj
6f1cf94c9f
fix: Fix 'Adjust Asset Value' button
2021-12-02 01:18:30 +05:30
GangaManoj
828769ca70
fix: Remove unnecessary variable
2021-12-02 01:09:15 +05:30
GangaManoj
774ac852c9
fix: Test if depreciation schedules are set up properly for existing assets
2021-12-01 22:51:55 +05:30
GangaManoj
de002005ac
fix: Modify has_pro_rata() to include existing assets
2021-12-01 22:51:08 +05:30
GangaManoj
5c3d4caeda
fix: Create Depreciation Schedules properly for existing Assets
2021-12-01 21:48:47 +05:30
Ankush Menat
bb00d38dd7
Merge branch 'develop' into asset-capitalization
2021-11-30 19:32:11 +05:30
GangaManoj
c94f1ed39a
fix: Change order of import statements
2021-11-25 22:18:57 +05:30
GangaManoj
b28f137ee8
fix: Remove unused import
2021-11-25 22:17:54 +05:30
GangaManoj
6b75d1439f
fix: Add test for consumption of serialized Assets
2021-11-25 22:10:24 +05:30
GangaManoj
efac7b0904
fix: Create setUpClass
2021-11-25 19:02:01 +05:30
GangaManoj
eea80b6c01
fix: Create stock item
2021-11-25 19:01:22 +05:30
GangaManoj
c9e79ef1f2
fix: Replace 'item' with 'item_code' in tests
2021-11-25 18:53:48 +05:30
Ganga Manoj
068177d293
Merge branch 'develop' into serialized-item-consumption
2021-11-24 05:29:56 +05:30
Ganga Manoj
5ef709f569
Merge branch 'develop' into depr-expense-account
2021-11-24 05:26:40 +05:30
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
