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 |
|
GangaManoj
|
17fa121779
|
fix(Asset Repair): Filter Cost Center and Project by Company
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
867fd02b2d
|
fix(Asset Repair): Add Company field
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
5ab0cabf91
|
fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
654074ad7a
|
fix(Asset Repair): Add title to error messages
|
2021-07-09 22:36:03 +05:30 |
|
GangaManoj
|
fd272569aa
|
fix(Asset Repair): Display fields according to the state of the doc
|
2021-07-09 22:36:02 +05:30 |
|
GangaManoj
|
4e620c3b32
|
fix: Set asset_name as title
|
2021-07-09 22:35:49 +05:30 |
|
GangaManoj
|
65b2f9234b
|
fix(Asset Repair): Set company when creating Stock Entry
|
2021-07-09 22:15:58 +05:30 |
|
GangaManoj
|
2833903ce5
|
fix(Asset Repair): Add tests
|
2021-07-09 22:15:42 +05:30 |
|
GangaManoj
|
70de974496
|
fix(Asset): Add depreciation schedule details in create_asset()
|
2021-07-09 22:15:42 +05:30 |
|
GangaManoj
|
3f9f0ffdfe
|
fix(Asset Repair): Add Company in GL Entries
|
2021-07-09 22:15:42 +05:30 |
|
GangaManoj
|
c6ed66ec5b
|
fix(Asset Repair): Remove unnecessary condition
|
2021-07-09 22:15:42 +05:30 |
|
GangaManoj
|
794807ecc3
|
fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked
|
2021-07-09 22:15:42 +05:30 |
|
GangaManoj
|
97193a4632
|
fix: Sider issues
|
2021-07-09 22:15:10 +05:30 |
|
GangaManoj
|
4e284433d1
|
fix: Fix depreciation_amount calculation
|
2021-07-09 22:12:46 +05:30 |
|
GangaManoj
|
42c70fba3c
|
fix: Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation)
|
2021-07-09 22:11:50 +05:30 |
|
GangaManoj
|
58bc967073
|
fix: Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults'
|
2021-07-09 22:10:35 +05:30 |
|
GangaManoj
|
9e26f2d797
|
fix: Organize buttons
|
2021-07-09 22:08:56 +05:30 |
|
Saqib
|
f6f924b340
|
Merge branch 'develop' into asset-credit-note
|
2021-07-09 10:38:50 +05:30 |
|
GangaManoj
|
3a7f25b218
|
fix: Make functions more readable
|
2021-07-07 15:59:52 +05:30 |
|
GangaManoj
|
ca87745be1
|
fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
|
2021-07-06 23:43:08 +05:30 |
|
Saqib
|
40c90d03a4
|
fix(Asset Repair): cancellation
|
2021-06-28 11:42:28 +05:30 |
|
GangaManoj
|
ca2dbcec59
|
fix(Asset Repair): Rearrange fields
|
2021-06-26 01:32:17 +05:30 |
|
GangaManoj
|
dcb8a2895c
|
fix(Asset Repair): Simplify code for Asset Repair creation in tests
|
2021-06-24 22:30:08 +05:30 |
|
GangaManoj
|
c73e137bfa
|
fix(Asset Repair): Edit description for total_repair_cost
|
2021-06-24 22:27:30 +05:30 |
|
GangaManoj
|
b44e4121da
|
fix(Asset Repair): Move filters for cost_center, warehouse and project to setup
|
2021-06-24 22:25:45 +05:30 |
|
GangaManoj
|
289b449f2b
|
fix(Asset): Add comment
|
2021-06-24 22:21:08 +05:30 |
|
GangaManoj
|
f4e8e7d933
|
fix(Asset): Remove extra tabs
|
2021-06-24 22:18:59 +05:30 |
|
GangaManoj
|
e21d44c5c3
|
fix(Asset): Remove to_date field
|
2021-06-24 15:04:44 +05:30 |
|
GangaManoj
|
2fdb923953
|
fix(Asset Repair): Change controller hooks
|
2021-06-24 14:56:34 +05:30 |
|
GangaManoj
|
550fe8ae39
|
fix(Asset): Remove redundant code
|
2021-06-24 13:22:26 +05:30 |
|
GangaManoj
|
60a44ae1e6
|
fix(Asset): Fix test
|
2021-06-24 12:44:13 +05:30 |
|
GangaManoj
|
dce2113736
|
fix(Asset Repair): Remove test that's no longer necessary
|
2021-06-23 22:26:45 +05:30 |
|
GangaManoj
|
2f5f9d8566
|
fix(Asset): Fix value_after_depreciation calculation
|
2021-06-23 22:19:05 +05:30 |
|
GangaManoj
|
80399802c6
|
fix(Asset Repair): Replace asset_value with value_after_depreciation in tests
|
2021-06-23 13:26:47 +05:30 |
|
GangaManoj
|
32d7b1f6ad
|
fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets
|
2021-06-23 11:24:05 +05:30 |
|
GangaManoj
|
2e45965405
|
fix(Asset Repair): Fix Sider issues
|
2021-06-22 17:24:14 +05:30 |
|
GangaManoj
|
859c8c92f7
|
fix: Remove changes made to Asset Maintenance
|
2021-06-22 17:16:12 +05:30 |
|
GangaManoj
|
2ea325c0c3
|
fix(Asset Repair): Revert Stock Entry on cancellation
|
2021-06-22 16:33:10 +05:30 |
|
GangaManoj
|
3a44d88866
|
fix(Asset): Fix tests for Asset Repair
|
2021-06-22 16:28:29 +05:30 |
|
GangaManoj
|
3b0eac79bf
|
fix(Asset Repair): Compute total_value
|
2021-06-22 16:26:09 +05:30 |
|
Saqib
|
4b4eb990a9
|
Merge branch 'develop' into asset-repair-refactor
|
2021-06-22 16:21:13 +05:30 |
|
GangaManoj
|
5776a962b3
|
fix(Asset Repair): Return Depreciation Schedule to original state on cancellation
|
2021-06-21 18:57:11 +05:30 |
|
GangaManoj
|
91a99e0d89
|
fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation
|
2021-06-21 15:22:02 +05:30 |
|
GangaManoj
|
f88a13b292
|
fix(Asset Repair): Compute total_value instantly
|
2021-06-21 15:02:40 +05:30 |
|
GangaManoj
|
a34bf5edec
|
fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'
|
2021-06-21 14:55:34 +05:30 |
|
GangaManoj
|
b081d79332
|
fix(Asset Repair): Fix tests
|
2021-06-21 14:52:00 +05:30 |
|
GangaManoj
|
740df95c58
|
fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'
|
2021-06-20 17:44:35 +05:30 |
|
GangaManoj
|
23876c0854
|
fix(Asset Repair): Prevent some fields from being copied on duplicating the doc
|
2021-06-19 15:23:06 +05:30 |
|
GangaManoj
|
012b9eaeff
|
fix(Asset Repair): Make Error Description non-mandatory
|
2021-06-19 15:18:54 +05:30 |
|
GangaManoj
|
7db7988e4c
|
fix(Asset Repair): Add Stock Entry field
|
2021-06-19 14:54:30 +05:30 |
|
GangaManoj
|
09ba6f6477
|
fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section
|
2021-06-19 14:06:45 +05:30 |
|
GangaManoj
|
da8da9fa4e
|
fix: Replace edit_dates with flags.increase_in_asset_life
|
2021-06-19 14:00:26 +05:30 |
|
GangaManoj
|
2b93e54e1f
|
fix(Asset Repair): Fix depreciation_amount calculation
|
2021-06-19 13:45:37 +05:30 |
|
GangaManoj
|
93b9752771
|
fix: Add comments
|
2021-06-19 13:06:27 +05:30 |
|