Added help pages for Subcontracting and deleted old images

erpnext/docs/user/manual/de/buying/purchase-order.md

@@ -7,7 +7,7 @@ Ein Lieferantenauftrag kann automatisch aus einer Materialanfrage oder einem Lie
 
 ### Flußdiagramm der Lieferantenbestellung
 
-![Lieferantenauftrag]({{docs_base_url}}/assets/old_images/erpnext/purchase-order-f.jpg)
+![Lieferantenauftrag]({{docs_base_url}}/assets/img/buying/purchase-order-f.jpg)
 
 In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
 

erpnext/docs/user/manual/de/buying/supplier-quotation.md

@@ -7,7 +7,7 @@ Sie können ein Lieferantenangebot aus einer Materialanfrage heraus erstellen.
 
 ### Flußdiagramm zum Lieferantenangebot
 
-![Lieferantenangebot]({{docs_base_url}}/assets/old_images/erpnext/supplier-quotation-f.jpg)
+![Lieferantenangebot]({{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg)
 
 Sie können ein Lieferantenangebot auch direkt erstellen über:
 

erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md

@@ -51,7 +51,7 @@ Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechti
 
 2\. **Ein Mitarbeiter sollte nur auf seine/Ihre eigenen Urlaubsanträge zugreifen können.** Daher sollte der Punkt "Benutzerberechtigungen anwenden" für die Rolle "Mitarbeiter" aktiviert sein und es sollte ein Datensatz "Benutzerberechtigung" für jede Kombination von Benutzer und Mitarbeiter erstellt werden. (Dieser Aufwand reduziert sich für den Dokumententyp, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
 
-<img class="screenshot" alt="Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken." src="{{docs_base_url}}/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png">
+<img class="screenshot" alt="Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png">
 
 3\. **Der Personalmanager sollte alle Urlaubsanträge sehen können.** Erstellen Sie für den Personalmanager eine Berechtigungsregel auf der Ebene 0 mit Lese-Rechten. Die Option "Benutzerberechtigungen anwenden" sollte deaktiviert sein.
 

erpnext/docs/user/manual/de/stock/material-request.md

@@ -3,13 +3,13 @@
 
 Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst.
 
-![Workflow]({{docs_base_url}}/assets/old_images/erpnext/material-request-workflow.jpg)
+![Workflow]({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg)
 
 Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: 
 
 > Lagerbestand > Dokumente > Materialanfrage > Neu
 
-### Materialanfrage erstellen
+### Materialanfrage erstelle
 
 <img class="screenshot" alt="Materialanfrage" src="{{docs_base_url}}/assets/img/buying/material-request.png">
 

erpnext/docs/user/manual/de/stock/projected-quantity.md

@@ -7,7 +7,7 @@ Der projizierte Lagerbestand wird vom Planungssystem verwendet um den Nachbestel
 
 Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können.
 
-![Bericht zur projizierten Menge]({{docs_base_url}}/assets/old_images/erpnext/projected-quantity-stock-report.png)
+![Bericht zur projizierten Menge]({{docs_base_url}}/assets/img/stock/projected-quantity-stock-report.png)
 
 > Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge
 

erpnext/docs/user/manual/en/CRM/setup/customer-group.md

@@ -9,6 +9,6 @@ based on your domain).
 Customer Group”. But all this effort, will pay off when you start getting
 reports. An example of a sample report is given below:
 
-![Sales Analytics]({{docs_base_url}}/assets/old_images/erpnext/sales-analytics-customer.png)
+![Sales Analytics]({{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif)
 
 {next}

erpnext/docs/user/manual/en/accounts/test.md

@@ -1 +0,0 @@
-This is test documentaion

erpnext/docs/user/manual/en/buying/purchase-taxes.md

@@ -8,9 +8,8 @@ Orders and Purchase Invoices.
 > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
 Master
 
-![Purchase-Taxes]({{docs_base_url}}/assets/old_images/erpnext/purchase-taxes.png)
+![Purchase-Taxes]({{docs_base_url}}/assets/img/buying/purchase-taxes.png)
 
-  
 
 You can specify if the tax / charge is only for valuation (not a part of
 total) or only for total (does not add value to the item) or for both.

erpnext/docs/user/manual/en/customer-portal/issues.md

@@ -3,20 +3,20 @@ simple and intuitive interface facilitates your customer to report their
 concerns as Issues. They can view the complete thread of their
 conversation.
 
-#### Empty Ticket List
+#### Empty Issue List
 
-![Ticket List]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-list-empty.png)
+![Ticket List]({{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png)
 
 #### New Issue
 
-![New Ticket]({{docs_base_url}}/assets/old_images/erpnext/portal-new-ticket.png)
+![New Ticket]({{docs_base_url}}/assets/img/website/portal-new-ticket.png)
 
 #### Open Issue
 
-![Open Issue]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-1.png)
+![Open Issue]({{docs_base_url}}/assets/img/website/portal-ticket-1.gif)
 
 #### Reply on Issue
 
-![Reply Issue]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-reply.png)
+![Reply Issue]({{docs_base_url}}/assets/img/website/portal-ticket-reply.gif)
 
 {next}

erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md

@@ -2,7 +2,7 @@
  
 Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line.
 
-In ERPNext Kanban board can be an laternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team.
+In ERPNext Kanban board can be an alternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team.
 
 ###Create new Kanban Board
 

erpnext/docs/user/manual/en/manufacturing/subcontracting.md

@@ -15,8 +15,7 @@ sub-contracting feature of ERPNext.
   2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
   3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
 
-![Subcontract]({{docs_base_url}}/assets/old_images/erpnext/subcontract.png)
-
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract.png">
   
 
 __Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed
@@ -24,13 +23,21 @@ Items as sub-items. For example, If you are manufacturing a pen, the processed
 pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and
 other items which go into the making of pen, will be categorized as sub-items.
 
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract2.png">
+
 __Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials.
 
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract3.png">
+
 __Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
 
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract4.png">
+
 __Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the
 correct stock is maintained at the Supplier’s end.
 
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract5.png">
+
 > Note 1: Make sure that the “Rate” of processed Item is the processing rate
 (excluding the raw material rate).
 

erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md

@@ -4,22 +4,26 @@ A sell price unit of measure (UOM) is the UOM with which you price items. You ca
  
 For example an Item Pen is stocked in Nos, but sold in Box. Hence we will make Sales Order for Pen in Box.
  
-Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors
+###Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors
 In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
 
- 
- 
-Setp 2: In the Sale Order, you will find two UoM field.
-UoM
-Stock UoM
++<img class="screenshot" alt="Item Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Item-UOM.png">
+
+
+###Setp 2: In the Sale Order, you will find two UoM fields
+
+-UoM
+-Stock UoM
+
 In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case).  Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM.
 
++<img class="screenshot" alt="Sale order Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Sale-Order-UOM.png">
  
 Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10.
  
  
-Stock Ledger Posting
+###Stock Ledger Posting
  
 Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM.
 
- 
+ +<img class="screenshot" alt="Stock report in UOM" src="{{docs_base_url}}/assets/img/selling/stock ledger for as STOCK-UOM.png">

erpnext/docs/user/manual/en/selling/sales-order.md

@@ -11,7 +11,7 @@ a Sales Order.
 
 ### Sales Order Flow-Chart
 
-![Sales Order]({{docs_base_url}}/assets/old_images/erpnext/sales-order-f.jpg)
+![Sales Order]({{docs_base_url}}/assets/img/buying/sales-order-f.jpg)
 
 To create a new Sales Order go to:
 

erpnext/docs/user/manual/en/selling/setup/sales-partner.md

@@ -25,10 +25,7 @@ To see listing of partner, you should go to:
 
 https://example.erpnext.com/partners
 
-![Sales Partner Listing]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-listing.png)
+![Sales Partner Listing]({{docs_base_url}}/assets/img/crm/sales-partner-listing.png)
 
-Following is the complete partners details published on the website.
-
-![Sales Partner Published]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-published.png)
 
 {next}

erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md

@@ -12,7 +12,7 @@ To allocate target, you should open specific Sales Person master.
 
 In the Sales Person master, you will find table called Sales Person Target.
 
-![Sales Person Target Item Group]({{docs_base_url}}/assets/old_images/erpnext/sales-person-target-item-group.png)
+![Sales Person Target Item Group]({{docs_base_url}}/assets/img/selling/sales-person-target-item-group.png)
 
 In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. 
 
@@ -22,7 +22,7 @@ In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
 
 If you wish to spread allocated target across months, then you should setup Monthly Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation).
 
-![Sales Person Target Distribution]({{docs_base_url}}/assets/old_images/erpnext/sales-person-target-distribution.png)
+![Sales Person Target Distribution]({{docs_base_url}}/assets/im/selling/sales-person-target-distribution.gif)
 
 ####Report - Sales Person Target Variance Item Groupwise
 
@@ -32,7 +32,7 @@ To check this report, go to:
 
 This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
 
-![Sales Person Item Group Report]({{docs_base_url}}/assets/old_images/erpnext/sales-person-item-group-report.png)
+![Sales Person Item Group Report]({{docs_base_url}}/assets/img/selling/sales-person-item-group-report.png)
 
 As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
 
@@ -48,7 +48,7 @@ To allocate target to Sales Person based on Territory, you can should select spe
 
 In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
 
-![Sales Person Territory Manager]({{docs_base_url}}/assets/old_images/erpnext/sales-person-territory-manager.png)
+![Sales Person Territory Manager]({{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png)
 
 ####2.2 Allocating Target
 
@@ -62,7 +62,7 @@ Using this Monthly Distribution document, you can divide target Qty or Amount ac
 
 This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
 
-![Sales Person Territory Report]({{docs_base_url}}/assets/old_images/erpnext/sales-person-territory-report.png)
+![Sales Person Territory Report]({{docs_base_url}}/assets/img/selling/sales-person-territory-report.png)
 
 ---
 
@@ -74,7 +74,7 @@ To create new Monthly Distriibution, go to:
 
 `Accounts > Monthly Distributon`
 
-![Target Distribution]({{docs_base_url}}/assets/old_images/erpnext/target-distribution.png)
+![Target Distribution]({{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png)
 
 You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
 

erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md

@@ -32,18 +32,24 @@ in the data below the column headings.
 
 <img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-file.png">
 
-Then export your template or save it as a **Excel** or **Comma Separated Values** (CSV)
-file. To export te document in Excel check the box for Download in Excel File Format 
+Then export your template or save it as a Excel or Comma Separated Values (CSV)
+file. To export the document in Excel tick the checkbox for Download in Excel File Format 
 
 <img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-csv.png">
 
-### 3\. Upload the File ethier in .xls or .csv 
+### Download in Excel
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-excel.png">
 
-Finally attach the .csv file in the section. Click on the "Upload and Import"
+### 3\. Upload the File ethier in .xlsx or .csv 
+
+Finally attach the  file in the section. Click on the "Upload". Once the upload is successfull click Import"
 button.
 
 <img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-3.png">
 
+
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-4.png">
+
 #### Notes:
 
 1. Make sure that if your application allows, use encoding as UTF-8.

erpnext/docs/user/manual/en/website/shopping-cart.md

@@ -39,7 +39,7 @@ Click on "Add to Cart" to add item to shopping cart.
 
 #### Goto Checkout
 
-Click on "Goto Cart" to checkout or on "Cart" which is on upper right side
+Click on "Go to Cart" to checkout or on "Cart" which is on upper right side
 of the screen.
 
 <img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/checkout.png">