Merge branch 'develop'

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 dist: trusty
+group: deprecated-2017Q2
 
 python:
   - "2.7"

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.1.1'
+__version__ = '8.1.2'
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -10,6 +11,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -20,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Document", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -37,17 +42,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 1, 
+   "columns": 2, 
    "fieldname": "payment_entry", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Payment Entry", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +66,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -66,6 +75,7 @@
    "width": "50"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -76,7 +86,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Against Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,6 +98,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -94,6 +107,7 @@
    "width": "15"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -104,7 +118,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -115,6 +131,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -122,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -132,7 +150,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -140,6 +160,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -148,6 +169,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,7 +180,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -168,6 +192,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -175,17 +200,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 1, 
+   "columns": 2, 
    "fieldname": "cheque_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Cheque Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -195,6 +223,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -202,6 +231,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -212,7 +242,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cheque Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -222,6 +254,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -229,6 +262,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -239,7 +273,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Clearance Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -249,6 +285,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -256,18 +293,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-17 11:39:00.308624", 
+ "modified": "2017-06-23 12:07:50.883515", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
@@ -276,6 +313,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -54,7 +54,10 @@ class SalesInvoice(SellingController):
 	def validate(self):
 		super(SalesInvoice, self).validate()
 		self.validate_auto_set_posting_time()
-		self.so_dn_required()
+
+		if not self.is_pos:
+			self.so_dn_required()
+
 		self.validate_proj_cust()
 		self.validate_with_previous_doc()
 		self.validate_uom_is_integer("stock_uom", "stock_qty")

erpnext/accounts/page/pos/pos.js

@@ -576,11 +576,15 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		})
 
 		$(this.numeric_keypad).find('.numeric-del').click(function(){
-			me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
+			if(me.numeric_id) {
-			me.numeric_val = cstr(flt(me.selected_field.val())).slice(0, -1);
+				me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
-			me.selected_field.val(me.numeric_val);
+				me.numeric_val = cstr(flt(me.selected_field.val())).slice(0, -1);
-			me.selected_field.trigger("change")
+				me.selected_field.val(me.numeric_val);
-			// me.render_selected_item()
+				me.selected_field.trigger("change")
+			} else {
+				//Remove an item from the cart, if focus is at selected item
+				me.remove_selected_item()
+			}
 		})
 
 		$(this.numeric_keypad).find('.pos-pay').click(function(){
@@ -591,6 +595,14 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		})
 	},
 
+	remove_selected_item: function() {
+		this.remove_item = []
+		idx = $(this.wrapper).find(".pos-selected-item-action").attr("data-idx")
+		this.remove_item.push(idx)
+		this.remove_zero_qty_item()
+		this.update_paid_amount_status(false)
+	},
+
 	render_list_customers: function () {
 		var me = this;
 

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

@@ -7,6 +7,6 @@ Kundengruppen versetzen Sie in die Lage Ihre Kunden zu organisieren. Sie können
 
 > Tipp: Wenn Sie der Meinung sind, dass hier zu viel Aufwand getrieben wird, dann können Sie es bei einer Standard-Kundengruppe belassen. Aber der gesamte Aufwand wird sich dann auszahlen, wenn Sie die ersten Berichte erhalten. Ein Beispiel eines Berichts ist unten abgebildet.
 
-![Vertriebsanalyse]({{docs_base_url}}/assets/old_images/erpnext/sales-analytics-customer.png)
+<img class="screenshot" alt="Vertriebsanalyse" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif">
 
 {next}

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)
+<img class="screenshot" alt="Lieferantenauftrag" src="{{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)
+<img class="screenshot" alt="Lieferantenangebot" src="{{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg">
 
 Sie können ein Lieferantenangebot auch direkt erstellen über:
 

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

@@ -5,18 +5,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac
 
 ### Ticketliste leeren
 
-![Ticketliste]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-list-empty.png)
+<img class="screenshot" alt="Ausgabeliste" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png">
-
 ### Neuer Fall
 
-![Neues Ticket]({{docs_base_url}}/assets/old_images/erpnext/portal-new-ticket.png)
+<img class="screenshot" alt="Neues Problem " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png">
 
 ### Fall öffnen
 
-![Fall eröffnen]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-1.png)
+<img class="screenshot" alt="Ausgabe aufgehoben" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif">
 
 ### Fall beantworten
 
-![Fall beantworten]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-reply.png)
+<img class="screenshot" alt="Frage beantworten" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif">
 
 {next}

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

@@ -9,11 +9,9 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr
 
 ### Flußdiagramm des Kundenauftrags
 
-![Kundenauftrag]({{docs_base_url}}/assets/old_images/erpnext/sales-order-f.jpg)
+<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="{{docs_base_url}}/assets/img/selling/sales-order-f.jpg">
 
-Um einen neuen Kundenauftrag zu erstellen gehen Sie zu:
+Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag
-
-> Vertrieb > Kundenauftrag > Neuer Kundenauftrag
 
 ### Einen Kundenauftrag aus einem Angebot erstellen
 

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

@@ -27,10 +27,7 @@ Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu:
 
 https://example.erpnext.com/Partners
 
-![Auflistung der Vertriebspartner]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-listing.png)
+<img class="screenshot" alt="Auflistung der Vertriebspartner" src="{{docs_base_url}}/assets/img/crm/sales-partner-listing.png">
 
-Im Folgenden sehen Sie, wie die vollständigen Daten Ihres Partners auf der Webseite angezeigt werden.
-
-![Veröffentlichte Vertriebspartner]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-published.png)
 
 {next}

erpnext/docs/user/manual/de/setting-up/sms-setting.md

@@ -10,8 +10,8 @@ Beispiel-URL:
     
     http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
     
+<img class="screenshot" alt="SMS-Einstellungen" src="{{docs_base_url}}/assets/img/setup/sms-settings2.jpg">
 
-![SMS-Einstellungen]({{docs_base_url}}/assets/old_images/erpnext/sms-setting2.jpg)
 
 > Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways.
 
@@ -23,6 +23,7 @@ Die oben angegebene URL verschickt SMS über das Konto "abcd" an Mobilnummern "9
 
 Beachten Sie, dass einige Parameter in der URL statisch sind. Sie bekommen von Ihrem SMS-Anbieter statische Werte wie Benutzername, Passwort usw. Diese statischen Werte sollten in die Tabelle der statischen Parameter eingetragen werden.
 
-![SMS-Einstellungen]({{docs_base_url}}/assets/old_images/erpnext/sms-settings1.png)
+<img class="screenshot" alt="SMS-Einstellungen" src="{{docs_base_url}}/assets/img/setup/sms-settings1.png">
+
 
 {next}

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,7 +3,7 @@
 
 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)
+<img class="screenshot" alt="Materialanfrage" src="({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg">
 
 Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: 
 

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)
+<img class="screenshot" alt="Bericht zur projizierten Menge" src="{{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)
+<img class="screenshot" alt="Customer Group report" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif">
 
 {next}

erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md

@@ -47,9 +47,14 @@ quantity box. These are mostly used if the same Item is purchased in bulk.
 If your product list is very long use the Search field, type the product name
 in Search box.
 
-### Removing an Item
+### Removing an Item from the Cart
 
-Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
+1. Select row in the cart and clik on delete button in the numeric keypad
+  
+<img class="screenshot" alt="POS Item" src="{{docs_base_url}}/assets/img/accounts/pos_deleted_item.gif">
+
+
+2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
 
   * If Item's Qty is 1, click on a minus sign to make it zero.
 

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)
+<img class="screenshot" alt="Purchase taxes" src="{{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/customer-orders-invoices-and-shipping-status.md

@@ -1,10 +1,11 @@
 ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
 
-<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
+Once an order is raised, either using the Shopping Cart or from within
+ERPNext, your customer can view the order and keep an eye on the billing and
+shipment status. When the invoice and payment against these orders are
+submitted, the customer can see the updated status on the portal, at a glance.
 
-Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
+<img class="screenshot" alt="Customer Portal" src={{docs_base_url}}/assets/img/website/place-order.png)
-
-<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 #### Outstanding Sales Invoice
 

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)
+<img class="screenshot" alt="Issue List" src="{{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)
+<img class="screenshot" alt="New Issue " src="{{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)
+<img class="screenshot" alt="Issue Raised" src="{{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)
+<img class="screenshot" alt="Issue reply" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif">
 
 {next}

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

@@ -0,0 +1,42 @@
+#Kanban Board
+ 
+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 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
+
+To  create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board.
+
+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-1.png">
+
+###Add new Card/Document
+
+To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details.
+
+<img class="screenshot" alt="Add card in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-2.png">
+
+###Update Cards/Document Status
+ 
+Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working.
+ 
+<img class="screenshot" alt="Move Cards on Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-3.gif">
+
+###Manage Columns
+ 
+To add more columns in the Kanban board click Add columns.
+
+<img class="screenshot" alt="Add New column in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-4.gif">
+ 
+To move columns based on the priority drag and drop the columns as per requirement.
+ 
+<img class="screenshot" alt="Move columns in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-5.gif">
+
+To set Colors to a Card click drop down menu on the card and assign color to it.
+
+<img class="screenshot" alt="Add color to cards in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-6.gif">
+ 
+You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board.
+
+<img class="screenshot" alt="Archive and Restore in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-7.gif">
+ 

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

@@ -0,0 +1,29 @@
+#Selling in Different Unit (UoM)
+ 
+A sell price unit of measure (UOM) is the UOM with which you price items. You can have multiple sell price UOMs for any inventory item.  However, when Customer places, UoM for an item could change. 
+ 
+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
+In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
+
+<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
+ 
+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)
+<img class="screenshot" alt="Sales Order flow" src="{{docs_base_url}}/assets/img/selling/sales-order-f.jpg">
 
 To create a new Sales Order go to:
 

erpnext/docs/user/manual/en/selling/setup/item-price.md

@@ -14,7 +14,7 @@ Step 1: Select Price List
 
 You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
 
-![Item Price list]({{docs_base_url}}/assets/old_images/erpnext/item-price-list.png)
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-1.png">
 
 On selection of Price List, its currency and for selling or buying property will be fetched as well.
 
@@ -24,13 +24,13 @@ Step 2: Select Item
 
 Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
 
-![Item Price Item]({{docs_base_url}}/assets/old_images/erpnext/item-price-item.png)
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-2.png">
 
 Step 3: Enter Rate
 
 Enter selling/buying rate of an item in Price List currency.
 
-![Item Price Rate]({{docs_base_url}}/assets/old_images/erpnext/item-price-rate.png)
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-3.png">
 
 Step 4: Save Item Price