mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-29 18:04:46 +00:00
[cleanup] fixes to v7
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
frappe.provide("erpnext.buying");
|
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", {
|
frappe.ui.form.on("Purchase Order", {
|
||||||
onload: function(frm) {
|
onload: function(frm) {
|
||||||
|
|||||||
@@ -118,9 +118,12 @@
|
|||||||
}
|
}
|
||||||
.dashboard-list-item {
|
.dashboard-list-item {
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
padding: 7px 15px;
|
padding: 5px 0px;
|
||||||
border-bottom: 1px solid #d1d8dd;
|
border-bottom: 1px solid #d1d8dd;
|
||||||
}
|
}
|
||||||
|
#page-stock-balance .dashboard-list-item {
|
||||||
|
padding: 5px 15px;
|
||||||
|
}
|
||||||
.dashboard-list-item:last-child {
|
.dashboard-list-item:last-child {
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,10 +149,14 @@
|
|||||||
|
|
||||||
.dashboard-list-item {
|
.dashboard-list-item {
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
padding: 7px 15px;
|
padding: 5px 0px;
|
||||||
border-bottom: 1px solid @border-color;
|
border-bottom: 1px solid @border-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#page-stock-balance .dashboard-list-item {
|
||||||
|
padding: 5px 15px;
|
||||||
|
}
|
||||||
|
|
||||||
.dashboard-list-item:last-child {
|
.dashboard-list-item:last-child {
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ domains = {
|
|||||||
'Manufacturing': {
|
'Manufacturing': {
|
||||||
'desktop_icons': ['Item', 'BOM', 'Customer', 'Supplier', 'Sales Order',
|
'desktop_icons': ['Item', 'BOM', 'Customer', 'Supplier', 'Sales Order',
|
||||||
'Production Order', 'Stock Entry', 'Purchase Order', 'Task', 'Buying', 'Selling',
|
'Production Order', 'Stock Entry', 'Purchase Order', 'Task', 'Buying', 'Selling',
|
||||||
'Accounts', 'HR'],
|
'Accounts', 'HR', 'ToDo'],
|
||||||
'properties': [
|
'properties': [
|
||||||
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'},
|
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'},
|
||||||
],
|
],
|
||||||
@@ -19,7 +19,7 @@ domains = {
|
|||||||
|
|
||||||
'Retail': {
|
'Retail': {
|
||||||
'desktop_icons': ['POS', 'Item', 'Customer', 'Sales Invoice', 'Purchase Order', 'Warranty Claim',
|
'desktop_icons': ['POS', 'Item', 'Customer', 'Sales Invoice', 'Purchase Order', 'Warranty Claim',
|
||||||
'Accounts', 'Buying'],
|
'Accounts', 'Buying', 'ToDo'],
|
||||||
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
|
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
|
||||||
'properties': [
|
'properties': [
|
||||||
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
|
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
|
||||||
@@ -32,7 +32,7 @@ domains = {
|
|||||||
|
|
||||||
'Distribution': {
|
'Distribution': {
|
||||||
'desktop_icons': ['Item', 'Customer', 'Supplier', 'Lead', 'Sales Order',
|
'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'],
|
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
|
||||||
'properties': [
|
'properties': [
|
||||||
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
|
{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
|
||||||
@@ -44,7 +44,7 @@ domains = {
|
|||||||
|
|
||||||
'Services': {
|
'Services': {
|
||||||
'desktop_icons': ['Project', 'Time Log', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
|
'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'],
|
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
|
||||||
'properties': [
|
'properties': [
|
||||||
{'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0},
|
{'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0},
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ $.extend(erpnext.item, {
|
|||||||
frm.dashboard.show_dashboard();
|
frm.dashboard.show_dashboard();
|
||||||
|
|
||||||
frappe.require('assets/js/item-dashboard.min.js', function() {
|
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({
|
erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
|
||||||
parent: section,
|
parent: section,
|
||||||
item_code: frm.doc.name
|
item_code: frm.doc.name
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
|
|||||||
page.start = 0;
|
page.start = 0;
|
||||||
|
|
||||||
page.warehouse_field = page.add_field({
|
page.warehouse_field = page.add_field({
|
||||||
fieldname: 'wareshouse',
|
fieldname: 'warehouse',
|
||||||
label: __('Warehouse'),
|
label: __('Warehouse'),
|
||||||
fieldtype:'Link',
|
fieldtype:'Link',
|
||||||
options:'Warehouse',
|
options:'Warehouse',
|
||||||
|
|||||||
Reference in New Issue
Block a user