Saif Ur Rehman
6c748966e7
feat: Asset Capitalization Form
2021-09-06 17:27:47 +05:00
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
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
GangaManoj
94dfd0e318
fix(Asset): Add function to clear old depreciation schedule
2021-06-18 09:59:45 +05:30
GangaManoj
354116142a
fix(Asset Repair): Create GL Entries for each item in Stock Items
2021-06-18 09:53:18 +05:30
GangaManoj
05c70ac584
fix(Asset): Replace asset_value with value_after_depreciation in Finance Books
2021-06-17 13:02:02 +05:30
GangaManoj
66d4e2ba51
fix(Asset Repair): Display value_after_depreciation in Finance Books
2021-06-17 08:28:19 +05:30
GangaManoj
34997789cd
fix(Asset Repair): Filter Warehouse by Company
2021-06-16 10:48:07 +05:30
GangaManoj
6d6aee29e8
fix(Asset Repair): Fix GL Entry creation
2021-06-16 10:42:37 +05:30
GangaManoj
491763fa27
fix(Asset Repair): Fix Sider issues
2021-06-16 08:45:54 +05:30
GangaManoj
a33e751b0f
fix(Asset Repair): Make Cost Center non-mandatory
2021-06-16 08:35:50 +05:30
GangaManoj
abb0c769a4
fix(Asset Repair): Uncheck allow_on_submit for all fields
2021-06-16 08:33:05 +05:30
GangaManoj
c61bbc5915
fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account
2021-06-16 08:26:02 +05:30
GangaManoj
94ac52c47d
fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice
2021-06-16 08:18:45 +05:30
GangaManoj
71c60f75d7
fix(Asset Repair): Filter Cost Center and Project by Company
2021-06-16 08:13:36 +05:30
GangaManoj
9e07b7d4a7
fix(Asset Repair): Add Company field
2021-06-16 08:07:06 +05:30
GangaManoj
bf52f55870
fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked
2021-06-16 07:56:40 +05:30
GangaManoj
695cd70994
fix(Asset Repair): Add title to error messages
2021-06-16 07:50:03 +05:30
GangaManoj
14ea9ebcb7
fix(Asset Repair): Display fields according to the state of the doc
2021-06-16 07:03:32 +05:30
GangaManoj
285bc60684
fix(Asset Repair): Set asset_name as title
2021-06-15 12:02:07 +05:30
GangaManoj
d4acf87feb
fix(Asset Repair): Make Accounting Dimensions section collapsible
2021-06-15 11:37:17 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +05:30
Saqib
6eeaf9b933
Merge branch 'version-13-hotfix' into asset-repair-refactor
2021-06-08 17:26:50 +05:30
GangaManoj
12d9e3b1e6
fix(Asset Repair): Add tests
2021-06-03 22:41:57 +05:30
GangaManoj
b55649f2ec
fix(Asset): Add depreciation schedule details in create_asset()
2021-06-03 22:28:30 +05:30
GangaManoj
aa9bbe51bd
fix(Asset Repair): Add Company in GL Entries
2021-06-03 21:28:58 +05:30
GangaManoj
034f7bde33
fix(Asset Repair): Remove unnecessary condition
2021-06-03 21:12:43 +05:30
GangaManoj
9fb47795c4
fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked
2021-06-03 04:55:49 +05:30
GangaManoj
2ceeb8138d
fix(Asset Repair): Set company when creating Stock Entry
2021-06-03 01:54:44 +05:30
GangaManoj
960840dc3a
fix(Asset Repair): Set completion_date
2021-06-03 01:53:13 +05:30
Suraj Shetty
19c5fd72d6
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-28 09:10:33 +05:30
GangaManoj
03a6977a01
fix: Sider issues
2021-05-25 21:35:06 +05:30
GangaManoj
1d7dda2664
fix(Asset): Fix depreciation_amount calculation
2021-05-25 21:35:03 +05:30
GangaManoj
28ca383534
feat(Asset): Edit value_after_depreciation
2021-05-25 21:31:13 +05:30
GangaManoj
4b543de329
feat(Asset Repair): Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation
2021-05-25 21:31:05 +05:30
GangaManoj
4277877883
feat(Asset Repair): Change visibilty of sections
2021-05-25 21:26:46 +05:30
GangaManoj
30fdebafa7
feat(Asset): Modify depreciation schedule
2021-05-25 21:26:46 +05:30
GangaManoj
6bb920f25e
fix(Asset Repair): Only create GL entries if repair cost is capitalised
2021-05-25 21:26:46 +05:30
GangaManoj
8a41f6354a
fix(Asset Repair): Remove 'Payable Account' field
2021-05-25 21:26:46 +05:30
GangaManoj
66e6f01e40
fix(Asset Repair): Make Purchase Invoice mandatory if capitalize_repair_cost is checked
2021-05-25 21:26:46 +05:30
GangaManoj
a8037c1896
fix(Asset Repair): Add Purchase Invoice
2021-05-25 21:26:46 +05:30
GangaManoj
3ab852d4d0
fix(Asset Repair): Fetch 'Asset Name' when 'Asset' is selected
2021-05-25 21:26:45 +05:30
GangaManoj
d5d7cacd67
fix(Asset Repair): Improve code
2021-05-25 21:26:45 +05:30
GangaManoj
15294d5543
feat(Asset Maintenance): Decrease stock quantity if consumed during Asset Maintenance
2021-05-25 21:26:45 +05:30
GangaManoj
a7bbaacfde
fix(Asset Repair): Always add value of consumed Stock Items to Asset value
2021-05-25 21:26:45 +05:30
GangaManoj
70bad470f7
feat(Asset Maintenance): Increase Asset value if Stock Items were consumed
2021-05-25 21:26:45 +05:30
GangaManoj
d1f521701c
feat(Asset Maintenance): Check if Warehouse and Stock Items were entered
2021-05-25 21:26:45 +05:30
GangaManoj
04a909bd99
feat(Asset Maintenance): Add 'Stock Consumption Details' section
2021-05-25 21:26:44 +05:30
GangaManoj
568369a5c2
feat(Asset Maintenance): Add stock_consumption checkbox
2021-05-25 21:26:44 +05:30
GangaManoj
2874d08534
fix(Asset Repair): Rearrange fields
2021-05-25 21:26:44 +05:30
GangaManoj
f7eebf0e78
feat(Asset Repair): Add 'Increase In Asset Life' field
2021-05-25 21:26:44 +05:30
GangaManoj
68b78374b5
fix(Asset): Make Manage button white
2021-05-25 21:26:44 +05:30
GangaManoj
ec72f8956f
fix(Asset Repair): Revert to asset's previous status if repair is completed/cancelled
2021-05-25 21:26:43 +05:30
GangaManoj
1ac1cedfff
feat(Asset Repair): Decrease stock quantity if consumed during Asset Repair
2021-05-25 21:26:43 +05:30
GangaManoj
c8cb96a38f
feat(Asset Repair): Add Warehouse field
2021-05-25 21:26:42 +05:30
GangaManoj
f2fe55ceeb
feat(Asset Repair): Check for Cost Center and Payable Account
2021-05-25 21:26:42 +05:30
GangaManoj
8d05eca45e
feat(Asset Repair): Create GL Entries to capitalise repair cost
2021-05-25 21:26:42 +05:30
GangaManoj
385ca80ceb
feat(Asset Repair): Add total_repair_cost field
2021-05-25 21:26:42 +05:30
GangaManoj
c2b0102852
feat(Asset Repair): Add 'View General Ledger' button
2021-05-25 21:26:41 +05:30
GangaManoj
7ad74cf800
feat(Asset Repair): Add stock_consumption checkbox
2021-05-25 21:26:41 +05:30
GangaManoj
234b473d93
feat(Asset Repair): Remove 'Assign To'
2021-05-25 21:26:41 +05:30
GangaManoj
d554267b05
feat(Asset Repair): Add 'Cost Center' to GL Entries
2021-05-25 21:26:40 +05:30
GangaManoj
f5a2ea9cb3
feat(Asset Repair): Add 'Accounting Dimensions' section
2021-05-25 21:26:40 +05:30
GangaManoj
e5ab5d8963
feat(Asset Repair): Create GL Entries
2021-05-25 21:26:40 +05:30
GangaManoj
0739d4bb1b
feat(Asset Repair): Add value of consumed stock items to asset value
2021-05-25 21:26:39 +05:30
GangaManoj
d2d31fd164
feat(Asset Repair): Add 'Stock Items' table
2021-05-25 21:26:39 +05:30
GangaManoj
c62890bcdb
feat: Create 'Stock Item' child table
2021-05-25 21:26:39 +05:30
GangaManoj
258c238583
feat(Asset Repair): Add repair_cost to asset_value
2021-05-25 21:26:39 +05:30
GangaManoj
6d1cf76b77
feat(Asset): Add 'Asset Value' field
2021-05-25 21:26:39 +05:30
GangaManoj
194a08e4ec
fix(Asset Repair): Hide 'Accounting Details' section till doc gets saved
2021-05-25 21:26:38 +05:30
GangaManoj
1b2a5d1489
feat(Asset Repair): Add 'Capitalize Repair Cost' checkbox
2021-05-25 21:26:38 +05:30
GangaManoj
deadcd9e97
feat(Asset Repair): Add payable_account field
2021-05-25 21:26:37 +05:30
GangaManoj
30c4a56491
feat(Asset Repair): Change Asset's status according to repair_status
2021-05-25 21:26:37 +05:30
GangaManoj
1c26b27a89
fix(Asset Repair): Display 'Completion Date' and 'Repair Status' only after save
2021-05-25 21:26:37 +05:30
GangaManoj
bbbd61dab8
fix(Asset): Group all buttons under 'Manage'
2021-05-25 21:26:37 +05:30
GangaManoj
3e0e3f0e1b
fix(Asset Repair): Replace 'Item Name' and 'Item Code' with 'Asset Name'
2021-05-25 21:26:36 +05:30
GangaManoj
322975a03c
feat(Asset): Add 'Create > Asset Repair' button
2021-05-25 21:26:36 +05:30
GangaManoj
ed79b224cc
fix(Asset): Group buttons under 'Action'
2021-05-25 21:26:36 +05:30
anushka19
90f7ec840c
fix: Accumulated depreciation ( #25748 )
...
* fix: Accumulated depreciation
* fix: Sider issues
2021-05-18 22:21:42 +05:30
anushka19
0fb6f9306f
fix: Accumulated depreciation ( #25740 )
...
* fix: Accumulated depreciation
* fix: Sider issues
2021-05-18 17:00:33 +05:30
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Saqib
9226cd3932
feat(india): reduced rate of depreciation as per IT Act ( #25648 )
...
* feat(india): reduced rate of depreciation as per IT Act
* refactor: check date difference instead of month difference
* feat: add test for regional feature
2021-05-10 12:36:56 +05:30
Suraj Shetty
ec6b652cd4
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-10 09:18:25 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual ( #25613 )
...
* chore: replace assertEquals with alias assertEqual
assertEquals has been deprecated.
ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases
* chore: sider fixes
2021-05-07 20:28:51 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Afshan
684fc4e27b
fix: asset category name disappear ( #24728 )
2021-02-24 19:08:56 +05:30
Suraj Shetty
f57efd1150
style: Fix invalid translation syntax usages
2021-02-01 20:09:20 +05:30
Saqib
beebaf6e1e
refactor: assets form cleanup with rebrand ui ( #24494 )
2021-02-01 11:22:57 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
Saqib
60a1d25196
fix: cancelling of asset value adjustement ( #24193 )
2020-12-26 13:01:49 +05:30
Your Name
3ebe511eb9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-16 08:19:47 +00:00
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Rucha Mahabal
85213fa8cb
fix(Asset): set current asset value before calculating difference amount ( #24119 )
2020-12-15 09:32:02 +05:30
Suraj Shetty
dc13d4b0fc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:04 +05:30
Mohammad Hasnain
f82997e3c3
fix(asset_val_adj): fb not getting added in je
2020-12-10 13:34:01 +05:30
Saqib
dc3e9f4216
fix: asset with value zero doesn't show up in fixed asset register ( #24091 )
2020-12-10 12:30:15 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
Deepesh Garg
1a4390de44
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e
fix: Move filter setup to doctype controllers
2020-11-25 14:49:10 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings ( #23783 )
...
* fix: start_pattern
* fix: translatable strings
* fix: add missing semicolon (task)
* fix: add missing semicolon (setup_wizard)
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: move out HTML element as variable
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: pull out message, translate "Undo".
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: typo
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* Revert "fix: start_pattern"
This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-25 09:11:51 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
Deepesh Garg
f916bc048f
fix: Remove cost center query from doctypes
2020-11-15 22:44:39 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
rohitwaghchaure
9a62858da2
Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop
...
fix: incorrect assign to in Maintenance Schedule
2020-11-05 18:43:51 +05:30
Saqib
19df4534f5
fix: asset finance book depreciation posting date fix ( #23833 )
2020-11-05 16:37:40 +05:30
Rohit Waghchaure
421348a5f2
fix: not able to select assign to
2020-11-05 15:43:41 +05:30
Saqib
32442008dc
fix: asset finance book posting date fix ( #23778 )
2020-10-30 15:30:18 +05:30
Kenneth Sequeira
10f2468076
fix: make asset dashboard charts public ( #23751 )
2020-10-29 12:02:48 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
rohitwaghchaure
14e7656a57
Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status
...
fix: Asset status after maintenance or repair
2020-10-12 16:13:29 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set ( #23580 )
...
* Never add an asset GL entry if CWIP is not enabled
* fix: asset purchase with purchase invoice
* chore: allow enable cwip accounting only if cwip account is set
* fix: cannot create asset if cwip disabled and account not set
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
2020-10-12 14:56:55 +05:30
Kevin Chan
7a86a77322
fix: Asset status after maintenance or repair
...
Fix a bug where an **Asset**'s status is not being set to what it was
previously after an **Asset Repair** or **Asset Maintenance**.
2020-10-12 11:30:36 +08:00
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
Saqib
2fa2a40b3f
chore: make asset movement transaction date match with purchase date & time ( #23423 )
2020-09-24 15:07:29 +05:30
Saqib
f2ea3877c8
fix: depreciation start date ux fixes ( #23339 )
2020-09-20 19:31:18 +05:30
Suraj Shetty
67095d239f
fix: Custom dashboard sections
2020-09-10 17:15:52 +05:30
Saqib
8f43cf2c9a
fix: asset movement date for backdated asset entry ( #23298 )
2020-09-08 17:44:47 +05:30
Suraj Shetty
6f9f40992c
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-23 16:33:50 +05:30
Rucha Mahabal
517a6d0054
fix: set draft indicators for Asset Maintenance Log listview
2020-08-12 18:01:45 +05:30
Rucha Mahabal
691ec1bd27
fix: don't set maintenance log status as Overdue when Completed or Cancelled
2020-08-12 18:01:07 +05:30
Deepesh Garg
41a4999711
Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix
...
fix: cannot submit value adjustment with custom dimension
2020-08-10 10:12:41 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. ( #22913 )
...
* refactor: Sanitize whitelisted method inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Format and sanitize tax_account_query inputs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Validate and sanitize search inputs via decorator
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* style: Minor formatting fix
* refactor: Validate and sanitize search inputs using decorator
* fix: Typo
* fix: Remove unwanted import statement
* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Shivam Mishra
11111cd9a9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-07-30 21:29:02 +05:30
Saqib
031768f49d
chore: asset form reorder ( #22833 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-30 12:40:53 +05:30
Saqib Ansari
8cfa00920e
fix: cannot submit value adjustment with custom dimension
2020-07-29 15:24:03 +05:30
Afshan
aa94abf601
fix: asset dashboard report changes ( #22759 )
...
* fix: asset dashboard report changes
* fix: moved static filters to dynamic filters
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 19:12:38 +05:30
Shivam Mishra
1358efe896
feat: update icons
2020-07-23 17:02:32 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts
2020-07-13 11:50:11 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding ( #22580 )
...
* fix: grammatical fixes in module onboarding
* fix: more grammatical changes for consistency
* fix: Reorder Stock Onboarding
* fix: update success message
* fix: change order of stock onboarding steps
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:25:51 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts
2020-07-08 13:11:37 +05:30
Deepesh Garg
92a03aa5db
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-07-06 12:37:28 +05:30
Saqib
819879dd12
Merge branch 'develop' into asset-delete-fix
2020-07-05 18:38:51 +05:30
Nabin Hait
fdbd10f193
fix: Dashboard label in Projects and Assets module ( #22517 )
2020-06-30 09:25:17 +05:30