Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,874 Commits 3 Branches 0 Tags 1 GiB
72d5366e96
Commit Graph

594 Commits

Author SHA1 Message Date
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
Saqib
41034f760d
Merge branch 'develop' into asset-delete-fix 2020-06-29 10:54:01 +05:30
Saqib Ansari
cc42aa1750 fix: cancel asset movement on asset cancellation 2020-06-29 10:33:24 +05:30
Saqib
40847aeac3
fix: cannot cancel assets with repair pending (#22440) 
* fix: cannot cancel assets with repair pending

* fix: message

* Update asset.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-25 15:43:31 +05:30
Saqib Ansari
acdaf2b001 fiix: cannot cancel asset and asset movement 2020-06-25 12:43:25 +05:30
Deepesh Garg
1b30ca6a36 fix: Codacy 2020-06-19 12:12:08 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Deepesh Garg
c2496a3600 fix: Asset maintenance test 2020-06-15 15:18:49 +05:30
Deepesh Garg
7e974c9e2c fix: Test Cases 2020-06-12 15:29:40 +05:30
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa This reverts commit aa196c0a66 2020-05-30 11:37:36 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Saqib
cd8b5d1e4c
fix: cannot assign same task to other asset maintenance (#22024) 2020-05-29 10:21:20 +05:30
Nabin Hait
054aafa1d7 fix: Assets module onboarding and dashboard 2020-05-20 18:22:39 +05:30
Saqib Ansari
4f024128af fix: dashboard chart dialog filters 2020-05-20 18:22:39 +05:30
Saqib Ansari
7c5e22e9d8 fix: depreciation amount not shown in asset register 2020-05-20 18:22:39 +05:30
Saqib Ansari
37c3bd2892 chore: rename onboarding to module onboarding 2020-05-20 18:22:39 +05:30
Saqib Ansari
8990697fee feat: fixed asset register based on fiscal year 
*asset value chart
 2020-05-20 18:22:39 +05:30
Saqib Ansari
3882939fd9 fix: dashboard fixtures and FAR chart 2020-05-20 18:22:38 +05:30
Saqib Ansari
ecddf3358d fix: dashboard fixtures 2020-05-20 18:22:38 +05:30
Saqib Ansari
1dcf103398 chore: enhance fixed asset report and remove redundant reports 2020-05-20 18:22:38 +05:30
Saqib Ansari
03007de4d7 fix: unexpected removal of finance book filter 2020-05-20 18:22:38 +05:30
Saqib Ansari
22aec57beb feat: asset onboarding, dashboards 2020-05-20 18:22:38 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries (#21689) 
* fix: Add misssing dimensions in GL entries

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
 2020-05-15 12:58:48 +05:30
Deepesh Garg
b52e40037a
fix: Remove domain restriction from Location doctype (#21659) 2020-05-11 20:01:57 +05:30
Saqib
d76f167e96
fix: handle make_gl_entry in case of cwip enable after puchasing (#21529) 
* fix: handle make_gl_entry in case of cwip enable after puchasing

* fix: invalid variable assignment

* fix: make gl entries if cwip has been booked even if cwip is disabled
* add tests

* fix: conditions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 16:14:45 +05:30
Saqib
d84a55313a
chore: add validation for gross purchase amount (#21534) 
* chore: add validation for gross purchase amount

* fix: tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-03 13:20:24 +05:30
Saqib
4422ffdb22
chore: asset accounts should have company currency (#21524) 2020-04-30 18:39:13 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740) 
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 10:38:58 +05:30
Saqib
9c494d3e72
fix: asset maintenance fixes (#21277) 
* fix: asset maintenance fixes

* fix: tests
 2020-04-22 11:48:19 +05:30
Saqib Ansari
33eb35d8b1 fix: incorrect transalation 2020-04-16 16:16:09 +05:30
Saqib Ansari
1f20c99ecf fix: tests depending on global default company 2020-04-14 19:40:25 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts 2020-04-14 14:05:32 +05:30
Saqib Ansari
aa196c0a66 fix: travis 2020-04-14 14:03:02 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation 2020-04-12 13:39:43 +05:30
Saqib Ansari
397f894a7c fix: cannot iterate over dict_keys 2020-04-11 18:10:59 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Saqib Ansari
debee1c977 fix: travis 2020-04-10 12:38:44 +05:30
Saqib Ansari
474222074b fix: tests 2020-04-06 12:40:41 +05:30
Saqib Ansari
4a85b42da0 fix: travis 2020-04-03 14:31:00 +05:30
Saqib Ansari
0c8a0c9c3a fix: no server side validations for accounts in asset category 2020-03-31 18:19:31 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Deepesh Garg
97669e975d
fix: Update condition 2020-02-11 10:18:39 +05:30
Ahmad M Abdelrahman
41e7163476
automatic booking of asset depreciation fix 
Stop Automatic deprecation is not working
 2020-02-05 08:33:53 +02:00
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Saqib
e009187e02 refac: filters and columns of fixed asset register report (#20332) 2020-01-27 16:05:55 +05:30
thefalconx33
e7154f155b fix: tuple index out of range error 2020-01-22 12:22:55 +05:30
Saqib
b0b179f1b7 fix: make jv depreciations only if calculate depr is checked (#20282) 2020-01-15 19:05:35 +05:30
Saqib
b8bcad5850 fix: gl not generated on manual asset creation (#20265) 2020-01-13 18:17:05 +05:30
thefalconx33
1e7a127dfa fix: auto cancel if movement exists 2020-01-11 14:19:02 +05:30
Mangesh-Khairnar
8768d5d396 fix: fetch opening accumulated depreciation (#20095) 2019-12-27 12:14:46 +05:30
Saqib
06f9538e51 fix: bad condition while checking last asset movement entry (#20047) 2019-12-23 16:08:21 +05:30