Fixed Asset module cleanup and fixes

erpnext/docs/current/models/stock/material_request_item.html

@@ -310,6 +310,27 @@
         
         <tr >
             <td>19</td>
+            <td ><code>project</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
             <td ><code>col_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -321,7 +342,7 @@
         </tr>
         
         <tr >
-            <td>20</td>
+            <td>21</td>
             <td ><code>min_order_qty</code></td>
             <td >
                 Float</td>
@@ -333,7 +354,7 @@
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>22</td>
             <td ><code>projected_qty</code></td>
             <td >
                 Float</td>
@@ -345,7 +366,7 @@
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>23</td>
             <td ><code>ordered_qty</code></td>
             <td >
                 Float</td>
@@ -357,7 +378,7 @@
         </tr>
         
         <tr >
-            <td>23</td>
+            <td>24</td>
             <td ><code>page_break</code></td>
             <td >
                 Check</td>

erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md

@@ -1,4 +1,4 @@
-In ERPNext, you can maintain your fixed asset records like Computers, Building, Cars etc and manage depreciations, sell or disposal of those assets.
+In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars etc and manage depreciations, sell or disposal of those assets.
 
 ## Asset Category
 
@@ -11,24 +11,25 @@ To start first you should create Asset Category, depending on the type of assets
 
 ## Asset
 
-Next step will be creating the fixed asset records. The assets which are partially / fully depreciated can also be created/maintained for the future reference.
+Next step will be creating the fixed asset records. Asset record is the heart of fixed asset management, all the activities like purchasing, depreciation, scrapping or sales are managed against it.
 
 <img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset.png">
 
 Explanation of the fields:
 
 1. Asset Category: The category of assets it belongs to.
-2. Item Code: The item/product code for the asset, which must be marked as a fixed asset and a non-stock item.
+2. Is Existing Asset: Check if adding an existing asset. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
 3. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
-4. Gross Purchase Amount: The purchase cost of the asset
-5. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
-6. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the currect value of the asset. In case of new asset, mention the purchase amount or leave it blank.
-7. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
+4. Warehouse: Set the location of the asset.
+5. Gross Purchase Amount: The purchase cost of the asset
+6. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
+7. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the currect value of the asset. In case of new asset, mention the purchase amount or leave it blank.
+8. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
 	- Straight Line: This method spreads the cost of the fixed asset evenly over its useful life.
 	- Double Declining Method: An accelerated method of depreciation, it results in higher depreciation expense in the earlier years of ownership.
-8. Number of Depreciations: The number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
-9. Number of Months in a Period: The number of months between two depreciations.
-10. Next Depreciation Date: Mention the next depreciation date, even if it is the first one. If depreciation already completed, leave it blank.
+9. Number of Depreciations: The number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
+10. Frequency of Depreciation (Months): The number of months between two depreciations.
+11. Next Depreciation Date: Mention the next depreciation date, even if it is the first one. If the asset is an existing one and depreciation has already been completed, leave it blank.
 
 ### Depreciations
 
@@ -45,16 +46,16 @@ In the depreciation entry, the "Accumulated Depreciation Account" is credited an
 
 ## Purchase an asset
 
-For purchasing an asset, first create an item for the asset with "Is Fixed Asset" checked. Then create a Purchase Invoice against that item. In the Purchase Invoice Item row, you have to mention Asset name and associated fixed asset account should be set as Expense Account. Fixed asset accounts are identified based on "Fixed Asset" account type.
+For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in teh Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice. 
 
 <img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-purchase-invoice.png">
 
-System will validate purchase date, supplier with the value mentioned in the Asset record. On submission of the Invoice, the "Fixed Asset Account" will be debited. It will also update Purchase Invoice number in the Asset.
+On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no in the Asset record.
 
 
-## Sell an ssset
+## Sale an ssset
 
-To sale an asset, create a Sales Invoice against the item linked with the asset. On submission of Sales Invoice, following entries will take place:
+To sale an asset, open the asset record and create a Sales Invoice using "Sale Asset" button. On submission of the Sales Invoice, following entries will take place:
 
 - "Receivable Account" (Debtors) will be debited by the sales amount.
 - "Fixed Asset Account" will be credited by the purchase amount of asset.
@@ -66,6 +67,6 @@ To sale an asset, create a Sales Invoice against the item linked with the asset.
 
 ## Scrap an Asset
 
-You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. , After scrapping, you can also restore the asset using "Restore Asset" button.
+You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
 
 <img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/scrap-journal-entry.png">

erpnext/docs/user/manual/en/stock/articles/index.txt

@@ -3,7 +3,6 @@ auto-creation-of-material-request
 depreciation-entry
 maintain-stock-field-frozen-in-item-master
 manage-rejected-finished-goods-items
-managing-assets
 managing-batch-wise-inventory
 managing-fractions-in-uom
 opening-stock-balance-entry-for-the-serialized-and-batch-item

erpnext/docs/user/manual/en/stock/articles/managing-assets.md

@@ -1,23 +0,0 @@
-#Managing Assets
-
-Items like machinery, furniture, land and property, patents etc. can be categorized as fixed asset of a company. In ERPNext, you can maintain fixed asset items, mainly stock items in a separate Warehouse.
-
-For the high value asset items, serialized inventory can be maintained. It will allow assigning unique Serial No. to each unit of an asset item.
-
-####Fixed Asset Master
-
-While creating Item Code for the fixed asset item, you should check "Is Fixed Asset" field.
-
-<img alt ="Fixed Asset Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/managing-assets-1.png">
-
-Other item properties like Stock/Non-stock item can be updated on the nature of asset. Like patent and trademarks will be non-stock assets.
-
-If your asset item is serialized, click [here]({{docs_base_url}}/user/videos/learn/serialized-inventory.html) to learn how serialized inventory is managed in ERPNext.
-
-####Warehouse for Fixed Asset
-
-Separate Warehouse should be created for the fixed asset items. All the sales, purchase and stock transactions for asset items should be done for fixed asset warehouse only.
-
-As per the perpetual inventory valuation system, accounting ledger is auto-created for a warehouse. You can move the accounting ledger of fixed asset from Stock Asset (default group) to Fixed Asset's group account.
-
-<!-- markdown -->