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 |
|
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 |
|
GangaManoj
|
75fbda10ad
|
fix(Asset Repair): Make Cost Center non-mandatory
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
0aaf88cc0a
|
fix(Asset Repair): Uncheck allow_on_submit for all fields
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
9779aa11fb
|
fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
aff9709525
|
fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice
|
2021-07-09 22:36:03 +05:30 |
|