nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 04:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,518 Commits 609 Branches 1,802 Tags
e5b586ffd5c460a6e87d0310db967cf4b8ea9b77
Commit Graph

440 Commits

Author SHA1 Message Date
Ganga Manoj
408d952332 fix: pro rata calculation for monthly depreciation (#30989) 2022-05-17 11:21:10 +05:30
Ganga Manoj
bf2eaecb1d fix: Set available-for-use date if missing (#30838) 2022-05-06 18:06:21 +05:30
Ganga Manoj
269e1923c9 fix: Use right precision for asset value after full schedule (#30745) 2022-04-20 19:44:09 +05:30
Ganga Manoj
9cf790db9d fix: Depreciation Amount calculation for first row when Monthly Depreciation is allowed (#30692) 2022-04-13 14:15:10 +05:30
marination
40a154e64d fix: (test) change expected exception due to https://github.com/frappe/frappe/pull/16454 
(cherry picked from commit 93f6346cea)
 2022-03-31 09:23:47 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
mergify[bot]
63e7d8c651 perf(asset): fetch only distinct depreciable assets (#30138) 
(cherry picked from commit 66f20209f6)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:48:49 +05:30
Marica
4b4b104843 fix: Merge conflicts 2022-03-09 17:29:38 +05:30
hrzzz
f721a2929f fix(translation) - correction for translation 
(cherry picked from commit 16de29a3cb)

# Conflicts:
#	erpnext/assets/doctype/asset/asset_dashboard.py
 2022-03-09 11:53:10 +00:00
Saqib Ansari
1689409438 Merge pull request #29714 from GangaManoj/fetch-valuation-rate 
fix: Fetch valuation rate for stock items consumed during asset repair
 2022-02-23 09:24:27 +05:30
Saqib Ansari
b6d42ff571 test: number_of_depr_booked = total_number_of_depr 
(cherry picked from commit 780694f6e2)
 2022-02-22 08:54:16 +00:00
Saqib Ansari
2e6a076f90 fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations 
(cherry picked from commit c5808543c8)
 2022-02-22 08:54:16 +00:00
Saqib Ansari
1b0ee018b5 Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-21 15:11:26 +05:30
Saqib Ansari
bc28755978 fix: sider 2022-02-21 14:26:21 +05:30
Saqib Ansari
2aba6c38b3 fix: cannot edit valutaion_rate in asset repair 2022-02-21 14:01:12 +05:30
Saqib Ansari
57d5a027fb fix: remove redundant method 2022-02-21 13:58:01 +05:30
mergify[bot]
e69f70f264 fix: fetch image form item (backport #29523) (#29571) 
* fix: fetch image form item (#29523)

(cherry picked from commit 319322228a)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json

* chore: resolve merge conflicts

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-02-08 21:54:07 +05:30
GangaManoj
e1a9b61103 fix: Pass value instead of array 2022-02-08 17:59:06 +05:30
GangaManoj
df71907be4 fix: Fetch valuation rate 2022-02-08 17:37:38 +05:30
Saqib Ansari
ddf5ffc47e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29373 2022-01-23 18:17:56 +05:30
Saqib Ansari
4fec250cbf fix: merge conflicts 2022-01-21 14:33:59 +05:30
Saqib Ansari
8e2b96e814 fix: failing test cases 
(cherry picked from commit ae580d116c)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2022-01-21 08:56:40 +00:00
Saqib Ansari
398fab4786 fix: depreciation amount on selling an asset 
(cherry picked from commit 0bbde4819b)
 2022-01-21 08:56:40 +00:00
Saqib Ansari
844b73efcd fix: first depreciation amount in asset 
(cherry picked from commit 60bfead773)
 2022-01-21 08:56:39 +00:00
Saqib Ansari
04e3fb85e5 Merge pull request #28851 from frappe/mergify/bp/version-13-hotfix/pr-28507 
fix: Clear Depreciation Schedule before modification (backport #28507)
 2022-01-21 12:34:05 +05:30
Saqib Ansari
b66f86b044 fix: merge conflict 2022-01-21 12:28:02 +05:30
Saqib Ansari
afda48a12b fix: cost center validation of asset 
(cherry picked from commit 4390adcaa1)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2022-01-21 06:52:31 +00:00
Ganga Manoj
852543cbcd fix: Merge conflicts 2022-01-12 14:05:09 +05:30
mergify[bot]
366f663c5a fix(asset): check if fixed asset account is set against company (#29256) 2022-01-12 13:45:37 +05:30
mergify[bot]
1988e72710 revert: "fix: expected value after useful life validation" (backport #28853) 2021-12-15 11:09:21 +05:30
GangaManoj
cefd0185a6 fix: Rename function 
(cherry picked from commit 4629308d94)
 2021-12-13 16:23:35 +00:00
GangaManoj
414558aa70 fix: Rename variable 
(cherry picked from commit 5b224f841b)
 2021-12-13 16:23:34 +00:00
GangaManoj
e10eea931b fix: Fix 'Adjust Asset Value' button 
(cherry picked from commit 6f1cf94c9f)
 2021-12-13 16:23:33 +00:00
GangaManoj
d000782de0 fix: Edit dates and frequency of depreciation 
(cherry picked from commit 4311936b7d)
 2021-12-13 16:20:51 +00:00
GangaManoj
855ae399b5 fix: Test if clear_depreciation_schedule() works for multiple finance books 
(cherry picked from commit 6ec5a19063)
 2021-12-13 16:20:50 +00:00
GangaManoj
ae875ab021 fix: Retain depreciation schedule rows that are linked with JEs while clearing the schedule 
(cherry picked from commit 33a0b1db2c)
 2021-12-13 16:20:49 +00:00
GangaManoj
57f41bc30a fix: Test if multiple Depreciation Schedules are set up for multiple Finance Books 
(cherry picked from commit f455de2924)
 2021-12-13 16:20:49 +00:00
GangaManoj
8a4019e501 fix: Clear Depreciation Schedule entries that aren't linked with Journal Entries before modifying the schedule 
(cherry picked from commit 475d8394e4)
 2021-12-13 16:20:48 +00:00
GangaManoj
54cac351cd fix: Rename loop variable 
(cherry picked from commit 059d1f3b74)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2021-12-13 16:20:47 +00:00
GangaManoj
db3d2c31a3 fix: Prevent clearing of Depreciation Schedule on adding more than one Finance Book 
(cherry picked from commit a4043c035d)
 2021-12-13 16:20:43 +00:00
Saqib
f9742394f3 feat: Make Depreciation Entry posting more flexible 2021-12-06 16:45:15 +05:30
Saqib Ansari
a9bcc869b9 fix: conflicts 2021-12-06 16:12:18 +05:30
Saqib Ansari
5b25558135 fix(test): test_depr_entry_posting_with_income_account 2021-12-06 16:07:38 +05:30
GangaManoj
c8541ed8e5 fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-12-06 16:07:29 +05:30
GangaManoj
5763f8405a fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-12-06 16:07:29 +05:30
GangaManoj
d898e74980 fix: Check root_type of Depreciation Expense Account 2021-12-06 16:07:29 +05:30
GangaManoj
81c88d643a fix: Check all ancestors and not just the root node 2021-12-06 16:07:06 +05:30
GangaManoj
78032dfb35 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-12-06 16:07:06 +05:30
GangaManoj
ce86bcf1eb fix: Make Depreciation Entry posting more flexible 2021-12-06 16:07:06 +05:30
GangaManoj
84952beed4 fix: Filter Depreciation Expense Account by root type 2021-12-06 16:06:27 +05:30