Commit Graph

335 Commits

Author SHA1 Message Date
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-03 18:57:43 +05:30
Ankush Menat
f0bcb753fb chore: whitespace trimming 2021-09-01 20:23:48 +05:30
Ankush Menat
1c63cbb1e4 fix: remove duplicate imports 2021-09-01 20:18:45 +05:30
Ankush Menat
76f1ed624a fix: remove bare excepts 2021-09-01 20:15:54 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181)
* 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.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 21:08:08 +05:30
Saqib
dd1aa5559a feat: depreciate Asset after sale (#27168) 2021-08-26 20:55:22 +05:30
Ganga Manoj
6d28507def feat: Handle Asset on Issuing Credit Note (#26519)
* fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice

* fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset

* fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets

* fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset

* fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice

* fix(Sales Invoice): Reset disposal_date on returning the Asset

* fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain

* fix: Make functions more readable

* fix: Let create_item() make items that are fixed assets

* fix: Test GL Entries made when an Asset is returned

* fix: Create asset data

* fix: Test

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-08-26 20:11:18 +05:30
Frappe PR Bot
4837d8872e fix: unable to create manual / auto asset depreciation entry when cost_center is mandatory (#26912) (#27149)
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)
(cherry picked from commit b99c011947)

Co-authored-by: Ashish Shah <mr.ashish.shah@gmail.com>
2021-08-25 22:25:29 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Ankush Menat
333d962ac2 test: fix tests failing due to doc amend feature (bp #26656) (#26907)
* test: fix test due to rename change

* test: fix attendance request tests

- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown

* test: fix Shift Request test

- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel

* test: fix POS Closing Entry Test

- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel

* test: fixed asset movement tests

- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces

* Revert "test: fix POS Closing Entry Test"

This reverts commit 8f1a3aef2e.

Co-authored-by: marination <maricadsouza221197@gmail.com>
2021-08-17 18:01:39 +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
GangaManoj
d354a301cb fix(Asset Repair): Display value_after_depreciation in Finance Books 2021-07-09 22:36:04 +05:30
GangaManoj
9520efb941 fix(Asset Repair): Filter Warehouse by Company 2021-07-09 22:36:03 +05:30
GangaManoj
96de4fdf1f fix(Asset Repair): Fix GL Entry creation 2021-07-09 22:36:03 +05:30
GangaManoj
71eaf3dbd8 fix(Asset Repair): Fix Sider issues 2021-07-09 22:36:03 +05:30