nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 13:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,499 Commits 606 Branches 1,802 Tags
4126e42ae7da1c3a51cdca5a1fcca16cdcde3093
Commit Graph

422 Commits

Author SHA1 Message Date
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
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
Saqib Ansari
d55daf5910 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into mergify/bp/version-13-hotfix/pr-28675 2021-12-06 15:49:02 +05:30
Saqib Ansari
635fd5e8f8 fix: conflicts 2021-12-06 11:33:37 +05:30
Saqib
2a6d202061 fix: test wdv method for indian region 
(cherry picked from commit 7681600b5e)
 2021-12-03 11:24:46 +00:00
GangaManoj
a424f55943 fix: Test for WDV 
(cherry picked from commit f047c6ffc8)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:45 +00:00
GangaManoj
445f1b2a09 fix: Linters 
(cherry picked from commit 06c505ddc2)
 2021-12-03 11:24:42 +00:00
GangaManoj
92ebe52432 fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0 
(cherry picked from commit 9e7022830e)
 2021-12-03 11:24:40 +00:00
GangaManoj
595d6c31b5 fix: Add missing digit 
(cherry picked from commit 0b8cb5dd47)
 2021-12-03 11:24:40 +00:00
GangaManoj
c104a2a2f4 fix: Sider issues 
(cherry picked from commit fdeb273fa0)
 2021-12-03 11:24:39 +00:00
GangaManoj
9595f7cc3f fix: Add missing digit 
(cherry picked from commit 60aae4423d)
 2021-12-03 11:24:38 +00:00
GangaManoj
6657a15898 fix: Compare date strings 
(cherry picked from commit 371b621364)
 2021-12-03 11:24:38 +00:00
GangaManoj
db06373fa6 fix: Format tests 
(cherry picked from commit e9d310a13e)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:36 +00:00
GangaManoj
a5b8b4ac41 fix: Remove PR creation from all tests in TestDepreciationBasics 
(cherry picked from commit 968be70bd1)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:34 +00:00
GangaManoj
38ec9c80fc fix: Remove PR creation from all tests for Depreciation Methods 
(cherry picked from commit 09215a9781)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:32 +00:00
GangaManoj
627d9633b2 fix: Move Purchase Receipt creation to setUpClass 
(cherry picked from commit 4bf01bb4b7)
 2021-12-03 11:24:29 +00:00
GangaManoj
511c742fd9 fix: Move test for Finance Books to Depreciation test suite 
(cherry picked from commit e8986df3ca)
 2021-12-03 11:24:29 +00:00
GangaManoj
026d72aff8 fix: Add test to validate available_for_use_date 
(cherry picked from commit 83ec9879ee)
 2021-12-03 11:24:28 +00:00
GangaManoj
0442230d98 fix: Enable cwip accounting 
(cherry picked from commit 749d1b6ee6)
 2021-12-03 11:24:27 +00:00
GangaManoj
86fcc94b7a fix: Add tests to validate item 
(cherry picked from commit a7ec007dcf)
 2021-12-03 11:24:26 +00:00