nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 19:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[design] list views

Browse Source
This commit is contained in:
Rushabh Mehta
2015-01-05 17:38:48 +05:30
parent 9b955feff8
commit e1cb0ae738
53 changed files with 1587 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
erpnext/selling/doctype/campaign/campaign.json
View File

@@ -1,99 +1,99 @@
{
"allow_import": 1,
"allow_rename": 1,
"autoname": "naming_series:",
"creation": "2013-01-10 16:34:18",
"description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"allow_import": 1,
"allow_rename": 1,
"autoname": "naming_series:",
"creation": "2013-01-10 16:34:18",
"description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"fields": [
{
"fieldname": "campaign",
"fieldtype": "Section Break",
"in_list_view": 0,
"label": "Campaign",
"oldfieldtype": "Section Break",
"fieldname": "campaign",
"fieldtype": "Section Break",
"in_list_view": 0,
"label": "Campaign",
"oldfieldtype": "Section Break",
"permlevel": 0
},
},
{
"fieldname": "campaign_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Campaign Name",
"oldfieldname": "campaign_name",
"oldfieldtype": "Data",
"permlevel": 0,
"fieldname": "campaign_name",
"fieldtype": "Data",
"in_list_view": 0,
"label": "Campaign Name",
"oldfieldname": "campaign_name",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 1
},
},
{
"fieldname": "naming_series",
"fieldtype": "Select",
"in_list_view": 0,
"label": "Naming Series",
"options": "Campaign-.####",
"permlevel": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"in_list_view": 0,
"label": "Naming Series",
"options": "Campaign-.####",
"permlevel": 0,
"reqd": 0
},
},
{
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"permlevel": 0,
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"permlevel": 0,
"width": "300px"
}
],
"icon": "icon-bullhorn",
"idx": 1,
"modified": "2014-05-27 03:49:08.416532",
"modified_by": "Administrator",
"module": "Selling",
"name": "Campaign",
"owner": "Administrator",
],
"icon": "icon-bullhorn",
"idx": 1,
"modified": "2015-01-05 14:46:52.204964",
"modified_by": "Administrator",
"module": "Selling",
"name": "Campaign",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"create": 0,
"delete": 0,
"email": 1,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "Sales Manager",
"submit": 0,
"amend": 0,
"create": 0,
"delete": 0,
"email": 1,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "Sales Manager",
"submit": 0,
"write": 0
},
},
{
"amend": 0,
"apply_user_permissions": 1,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales User",
"submit": 0,
"amend": 0,
"apply_user_permissions": 1,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales User",
"submit": 0,
"write": 0
},
},
{
"amend": 0,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales Master Manager",
"submit": 0,
"amend": 0,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales Master Manager",
"submit": 0,
"write": 1
}
]
}
}

29
erpnext/selling/doctype/customer/customer_list.html
View File

@@ -1,5 +1,5 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-12">
<div class="col-xs-12 col-sm-6">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
{% if(doc.customer_name != doc.name) { %}
@@ -9,21 +9,20 @@
<span style="margin-right: 8px; display: inline-block"
title="{%= doc.customer_type %}" class="filterable"
data-filter="customer_type,=,{%= doc.customer_type %}">
{% if(doc.customer_type==="Company") { %}
<i class="icon-building"></i>
{% } else { %}
<i class="icon-user"></i>
{% } %}
</span>
<span class="label label-info filterable"
data-filter="customer_group,=,{%= doc.customer_group %}">
{%= doc.customer_group %}</span>
{% if(doc.territory) { %}
<span class="label label-default filterable"
data-filter="territory,=,{%= doc.territory %}">
<i class="icon-map-marker"></i>
{%= doc.territory %}</span>
{% } %}
</div>
</div>
<div class="col-sm-3 hidden-xs text-ellipsis">
<span class="indicator darkgrey filterable"
data-filter="customer_group,=,{%= doc.customer_group %}">
{%= doc.customer_group %}</span>
</div>
<div class="col-sm-3 hidden-xs text-ellipsis">
{% if(doc.territory) { %}
<a class="h6 text-muted filterable"
data-filter="territory,=,{%= doc.territory %}">
<i class="icon-map-marker"></i>
{%= doc.territory %}</a>
{% } %}
</div>
</div>

5
erpnext/selling/doctype/industry_type/industry_type.json
View File

@@ -1,5 +1,6 @@
{
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:industry",
"creation": "2012-03-27 14:36:09",
"docstatus": 0,
@@ -9,7 +10,7 @@
{
"fieldname": "industry",
"fieldtype": "Data",
"in_list_view": 1,
"in_list_view": 0,
"label": "Industry",
"oldfieldname": "industry",
"oldfieldtype": "Data",
@@ -19,7 +20,7 @@
],
"icon": "icon-flag",
"idx": 1,
"modified": "2014-05-27 03:49:11.146729",
"modified": "2015-01-05 15:02:09.356985",
"modified_by": "Administrator",
"module": "Selling",
"name": "Industry Type",

24
erpnext/selling/doctype/lead/lead_list.html
View File

@@ -1,18 +1,12 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-12">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block">
{%= doc.company_name %}</span>
<span class="label
{%= doc.status=="Open" ? "label-danger" : "label-info" %} filterable"
data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
{% if(doc.territory) { %}
<span class="label label-default filterable"
data-filter="territory,=,{%= doc.territory %}">
<i class="icon-map-marker"></i>
{%= doc.territory %}</span>
{% } %}
</div>
<div class="col-xs-12 col-sm-9 text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block">
{%= doc.company_name %}</span>
</div>
<div class="col-sm-3 hidden-xs">
<span class="indicator
{%= doc.status=="Open" ? "red" : "darkgrey" %} filterable"
data-filter="status,=,{%= doc.status %}">{%= __(doc.status) %}</span>
</div>
</div>

5
erpnext/selling/doctype/opportunity/opportunity.json
View File

@@ -389,7 +389,7 @@
"icon": "icon-info-sign",
"idx": 1,
"is_submittable": 1,
"modified": "2015-01-01 14:30:03.287608",
"modified": "2015-01-05 12:14:59.101693",
"modified_by": "Administrator",
"module": "Selling",
"name": "Opportunity",
@@ -427,5 +427,6 @@
],
"search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company",
"sort_field": "modified",
"sort_order": "DESC"
"sort_order": "DESC",
"title_field": "customer_name"
}

27
erpnext/selling/doctype/opportunity/opportunity_list.html
View File

@@ -1,23 +1,10 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-12">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block">
<span class="filterable"
data-filter="{%= doc.enquiry_from.toLowerCase() %},=,{%= doc[doc.enquiry_from.toLowerCase()] %}">
{%= doc.customer_name %}</span> ({%= doc.enquiry_from %})</span>
<span style="margin-right: 8px; display: inline-block"
title="{%= doc.enquiry_type %}" class="filterable"
data-filter="enquiry_type,=,{%= doc.enquiry_type %}">
{% if(doc.enquiry_type==="Sales") { %}
<i class="icon-tag"></i>
{% } else { %}
<i class="icon-wrench"></i>
{% } %}
</span>
<span class="label
{%= doc.status=="Draft" ? "label-danger" : "label-info" %} filterable"
data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
</div>
<div class="col-sm-9 col-xs-12 text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
</div>
<div class="col-sm-3 hidden-xs text-ellipsis">
<span class="indicator
{%= doc.status=="Draft" ? "red" : "darkgrey" %} filterable"
data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
</div>
</div>

5
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -800,7 +800,7 @@
"idx": 1,
"is_submittable": 1,
"max_attachments": 1,
"modified": "2015-01-01 14:30:03.814148",
"modified": "2015-01-05 12:33:02.162194",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
@@ -927,5 +927,6 @@
"read_only_onload": 1,
"search_fields": "status,transaction_date,customer,lead,order_type",
"sort_field": "modified",
"sort_order": "DESC"
"sort_order": "DESC",
"title_field": "customer_name"
}

33
erpnext/selling/doctype/quotation/quotation_list.html
View File

@@ -1,29 +1,14 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-10">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block">
<span class="filterable"
data-filter="{%= doc.quotation_to.toLowerCase() %},=,{%= doc[doc.quotation_to.toLowerCase()] %}">
{%= doc.customer_name %}</span> ({%= doc.quotation_to %})
</span>
</span>
<span style="margin-right: 8px; display: inline-block"
title="{%= doc.order_type %}" class="filterable"
data-filter="order_type,=,{%= doc.order_type %}">
{% if(doc.order_type==="Service") { %}
<i class="icon-wrench"></i>
{% } else { %}
<i class="icon-tag"></i>
{% } %}
</span>
<span class="label {%= doc.status=="Draft" ? "label-danger" :
(doc.status=="Ordered" ? "label-success": "label-info") %}
filterable"
data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
</div>
<div class="col-xs-12 col-sm-8 text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
</div>
<div class="col-xs-2 text-right">
<div class="col-sm-2 hidden-xs">
<span class="indicator {%= doc.status=="Draft" ? "red" :
(doc.status=="Ordered" ? "green": "blue") %}
filterable"
data-filter="status,=,{%= doc.status %}">{%= __(doc.status) %}</span>
</div>
<div class="col-sm-2 hidden-xs text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_export') %}">
{%= doc.get_formatted("grand_total_export") %}
</div>

5
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -1021,7 +1021,7 @@
"idx": 1,
"is_submittable": 1,
"issingle": 0,
"modified": "2015-01-01 14:30:05.304190",
"modified": "2015-01-05 12:25:02.687860",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -1111,5 +1111,6 @@
"read_only_onload": 1,
"search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
"sort_field": "modified",
"sort_order": "DESC"
"sort_order": "DESC",
"title_field": "customer_name"
}

65
erpnext/selling/doctype/sales_order/sales_order_list.html
View File

@@ -1,47 +1,34 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-8">
<div class="col-xs-12 col-sm-8">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block">
<span class="filterable"
data-filter="customer,=,{%= doc.customer %}">
{%= doc.customer_name %}</span></span>
{% if(doc.per_delivered < 100 && doc.status!=="Stopped") { %}
{% if(frappe.datetime.get_diff(doc.delivery_date) < 0) { %}
<span class="label label-danger filterable"
title="{%= doc.get_formatted("delivery_date")%}"
data-filter="per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"
>
{%= __("Overdue") %}
</span>
{% } else { %}
<span class="label label-warning filterable"
data-filter="per_delivered,<,100|status,!=,Stopped"
title="{%= __("Pending") %}">
{%= doc.get_formatted("delivery_date") || "Pending" %}</span>
{% } %}
{% } %}
{% if(doc.per_delivered == 100 && doc.status!=="Stopped") { %}
<span class="filterable text-muted"
data-filter="per_delivered,=,100|status,!=,Stopped">
<i class="icon-ok-sign"></i></span>
{% } %}
{% if(doc.status==="Stopped") { %}
<span class="label label-danger filterable"
data-filter="status,=,Stopped">{%= __("Stopped") %}</span>
{% } %}
</div>
</div>
<div class="col-xs-1 text-right">
{% var completed = doc.per_delivered, title = __("Delivered") %}
{% include "templates/form_grid/includes/progress.html" %}
</div>
<div class="col-xs-1 text-right">
{% var completed = doc.per_billed, title = __("Billed") %}
{% include "templates/form_grid/includes/progress.html" %}
</div>
<div class="col-xs-2 text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_export') %}">
<div class="col-sm-2 hidden-xs text-ellipsis">
{% if(doc.per_delivered < 100 && doc.status!=="Stopped" &&
frappe.datetime.get_diff(doc.delivery_date) < 0) { %}
<span class="indicator red filterable"
title="{%= doc.get_formatted("delivery_date")%}"
data-filter="per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped">
{%= __("Overdue") %}
</span>
{% } else if(doc.per_delivered < 100 && doc.status!=="Stopped") { %}
<span class="indicator orange filterable"
data-filter="per_delivered,<,100|status,!=,Stopped"
title="{%= __("Pending") %}">
{%= doc.get_formatted("delivery_date") || "Pending" %}</span>
{% } else if(doc.per_delivered == 100 && doc.status!=="Stopped") { %}
<span class="filterable indicator green"
data-filter="per_delivered,=,100|status,!=,Stopped">
{%= __("Delivered") %}
</span>
{% } else if(doc.status==="Stopped") { %}
<span class="indicator red filterable"
data-filter="status,=,Stopped">{%= __("Stopped") %}</span>
{% } %}
</div>
<div class="col-sm-2 hidden-xs text-ellipsis text-right">
<div title="{%= doc.get_formatted('grand_total_export') %}">
{%= doc.get_formatted("grand_total_export") %}
</div>
</div>