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 |
|
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 |
|
Saqib Ansari
|
11fae15bec
|
fix(asset): check if fixed asset account is set against company (#29189)
|
2022-01-12 13:23:18 +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 |
|
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 |
|
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 |
|
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 |
|