Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cleanup] fixes to v7

Browse Source
This commit is contained in:
Rushabh Mehta 2016-06-13 17:46:55 +05:30
parent 7f8142d30d
commit d1eba515e9
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -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) {

5
erpnext/public/css/erpnext.css
View File

@ -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;
}

6
erpnext/public/less/erpnext.less
View File

@ -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;
}

8
erpnext/setup/setup_wizard/domainify.py
View File

@ -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},

2
erpnext/stock/doctype/item/item.js
View File

@ -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('<h5 style="margin-top: 0px;">Stock Levels</h5>');
var section = frm.dashboard.add_section('<h5 style="margin-top: 0px;"><a href="#stock-balance">Stock Levels</a></h5>');
erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
parent: section,
item_code: frm.doc.name

2
erpnext/stock/page/stock_balance/stock_balance.js
View File

@ -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',