diff --git a/erpnext/docs/assets/img/articles/$SGrab_383.png b/erpnext/docs/assets/img/articles/$SGrab_383.png deleted file mode 100644 index 720ecdfafb3..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_383.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_389.png b/erpnext/docs/assets/img/articles/$SGrab_389.png deleted file mode 100644 index ee1b8cbe523..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_389.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_390.png b/erpnext/docs/assets/img/articles/$SGrab_390.png deleted file mode 100644 index b936c07e2b4..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_390.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_391.png b/erpnext/docs/assets/img/articles/$SGrab_391.png deleted file mode 100644 index 79595aea2a9..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_391.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_392.png b/erpnext/docs/assets/img/articles/$SGrab_392.png deleted file mode 100644 index 677e7c9743f..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_392.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png deleted file mode 100644 index e20b65fcbd4..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png deleted file mode 100644 index f446efc1793..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png deleted file mode 100644 index 404a1cd7d50..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_049.png b/erpnext/docs/assets/img/articles/Selection_049.png deleted file mode 100644 index 2cf490e3e6e..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_049.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_054.png b/erpnext/docs/assets/img/articles/Selection_054.png deleted file mode 100644 index a17b1eae392..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_054.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_061.png b/erpnext/docs/assets/img/articles/Selection_061.png deleted file mode 100644 index 176d8c5eae1..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_061.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_062.png b/erpnext/docs/assets/img/articles/Selection_062.png deleted file mode 100644 index a230c9392a0..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_062.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_071.png b/erpnext/docs/assets/img/articles/Selection_071.png deleted file mode 100644 index 86b7cff34fe..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_071.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_072.png b/erpnext/docs/assets/img/articles/Selection_072.png deleted file mode 100644 index e8dd5192907..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_072.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_440.png b/erpnext/docs/assets/img/articles/Selection_440.png deleted file mode 100644 index 63fb04cf097..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_440.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_442.png b/erpnext/docs/assets/img/articles/Selection_442.png deleted file mode 100644 index 55d0735e447..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_442.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_443.png b/erpnext/docs/assets/img/articles/Selection_443.png deleted file mode 100644 index 6d045f2331a..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_443.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_445.png b/erpnext/docs/assets/img/articles/Selection_445.png deleted file mode 100644 index bab81858a60..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_445.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_446.png b/erpnext/docs/assets/img/articles/Selection_446.png deleted file mode 100644 index ecd0edd5e90..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_446.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Selection_447.png b/erpnext/docs/assets/img/articles/Selection_447.png deleted file mode 100644 index 683c289d347..00000000000 Binary files a/erpnext/docs/assets/img/articles/Selection_447.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-1.png b/erpnext/docs/assets/img/articles/allowance-percentage-1.png new file mode 100644 index 00000000000..4fbed90f712 Binary files /dev/null and b/erpnext/docs/assets/img/articles/allowance-percentage-1.png differ diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-2.png b/erpnext/docs/assets/img/articles/allowance-percentage-2.png new file mode 100644 index 00000000000..a7b968834ce Binary files /dev/null and b/erpnext/docs/assets/img/articles/allowance-percentage-2.png differ diff --git a/erpnext/docs/assets/img/articles/allowance_percentage.png b/erpnext/docs/assets/img/articles/allowance_percentage.png deleted file mode 100644 index 519a8376233..00000000000 Binary files a/erpnext/docs/assets/img/articles/allowance_percentage.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/allowance_percentage_item.png b/erpnext/docs/assets/img/articles/allowance_percentage_item.png deleted file mode 100644 index 3d30fdc6a44..00000000000 Binary files a/erpnext/docs/assets/img/articles/allowance_percentage_item.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/barcode-feature-setup.png b/erpnext/docs/assets/img/articles/barcode-feature-setup.png new file mode 100644 index 00000000000..0a097ef1740 Binary files /dev/null and b/erpnext/docs/assets/img/articles/barcode-feature-setup.png differ diff --git a/erpnext/docs/assets/img/articles/barcode-item-master.png b/erpnext/docs/assets/img/articles/barcode-item-master.png new file mode 100644 index 00000000000..57b5fccc337 Binary files /dev/null and b/erpnext/docs/assets/img/articles/barcode-item-master.png differ diff --git a/erpnext/docs/assets/img/articles/barcode-item-selection.gif b/erpnext/docs/assets/img/articles/barcode-item-selection.gif new file mode 100644 index 00000000000..55f3465c1ea Binary files /dev/null and b/erpnext/docs/assets/img/articles/barcode-item-selection.gif differ diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-1.png b/erpnext/docs/assets/img/articles/batchwise-stock-1.png new file mode 100644 index 00000000000..4477425882c Binary files /dev/null and b/erpnext/docs/assets/img/articles/batchwise-stock-1.png differ diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-2.png b/erpnext/docs/assets/img/articles/batchwise-stock-2.png new file mode 100644 index 00000000000..5d9b9b461d1 Binary files /dev/null and b/erpnext/docs/assets/img/articles/batchwise-stock-2.png differ diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-3.png b/erpnext/docs/assets/img/articles/batchwise-stock-3.png new file mode 100644 index 00000000000..2fa77123223 Binary files /dev/null and b/erpnext/docs/assets/img/articles/batchwise-stock-3.png differ diff --git a/erpnext/docs/assets/img/articles/batchwise-stock-4.png b/erpnext/docs/assets/img/articles/batchwise-stock-4.png new file mode 100644 index 00000000000..e6a22f3de21 Binary files /dev/null and b/erpnext/docs/assets/img/articles/batchwise-stock-4.png differ diff --git a/erpnext/docs/assets/img/articles/delivery-note-barcode.png b/erpnext/docs/assets/img/articles/delivery-note-barcode.png deleted file mode 100644 index 25814c64077..00000000000 Binary files a/erpnext/docs/assets/img/articles/delivery-note-barcode.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/difference-account-1.png b/erpnext/docs/assets/img/articles/difference-account-1.png new file mode 100644 index 00000000000..d812b70155e Binary files /dev/null and b/erpnext/docs/assets/img/articles/difference-account-1.png differ diff --git a/erpnext/docs/assets/img/articles/feature-setup-barcode.png b/erpnext/docs/assets/img/articles/feature-setup-barcode.png deleted file mode 100644 index 667e3a1d778..00000000000 Binary files a/erpnext/docs/assets/img/articles/feature-setup-barcode.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif b/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif new file mode 100644 index 00000000000..e6330adb871 Binary files /dev/null and b/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif differ diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png new file mode 100644 index 00000000000..0679403e146 Binary files /dev/null and b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png differ diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/docs/assets/img/articles/item-barcode.png b/erpnext/docs/assets/img/articles/item-barcode.png deleted file mode 100644 index 6fd0f72596f..00000000000 Binary files a/erpnext/docs/assets/img/articles/item-barcode.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/maintain-stock-1.png b/erpnext/docs/assets/img/articles/maintain-stock-1.png new file mode 100644 index 00000000000..c38b88fb8c2 Binary files /dev/null and b/erpnext/docs/assets/img/articles/maintain-stock-1.png differ diff --git a/erpnext/docs/assets/img/articles/managing-assets-1.png b/erpnext/docs/assets/img/articles/managing-assets-1.png new file mode 100644 index 00000000000..772037ec097 Binary files /dev/null and b/erpnext/docs/assets/img/articles/managing-assets-1.png differ diff --git a/erpnext/docs/assets/img/articles/reorder-request-1.png b/erpnext/docs/assets/img/articles/reorder-request-1.png new file mode 100644 index 00000000000..ca9b2b095ca Binary files /dev/null and b/erpnext/docs/assets/img/articles/reorder-request-1.png differ diff --git a/erpnext/docs/assets/img/articles/reorder-request-2.png b/erpnext/docs/assets/img/articles/reorder-request-2.png new file mode 100644 index 00000000000..7ed3b03c7e3 Binary files /dev/null and b/erpnext/docs/assets/img/articles/reorder-request-2.png differ diff --git a/erpnext/docs/assets/img/articles/reorder-request-3.png b/erpnext/docs/assets/img/articles/reorder-request-3.png new file mode 100644 index 00000000000..a4e4f07cf8c Binary files /dev/null and b/erpnext/docs/assets/img/articles/reorder-request-3.png differ diff --git a/erpnext/docs/assets/img/articles/repack-1.png b/erpnext/docs/assets/img/articles/repack-1.png new file mode 100644 index 00000000000..d08429979dd Binary files /dev/null and b/erpnext/docs/assets/img/articles/repack-1.png differ diff --git a/erpnext/docs/assets/img/articles/repack-2.png b/erpnext/docs/assets/img/articles/repack-2.png new file mode 100644 index 00000000000..5b0f4dfa1e9 Binary files /dev/null and b/erpnext/docs/assets/img/articles/repack-2.png differ diff --git a/erpnext/docs/assets/img/articles/serial-naming-1.png b/erpnext/docs/assets/img/articles/serial-naming-1.png new file mode 100644 index 00000000000..964363a79f9 Binary files /dev/null and b/erpnext/docs/assets/img/articles/serial-naming-1.png differ diff --git a/erpnext/docs/assets/img/articles/serial-naming-2.png b/erpnext/docs/assets/img/articles/serial-naming-2.png new file mode 100644 index 00000000000..12336df728d Binary files /dev/null and b/erpnext/docs/assets/img/articles/serial-naming-2.png differ diff --git a/erpnext/docs/assets/img/articles/serial-naming-3.png b/erpnext/docs/assets/img/articles/serial-naming-3.png new file mode 100644 index 00000000000..17ecdcf7575 Binary files /dev/null and b/erpnext/docs/assets/img/articles/serial-naming-3.png differ diff --git a/erpnext/docs/assets/img/articles/serial-naming-4.png b/erpnext/docs/assets/img/articles/serial-naming-4.png new file mode 100644 index 00000000000..6b3d52c2b66 Binary files /dev/null and b/erpnext/docs/assets/img/articles/serial-naming-4.png differ diff --git a/erpnext/docs/assets/img/articles/stock-entry-issue.png b/erpnext/docs/assets/img/articles/stock-entry-issue.png new file mode 100644 index 00000000000..eb470372663 Binary files /dev/null and b/erpnext/docs/assets/img/articles/stock-entry-issue.png differ diff --git a/erpnext/docs/assets/img/articles/stock-entry-manufacture-transfer.gif b/erpnext/docs/assets/img/articles/stock-entry-manufacture-transfer.gif new file mode 100644 index 00000000000..20379ff035e Binary files /dev/null and b/erpnext/docs/assets/img/articles/stock-entry-manufacture-transfer.gif differ diff --git a/erpnext/docs/assets/img/articles/stock-entry-manufacture.gif b/erpnext/docs/assets/img/articles/stock-entry-manufacture.gif new file mode 100644 index 00000000000..a36c18d2f81 Binary files /dev/null and b/erpnext/docs/assets/img/articles/stock-entry-manufacture.gif differ diff --git a/erpnext/docs/assets/img/articles/stock-entry-receipt.png b/erpnext/docs/assets/img/articles/stock-entry-receipt.png new file mode 100644 index 00000000000..44f62aa5a53 Binary files /dev/null and b/erpnext/docs/assets/img/articles/stock-entry-receipt.png differ diff --git a/erpnext/docs/assets/img/articles/stock-entry-subcontract.gif b/erpnext/docs/assets/img/articles/stock-entry-subcontract.gif new file mode 100644 index 00000000000..f952654e146 Binary files /dev/null and b/erpnext/docs/assets/img/articles/stock-entry-subcontract.gif differ diff --git a/erpnext/docs/assets/img/articles/stock-entry-transfer.png b/erpnext/docs/assets/img/articles/stock-entry-transfer.png new file mode 100644 index 00000000000..04bd881a260 Binary files /dev/null and b/erpnext/docs/assets/img/articles/stock-entry-transfer.png differ diff --git a/erpnext/docs/assets/img/articles/uom-fraction-1.png b/erpnext/docs/assets/img/articles/uom-fraction-1.png new file mode 100644 index 00000000000..081627b8991 Binary files /dev/null and b/erpnext/docs/assets/img/articles/uom-fraction-1.png differ diff --git a/erpnext/docs/assets/img/articles/uom-fraction-2.png b/erpnext/docs/assets/img/articles/uom-fraction-2.png new file mode 100644 index 00000000000..831106b4024 Binary files /dev/null and b/erpnext/docs/assets/img/articles/uom-fraction-2.png differ diff --git a/erpnext/docs/assets/img/videos/conf-2015.jpg b/erpnext/docs/assets/img/videos/conf-2015.jpg new file mode 100644 index 00000000000..c8f0591b996 Binary files /dev/null and b/erpnext/docs/assets/img/videos/conf-2015.jpg differ diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md index 6f2b86b40fe..9252171a243 100644 --- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md +++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md @@ -37,4 +37,8 @@ correct stock is maintained at the Supplier’s end. > Note 2: ERPNext will automatically add the raw material rate for your valuation purpose when you receive the finished Item in your stock. +### Video Help + + + {next} diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md index bfee1434048..f0963d142c1 100644 --- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md +++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md @@ -1,15 +1,22 @@ -
-1. Go to `Stock > Setup > Stock Settings`.
-2. Set `Allowance Percentage` and save the Stock Settings.
-
-For example: If you have ordered 100 units. and your Allowance is 50% then you are allowed to receive 150 units.
-3. To set item-specific limit, set `Allowance Percentage` in `Item` master.
-
+Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
+
+For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50%, then you are allowed to make Purchase Receipt for upto 150 units.
+
+Update global value for "Allow over delivery or receipt upto this percent" from Stock Settings. Value updated here will be applicable for all the items.
+
+1. Go to `Stock > Setup > Stock Settings`
+
+2. Set `Allowance Percentage`.
+
+3. Save Stock Settings.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
index e95b113f2bf..02d88d8d3f3 100644
--- a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -1,25 +1,27 @@
-
With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
-
+
-You can have Material Request automatically created for items whose stock level reaches re-order level. You can enable this feature from:
+When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from:
`Stock > Setup > Stock Settings`
-
+
-A separate Material Request will be created for each item. User with Purchase Manager's role will be informed about these Material Request. He can further process this Material Request, and create Supplier Quotation and Purchase Order against it.
+A separate Material Request will be created for each item. User with Purchase Manager's role will receive email alert about these Material Requests.
-If auto creation of Material Request is failed, Purchase Manager will be informed about error message via email. One of the most encountered error message is:
+If auto creation of Material Request is failed, User with Purchase Manager role will be informed about error message. One of the most encountered error message is:
-**An error occurred for certain Items while creating Material Requests based on Re-order level.
-Date 01-04-2015 not in any Fiscal Year.**
+**An error occurred for certain Items while creating Material Requests based on Re-order level.**
+**Date 01-04-2016 not in any Fiscal Year.**
-One of the reason of error could be Fiscal Year as well. Click [here](https://erpnext.com/kb/accounts/fiscal-year-error) to learn more about it.
+One of the reason of error could be Fiscal Year as well. Click [here]({{docs_base_url}}/user/manual/en/accounts/articles/fiscal-year-error.html) to learn more about it.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
deleted file mode 100644
index 6115ed5451a..00000000000
--- a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-

-
Step 2: In the Stock Reconciliation Form, enter the Expense account for depreciation in Difference Account.
-
-
-

-####Step 2:
+After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file.
-In the Stock Reconciliation Form, enter the Expense account for depreciation in Difference Account.
-
+####Step 2:
-
+
+####Stock Reconciliation Help Video
+
+
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
index fc039b1795d..6d20384554f 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.txt
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -1,7 +1,7 @@
allow-over-delivery-billing-against-sales-order-upto-certain-limit
auto-creation-of-material-request
-creating-depreciation-for-item
-is-stock-item-field-frozen-in-item-master
+depreciation-entry
+maintain-stock-field-frozen-in-item-master
manage-rejected-finished-goods-items
managing-assets
managing-batch-wise-inventory
@@ -11,5 +11,4 @@ repack-entry
serial-no-naming
stock-entry-purpose
stock-level-report
-track-items-using-barcode
-using-batch-feature-in-stock-entry
\ No newline at end of file
+track-items-using-barcode
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
similarity index 76%
rename from erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
rename to erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
index a0128273f9f..f93e66862b3 100644
--- a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
+++ b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
@@ -1,14 +1,12 @@
-
For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
diff --git a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
index 9bb01036c37..2d57d6442ec 100644
--- a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
+++ b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
@@ -1,32 +1,31 @@
-
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](https://erpnext.com/user-guide/stock/serialized-inventory) to learn how serialized inventory is managed in ERPNext.
+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 will be done in that fixed asset warehouse only.
+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 asset from Stock Asset (default group) to Fixed Asset's group account.
-Also, as per the perpetual inventory valuation system, you will have accounting ledger auto-created for the warehouse. You can move the accounting ledger of warehouse created for fixed asset from Stock Asset group to fixed asset group. This will be helpful while preparing financial statement for a company.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
deleted file mode 100644
index 23cd46d518c..00000000000
--- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Stock > Documents > Batch > New
Batch No. in Purchase Receipt

Batch No. in Delivery Note

Batch-wise Stock Balance Report
To check batch-wise stock balance report, go to:
Stock > Standard Reports > Batch-wise Balance History
+
+You can create a new Batch from:
`Stock > Documents > Batch > New`
-To learn more about batch check out the manual page at: https://manual.erpnext.com/contents/stock/batch
+To learn more about batch, click [here.]({{docs_base_url}}/user/manual/en/stock/batch.html)
-While making a purchase receipt or delivery note, mention the batch number against the item.
+For the Batch item, updating Batch No. in the stock transactions (Purchase Receipt & Delivery Note) is mandatory.
-**Batch No. in Purchase Receipt**
+#### Purchase Receipt
-
+When creating Purchase Receipt, you should create new Batch, or select one of the existing Batch master. One Batch can be associated with one Batch Item.
-**Batch No. in Delivery Note**
+
-
+
+#### Batch-wise Stock Balance Report
To check batch-wise stock balance report, go to:
-`Stock > Standard Reports > Batch-wise Balance History`
+Stock > Standard Reports > Batch-wise Balance History
+
+
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
index 75acd387df1..12447e006de 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -1,12 +1,10 @@
-
-####While Creating Entry
+####Validation
-While creating transaction, if you enter value in fraction for item who's UoM has "Must be whole number" checked, you will get error message stating:
+While creating transaction, if you enter value in fraction for item whos UoM has "Must be whole number" checked, you will get error message stating:
`Quantity cannot be a fraction at row #`
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
index 5251a8e4ef7..9b8684a1c46 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -1,14 +1,14 @@
-
#### Step 9: Save and Submit Stock Entry
-On submission of Stock Entry, stock ledger entry will be posted, and opening balance will be updated for the items on a given posting date.
+On submission of Stock Entry, stock ledger posting will be posted, and opening balance will be updated for the items on a given Posting Date.
-If Serial Nos. for your items are set to be created based on prefix, then on submission of Stock Entry, Serial Nos. will be created as well.
-
-
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
index 59bf9835f75..1d758c8a04a 100644
--- a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
@@ -1,16 +1,14 @@
-
+
+Update Qty for all the items selected.
#### 3. Submit Stock Entry
-On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repacked/production item will be added in the Target Warehouse.
+On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repack/output item will be added in the Target Warehouse.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
index c4e8774e406..4f2425ffb36 100644
--- a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -1,26 +1,24 @@
-
Generated Serial numbers will be updated for each item.
-
+
###2. Serializing Manufacturing Item
@@ -30,12 +28,12 @@ To Serialize Manufacturing Item, you can define Series for Serial No. Generation
When Item is set as serialized, it will allow you to mentioned Series for it.
-
+
####2.2 Production Entry for Serialized Item
On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
index 26b63469273..426328ecf7e 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -1,53 +1,49 @@
-
-#### 2.Purpose = Material Receipt
+#### 2.Purpose: Material Receipt
-This purpose is selected to receive item in a warehouse. In this stock entry, you should define Target Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+Material Receipt entry is created to inward stock of item(s) in a warehouse. This type of stock entry can be created for updating opening balance of serialized and batched item. Also items purchased without Purchase Order can be inwarded from Material Receipt entry.
-
+For the stock valuation purpose, provided Item Valuation becomes a mandatory field in the Material Receipt entry.
-#### 3.Purpose = Material Transfer
+
-This purpose is selected to transfer item from warehouse to warehouse or to transfer raw material for production. In this stock entry, you should define Source Warehouse and Target Warehouse also.
+#### 3.Purpose: Material Transfer
-
+Material Transfer entry is created for the inter-warehouse Material Transfer.
+
+
-#### 4.Purpose = Manufacture
+#### 4.Purpose: Material Transfer for Manufacture
-This purpose is selected to perform finished goods entry. This purpose is auto selected in stock entry form, when you Update Finished Goods entry from Submitted Production Order. 
+In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order.
-
+
-#### 5.Purpose = Repack
+#### 4.Purpose: Manufacture
-This purpose is selected to perform repack of item. 
+Manufacture is created from Production Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Production Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Production Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
-#### 6.Purpose = Subcontract
+
-This purpose is selected to transfer row material to supplier for manufacturing subcontracting item.
+#### 5.Purpose: Repack
-
+Repack Entry is created when items purchases in bulk is repacked under smaller packs. 
-#### 6.Purpose = Sales Return
+#### 6.Purpose: Subcontract
-This purpose is selected to receive returned item by customer. 
+Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse..
-
+
-#### 6.Purpose = Purchase Return
-
-This purpose is selected to issue purchased item to supplier. 
-
-
-
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
index fa9261298fc..b6744701564 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
@@ -1,6 +1,4 @@
-
-Once you have updated barcode field in item master, you can fetch items using barcode in Delivery Note, Sales Invoice and Purchase Receipt document.
+Now a new field "Barcode" will be appear in Item master. Enter barcode while creating a new item.
-For example, in Delivery Note Item table, a new field "Barcode" will be appear and if you point your mouse cursor to that field and scan the barcode using Barcode Scanner, the code will appear in that field. At the same time, system will pull item details, based on the barcode.
-
+
+Once barcode field is updated in item master, items can be fetched using barcode. This feature will be availble in Delivery Note, Sales Invoice and Purchase Receipt transactions only.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
deleted file mode 100644
index eeb5cdfdab9..00000000000
--- a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-2. In the Item Master fill in all item related details. In the 'Inventory' section select 'Has Batch No.' as 'YES'
-
- NOTE: This option can be changed after submit but only as long as there are no Stock Entries created against that Item. Once an Stock Entry is created against that item this field freezes. To modify it again you need to cancel all outstanding 'Stock Entries'
-3. You can then create a batch. To do so you can type 'new Batch' in the Awesome bar.
-4. Fill in the batch related details and save the Doc.
-
-5. Now in Stock Transaction You can associate a batch against that item under the 'Serial No / Batch' Section.