Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,188 Commits 3 Branches 0 Tags 1 GiB
650d44a714
Commit Graph

553 Commits

Author SHA1 Message Date
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
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
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
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup (#27112) 
* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-27 15:47:11 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
Ashish Shah
b99c011947
fix: unable to create manual / auto asset depreciation entry when cost_center is mandatory (#26912) 
Summary : unable to create manual / auto asset depreciation entry when cost_center is mandatory

Reason: Though we are calculating value for depreciation_cost_center, it is not passed in credit_entry(it is passed in debit_entry) and this prevents creation of manual / auto asset depreciation entry when cost_center is mandatory

Solution : pass already calculated depreciation_cost_center value in credit_entry (in line with, already done as in debit_entry)
 2021-08-25 21:33:08 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Ganga Manoj
54c31ed33c
feat: depreciate asset after sale (#26543) 2021-08-12 13:42:56 +05:30
marination
455d300fca Revert "test: fix POS Closing Entry Test" 
This reverts commit 8f1a3aef2e.
 2021-08-11 17:00:46 +05:30
marination
867939fcae test: fixed asset movement tests 
- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces
 2021-08-11 16:40:07 +05:30
Saqib
2ae2580706
fix(asset): incorrect date difference calculation (#26793) 2021-08-10 16:37:48 +05:30
Saqib
363225d2ba
fix(asset): incorrect date difference calculation (#26805) 2021-08-10 16:37:23 +05:30
GangaManoj
56cdcebbf4 fix: Sider issues 2021-07-16 02:23:55 +05:30
Saqib
2e507b47a8 fix(Asset Repair): cancellation 2021-07-09 22:39:34 +05:30
GangaManoj
073b50f7fd fix(Asset Repair): Rearrange fields 2021-07-09 22:38:58 +05:30
GangaManoj
fd7fb37697 fix(Asset Repair): Simplify code for Asset Repair creation in tests 2021-07-09 22:38:58 +05:30
GangaManoj
e328e3b48a fix(Asset Repair): Edit description for total_repair_cost 2021-07-09 22:38:57 +05:30
GangaManoj
c8caafa680 fix(Asset Repair): Move filters for cost_center, warehouse and project to setup 2021-07-09 22:38:57 +05:30
GangaManoj
267fed2d23 fix(Asset): Add comment 2021-07-09 22:38:57 +05:30
GangaManoj
597016bb34 fix(Asset): Remove extra tabs 2021-07-09 22:38:57 +05:30
GangaManoj
7c37e83535 fix(Asset): Remove to_date field 2021-07-09 22:38:57 +05:30
GangaManoj
cba0966ec5 fix(Asset Repair): Change controller hooks 2021-07-09 22:38:57 +05:30
GangaManoj
81bcae7433 fix(Asset): Remove redundant code 2021-07-09 22:38:57 +05:30
GangaManoj
f3ae1dd23b fix(Asset): Fix test 2021-07-09 22:38:57 +05:30
GangaManoj
18bbfdf343 fix(Asset Repair): Remove test that's no longer necessary 2021-07-09 22:38:56 +05:30
GangaManoj
39dba43b87 fix(Asset): Fix value_after_depreciation calculation 2021-07-09 22:38:56 +05:30
GangaManoj
3ba9fb32de fix(Asset Repair): Replace asset_value with value_after_depreciation in tests 2021-07-09 22:38:56 +05:30
GangaManoj
72ea64f6ac fix: Sider issues 2021-07-09 22:38:49 +05:30
GangaManoj
307fe43e08 fix: Remove changes made to Asset Maintenance 2021-07-09 22:38:02 +05:30
GangaManoj
55bca4cbc7 fix(Asset Repair): Revert Stock Entry on cancellation 2021-07-09 22:38:02 +05:30
GangaManoj
c34e6b1889 fix(Asset): Fix tests for Asset Repair 2021-07-09 22:38:02 +05:30
GangaManoj
ba9558527d fix(Asset Repair): Return Depreciation Schedule to original state on cancellation 2021-07-09 22:37:08 +05:30
GangaManoj
6c2f4ce6a5 fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation 2021-07-09 22:37:08 +05:30
GangaManoj
ad78888c86 fix(Asset Repair): Compute total_value instantly 2021-07-09 22:37:08 +05:30
GangaManoj
e921878633 fix: Rename 'Stock Item' to 'Asset Repair Consumed Item' 2021-07-09 22:37:08 +05:30
GangaManoj
852881e33e fix(Asset Repair): Fix tests 2021-07-09 22:37:04 +05:30
GangaManoj
42fd7ffbc0 fix(Asset Repair): Set completion_date on changing repair_status to 'Completed' 2021-07-09 22:36:05 +05:30
GangaManoj
68e0c96c03 fix(Asset Repair): Prevent some fields from being copied on duplicating the doc 2021-07-09 22:36:05 +05:30
GangaManoj
399d17e40e fix(Asset Repair): Make Error Description non-mandatory 2021-07-09 22:36:05 +05:30
GangaManoj
e755c74a60 fix(Asset Repair): Add Stock Entry field 2021-07-09 22:36:04 +05:30
GangaManoj
4004bcd436 fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section 2021-07-09 22:36:04 +05:30
GangaManoj
bd1796cbb6 fix: Replace edit_dates with flags.increase_in_asset_life 2021-07-09 22:36:04 +05:30
GangaManoj
ae8cb335b6 fix(Asset Repair): Fix depreciation_amount calculation 2021-07-09 22:36:04 +05:30
GangaManoj
be536040df fix: Add comments 2021-07-09 22:36:04 +05:30
GangaManoj
bd336c7d8e fix(Asset): Add function to clear old depreciation schedule 2021-07-09 22:36:04 +05:30
GangaManoj
54cbc8324a fix(Asset Repair): Create GL Entries for each item in Stock Items 2021-07-09 22:36:04 +05:30
GangaManoj
50826f16ee fix(Asset): Replace asset_value with value_after_depreciation in Finance Books 2021-07-09 22:36:04 +05:30