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

323 Commits

Author SHA1 Message Date
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
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
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