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

Merge branch 'KanchanChauhan-WebsiteChanges' into develop

Browse Source
This commit is contained in:
Anand Doshi 2016-04-22 18:53:39 +05:30
commit 700ff7a127
36 changed files with 1178 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/config/website.py
View File

@ -5,6 +5,11 @@ def get_data():
{
"label": _("Portal"),
"items": [
{
"type": "doctype",
"name": "Homepage",
"description": _("Settings for website homepage"),
},
{
"type": "doctype",
"name": "Shopping Cart Settings",

6
erpnext/hooks.py
View File

@ -139,7 +139,11 @@ doc_events = {
'Supplier Quotation', 'Purchase Order', 'Purchase Receipt',
'Purchase Invoice', 'Project', 'Issue'): {
'on_change': 'erpnext.accounts.party_status.notify_status'
}
},
"Website Settings": {
"validate": "erpnext.portal.doctype.products_settings.products_settings.home_page_is_products"
}
}
scheduler_events = {

1
erpnext/modules.txt
View File

@ -11,3 +11,4 @@ Support
Utilities
Shopping Cart
Hub Node
Portal

0
erpnext/portal/__init__.py Normal file
View File

0
erpnext/portal/doctype/__init__.py Normal file
View File

0
erpnext/portal/doctype/homepage/__init__.py Normal file
View File

39
erpnext/portal/doctype/homepage/homepage.js Normal file
View File

@ -0,0 +1,39 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Homepage', {
refresh: function(frm) {
},
});
frappe.ui.form.on('Homepage Featured Product', {
item_code: function(frm, cdt, cdn) {
var featured_product = frappe.model.get_doc(cdt, cdn);
if (featured_product.item_code) {
frappe.call({
method: 'frappe.client.get_value',
args: {
'doctype': 'Item',
'filters': featured_product.item_code,
'fieldname': [
'item_name',
'web_long_description',
'description',
'image',
'thumbnail'
]
},
callback: function(r) {
if (!r.exc) {
$.extend(featured_product, r.message);
if (r.message.web_long_description) {
featured_product.description = r.message.web_long_description;
}
frm.refresh_field('products');
}
}
});
}
}
});

208
erpnext/portal/doctype/homepage/homepage.json Normal file
View File

@ -0,0 +1,208 @@
{
"allow_copy": 0,
"allow_import": 0,
"allow_rename": 0,
"autoname": "",
"creation": "2016-04-22 05:27:52.109319",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
"options": "Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"description": "Company Tagline for website homepage",
"fieldname": "tag_line",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Tag Line",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"description": "Company Description for website homepage",
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "products_section",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Products",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"description": "Products to be shown on website homepage",
"fieldname": "products",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Products",
"length": 0,
"no_copy": 0,
"options": "Homepage Featured Product",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "40px"
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2016-04-22 05:57:38.701653",
"modified_by": "Administrator",
"module": "Portal",
"name": "Homepage",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "Administrator",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "company",
"track_seen": 0
}

10
erpnext/portal/doctype/homepage/homepage.py Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class Homepage(Document):
pass

0
erpnext/portal/doctype/homepage_featured_product/__init__.py Normal file
View File

273
erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json Normal file
View File

@ -0,0 +1,273 @@
{
"allow_copy": 0,
"allow_import": 0,
"allow_rename": 0,
"autoname": "hash",
"creation": "2016-04-22 05:57:06.261401",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"fields": [
{
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
"fieldname": "item_code",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
"oldfieldname": "item_code",
"oldfieldtype": "Link",
"options": "Item",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
"set_only_once": 0,
"unique": 0,
"width": "150px"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "col_break1",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "item_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Item Name",
"length": 0,
"no_copy": 0,
"oldfieldname": "item_name",
"oldfieldtype": "Data",
"options": "",
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"print_width": "150",
"read_only": 1,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "150"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
"fieldname": "section_break_5",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "description",
"fieldtype": "Text Editor",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Description",
"length": 0,
"no_copy": 0,
"oldfieldname": "description",
"oldfieldtype": "Small Text",
"options": "",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "300px",
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "300px"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break_7",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "thumbnail",
"fieldtype": "Attach Image",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Thumbnail",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "route",
"fieldtype": "Small Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "route",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2016-04-22 05:57:06.261401",
"modified_by": "Administrator",
"module": "Portal",
"name": "Homepage Featured Product",
"name_case": "",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_seen": 0
}

10
erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.py Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class HomepageFeaturedProduct(Document):
pass

0
erpnext/portal/doctype/products_settings/__init__.py Normal file
View File

8
erpnext/portal/doctype/products_settings/products_settings.js Normal file
View File

@ -0,0 +1,8 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Products Settings', {
refresh: function(frm) {
}
});

106
erpnext/portal/doctype/products_settings/products_settings.json Normal file
View File

@ -0,0 +1,106 @@
{
"allow_copy": 0,
"allow_import": 0,
"allow_rename": 0,
"creation": "2016-04-22 09:11:55.272398",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"description": "If checked, the Home page will be the default Item Group for the website",
"fieldname": "home_page_is_products",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Home Page is Products",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "products_as_list",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Show Products as a List",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2016-04-22 09:11:59.537639",
"modified_by": "Administrator",
"module": "Portal",
"name": "Products Settings",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "Website Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_seen": 0
}

22
erpnext/portal/doctype/products_settings/products_settings.py Normal file
View File

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe.utils import cint
from frappe.model.document import Document
class ProductsSettings(Document):
def validate(self):
if self.home_page_is_products:
website_settings = frappe.get_doc('Website Settings')
website_settings.home_page = 'products'
website_settings.save()
def home_page_is_products(doc, method):
'''Called on saving Website Settings'''
home_page_is_products = cint(frappe.db.get_single_value('Products Settings', 'home_page_is_products'))
if home_page_is_products:
doc.home_page = 'products'

1
erpnext/public/build.json
View File

@ -20,6 +20,7 @@
"public/js/pos/pos_tax_row.html",
"public/js/pos/pos.js",
"public/js/utils/item_selector.js",
"public/js/utils/inventory.js",
"public/js/templates/item_selector.html"
]
}

65
erpnext/public/css/website.css
View File

@ -23,7 +23,7 @@
background-size: cover;
background-repeat: no-repeat;
background-position: center top;
border-bottom: 1px dashed #EBEFF2;
border-radius: 4px;
}
.product-image.missing-image {
width: 100%;
@ -32,8 +32,9 @@
background-size: cover;
background-repeat: no-repeat;
background-position: center top;
border-radius: 4px;
position: relative;
border-bottom: 1px dashed #EBEFF2;
background-color: #EBEFF2;
}
.product-image.missing-image .octicon {
font-size: 32px;
@ -63,3 +64,63 @@
border-top: 2px solid #EBEFF2;
padding-top: 10px;
}
.featured-products {
border-top: 1px solid #EBEFF2;
}
.transaction-list-item {
border-bottom: none;
padding: 30px;
margin: 0px -30px;
}
.transaction-list-item:hover,
.transaction-list-item:active,
.transaction-list-item:focus {
background-color: #fafbfc;
}
.transaction-list-item .indicator {
font-size: inherit;
font-weight: inherit;
color: #8D99A6;
margin-left: -15px;
}
.transaction-list-item .items-preview,
.transaction-list-item .transaction-time {
margin-top: 5px;
}
.transaction-subheading .indicator {
font-weight: inherit;
color: #8D99A6;
}
.order-container {
margin: 50px 0px;
}
.order-container .order-item-header .h6 {
padding: 7px 15px;
}
.order-container .order-items {
margin: 30px 0px 0px;
}
.order-container .order-item-table {
margin: 0px -15px;
}
.order-container .order-item-header {
border-bottom: 1px solid #d1d8dd;
}
.order-container .order-image-col {
padding-right: 0px;
}
.order-container .order-image {
max-width: 55px;
max-height: 55px;
margin-top: -5px;
}
.order-container .order-taxes {
margin-top: 30px;
}
.order-container .order-taxes .row {
margin-top: 15px;
}
.order-container .tax-grand-total-row {
border-top: 1px solid #d1d8dd;
padding-top: 15px;
}

21
erpnext/public/js/utils.js
View File

@ -131,23 +131,4 @@ $(document).on('app_ready', function() {
});
});
}
});
erpnext.get_item_dashboard_data = function(data, max_count) {
if(!max_count) max_count = 0;
data.forEach(function(d) {
d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production;
d.pending_qty = 0;
d.total_reserved = d.reserved_qty + d.reserved_qty_for_production;
if(d.actual_or_pending > d.actual_qty) {
d.pending_qty = d.actual_or_pending - d.actual_qty;
}
max_count = Math.max(d.actual_or_pending, d.actual_qty,
d.total_reserved, max_count);
});
return {
data: data,
max_count: max_count
}
}
});

77
erpnext/public/js/utils/inventory.js Normal file
View File

@ -0,0 +1,77 @@
erpnext.get_item_dashboard_data = function(data, max_count, show_item) {
if(!max_count) max_count = 0;
data.forEach(function(d) {
d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production;
d.pending_qty = 0;
d.total_reserved = d.reserved_qty + d.reserved_qty_for_production;
if(d.actual_or_pending > d.actual_qty) {
d.pending_qty = d.actual_or_pending - d.actual_qty;
}
max_count = Math.max(d.actual_or_pending, d.actual_qty,
d.total_reserved, max_count);
});
return {
data: data,
max_count: max_count,
show_item: show_item || false
}
}
frappe.provide('erpnext.inventory');
erpnext.inventory.move_item = function(item, source, target, actual_qty, callback) {
var dialog = new frappe.ui.Dialog({
title: target ? __('Add Item') : __('Move Item'),
fields: [
{fieldname: 'item_code', label: __('Item'),
fieldtype: 'Link', options: 'Item', read_only: 1},
{fieldname: 'source', label: __('Source Warehouse'),
fieldtype: 'Link', options: 'Warehouse', read_only: 1},
{fieldname: 'target', label: __('Target Warehouse'),
fieldtype: 'Link', options: 'Warehouse', reqd: 1},
{fieldname: 'qty', label: __('Quantity'), reqd: 1,
fieldtype: 'Float', description: __('Available {0}', [actual_qty]) },
],
})
dialog.show();
dialog.get_field('item_code').set_input(item);
if(source) {
dialog.get_field('source').set_input(source);
} else {
dialog.get_field('source').df.hidden = 1;
dialog.get_field('source').refresh();
}
if(target) {
dialog.get_field('target').df.read_only = 1;
dialog.get_field('target').value = target;
dialog.get_field('target').refresh();
}
dialog.set_primary_action(__('Submit'), function() {
values = dialog.get_values();
if(!values) {
return;
}
if(source && values.qty > actual_qty) {
frappe.msgprint(__('Quantity must be less than or equal to {0}', [actual_qty]));
return;
}
if(values.source === values.target) {
frappe.msgprint(__('Source and target warehouse must be different'));
}
frappe.call({
method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
args: values,
callback: function(r) {
frappe.show_alert(__('Stock Entry {0} created',
['<a href="#Form/Stock Entry/'+r.message.name+'">' + r.message.name+ '</a>']));
dialog.hide();
callback(r);
},
});
});
}

97
erpnext/public/less/website.less
View File

@ -1,10 +1,13 @@
@border-color: #d1d8dd;
@light-border-color: #EBEFF2;
@light-border-color: #EBEFF2;
@text-muted: #8D99A6;
@light-bg: #fafbfc;
.web-long-description {
font-size: 18px;
line-height: 200%;
}
.item-stock {
margin-bottom: 10px !important;
}
@ -14,10 +17,6 @@
text-align: center;
}
.product-image-wrapper {
}
@media (max-width: 767px) {
.product-image {
height: 0px;
@ -33,13 +32,13 @@
background-size: cover;
background-repeat: no-repeat;
background-position: center top;
border-bottom: 1px dashed @light-border-color;
border-radius: 4px;
}
.product-image.missing-image {
.product-image-square;
position: relative;
border-bottom: 1px dashed @light-border-color;
background-color: @light-border-color;
}
.product-image.missing-image .octicon {
@ -74,3 +73,87 @@
border-top: 2px solid @light-border-color;
padding-top:10px;
}
.featured-products {
border-top: 1px solid @light-border-color;
}
.transaction-list-item {
border-bottom: none;
padding: 30px;
margin: 0px -30px;
&:hover,
&:active,
&:focus {
background-color: @light-bg;
}
.indicator {
font-size: inherit;
font-weight: inherit;
color: @text-muted;
margin-left: -15px;
}
.transaction-time {
// margin-left: 15px;
}
.items-preview,
.transaction-time {
margin-top: 5px;
}
}
// order.html
.transaction-subheading {
.indicator {
font-weight: inherit;
color: @text-muted;
}
}
.order-container {
margin: 50px 0px;
.order-item-header .h6 {
padding: 7px 15px;
}
.order-items {
margin: 30px 0px 0px;
}
.order-item-table {
margin: 0px -15px;
}
.order-item-header {
border-bottom: 1px solid #d1d8dd;
}
.order-image-col {
padding-right: 0px;
}
.order-image {
max-width: 55px;
max-height: 55px;
margin-top: -5px;
}
.order-taxes {
margin-top: 30px;
.row {
margin-top: 15px;
}
}
.tax-grand-total-row {
border-top: 1px solid @border-color;
padding-top: 15px;
}
}

15
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -310,10 +310,13 @@ class SalesOrder(SellingController):
def get_list_context(context=None):
from erpnext.controllers.website_list_for_contact import get_list_context
list_context = get_list_context(context)
list_context["show_sidebar"] = True
list_context["show_search"] = True
list_context["title"] = _("My Orders")
list_context["parents"] = [{"title": _("My Account"), "name": "me"}]
list_context.update({
'show_sidebar': True,
'show_search': True,
'no_breadcrumbs': True,
'title': _('Orders'),
})
return list_context
@frappe.whitelist()
@ -338,10 +341,10 @@ def close_or_unclose_sales_orders(names, status):
def make_material_request(source_name, target_doc=None):
def postprocess(source, doc):
doc.material_request_type = "Purchase"
def update_item(source, target, source_parent):
target.project = source_parent.project
so = frappe.get_doc("Sales Order", source_name)

18
erpnext/stock/doctype/item/item_dashboard.html
View File

@ -1,11 +1,11 @@
{% for d in data %}
<li class="list-group-item" style="background-color: inherit;">
<div class="row">
<div class="col-sm-4 small" style="margin-top: 8px;">
<div class="col-sm-3 small" style="margin-top: 8px;">
<a data-type="warehouse" data-name="{{ d.warehouse }}">{{ d.warehouse }}</a>
</div>
<div class="col-sm-4 small" style="margin-top: 8px;">
{% if d.item_code %}
<div class="col-sm-3 small" style="margin-top: 8px;">
{% if show_item %}
<a data-type="item"
data-name="{{ d.item_code }}">{{ d.item_code }}</a>
{% endif %}
@ -37,6 +37,18 @@
</span>
</span>
</div>
<div class="col-sm-2 text-right" style="margin-top: 8px;">
{% if d.actual_qty %}
<button class="btn btn-default btn-xs btn-move"
data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}"
data-item="{{ d.item_code }}">{{ __("Move") }}</a>
{% endif %}
<button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}"
data-item="{{ d.item_code }}">{{ __("Add") }}</a>
</div>
</div>
</li>
{% endfor %}

47
erpnext/stock/doctype/stock_entry/stock_entry_utils.py
View File

@ -1,16 +1,34 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
import frappe
import frappe, erpnext
from frappe.utils import cint, flt
@frappe.whitelist()
def make_stock_entry(**args):
s = frappe.new_doc("Stock Entry")
args = frappe._dict(args)
if args.posting_date:
s.posting_date = args.posting_date
if args.posting_time:
s.posting_time = args.posting_time
# map names
if args.from_warehouse:
args.source = args.from_warehouse
if args.to_warehouse:
args.target = args.to_warehouse
if args.item_code:
args.item = args.item_code
if isinstance(args.qty, basestring):
if '.' in args.qty:
args.qty = flt(args.qty)
else:
args.qty = cint(args.qty)
# purpose
if not args.purpose:
if args.source and args.target:
s.purpose = "Material Transfer"
@ -21,21 +39,34 @@ def make_stock_entry(**args):
else:
s.purpose = args.purpose
s.company = args.company or "_Test Company"
# company
if not args.company:
if args.source:
args.company = frappe.db.get_value('Warehouse', args.source, 'company')
elif args.target:
args.company = frappe.db.get_value('Warehouse', args.target, 'company')
# set vales from test
if frappe.flags.in_test:
if not args.company:
args.company = '_Test Company'
if not args.item:
args.item = '_Test Item'
s.company = args.company or erpnext.get_default_company()
s.purchase_receipt_no = args.purchase_receipt_no
s.delivery_note_no = args.delivery_note_no
s.sales_invoice_no = args.sales_invoice_no
s.difference_account = args.difference_account or "Stock Adjustment - _TC"
if args.difference_account:
s.difference_account = args.difference_account
s.append("items", {
"item_code": args.item or args.item_code or "_Test Item",
"s_warehouse": args.from_warehouse or args.source,
"t_warehouse": args.to_warehouse or args.target,
"item_code": args.item,
"s_warehouse": args.source,
"t_warehouse": args.target,
"qty": args.qty,
"basic_rate": args.basic_rate,
"expense_account": args.expense_account or "Stock Adjustment - _TC",
"conversion_factor": 1.0,
"cost_center": "_Test Cost Center - _TC",
"serial_no": args.serial_no
})

34
erpnext/stock/get_item_details.py
View File

@ -48,7 +48,7 @@ def get_item_details(args):
if frappe.db.exists("Product Bundle", args.item_code):
valuation_rate = 0.0
bundled_items = frappe.get_doc("Product Bundle", args.item_code)
for bundle_item in bundled_items.items:
valuation_rate += \
flt(get_valuation_rate(bundle_item.item_code, out.get("warehouse")).get("valuation_rate") \
@ -83,7 +83,7 @@ def get_item_details(args):
if args.get("is_subcontracted") == "Yes":
out.bom = get_default_bom(args.item_code)
get_gross_profit(out)
return out
@ -101,7 +101,7 @@ def process_args(args):
args.item_code = get_item_code(barcode=args.barcode)
elif not args.item_code and args.serial_no:
args.item_code = get_item_code(serial_no=args.serial_no)
set_transaction_type(args)
return args
@ -127,7 +127,7 @@ def validate_item_details(args, item):
if args.transaction_type=="selling" and cint(item.has_variants):
throw(_("Item {0} is a template, please select one of its variants").format(item.name))
elif args.transaction_type=="buying" and args.doctype != "Material Request":
if args.get("is_subcontracted") == "Yes" and item.is_sub_contracted_item != 1:
throw(_("Item {0} must be a Sub-contracted Item").format(item.name))
@ -143,7 +143,7 @@ def get_basic_details(args, item):
user_default_warehouse_list = get_user_default_as_list('Warehouse')
user_default_warehouse = user_default_warehouse_list[0] \
if len(user_default_warehouse_list)==1 else ""
warehouse = user_default_warehouse or args.warehouse or item.default_warehouse
out = frappe._dict({
@ -177,8 +177,8 @@ def get_basic_details(args, item):
})
# if default specified in item is for another company, fetch from company
for d in [["Account", "income_account", "default_income_account"],
["Account", "expense_account", "default_expense_account"],
for d in [["Account", "income_account", "default_income_account"],
["Account", "expense_account", "default_expense_account"],
["Cost Center", "cost_center", "cost_center"], ["Warehouse", "warehouse", ""]]:
company = frappe.db.get_value(d[0], out.get(d[1]), "company")
if not out[d[1]] or (company and args.company != company):
@ -365,7 +365,7 @@ def get_projected_qty(item_code, warehouse):
def get_bin_details(item_code, warehouse):
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
["projected_qty", "actual_qty"], as_dict=True) \
or {"projected_qty": 0, "actual_qty": 0, "valuation_rate": 0}
or {"projected_qty": 0, "actual_qty": 0}
@frappe.whitelist()
def get_batch_qty(batch_no,warehouse,item_code):
@ -473,31 +473,31 @@ def get_default_bom(item_code=None):
return bom
else:
frappe.throw(_("No default BOM exists for Item {0}").format(item_code))
def get_valuation_rate(item_code, warehouse=None):
item = frappe.get_doc("Item", item_code)
if item.is_stock_item:
if not warehouse:
warehouse = item.default_warehouse
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
["valuation_rate"], as_dict=True) or {"valuation_rate": 0}
elif not item.is_stock_item:
valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty)
from `tabPurchase Invoice Item`
valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty)
from `tabPurchase Invoice Item`
where item_code = %s and docstatus=1""", item_code)
if valuation_rate:
return {"valuation_rate": valuation_rate[0][0] or 0.0}
else:
return {"valuation_rate": 0.0}
def get_gross_profit(out):
if out.valuation_rate:
out.update({
"gross_profit": ((out.base_rate - out.valuation_rate) * out.qty)
})
return out

6
erpnext/stock/page/stock_balance/stock_balance.html
View File

@ -1,11 +1,5 @@
<div class="padding">
<div class="row" style="margin-bottom: 15px;">
<div class="col-sm-8"></div>
<div class="col-sm-4 sort-selector-area">
</div>
</div>
<div class="result list-group">
</div>
<div class="more hidden" style="padding-top: 15px;">
<a class="btn btn-default btn-xs btn-more">More</a>

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

@ -7,7 +7,7 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
single_column: true
});
var warehouse_field = page.add_field({
page.warehouse_field = page.add_field({
fieldname: 'wareshouse',
label: __('Warehouse'),
fieldtype:'Link',
@ -18,7 +18,7 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
}
});
var item_field = page.add_field({
page.item_field = page.add_field({
fieldname: 'item_code',
label: __('Item'),
fieldtype:'Link',
@ -30,8 +30,8 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
});
page.start = 0;
page.sort_by = 'actual_qty';
page.sort_order = 'desc';
page.sort_by = 'projected_qty';
page.sort_order = 'asc';
page.content = $(frappe.render_template('stock_balance')).appendTo(page.main);
page.result = page.content.find('.result');
@ -42,8 +42,19 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
refresh();
});
// move
page.content.on('click', '.btn-move', function() {
erpnext.inventory.move_item($(this).attr('data-item'), $(this).attr('data-warehouse'),
null, $(this).attr('data-actual_qty'), function() { refresh(); });
});
page.content.on('click', '.btn-add', function() {
erpnext.inventory.move_item($(this).attr('data-item'), null, $(this).attr('data-warehouse'),
$(this).attr('data-actual_qty'), function() { refresh(); });
});
page.sort_selector = new frappe.ui.SortSelector({
parent: page.content.find('.sort-selector-area'),
parent: page.wrapper.find('.page-form'),
args: {
sort_by: 'projected_qty',
sort_order: 'asc',
@ -60,11 +71,13 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
page.start = 0;
refresh();
}
})
});
page.sort_selector.wrapper.css({'margin-right': '15px', 'margin-top': '4px'});
var refresh = function() {
var item_code = item_field.get_value();
var warehouse = warehouse_field.get_value();
var item_code = page.item_field.get_value();
var warehouse = page.warehouse_field.get_value();
frappe.call({
method: 'erpnext.stock.page.stock_balance.stock_balance.get_data',
args: {
@ -86,7 +99,7 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
page.result.empty();
}
var context = erpnext.get_item_dashboard_data(data, page.max_count);
var context = erpnext.get_item_dashboard_data(data, page.max_count, true);
page.max_count = context.max_count;
// show more button
@ -105,4 +118,21 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
refresh();
// item click
var setup_click = function(doctype) {
page.result.on('click', 'a[data-type="'+ doctype.toLowerCase() +'"]', function() {
var name = $(this).attr('data-name');
var field = page[doctype.toLowerCase() + '_field'];
if(field.get_value()===name) {
frappe.set_route('Form', doctype, name)
} else {
field.set_input(name);
refresh();
}
});
}
setup_click('Item');
setup_click('Warehouse');
}

4
erpnext/stock/page/stock_balance/stock_balance.py
View File

@ -6,9 +6,9 @@ import frappe
def get_data(item_code=None, warehouse=None, start=0, sort_by='actual_qty', sort_order='desc'):
filters = {}
if item_code:
filters = {'item_code': item_code }
filters['item_code'] = item_code
if warehouse:
filters = {'warehouse': warehouse }
filters['warehouse'] = warehouse
return frappe.get_list("Bin", filters=filters, fields=['item_code', 'warehouse',
'projected_qty', 'reserved_qty', 'reserved_qty_for_production', 'actual_qty'],
order_by='{0} {1}'.format(sort_by, sort_order), start=start, page_length = 21)

3
erpnext/templates/includes/macros.html
View File

@ -1,7 +1,6 @@
{% macro product_image_square(website_image, css_class="") %}
<div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
{% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');" {%- endif %}>
{% if not website_image -%}<i class="centered octicon octicon-device-camera"></i>{%- endif %}
</div>
{% endmacro %}
@ -9,8 +8,6 @@
<div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}">
{% if website_image -%}
<img src="{{ frappe.utils.quoted(website_image) | abs_url }}" class="img-responsive">
{%- else -%}
<i class="centered octicon octicon-device-camera"></i>
{%- endif %}
</div>
{% endmacro %}

25
erpnext/templates/includes/order/order.css
View File

@ -1,25 +0,0 @@
.order-container {
margin: 50px 0px;
}
.order-items {
margin: 20px 0px;
}
.order-item-table {
margin: 0px -15px;
}
.order-item-header {
border-bottom: 1px solid #d1d8dd;
}
.order-image-col {
padding-right: 0px;
}
.order-image {
max-width: 55px;
max-height: 55px;
margin-top: -5px;
}

14
erpnext/templates/includes/order/order_taxes.html
View File

@ -1,20 +1,20 @@
{% if doc.taxes %}
<div class="row tax-net-total-row">
<div class="col-xs-6 text-right">{{ _("Net Total") }}</div>
<div class="col-xs-6 text-right">
<div class="col-xs-8 text-right">{{ _("Net Total") }}</div>
<div class="col-xs-4 text-right">
{{ doc.get_formatted("net_total") }}</div>
</div>
{% endif %}
{% for d in doc.taxes %}
<div class="row tax-row">
<div class="col-xs-6 text-right">{{ d.description }}</div>
<div class="col-xs-6 text-right">
<div class="row tax-row">
<div class="col-xs-8 text-right">{{ d.description }}</div>
<div class="col-xs-4 text-right">
{{ d.get_formatted("base_tax_amount") }}</div>
</div>
{% endfor %}
<div class="row tax-grand-total-row">
<div class="col-xs-6 text-right">{{ _("Grand Total") }}</div>
<div class="col-xs-6 text-right">
<div class="col-xs-8 text-right">{{ _("Grand Total") }}</div>
<div class="col-xs-4 text-right">
<span class="tax-grand-total">
{{ doc.get_formatted("grand_total") }}
</span>

40
erpnext/templates/includes/transaction_row.html
View File

@ -1,17 +1,27 @@
<div class="web-list-item">
<a href="/{{ pathname }}/{{ doc.name }}">
<div class="row">
<div class="col-sm-6">
<div class="web-list-item transaction-list-item">
<a href="/{{ pathname }}/{{ doc.name }}">
<div class="row">
<div class="col-sm-6">
<span>{{ doc.name }}</span>
<div class="small text-muted items-preview text-ellipsis">
{{ doc.items_preview }}
</div>
</div>
<div class="col-sm-4">
<span class="indicator {{ doc.indicator_color or "darkgrey" }}">
{{ doc.indicator_title or doc.status }}
</span>
<div class="small text-muted transaction-time"
title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
{{ frappe.utils.pretty_date(doc.modified) }}
</div>
</div>
<div class="col-sm-2 text-right">
{{ doc.get_formatted("grand_total") }}
</div>
<!-- <div class="col-sm-3 text-right">
<span class="indicator {{ doc.indicator_color or "darkgrey" }}">{{ doc.name }}</span>
<div class="small text-muted">{{ doc.items_preview }}</div>
</div>
<div class="col-sm-3 col-xs-5">
{{ doc.get_formatted("grand_total") }}
</div>
<div class="col-sm-3 small text-muted text-right" title="{{ frappe.utils.format_datetime(doc.creation, "medium") }}">
{{ frappe.utils.pretty_date(doc.creation) }}</div>
</div>
</a>
</div> -->
</div>
</a>
</div>

2
erpnext/templates/pages/cart.html
View File

@ -68,7 +68,7 @@
</div>
<div class="cart-link">
<a href="#" onclick="show_terms();return false;">*Terms and Conditions</a>
</div>
</div>
{% endif %}
<div class="cart-addresses">
{% include "templates/includes/cart/cart_address.html" %}

48
erpnext/templates/pages/home.html Normal file
View File

@ -0,0 +1,48 @@
{% extends "templates/web.html" %}
{% from "erpnext/templates/includes/macros.html" import product_image_square %}
{% block title %}{{ brand_html }}{% endblock %}
{% block page_content %}
<div class="row">
<div class="col-sm-12">
<h2 class="text-center">{{ homepage.tag_line or '' }}</h2>
<p class="lead text-center">{{ homepage.description or '' }}</p>
<p class="text-center">
<a href="/login" class="btn btn-primary text-center">Login</a>
</p>
{% if homepage.products %}
<!-- TODO: styling of this section -->
<div class='featured-products-section'>
<h5 class='text-uppercase'>{{ _("Featured Products") }}</h5>
<div class="featured-products">
<div id="search-list" class="row" style="margin-top:40px;">
{% for item in homepage.products %}
<a class="product-link" href="{{ item.route | abs_url }}">
<div class="col-sm-4 product-image-wrapper">
{{ product_image_square(item.thumbnail or item.image) }}
<div class="text-ellipsis inline-block small product-text">
{{ item.item_name }}
</div>
</div>
</a>
{% endfor %}
</div>
</div>
<!-- TODO: remove hardcoding of /products -->
<p class="text-center"><a href="/products" class="btn btn-primary">More Products</a></p>
</div>
{% endif %}
</div>
</div>
{% endblock %}
{% block style %}
<style>
.featured-products-section {
margin-top: 75px;
}
</style>
{% endblock %}

44
erpnext/templates/pages/home.py Normal file
View File

@ -0,0 +1,44 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe.utils import cstr, nowdate
from erpnext.setup.doctype.item_group.item_group import get_item_for_list_in_html
no_cache = 1
no_sitemap = 1
def get_context(context):
homepage = frappe.get_doc('Homepage')
return {
'homepage': homepage
}
@frappe.whitelist(allow_guest=True)
def get_product_list(search=None, start=0, limit=6):
# limit = 12 because we show 12 items in the grid view
# base query
query = """select name, item_name, page_name, website_image, thumbnail, item_group,
web_long_description as website_description, parent_website_route
from `tabItem`
where show_in_website = 1
and disabled=0
and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %(today)s)
and (variant_of is null or variant_of = '')"""
# order by
query += """ order by weightage desc, idx desc, modified desc limit %s, %s""" % (start, limit)
data = frappe.db.sql(query, {
"today": nowdate()
}, as_dict=1)
for d in data:
d.route = ((d.parent_website_route + "/") if d.parent_website_route else "") \
+ (d.page_name or "")
return [get_item_for_list_in_html(r) for r in data]

34
erpnext/templates/pages/order.html
View File

@ -1,32 +1,24 @@
{% extends "templates/web.html" %}
{% block header %}
<h1>{{ doc.name }}</h1>
<!-- <h6 class="text-muted">{{ doc._title or doc.doctype }}</h6> -->
{% endblock %}
{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
{% block breadcrumbs %}
{% include "templates/includes/breadcrumbs.html" %}
{% endblock %}
{% block style %}
<style>
{% include "templates/includes/order/order.css" %}
</style>
{% block header %}
<h1>{{ doc.name }}</h1>
{% endblock %}
{% block page_content %}
{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
<div class="row">
<div class="row transaction-subheading">
<div class="col-xs-6">
<span class="indicator {{ doc.indicator_color or "darkgrey" }}">
{{ doc.indicator_title or doc.status or "Submitted" }}
</span>
</div>
<div class="col-xs-6 text-muted text-right h6">
{{ doc.get_formatted("transaction_date") }}
<div class="col-xs-6 text-muted text-right small">
{{ frappe.utils.formatdate(doc.transaction_date, 'medium') }}
</div>
</div>
@ -38,14 +30,14 @@
<!-- items -->
<div class="order-item-table">
<div class="row order-items order-item-header">
<div class="col-sm-8 col-xs-6 h6">
<div class="row order-items order-item-header text-muted">
<div class="col-sm-8 col-xs-6 h6 text-uppercase">
{{ _("Item") }}
</div>
<div class="col-sm-2 col-xs-3 text-right h6">
<div class="col-sm-2 col-xs-3 text-right h6 text-uppercase">
{{ _("Quantity") }}
</div>
<div class="col-sm-2 col-xs-3 text-right h6">
<div class="col-sm-2 col-xs-3 text-right h6 text-uppercase">
{{ _("Amount") }}
</div>
</div>
@ -71,9 +63,9 @@
</div>
<!-- taxes -->
<div class="order-taxes row small">
<div class="col-sm-8"><!-- empty --></div>
<div class="col-sm-4">
<div class="order-taxes row">
<div class="col-sm-6"><!-- empty --></div>
<div class="col-sm-6 text-right">
{% include "erpnext/templates/includes/order/order_taxes.html" %}
</div>
</div>