Merge pull request #9435 from rmehta/gst
GST (India) Setup and Invoices #8711
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 7526f37..36bf1bf 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '8.1.1'
+__version__ = '8.1.3'
def get_default_company(user=None):
diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
index 2e4af26..a23c0aa 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/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
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 85c5079..fd4598c 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -54,7 +54,10 @@
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")
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 2bbce60..02d5428 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -576,11 +576,15 @@
})
$(this.numeric_keypad).find('.numeric-del').click(function(){
- me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
- me.numeric_val = cstr(flt(me.selected_field.val())).slice(0, -1);
- me.selected_field.val(me.numeric_val);
- me.selected_field.trigger("change")
- // me.render_selected_item()
+ if(me.numeric_id) {
+ me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
+ me.numeric_val = cstr(flt(me.selected_field.val())).slice(0, -1);
+ me.selected_field.val(me.numeric_val);
+ 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 @@
})
},
+ 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;
diff --git a/erpnext/docs/assets/img/accounts/pos_deleted_item.gif b/erpnext/docs/assets/img/accounts/pos_deleted_item.gif
new file mode 100644
index 0000000..097d3d0
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/pos_deleted_item.gif
Binary files differ
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/customize/kanban-board-1.png b/erpnext/docs/assets/img/customize/kanban-board-1.png
new file mode 100644
index 0000000..43826a2
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/kanban-board-2.png b/erpnext/docs/assets/img/customize/kanban-board-2.png
new file mode 100644
index 0000000..552fa64
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/kanban-board-3.gif b/erpnext/docs/assets/img/customize/kanban-board-3.gif
new file mode 100644
index 0000000..beb4c9b
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-3.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/kanban-board-4.gif b/erpnext/docs/assets/img/customize/kanban-board-4.gif
new file mode 100644
index 0000000..111995b
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-4.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/kanban-board-5.gif b/erpnext/docs/assets/img/customize/kanban-board-5.gif
new file mode 100644
index 0000000..eb4310e
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-5.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/kanban-board-6.gif b/erpnext/docs/assets/img/customize/kanban-board-6.gif
new file mode 100644
index 0000000..35ca27a
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-6.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/kanban-board-7.gif b/erpnext/docs/assets/img/customize/kanban-board-7.gif
new file mode 100644
index 0000000..29b5e45
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/kanban-board-7.gif
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/old_images/erpnext/sms-setting2.jpg b/erpnext/docs/assets/img/setup/sms-setting2.jpg
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg
rename to erpnext/docs/assets/img/setup/sms-setting2.jpg
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/sms-settings1.png b/erpnext/docs/assets/img/setup/sms-settings1.png
new file mode 100644
index 0000000..8f70eb1
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/sms-settings1.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/item-price-1.png b/erpnext/docs/assets/img/stock/item-price-1.png
new file mode 100644
index 0000000..b8df0ae
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-price-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/item-price-2.png b/erpnext/docs/assets/img/stock/item-price-2.png
new file mode 100644
index 0000000..d19308f
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-price-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/item-price-3.png b/erpnext/docs/assets/img/stock/item-price-3.png
new file mode 100644
index 0000000..2d26aa6
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-price-3.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/item-price-item.png b/erpnext/docs/assets/old_images/erpnext/item-price-item.png
deleted file mode 100644
index 90acbf1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-price-item.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-price-list.png b/erpnext/docs/assets/old_images/erpnext/item-price-list.png
deleted file mode 100644
index 60591f0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-price-list.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-price-rate.png b/erpnext/docs/assets/old_images/erpnext/item-price-rate.png
deleted file mode 100644
index 05dbef0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-price-rate.png
+++ /dev/null
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/sms-settings1.png b/erpnext/docs/assets/old_images/erpnext/sms-settings1.png
deleted file mode 100644
index 64678d0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sms-settings1.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/CRM/setup/customer-group.md b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
index 1aeb2d1..4cdeb22 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
@@ -7,6 +7,6 @@
> 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.
-
+<img class="screenshot" alt="Vertriebsanalyse" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md
index 11b414c..7c72d1e 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
-
+<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:
diff --git a/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
index 1aec103..93db6a7 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
-
+<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:
diff --git a/erpnext/docs/user/manual/de/customer-portal/issues.md b/erpnext/docs/user/manual/de/customer-portal/issues.md
index 9650cca..8f0c7d3 100644
--- a/erpnext/docs/user/manual/de/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/de/customer-portal/issues.md
@@ -5,18 +5,17 @@
### Ticketliste leeren
-
-
+<img class="screenshot" alt="Ausgabeliste" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png">
### Neuer Fall
-
+<img class="screenshot" alt="Neues Problem " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png">
### Fall öffnen
-
+<img class="screenshot" alt="Ausgabe aufgehoben" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif">
### Fall beantworten
-
+<img class="screenshot" alt="Frage beantworten" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/selling/sales-order.md b/erpnext/docs/user/manual/de/selling/sales-order.md
index bd9ddc4..187aeab 100644
--- a/erpnext/docs/user/manual/de/selling/sales-order.md
+++ b/erpnext/docs/user/manual/de/selling/sales-order.md
@@ -9,11 +9,9 @@
### Flußdiagramm des Kundenauftrags
-
+<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:
-
-> Vertrieb > Kundenauftrag > Neuer Kundenauftrag
+Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag
### Einen Kundenauftrag aus einem Angebot erstellen
diff --git a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
index 7cbf0d8..66a95a0 100644
--- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
@@ -27,10 +27,7 @@
https://example.erpnext.com/Partners
-
+<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.
-
-
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/sms-setting.md b/erpnext/docs/user/manual/de/setting-up/sms-setting.md
index 327e8e8..1bcc058 100644
--- a/erpnext/docs/user/manual/de/setting-up/sms-setting.md
+++ b/erpnext/docs/user/manual/de/setting-up/sms-setting.md
@@ -10,8 +10,8 @@
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">
-
> Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways.
@@ -23,6 +23,7 @@
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.
-
+<img class="screenshot" alt="SMS-Einstellungen" src="{{docs_base_url}}/assets/img/setup/sms-settings1.png">
+
{next}
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..5a47b13 100644
--- a/erpnext/docs/user/manual/de/stock/material-request.md
+++ b/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.
-
+<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:
diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md
index 8cea6cf..2b3d9e7 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.
-
+<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
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..505c4fb 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:
-
+<img class="screenshot" alt="Customer Group report" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 0c7e591..78d2226 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -47,9 +47,14 @@
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.
diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
index 871ff96..f3be64d 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
-
+<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.
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index 257370e..a5e277d 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/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 Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
+<img class="screenshot" alt="Customer Portal" src={{docs_base_url}}/assets/img/website/place-order.png)
#### Outstanding Sales Invoice
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
index 79ac676..0088de6 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
-
+<img class="screenshot" alt="Issue List" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png">
#### New Issue
-
+<img class="screenshot" alt="New Issue " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png">
#### Open Issue
-
+<img class="screenshot" alt="Issue Raised" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif">
#### Reply on Issue
-
+<img class="screenshot" alt="Issue reply" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif">
{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
new file mode 100644
index 0000000..ccfa63a
--- /dev/null
+++ b/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">
+
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.md b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
new file mode 100644
index 0000000..1efed75
--- /dev/null
+++ b/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">
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index bcd9c93..99b9a85 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
-
+<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:
diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
index b877e8d..92b41fb 100644
--- a/erpnext/docs/user/manual/en/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -14,7 +14,7 @@
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.
-
++<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 @@
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.
-
++<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.
-
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-3.png">
Step 4: Save Item Price
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..728218f 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
-
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/crm/sales-partner-listing.png">
-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..08bbd78 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.
-
+<img class="screenshot" alt="Sales person target " src="{{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,8 @@
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).
-
+
+<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}/assets/im/selling/sales-person-target-distribution.gif">
####Report - Sales Person Target Variance Item Groupwise
@@ -32,7 +33,8 @@
This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
-
+
+<img class="screenshot" alt="Target Item Group" src="{{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 +50,7 @@
In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
-
+<img class="screenshot" alt="Sales Person Territory Manager" src="{{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png">
####2.2 Allocating Target
@@ -62,7 +64,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.
-
+<img class="screenshot" alt="Sales Person Territory Report" src="{{docs_base_url}}/assets/img/selling/sales-person-territory-report.png">
---
@@ -74,7 +76,7 @@
`Accounts > Monthly Distributon`
-
+<img class="screenshot" alt="Target Distribution" src="{{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.
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 563568a..a5dd939 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,25 @@
<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 **Comma Separated Values** (CSV)
-file.
+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 .csv File
+### Download in Excel
-Finally attach the .csv file in the section. Click on the "Upload and Import"
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-excel.png">
+
+### 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/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
index 4871ed1..7c66692 100644
--- a/erpnext/docs/user/manual/en/setting-up/sms-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
@@ -17,7 +17,8 @@
http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
-
+<img class="screenshot" alt="SMS Setting 2" src="{{docs_base_url}}/assets/img/setup/sms-settings2.jpg">
+
> Note: the string up to the "?" is the SMS Gateway URL
@@ -35,6 +36,6 @@
from your SMS Provider like username, password etc. These static values should
be entered in the Static Parameters table.
-
+<img class="screenshot" alt="SMS Setting" src="{{docs_base_url}}/assets/img/setup/sms-settings1.png">
{next}
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index b3b7279..b8b5fd6 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -52,7 +52,7 @@
### Purchase Details
-<img alt="Item Purchase Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
+<img class="screenshot" alt="Purchase details" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
* **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
@@ -80,9 +80,11 @@
* **Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order.
+<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
+
### Manufacturing And Website
-<img alt="Item Manfacturing and Website Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-and-website.png">
+<img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png">
Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index d707dd7..8e4caea 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -1,7 +1,7 @@
A Material Request is a simple document identifying a requirement of a set of
Items (products or services) for a particular reason.
-
+<img class="screenshot" alt="Material Request" src="{{docs_base_url}}/assets/img/buying/material-request-flowchart.png">
To generate a Material Request manually go to:
diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
index d38bfc9..0e7b742 100644
--- a/erpnext/docs/user/manual/en/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -11,7 +11,7 @@
Having a tight control of the projected inventory is crucial to determine
shortages and to calculate the right order quantity.
-
+<img class="screenshot" alt="Projected Quantity" src="{{docs_base_url}}/assets/img/stock/projected_quantity.png">
> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
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">
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json
index f2090b7..c563b87 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json
@@ -8,7 +8,7 @@
"idx": 0,
"is_standard": "Yes",
"letter_head": "",
- "modified": "2017-02-24 19:56:30.215599",
+ "modified": "2017-06-23 04:46:43.209008",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Stock Report",
@@ -16,7 +16,7 @@
"query": "SELECT \n\tbom_item.item_code as \"Item:Link/Item:200\",\n\tbom_item.description as \"Description:Data:300\",\n\tbom_item.qty as \"Required Qty:Float:100\",\n\tledger.actual_qty as \"In Stock Qty:Float:100\",\n\tFLOOR(ledger.actual_qty /bom_item.qty) as \"Enough Parts to Build:Int:100\"\nFROM\n\t`tabBOM Item` AS bom_item \n\tLEFT JOIN `tabBin` AS ledger\t\n\t\tON bom_item.item_code = ledger.item_code \n\t\tAND ledger.warehouse = %(warehouse)s\nWHERE\n\tbom_item.parent=%(bom)s\n\nGROUP BY bom_item.item_code",
"ref_doctype": "BOM",
"report_name": "BOM Stock Report",
- "report_type": "Query Report",
+ "report_type": "Script Report",
"roles": [
{
"role": "Manufacturing Manager"
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
new file mode 100644
index 0000000..343cfe9
--- /dev/null
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
@@ -0,0 +1,57 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+ if not filters: filters = {}
+ columns = get_columns()
+ data = get_bom_stock(filters)
+ return columns, data
+
+def get_columns():
+ """return columns"""
+ columns = [
+ _("Item") + ":Link/Item:150",
+ _("Description") + "::500",
+ _("Required Qty") + ":Float:100",
+ _("In Stock Qty") + ":Float:100",
+ _("Enough Parts to Build") + ":Float:200",
+ ]
+
+ return columns
+
+def get_bom_stock(filters):
+ conditions = ""
+ bom = filters.get("bom")
+
+ if filters.get("warehouse"):
+ warehouse_details = frappe.db.get_value("Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1)
+ if warehouse_details:
+ conditions += " and exists (select name from `tabWarehouse` wh \
+ where wh.lft >= %s and wh.rgt <= %s and ledger.warehouse = wh.name)" % (warehouse_details.lft,
+ warehouse_details.rgt)
+ else:
+ conditions += " and ledger.warehouse = '%s'" % frappe.db.escape(filters.get("warehouse"))
+
+ else:
+ conditions += ""
+
+ return frappe.db.sql("""
+ SELECT
+ bom_item.item_code ,
+ bom_item.description ,
+ bom_item.qty,
+ sum(ledger.actual_qty) as actual_qty,
+ sum(FLOOR(ledger.actual_qty /bom_item.qty))as to_build
+ FROM
+ `tabBOM Item` AS bom_item
+ LEFT JOIN `tabBin` AS ledger
+ ON bom_item.item_code = ledger.item_code
+ %s
+ WHERE
+ bom_item.parent = '%s'
+
+ GROUP BY bom_item.item_code""" % (conditions, bom))
diff --git a/erpnext/patches/v7_2/contact_address_links.py b/erpnext/patches/v7_2/contact_address_links.py
index 5375d81..07d9341 100644
--- a/erpnext/patches/v7_2/contact_address_links.py
+++ b/erpnext/patches/v7_2/contact_address_links.py
@@ -5,7 +5,7 @@
def execute():
frappe.reload_doc('core', 'doctype', 'dynamic_link')
frappe.reload_doc('email', 'doctype', 'contact')
- frappe.reload_doc('geo', 'doctype', 'address')
+ frappe.reload_doc('contact', 'doctype', 'address')
map_fields = (
('Customer', 'customer'),
('Supplier', 'supplier'),
diff --git a/erpnext/patches/v8_0/create_domain_docs.py b/erpnext/patches/v8_0/create_domain_docs.py
index 2f376db..cdd3117 100644
--- a/erpnext/patches/v8_0/create_domain_docs.py
+++ b/erpnext/patches/v8_0/create_domain_docs.py
@@ -21,7 +21,7 @@
condition = ""
company = erpnext.get_default_company()
if company:
- condition = " and name='{0}'".format(company)
+ condition = " and name='{0}'".format(frappe.db.escape(company))
domains = frappe.db.sql_list("select distinct domain from `tabCompany` where domain != 'Other' {0}".format(condition))
diff --git a/erpnext/patches/v8_0/move_perpetual_inventory_setting.py b/erpnext/patches/v8_0/move_perpetual_inventory_setting.py
index 594a15c..78322d4 100644
--- a/erpnext/patches/v8_0/move_perpetual_inventory_setting.py
+++ b/erpnext/patches/v8_0/move_perpetual_inventory_setting.py
@@ -10,4 +10,4 @@
for data in frappe.get_all('Company', fields = ["name"]):
doc = frappe.get_doc('Company', data.name)
doc.enable_perpetual_inventory = enabled
- doc.save(ignore_permissions=True)
\ No newline at end of file
+ doc.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/save_system_settings.py b/erpnext/patches/v8_0/save_system_settings.py
index d91e4c1..d479ece 100644
--- a/erpnext/patches/v8_0/save_system_settings.py
+++ b/erpnext/patches/v8_0/save_system_settings.py
@@ -3,6 +3,7 @@
from __future__ import unicode_literals
import frappe
+from frappe.utils import cint
def execute():
"""
@@ -10,6 +11,10 @@
"""
frappe.reload_doc("core", "doctype", "system_settings")
- doc = frappe.get_doc("System Settings", "System Settings")
+ doc = frappe.get_doc("System Settings")
doc.flags.ignore_mandatory = True
+
+ if cint(doc.currency_precision) == 0:
+ doc.currency_precision = ''
+
doc.save(ignore_permissions=True)
diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html
index 64f8c16..0ed6c71 100644
--- a/erpnext/public/js/pos/pos_selected_item.html
+++ b/erpnext/public/js/pos/pos_selected_item.html
@@ -1,4 +1,4 @@
-<div class="pos-selected-item-action" data-item-code="{%= item_code %}">
+<div class="pos-selected-item-action" data-item-code="{%= item_code %}" data-idx="{%= idx %}">
<div class="pos-list-row">
<div class="cell">{{ __("Quantity") }}:</div>
<input type="tel" class="form-control cell pos-item-qty" value="{%= qty %}"/>
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 69b2c3a..2726523 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -112,7 +112,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "eval:!doc.__islocal && in_list(roles, \"System Manager\")",
+ "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
"fieldname": "change_abbr",
"fieldtype": "Button",
"hidden": 0,
@@ -1809,7 +1809,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-06-15 19:46:10.875108",
+ "modified": "2017-06-23 19:46:10.875108",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
