Commit Graph

643 Commits

Author SHA1 Message Date
anandbaburajan
0e726609f1 fix: precision in asset test_scrap_asset 2022-11-24 15:38:05 +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
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
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