Added help pages for Subcontracting and deleted old images
diff --git a/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg b/erpnext/docs/assets/img/buying/material-request-workflow.jpg
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg
rename to erpnext/docs/assets/img/buying/material-request-workflow.jpg
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg b/erpnext/docs/assets/img/buying/purchase-order-f.jpg
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg
rename to erpnext/docs/assets/img/buying/purchase-order-f.jpg
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/purchase-taxes.png b/erpnext/docs/assets/img/buying/purchase-taxes.png
new file mode 100644
index 0000000..f372b0a
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/purchase-taxes.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/supplier-quotation-f.jpg b/erpnext/docs/assets/img/buying/supplier-quotation-f.jpg
new file mode 100644
index 0000000..03c50de
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-quotation-f.jpg
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/sales-analytics-customer.gif b/erpnext/docs/assets/img/crm/sales-analytics-customer.gif
new file mode 100644
index 0000000..f61cea0
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/sales-analytics-customer.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/sales-partner-listing.png b/erpnext/docs/assets/img/crm/sales-partner-listing.png
new file mode 100644
index 0000000..d9825b3
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/sales-partner-listing.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/subcontract.png b/erpnext/docs/assets/img/manufacturing/subcontract.png
new file mode 100644
index 0000000..84f59b5
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/subcontract.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/subcontract2.png b/erpnext/docs/assets/img/manufacturing/subcontract2.png
new file mode 100644
index 0000000..53aac15
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/subcontract2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/subcontract3.png b/erpnext/docs/assets/img/manufacturing/subcontract3.png
new file mode 100644
index 0000000..9a74824
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/subcontract3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/subcontract4.png b/erpnext/docs/assets/img/manufacturing/subcontract4.png
new file mode 100644
index 0000000..20c367c
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/subcontract4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/subcontract5.png b/erpnext/docs/assets/img/manufacturing/subcontract5.png
new file mode 100644
index 0000000..6e8a5f4
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/subcontract5.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/Item-UOM.png b/erpnext/docs/assets/img/selling/Item-UOM.png
new file mode 100644
index 0000000..b3ffff4
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/Item-UOM.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/Sale-Order-UOM.png b/erpnext/docs/assets/img/selling/Sale-Order-UOM.png
new file mode 100644
index 0000000..9983bad
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/Sale-Order-UOM.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/portal-new-ticket.png b/erpnext/docs/assets/img/selling/portal-new-ticket.png
new file mode 100644
index 0000000..ae998b1
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/portal-new-ticket.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/portal-ticket-1.gif b/erpnext/docs/assets/img/selling/portal-ticket-1.gif
new file mode 100644
index 0000000..2024364
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/portal-ticket-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/portal-ticket-list-empty.png b/erpnext/docs/assets/img/selling/portal-ticket-list-empty.png
new file mode 100644
index 0000000..07582f4
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/portal-ticket-list-empty.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/portal-ticket-reply.gif b/erpnext/docs/assets/img/selling/portal-ticket-reply.gif
new file mode 100644
index 0000000..87b208d
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/portal-ticket-reply.gif
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg b/erpnext/docs/assets/img/selling/sales-order-f.jpg
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg
rename to erpnext/docs/assets/img/selling/sales-order-f.jpg
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/sales-person-item-group-report.png b/erpnext/docs/assets/img/selling/sales-person-item-group-report.png
new file mode 100644
index 0000000..d77f3ef
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-person-item-group-report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/sales-person-target-distribution.gif b/erpnext/docs/assets/img/selling/sales-person-target-distribution.gif
new file mode 100644
index 0000000..f482ada
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-person-target-distribution.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/sales-person-target-item-group.png b/erpnext/docs/assets/img/selling/sales-person-target-item-group.png
new file mode 100644
index 0000000..b2090bd
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-person-target-item-group.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/sales-person-territory-manager.png b/erpnext/docs/assets/img/selling/sales-person-territory-manager.png
new file mode 100644
index 0000000..d5ad4c5
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-person-territory-manager.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/sales-person-territory-report.png b/erpnext/docs/assets/img/selling/sales-person-territory-report.png
new file mode 100644
index 0000000..d2bef77
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-person-territory-report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/stock ledger for as STOCK-UOM.png b/erpnext/docs/assets/img/selling/stock ledger for as STOCK-UOM.png
new file mode 100644
index 0000000..2ef6f44
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/stock ledger for as STOCK-UOM.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/target-distribution.png b/erpnext/docs/assets/img/selling/target-distribution.png
new file mode 100644
index 0000000..cc06ec2
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/target-distribution.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-4.png b/erpnext/docs/assets/img/setup/data-import/data-import-4.png
new file mode 100644
index 0000000..24e7ba0
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-excel.png b/erpnext/docs/assets/img/setup/data-import/data-import-excel.png
new file mode 100644
index 0000000..f012f0e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-excel.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/item-manufacturing-website.png b/erpnext/docs/assets/img/stock/item-manufacturing-website.png
new file mode 100644
index 0000000..54e9746
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-manufacturing-website.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/projected-quantity-stock-report.png b/erpnext/docs/assets/img/stock/projected-quantity-stock-report.png
new file mode 100644
index 0000000..ec372b3
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/projected-quantity-stock-report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png
new file mode 100644
index 0000000..0d9d8f6
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-level-1.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-level-1.png
new file mode 100644
index 0000000..61a1baf
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-level-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/portal-new-ticket.png b/erpnext/docs/assets/img/website/portal-new-ticket.png
new file mode 100644
index 0000000..ae998b1
--- /dev/null
+++ b/erpnext/docs/assets/img/website/portal-new-ticket.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/portal-ticket-1.gif b/erpnext/docs/assets/img/website/portal-ticket-1.gif
new file mode 100644
index 0000000..2024364
--- /dev/null
+++ b/erpnext/docs/assets/img/website/portal-ticket-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/website/portal-ticket-list-empty.png b/erpnext/docs/assets/img/website/portal-ticket-list-empty.png
new file mode 100644
index 0000000..07582f4
--- /dev/null
+++ b/erpnext/docs/assets/img/website/portal-ticket-list-empty.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/portal-ticket-reply.gif b/erpnext/docs/assets/img/website/portal-ticket-reply.gif
new file mode 100644
index 0000000..87b208d
--- /dev/null
+++ b/erpnext/docs/assets/img/website/portal-ticket-reply.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/website/shopping-cart-1.png b/erpnext/docs/assets/img/website/shopping-cart-1.png
new file mode 100644
index 0000000..ddf1950
--- /dev/null
+++ b/erpnext/docs/assets/img/website/shopping-cart-1.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png b/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png
deleted file mode 100644
index 6130ded..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png
deleted file mode 100644
index 175eca7..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png
deleted file mode 100644
index fd5875c..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png
deleted file mode 100644
index f03f673..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png b/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png
deleted file mode 100644
index b7d0a90..0000000
--- a/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png b/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png
deleted file mode 100644
index 508bf4e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png b/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png
deleted file mode 100644
index bb51d60..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png b/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png
deleted file mode 100644
index 944a7da..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png b/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png
deleted file mode 100644
index 631ca31..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png b/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png
deleted file mode 100644
index de1c6b8..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png b/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png
deleted file mode 100644
index d10da04..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png b/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png
deleted file mode 100644
index e1a2eb5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png
deleted file mode 100644
index 51f470b..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png
deleted file mode 100644
index 154a73d..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png
deleted file mode 100644
index 80ce1e1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png
deleted file mode 100644
index ffa0d07..0000000
--- a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png
deleted file mode 100644
index 2611ce4..0000000
--- a/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png
deleted file mode 100644
index 868c170..0000000
--- a/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png
deleted file mode 100644
index d9ab164..0000000
--- a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png
deleted file mode 100644
index 6fd5f000..0000000
--- a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/subcontract.png b/erpnext/docs/assets/old_images/erpnext/subcontract.png
deleted file mode 100644
index a199314..0000000
--- a/erpnext/docs/assets/old_images/erpnext/subcontract.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/target-distribution.png b/erpnext/docs/assets/old_images/erpnext/target-distribution.png
deleted file mode 100644
index 7e451cd..0000000
--- a/erpnext/docs/assets/old_images/erpnext/target-distribution.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md
index 11b414c..705dd8d 100644
--- a/erpnext/docs/user/manual/de/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/de/buying/purchase-order.md
@@ -7,7 +7,7 @@
### Flußdiagramm der Lieferantenbestellung
-
+
In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
diff --git a/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
index 1aec103..3295d38 100644
--- a/erpnext/docs/user/manual/de/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
@@ -7,7 +7,7 @@
### Flußdiagramm zum Lieferantenangebot
-
+
Sie können ein Lieferantenangebot auch direkt erstellen über:
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
index 6d101bc..6d8108a 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
@@ -51,7 +51,7 @@
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.
diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md
index 0f55b1e..f7f441b 100644
--- a/erpnext/docs/user/manual/de/stock/material-request.md
+++ b/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.
-
+
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">
diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md
index 8cea6cf..18448be 100644
--- a/erpnext/docs/user/manual/de/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/de/stock/projected-quantity.md
@@ -7,7 +7,7 @@
Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können.
-
+
> Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge
diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
index 007f445..68608a7 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -9,6 +9,6 @@
Customer Group”. But all this effort, will pay off when you start getting
reports. An example of a sample report is given below:
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/test.md b/erpnext/docs/user/manual/en/accounts/test.md
deleted file mode 100644
index e677bde..0000000
--- a/erpnext/docs/user/manual/en/accounts/test.md
+++ /dev/null
@@ -1 +0,0 @@
-This is test documentaion
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
index 871ff96..180ad3e 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -8,9 +8,8 @@
> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
Master
-
+
-
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.
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
index 79ac676..31fec08 100644
--- a/erpnext/docs/user/manual/en/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -3,20 +3,20 @@
concerns as Issues. They can view the complete thread of their
conversation.
-#### Empty Ticket List
+#### Empty Issue List
-
+
#### New Issue
-
+
#### Open Issue
-
+
#### Reply on Issue
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
index 2a6cd7f..5f74004 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
+++ b/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
diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
index 9252171..1589d1b 100644
--- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -15,8 +15,7 @@
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”.
-
-
+<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 @@
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).
diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
similarity index 63%
rename from erpnext/docs/user/manual/en/selling/articles/Selling in different UOM
rename to erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
index b435e95..4fbdf8e 100644
--- a/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM
+++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
@@ -4,22 +4,26 @@
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">
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index bcd9c93..18b84fd 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -11,7 +11,7 @@
### Sales Order Flow-Chart
-
+
To create a new Sales Order go to:
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
index b876205..0495a1e 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -25,10 +25,7 @@
https://example.erpnext.com/partners
-
+
-Following is the complete partners details published on the website.
-
-
{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 75b7561..258f4c6 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -12,7 +12,7 @@
In the Sales Person master, you will find table called Sales Person Target.
-
+
In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
@@ -22,7 +22,7 @@
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).
-
+
####Report - Sales Person Target Variance Item Groupwise
@@ -32,7 +32,7 @@
This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
-
+
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 @@
In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
-
+
####2.2 Allocating Target
@@ -62,7 +62,7 @@
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.
-
+
---
@@ -74,7 +74,7 @@
`Accounts > Monthly Distributon`
-
+
You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index 70aa0f5..28bf0af 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -32,18 +32,24 @@
<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.
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 7b10037..6103e3c 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -39,7 +39,7 @@
#### 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">
