diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 9c457706c3..9e44855277 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -3,7 +3,7 @@ frappe.provide("erpnext.buying"); -{% include 'buying/doctype/purchase_common/purchase_common.js' %}; +{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %}; frappe.ui.form.on("Purchase Order", { onload: function(frm) { diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css index 91e1d6bf61..719f259828 100644 --- a/erpnext/public/css/erpnext.css +++ b/erpnext/public/css/erpnext.css @@ -118,9 +118,12 @@ } .dashboard-list-item { background-color: inherit; - padding: 7px 15px; + padding: 5px 0px; border-bottom: 1px solid #d1d8dd; } +#page-stock-balance .dashboard-list-item { + padding: 5px 15px; +} .dashboard-list-item:last-child { border-bottom: none; } diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less index 7da54e7dd8..a9ef2d09fe 100644 --- a/erpnext/public/less/erpnext.less +++ b/erpnext/public/less/erpnext.less @@ -149,10 +149,14 @@ .dashboard-list-item { background-color: inherit; - padding: 7px 15px; + padding: 5px 0px; border-bottom: 1px solid @border-color; } +#page-stock-balance .dashboard-list-item { + padding: 5px 15px; +} + .dashboard-list-item:last-child { border-bottom: none; } diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py index af4317e017..f77b05d034 100644 --- a/erpnext/setup/setup_wizard/domainify.py +++ b/erpnext/setup/setup_wizard/domainify.py @@ -8,7 +8,7 @@ domains = { 'Manufacturing': { 'desktop_icons': ['Item', 'BOM', 'Customer', 'Supplier', 'Sales Order', 'Production Order', 'Stock Entry', 'Purchase Order', 'Task', 'Buying', 'Selling', - 'Accounts', 'HR'], + 'Accounts', 'HR', 'ToDo'], 'properties': [ {'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'}, ], @@ -19,7 +19,7 @@ domains = { 'Retail': { 'desktop_icons': ['POS', 'Item', 'Customer', 'Sales Invoice', 'Purchase Order', 'Warranty Claim', - 'Accounts', 'Buying'], + 'Accounts', 'Buying', 'ToDo'], 'remove_roles': ['Manufacturing User', 'Manufacturing Manager'], 'properties': [ {'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1}, @@ -32,7 +32,7 @@ domains = { 'Distribution': { 'desktop_icons': ['Item', 'Customer', 'Supplier', 'Lead', 'Sales Order', - 'Sales Invoice', 'CRM', 'Selling', 'Buying', 'Stock', 'Accounts', 'HR'], + 'Sales Invoice', 'CRM', 'Selling', 'Buying', 'Stock', 'Accounts', 'HR', 'ToDo'], 'remove_roles': ['Manufacturing User', 'Manufacturing Manager'], 'properties': [ {'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1}, @@ -44,7 +44,7 @@ domains = { 'Services': { 'desktop_icons': ['Project', 'Time Log', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity', - 'Expense Claim', 'Employee', 'HR'], + 'Expense Claim', 'Employee', 'HR', 'ToDo'], 'remove_roles': ['Manufacturing User', 'Manufacturing Manager'], 'properties': [ {'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0}, diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index a0c1e8a447..fe7e54e8e5 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -174,7 +174,7 @@ $.extend(erpnext.item, { frm.dashboard.show_dashboard(); frappe.require('assets/js/item-dashboard.min.js', function() { - var section = frm.dashboard.add_section('
Stock Levels
'); + var section = frm.dashboard.add_section('
Stock Levels
'); erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({ parent: section, item_code: frm.doc.name diff --git a/erpnext/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js index 2b6fd8d492..efaf96fde8 100644 --- a/erpnext/stock/page/stock_balance/stock_balance.js +++ b/erpnext/stock/page/stock_balance/stock_balance.js @@ -7,7 +7,7 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) { page.start = 0; page.warehouse_field = page.add_field({ - fieldname: 'wareshouse', + fieldname: 'warehouse', label: __('Warehouse'), fieldtype:'Link', options:'Warehouse',