Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,952 Commits 3 Branches 0 Tags 1 GiB
f2fe55ceeb
Commit Graph

241 Commits

Author SHA1 Message Date
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
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
Rucha Mahabal
85213fa8cb
fix(Asset): set current asset value before calculating difference amount (#24119) 2020-12-15 09:32:02 +05:30
Mohammad Hasnain
f82997e3c3 fix(asset_val_adj): fb not getting added in je 2020-12-10 13:34:01 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +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
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