Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,639 Commits 3 Branches 0 Tags 1 GiB
216a46bd66
Commit Graph

702 Commits

Author SHA1 Message Date
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
GangaManoj
a4043c035d fix: Prevent clearing of Depreciation Schedule on adding more than one Finance Book 2021-11-19 05:27:06 +05:30
GangaManoj
cb93cc972d fix: Check all ancestors and not just the root node 2021-11-17 05:22:43 +05:30
GangaManoj
62fbbe8915 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-11-17 04:59:59 +05:30
GangaManoj
8fc31e3cea fix: Make Depreciation Entry posting more flexible 2021-11-17 04:58:13 +05:30
GangaManoj
aa34780265 fix: Filter Depreciation Expense Account by root type 2021-11-17 04:57:40 +05:30
Saqib
950261d860
Merge branch 'develop' into serialized-item-consumption 2021-11-16 15:59:53 +05:30
GangaManoj
1393f97ad5 fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair 2021-11-11 18:48:23 +05:30
GangaManoj
4668bb4be0 feat: Add 'Add Serial No' button in the Stock Items table 2021-11-11 18:42:25 +05:30
GangaManoj
abb535540a fix: Rename item to item_code 2021-11-11 18:41:16 +05:30
GangaManoj
1aed8c4b2f feat: Add Serial No field 2021-11-11 18:40:38 +05:30
Saif Ur Rehman
13f8edd43f Merge remote-tracking branch 'upstream/develop' into asset-capitalization 
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2021-11-09 12:17:17 +05:00
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Saif Ur Rehman
85d1a237ce fix(Asset Capitalization): Reverse depreciation on cancel 2021-11-04 14:15:47 +05:00
Saif Ur Rehman
dc3c27fd1b fix(Asset Capitalization): update code for changes in depreciation logic 2021-11-04 13:47:33 +05:00
Saif Ur Rehman
2d9da22721 Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization 
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/assets/doctype/asset/test_asset.py
#	erpnext/assets/workspace/assets/assets.json
 2021-11-04 12:48:33 +05:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region 2021-11-02 17:47:44 +05:30
GangaManoj
f047c6ffc8 fix: Test for WDV 2021-11-02 16:43:31 +05:30
Ganga Manoj
15e9b5170d
fix: Make status filter optional (#28126) 2021-10-29 18:07:11 +05:30
GangaManoj
06c505ddc2 fix: Linters 2021-10-27 05:23:01 +05:30
GangaManoj
9e7022830e fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0 2021-10-25 01:34:42 +05:30
GangaManoj
0b8cb5dd47 fix: Add missing digit 2021-10-15 04:56:00 +05:30
GangaManoj
fdeb273fa0 fix: Sider issues 2021-10-15 04:53:23 +05:30
GangaManoj
60aae4423d fix: Add missing digit 2021-10-15 04:03:30 +05:30
GangaManoj
371b621364 fix: Compare date strings 2021-10-15 04:02:27 +05:30
GangaManoj
e9d310a13e fix: Format tests 2021-10-15 01:45:53 +05:30
Ganga Manoj
5a0289a810
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 22:37:07 +05:30
GangaManoj
968be70bd1 fix: Remove PR creation from all tests in TestDepreciationBasics 2021-10-14 22:33:35 +05:30
GangaManoj
09215a9781 fix: Remove PR creation from all tests for Depreciation Methods 2021-10-14 22:32:55 +05:30
GangaManoj
4bf01bb4b7 fix: Move Purchase Receipt creation to setUpClass 2021-10-14 22:32:54 +05:30
Saqib
1f70dd6e98
fix: value_after_depreciation calculation (#27954) 2021-10-14 16:23:12 +05:30
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +05:30
GangaManoj
e8986df3ca fix: Move test for Finance Books to Depreciation test suite 2021-10-13 21:36:10 +05:30
GangaManoj
83ec9879ee fix: Add test to validate available_for_use_date 2021-10-13 21:21:50 +05:30
GangaManoj
749d1b6ee6 fix: Enable cwip accounting 2021-10-13 20:49:07 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
GangaManoj
a7ec007dcf fix: Add tests to validate item 2021-10-12 01:33:46 +05:30
GangaManoj
d8aaf3d389 fix: Add tests to validate Asset values 2021-10-12 01:07:11 +05:30
GangaManoj
4918e9533b fix: Add tearDownClass() 2021-10-10 03:51:35 +05:30
GangaManoj
ef3f2fcb3a fix: Replace setUp() with setUpClass() 2021-10-10 03:50:45 +05:30
GangaManoj
adebf2d71b fix: Adjust depreciation_amount in final row 2021-10-06 02:04:05 +05:30
Saqib
065a2ce983
fix(asset): expected value after useful life validation (#27539) 2021-10-05 11:14:16 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act (#27600) 2021-09-28 18:12:02 +05:30
GangaManoj
c84c983073 fix: Categorize into test suites 2021-09-28 01:22:38 +05:30
GangaManoj
40ec2d622b fix: Add tests for depreciation 2021-09-27 22:14:42 +05:30
GangaManoj
fdd9e6cc3c fix: Replace asset.schedules with asset.get('schedules') 2021-09-27 22:14:16 +05:30
GangaManoj
b9fb59da58 fix: Reset depreciation schedule on returning asset 2021-09-25 19:04:16 +05:30
GangaManoj
249672c35d fix: Add depreciation_schedule details in create_asset() 2021-09-21 07:11:40 +05:30
GangaManoj
700e78d69b fix: Remove extra brackets 2021-09-21 07:11:40 +05:30
GangaManoj
3c8879e777 fix: Calculate depreciation_amount accurately 2021-09-21 06:07:06 +05:30
GangaManoj
164a2ad28d fix: Calculate depreciation_left accurately 2021-09-20 04:33:30 +05:30
Saif Ur Rehman
86a6293e62 test(Asset Capitalization): unit tests 2021-09-16 23:24:46 +05:00
Saif Ur Rehman
c311b8ea4f fix(Asset Capitalization): validation edge cases 2021-09-16 23:23:22 +05:00
Saif Ur Rehman
003cfe2717 fix(Asset Capitalization): Hide source items section if table is empty 2021-09-16 23:21:09 +05:00
Saif Ur Rehman
132b517584 fix(Asset Captalization): run_serially on posting_date changed 2021-09-16 23:20:36 +05:00
Saif Ur Rehman
d173e06e69 chore(Asset Capitalization): isort linting 2021-09-14 15:13:35 +05:00
Saif Ur Rehman
8873ef7b67 chore(Asset Capitalization): isort linting 2021-09-14 15:05:39 +05:00
Saif Ur Rehman
dc24a657fd chore(Asset Capitalization): linting 2021-09-14 12:40:17 +05:00
Saif Ur Rehman
8c54be7e99 chore(Asset Capitalization): linting 2021-09-14 12:30:40 +05:00
Saif Ur Rehman
7a5d75b68d feat(Asset Capitalization): Submission and Cancellation 2021-09-13 23:01:52 +05:00
Saif Ur Rehman
3b9bc8e4ef feat(Asset Capitalization): Finance Book field in Asset Row 2021-09-12 14:28:14 +05:00
Saif Ur Rehman
702b5c32c1 feat(Asset Capitalization): Accounting Fields 2021-09-08 16:36:07 +05:00
Saif Ur Rehman
6c748966e7 feat: Asset Capitalization Form 2021-09-06 17:27:47 +05:00