Code

refactor: Asset Repair#25798

Code

Merged

nextchamp-saqib merged 111 commits intofrappe:developfrappe/erpnext:developfrom GangaManoj:asset-repair-refactorGangaManoj/erpnext:asset-repair-refactorCopy head branch name to clipboardJul 7, 2021

+805-125

Commits

Commits on May 25, 2021

• fix(Asset): Group buttons under 'Action'

  GangaManoj

  committed
  ed79b22

  Copy full SHA for ed79b22

• feat(Asset): Add 'Create > Asset Repair' button

  GangaManoj

  committed
  322975a

  Copy full SHA for 322975a

• fix(Asset Repair): Replace 'Item Name' and 'Item Code' with 'Asset Name'

  GangaManoj

  committed
  3e0e3f0

  Copy full SHA for 3e0e3f0

• fix(Asset): Group all buttons under 'Manage'

  GangaManoj

  committed
  bbbd61d

  Copy full SHA for bbbd61d

• fix(Asset Repair): Display 'Completion Date' and 'Repair Status' only after save

  GangaManoj

  committed
  1c26b27

  Copy full SHA for 1c26b27

• feat(Asset Repair): Change Asset's status according to repair_status

  GangaManoj

  committed
  30c4a56

  Copy full SHA for 30c4a56

• feat(Asset Repair): Add payable_account field

  GangaManoj

  committed
  deadcd9

  Copy full SHA for deadcd9

• fix(Company): Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults'

  GangaManoj

  committed
  88ac9b2

  Copy full SHA for 88ac9b2

• fix(Company): Add 'Repair and Maintenance Account' field

  GangaManoj

  committed
  11594f8

  Copy full SHA for 11594f8

• feat(Asset Repair): Add 'Capitalize Repair Cost' checkbox

  GangaManoj

  committed
  1b2a5d1

  Copy full SHA for 1b2a5d1

• fix(Asset Repair): Hide 'Accounting Details' section till doc gets saved

  GangaManoj

  committed
  194a08e

  Copy full SHA for 194a08e

• feat(Asset): Add 'Asset Value' field

  GangaManoj

  committed
  6d1cf76

  Copy full SHA for 6d1cf76

• feat(Asset Repair): Add repair_cost to asset_value

  GangaManoj

  committed
  258c238

  Copy full SHA for 258c238

• feat: Create 'Stock Item' child table

  GangaManoj

  committed
  c62890b

  Copy full SHA for c62890b

• feat(Asset Repair): Add 'Stock Items' table

  GangaManoj

  committed
  d2d31fd

  Copy full SHA for d2d31fd

• feat(Asset Repair): Add value of consumed stock items to asset value

  GangaManoj

  committed
  0739d4b

  Copy full SHA for 0739d4b

• feat(Asset Repair): Create GL Entries

  GangaManoj

  committed
  e5ab5d8

  Copy full SHA for e5ab5d8

• feat(Asset Repair): Add 'Accounting Dimensions' section

  GangaManoj

  committed
  f5a2ea9

  Copy full SHA for f5a2ea9

• feat(Asset Repair): Add 'Cost Center' to GL Entries

  GangaManoj

  committed
  d554267

  Copy full SHA for d554267

• feat(Asset Repair): Remove 'Assign To'

  GangaManoj

  committed
  234b473

  Copy full SHA for 234b473

• feat(Asset Repair): Add stock_consumption checkbox

  GangaManoj

  committed
  7ad74cf

  Copy full SHA for 7ad74cf

• feat(Asset Repair): Add 'View General Ledger' button

  GangaManoj

  committed
  c2b0102

  Copy full SHA for c2b0102

• feat(Asset Repair): Add total_repair_cost field

  GangaManoj

  committed
  385ca80

  Copy full SHA for 385ca80

• feat(Asset Repair): Create GL Entries to capitalise repair cost

  GangaManoj

  committed
  8d05eca

  Copy full SHA for 8d05eca

• feat(Asset Repair): Check for Cost Center and Payable Account

  GangaManoj

  committed
  f2fe55c

  Copy full SHA for f2fe55c

• feat(Asset Repair): Add Warehouse field

  GangaManoj

  committed
  c8cb96a

  Copy full SHA for c8cb96a

• feat(Asset Repair): Decrease stock quantity if consumed during Asset Repair

  GangaManoj

  committed
  1ac1ced

  Copy full SHA for 1ac1ced

• fix(Asset Repair): Revert to asset's previous status if repair is completed/cancelled

  GangaManoj

  committed
  ec72f89

  Copy full SHA for ec72f89

• fix(Asset): Make Manage button white

  GangaManoj

  committed
  68b7837

  Copy full SHA for 68b7837

• feat(Asset Repair): Add 'Increase In Asset Life' field

  GangaManoj

  committed
  f7eebf0

  Copy full SHA for f7eebf0

• fix(Asset Repair): Rearrange fields

  GangaManoj

  committed
  2874d08

  Copy full SHA for 2874d08

• feat(Asset Maintenance): Add stock_consumption checkbox

  GangaManoj

  committed
  568369a

  Copy full SHA for 568369a

• feat(Asset Maintenance): Add 'Stock Consumption Details' section

  GangaManoj

  committed
  04a909b

  Copy full SHA for 04a909b

• feat(Asset Maintenance): Check if Warehouse and Stock Items were entered

  GangaManoj

  committed
  d1f5217

  Copy full SHA for d1f5217

• feat(Asset Maintenance): Increase Asset value if Stock Items were consumed

  GangaManoj

  committed
  70bad47

  Copy full SHA for 70bad47

• fix(Asset Repair): Always add value of consumed Stock Items to Asset value

  GangaManoj

  committed
  a7bbaac

  Copy full SHA for a7bbaac

• feat(Asset Maintenance): Decrease stock quantity if consumed during Asset Maintenance

  GangaManoj

  committed
  15294d5

  Copy full SHA for 15294d5

• fix(Asset Repair): Improve code

  GangaManoj

  committed
  d5d7cac

  Copy full SHA for d5d7cac

• fix(Asset Repair): Fetch 'Asset Name' when 'Asset' is selected

  GangaManoj

  committed
  3ab852d

  Copy full SHA for 3ab852d

• fix(Asset Repair): Add Purchase Invoice

  GangaManoj

  committed
  a8037c1

  Copy full SHA for a8037c1

• fix(Asset Repair): Make Purchase Invoice mandatory if capitalize_repair_cost is checked

  GangaManoj

  committed
  66e6f01

  Copy full SHA for 66e6f01

• fix(Asset Repair): Remove 'Payable Account' field

  GangaManoj

  committed
  8a41f63

  Copy full SHA for 8a41f63

• fix(Asset Repair): Only create GL entries if repair cost is capitalised

  GangaManoj

  committed
  6bb920f

  Copy full SHA for 6bb920f

• feat(Asset): Modify depreciation schedule

  GangaManoj

  committed
  30fdeba

  Copy full SHA for 30fdeba

• feat(Asset Repair): Change visibilty of sections

  GangaManoj

  committed
  4277877

  Copy full SHA for 4277877

• feat(Asset Repair): Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation

  GangaManoj

  committed
  4b543de

  Copy full SHA for 4b543de

• feat(Asset): Edit value_after_depreciation

  GangaManoj

  committed
  28ca383

  Copy full SHA for 28ca383

• fix(Asset): Fix depreciation_amount calculation

  GangaManoj

  committed
  1d7dda2

  Copy full SHA for 1d7dda2

• fix: Sider issues

  GangaManoj

  committed
  03a6977

  Copy full SHA for 03a6977

Commits on Jun 2, 2021

• fix(Asset Repair): Set completion_date

  GangaManoj

  committed
  960840d

  Copy full SHA for 960840d

• fix(Asset Repair): Set company when creating Stock Entry

  GangaManoj

  committed
  2ceeb81

  Copy full SHA for 2ceeb81

• fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked

  GangaManoj

  committed
  9fb4779

  Copy full SHA for 9fb4779

Commits on Jun 3, 2021

• fix(Asset Repair): Remove unnecessary condition

  GangaManoj

  committed
  034f7bd

  Copy full SHA for 034f7bd

• fix(Asset Repair): Add Company in GL Entries

  GangaManoj

  committed
  aa9bbe5

  Copy full SHA for aa9bbe5

• fix(Asset): Add depreciation schedule details in create_asset()

  GangaManoj

  committed
  b55649f

  Copy full SHA for b55649f

• fix(Asset Repair): Add tests

  GangaManoj

  committed
  12d9e3b

  Copy full SHA for 12d9e3b

Commits on Jun 8, 2021

• Merge branch 'version-13-hotfix' into asset-repair-refactor

  nextchamp-saqib

  authored
  6eeaf9b

  Copy full SHA for 6eeaf9b

Commits on Jun 15, 2021

• fix(Asset Repair): Make Accounting Dimensions section collapsible

  GangaManoj

  committed
  d4acf87

  Copy full SHA for d4acf87

• fix(Asset Repair): Set asset_name as title

  GangaManoj

  committed
  285bc60

  Copy full SHA for 285bc60

Commits on Jun 16, 2021

• fix(Asset Repair): Display fields according to the state of the doc

  GangaManoj

  committed
  14ea9eb

  Copy full SHA for 14ea9eb

• fix(Asset Repair): Add title to error messages

  GangaManoj

  committed
  695cd70

  Copy full SHA for 695cd70

• fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked

  GangaManoj

  committed
  bf52f55

  Copy full SHA for bf52f55

• fix(Asset Repair): Add Company field

  GangaManoj

  committed
  9e07b7d

  Copy full SHA for 9e07b7d

• fix(Asset Repair): Filter Cost Center and Project by Company

  GangaManoj

  committed
  71c60f7

  Copy full SHA for 71c60f7

• fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice

  GangaManoj

  committed
  94ac52c

  Copy full SHA for 94ac52c

• fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account

  GangaManoj

  committed
  c61bbc5

  Copy full SHA for c61bbc5

• fix(Asset Repair): Uncheck allow_on_submit for all fields

  GangaManoj

  committed
  abb0c76

  Copy full SHA for abb0c76

• fix(Asset Repair): Make Cost Center non-mandatory

  GangaManoj

  committed
  a33e751

  Copy full SHA for a33e751

• fix(Asset Repair): Fix Sider issues

  GangaManoj

  committed
  491763f

  Copy full SHA for 491763f

• fix(Asset Repair): Fix GL Entry creation

  GangaManoj

  committed
  6d6aee2

  Copy full SHA for 6d6aee2

• fix(Asset Repair): Filter Warehouse by Company

  GangaManoj

  committed
  3499778

  Copy full SHA for 3499778

Commits on Jun 17, 2021

• fix(Asset Repair): Display value_after_depreciation in Finance Books

  GangaManoj

  committed
  66d4e2b

  Copy full SHA for 66d4e2b

• fix(Asset): Replace asset_value with value_after_depreciation in Finance Books

  GangaManoj

  committed
  05c70ac

  Copy full SHA for 05c70ac

Commits on Jun 18, 2021

• fix(Asset Repair): Create GL Entries for each item in Stock Items

  GangaManoj

  committed
  3541161

  Copy full SHA for 3541161

• fix(Asset): Add function to clear old depreciation schedule

  GangaManoj

  committed
  94dfd0e

  Copy full SHA for 94dfd0e

Commits on Jun 19, 2021

• fix: Add comments

  GangaManoj

  committed
  93b9752

  Copy full SHA for 93b9752

• fix(Asset Repair): Fix depreciation_amount calculation

  GangaManoj

  committed
  2b93e54

  Copy full SHA for 2b93e54

• fix: Replace edit_dates with flags.increase_in_asset_life

  GangaManoj

  committed
  da8da9f

  Copy full SHA for da8da9f

• fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section

  GangaManoj

  committed
  09ba6f6

  Copy full SHA for 09ba6f6

• fix(Asset Repair): Add Stock Entry field

  GangaManoj

  committed
  7db7988

  Copy full SHA for 7db7988

• fix(Asset Repair): Make Error Description non-mandatory

  GangaManoj

  committed
  012b9ea

  Copy full SHA for 012b9ea

• fix(Asset Repair): Prevent some fields from being copied on duplicating the doc

  GangaManoj

  committed
  23876c0

  Copy full SHA for 23876c0

Commits on Jun 20, 2021

• fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'

  GangaManoj

  committed
  740df95

  Copy full SHA for 740df95

Commits on Jun 21, 2021

• fix(Asset Repair): Fix tests

  GangaManoj

  committed
  b081d79

  Copy full SHA for b081d79

• fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'

  GangaManoj

  committed
  a34bf5e

  Copy full SHA for a34bf5e

• fix(Asset Repair): Compute total_value instantly

  GangaManoj

  committed
  f88a13b

  Copy full SHA for f88a13b

• fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation

  GangaManoj

  committed
  91a99e0

  Copy full SHA for 91a99e0

• fix(Asset Repair): Return Depreciation Schedule to original state on cancellation

  GangaManoj

  committed
  5776a96

  Copy full SHA for 5776a96

Commits on Jun 22, 2021

• Merge branch 'develop' into asset-repair-refactor

  nextchamp-saqib

  authored
  4b4eb99

  Copy full SHA for 4b4eb99

• fix(Asset Repair): Compute total_value

  GangaManoj

  committed
  3b0eac7

  Copy full SHA for 3b0eac7

• fix(Asset): Fix tests for Asset Repair

  GangaManoj

  committed
  3a44d88

  Copy full SHA for 3a44d88

• fix(Asset Repair): Revert Stock Entry on cancellation

  GangaManoj

  committed
  2ea325c

  Copy full SHA for 2ea325c

• fix: Remove changes made to Asset Maintenance

  GangaManoj

  committed
  859c8c9

  Copy full SHA for 859c8c9

• fix(Asset Repair): Fix Sider issues

  GangaManoj

  committed
  2e45965

  Copy full SHA for 2e45965

Commits on Jun 23, 2021

• fix(Asset Repair): Replace asset_value with value_after_depreciation in tests

  GangaManoj

  committed
  8039980

  Copy full SHA for 8039980

• fix(Asset): Fix value_after_depreciation calculation

  GangaManoj

  committed
  2f5f9d8

  Copy full SHA for 2f5f9d8

• fix(Asset Repair): Remove test that's no longer necessary

  GangaManoj

  committed
  dce2113

  Copy full SHA for dce2113

Commits on Jun 24, 2021

• fix(Asset): Fix test

  GangaManoj

  committed
  60a44ae

  Copy full SHA for 60a44ae

• fix(Asset): Remove redundant code

  GangaManoj

  committed
  550fe8a

  Copy full SHA for 550fe8a

• fix(Asset Repair): Change controller hooks

  GangaManoj

  committed
  2fdb923

  Copy full SHA for 2fdb923

• fix(Asset): Remove to_date field

  GangaManoj

  committed
  e21d44c

  Copy full SHA for e21d44c

• fix(Asset): Remove extra tabs

  GangaManoj

  committed
  f4e8e7d

  Copy full SHA for f4e8e7d

• fix(Asset): Add comment

  GangaManoj

  committed
  289b449

  Copy full SHA for 289b449

• fix(Asset Repair): Move filters for cost_center, warehouse and project to setup

  GangaManoj

  committed
  b44e412

  Copy full SHA for b44e412

• fix(Asset Repair): Edit description for total_repair_cost

  GangaManoj

  committed
  c73e137

  Copy full SHA for c73e137

• fix(Asset Repair): Simplify code for Asset Repair creation in tests

  GangaManoj

  committed
  dcb8a28

  Copy full SHA for dcb8a28

Commits on Jun 25, 2021

• fix(Asset Repair): Rearrange fields

  GangaManoj

  committed
  ca2dbce

  Copy full SHA for ca2dbce

Commits on Jun 28, 2021

• Merge branch 'develop' into asset-repair-refactor

  nextchamp-saqib

  authored
  4b69563

  Copy full SHA for 4b69563

• fix(Asset Repair): cancellation

  nextchamp-saqib

  authored
  40c90d0

  Copy full SHA for 40c90d0

Commits on Jul 1, 2021

• Merge branch 'develop' into asset-repair-refactor

  nextchamp-saqib

  authored
  49ef260

  Copy full SHA for 49ef260

Commits on Jul 2, 2021

• Merge branch 'develop' into asset-repair-refactor

  nextchamp-saqib

  authored
  f9c5893

  Copy full SHA for f9c5893