Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

@ -448,7 +448,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-12-25 17:21:56.824371", "modified": "2015-01-05 10:54:54.294810",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry", "name": "Journal Entry",
@ -502,5 +502,6 @@
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "voucher_type,posting_date, due_date, cheque_no", "search_fields": "voucher_type,posting_date, due_date, cheque_no",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "voucher_type"
} }

19
erpnext/accounts/doctype/journal_entry/journal_entry_list.html
View File

@ -1,20 +1,15 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-10"> <div class="col-xs-12 col-sm-5 text-ellipsis">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span class="text-muted" style="margin-right: 8px;"> </div>
{%= doc.get_formatted("posting_date") %}</span> <div class="col-sm-5 hidden-xs">
<span class="label label-info filterable"
data-filter="voucher_type,=,{%= doc.voucher_type %}">
{%= doc.voucher_type %}
</span>
{% if(doc.docstatus===0) { %} {% if(doc.docstatus===0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
data-filter="docstatus,=,0">{%= __("Draft") %}</span> data-filter="docstatus,=,0">{%= __("Draft") %}</span><br>
{% } %} {% } %}
{%= doc.user_remark %}
</div> </div>
</div> <div class="col-sm-2 hidden-xs text-right">
<div class="col-xs-2 text-right">
{%= doc.get_formatted("total_debit") %} {%= doc.get_formatted("total_debit") %}
</div> </div>
</div> </div>

2
erpnext/accounts/doctype/journal_entry/journal_entry_list.js
View File

@ -1,3 +1,3 @@
frappe.listview_settings['Journal Entry'] = { frappe.listview_settings['Journal Entry'] = {
add_fields: ["voucher_type", "posting_date", "total_debit", "company"] add_fields: ["voucher_type", "posting_date", "total_debit", "company", "user_remark"]
}; };

4
erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
View File

@ -10,7 +10,7 @@
{ {
"fieldname": "mode_of_payment", "fieldname": "mode_of_payment",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 0,
"label": "Mode of Payment", "label": "Mode of Payment",
"oldfieldname": "mode_of_payment", "oldfieldname": "mode_of_payment",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -41,7 +41,7 @@
], ],
"icon": "icon-credit-card", "icon": "icon-credit-card",
"idx": 1, "idx": 1,
"modified": "2014-05-27 03:49:13.846602", "modified": "2015-01-05 11:13:54.446006",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Mode of Payment", "name": "Mode of Payment",

2
erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
View File

@ -4,7 +4,7 @@
cur_frm.cscript.onload = function(doc,cdt,cdn){ cur_frm.cscript.onload = function(doc,cdt,cdn){
if(doc.__islocal){ if(doc.__islocal){
var callback1 = function(r,rt){ var callback1 = function(r,rt){
refresh_field('budget_distribution_details'); refresh_field('percentages');
} }
return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1); return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1);

10
erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
View File

@ -13,13 +13,15 @@ class MonthlyDistribution(Document):
'October','November','December'] 'October','November','December']
idx =1 idx =1
for m in month_list: for m in month_list:
mnth = self.append('budget_distribution_details') mnth = self.append('percentages')
mnth.month = m mnth.month = m
mnth.percentage_allocation = 100.0/12
mnth.idx = idx mnth.idx = idx
idx += 1 idx += 1
def validate(self): def validate(self):
total = sum([flt(d.percentage_allocation) for d in self.get("budget_distribution_details")]) total = sum([flt(d.percentage_allocation) for d in self.get("percentages")])
if total != 100.0: if flt(total, 2) != 100.0:
frappe.throw(_("Percentage Allocation should be equal to 100%")) frappe.throw(_("Percentage Allocation should be equal to 100%") + \
" ({0}%)".format(str(flt(total, 2))))

12
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
View File

@ -14,7 +14,7 @@
{ {
"fieldname": "transaction_date", "fieldname": "transaction_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1, "in_list_view": 0,
"label": "Transaction Date", "label": "Transaction Date",
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -23,7 +23,7 @@
{ {
"fieldname": "posting_date", "fieldname": "posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1, "in_list_view": 0,
"label": "Posting Date", "label": "Posting Date",
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -45,7 +45,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_user_permissions": 1, "ignore_user_permissions": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@ -57,6 +57,7 @@
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 0,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@ -102,7 +103,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-06-23 07:55:49.946225", "modified": "2015-01-05 11:27:11.937653",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Period Closing Voucher", "name": "Period Closing Voucher",
@ -139,5 +140,6 @@
], ],
"search_fields": "posting_date, fiscal_year", "search_fields": "posting_date, fiscal_year",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "closing_account_head"
} }

13
erpnext/accounts/doctype/pricing_rule/pricing_rule.json
View File

@ -13,6 +13,14 @@
"label": "Applicability", "label": "Applicability",
"permlevel": 0 "permlevel": 0
}, },
{
"fieldname": "title",
"fieldtype": "Data",
"label": "Title",
"permlevel": 0,
"precision": "",
"reqd": 1
},
{ {
"default": "Item Code", "default": "Item Code",
"fieldname": "apply_on", "fieldname": "apply_on",
@ -236,7 +244,7 @@
"icon": "icon-gift", "icon": "icon-gift",
"idx": 1, "idx": 1,
"istable": 0, "istable": 0,
"modified": "2014-09-26 09:09:38.418765", "modified": "2015-01-05 10:58:42.550092",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",
@ -296,5 +304,6 @@
} }
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "title"
} }

5
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -880,7 +880,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-12-24 14:32:24.551641", "modified": "2015-01-05 10:57:10.892210",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",
@ -970,5 +970,6 @@
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "posting_date, supplier, fiscal_year, bill_no, grand_total, outstanding_amount", "search_fields": "posting_date, supplier, fiscal_year, bill_no, grand_total, outstanding_amount",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "supplier_name"
} }

24
erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html
View File

@ -1,42 +1,40 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-9"> <div class="col-xs-8">
<div class="text-ellipsis"> <div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block"> </div>
<span class="filterable" </div>
data-filter="supplier,=,{%= doc.supplier %}"> <div class="col-xs-2">
{%= doc.supplier_name %}</span></span>
{% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %} {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
{% if(frappe.datetime.get_diff(doc.due_date) < 0) { %} {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
title="{%= doc.get_formatted("due_date")%}" title="{%= doc.get_formatted("due_date")%}"
data-filter="outstanding_amount,>,0|due_date,<,Today"> data-filter="outstanding_amount,>,0|due_date,<,Today">
{%= __("Overdue: ") + comment_when(doc.due_date) %} {%= __("Overdue: ") + comment_when(doc.due_date) %}
</span> </span>
{% } else { %} {% } else { %}
<span class="label label-warning filterable" <span class="indictator orange filterable"
data-filter="outstanding_amount,>,0|due,>=,Today" data-filter="outstanding_amount,>,0|due,>=,Today"
title="{%= __("Payment Pending") %}"> title="{%= __("Payment Pending") %}">
{%= doc.get_formatted("due_date") %}</span> {%= doc.get_formatted("due_date") %}</span>
{% } %} {% } %}
{% } %} {% } %}
{% if(doc.outstanding_amount==0 && doc.docstatus==1) { %} {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
<span class="label label-success filterable" <span class="indicator green filterable"
title="{%= doc.get_formatted("due_date")%}" title="{%= doc.get_formatted("due_date")%}"
data-filter="outstanding_amount,=,0"> data-filter="outstanding_amount,=,0">
<i class="icon-ok-sign"></i> {%= __("Paid") %} {%= __("Paid") %}
</span> </span>
{% } %} {% } %}
{% if(doc.docstatus===0) { %} {% if(doc.docstatus===0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
data-filter="docstatus,=,0">{%= __("Draft") %}</span> data-filter="docstatus,=,0">{%= __("Draft") %}</span>
{% } %} {% } %}
</div> </div>
</div> <!-- <div class="col-xs-1 text-right">
<div class="col-xs-1 text-right">
{% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %} {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
{% include "templates/form_grid/includes/progress.html" %} {% include "templates/form_grid/includes/progress.html" %}
</div> </div> -->
<div class="col-xs-2 text-right"> <div class="col-xs-2 text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_import') %}"> <div class="text-ellipsis" title="{%= doc.get_formatted('grand_total_import') %}">
{%= doc.get_formatted("grand_total_import") %} {%= doc.get_formatted("grand_total_import") %}

4
erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.json
View File

@ -12,7 +12,7 @@
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Title", "label": "Title",
"oldfieldname": "title", "oldfieldname": "title",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -71,7 +71,7 @@
], ],
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"modified": "2014-12-24 17:19:29.921875", "modified": "2015-01-05 11:12:27.944849",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Taxes and Charges Master", "name": "Purchase Taxes and Charges Master",

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -1192,7 +1192,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-01 14:30:04.525035", "modified": "2015-01-05 10:57:31.054236",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@ -1248,5 +1248,6 @@
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "posting_date, due_date, customer, fiscal_year, grand_total, outstanding_amount", "search_fields": "posting_date, due_date, customer, fiscal_year, grand_total, outstanding_amount",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "customer_name"
} }

26
erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html
View File

@ -1,42 +1,40 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-9"> <div class="col-xs-8">
<div class="text-ellipsis"> <div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block"> </div>
<span class="filterable" </div>
data-filter="customer,=,{%= doc.customer %}"> <div class="col-xs-2">
{%= doc.customer_name %}</span></span>
{% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %} {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %}
{% if(frappe.datetime.get_diff(doc.due_date) < 0) { %} {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
title="{%= doc.get_formatted("due_date")%}" title="{%= doc.get_formatted("due_date")%}"
data-filter="outstanding_amount,>,0|due_date,<,Today"> data-filter="outstanding_amount,>,0|due_date,<,Today">
{%= __("Overdue: ") + comment_when(doc.due_date) %} {%= __("Overdue") %}
</span> </span>
{% } else { %} {% } else { %}
<span class="label label-warning filterable" <span class="indicator orange filterable"
data-filter="outstanding_amount,>,0|due_date,>=,Today" data-filter="outstanding_amount,>,0|due_date,>=,Today"
title="{%= __("Payment Pending") %}"> title="{%= __("Payment Pending") %}">
{%= doc.get_formatted("due_date") %}</span> {%= doc.get_formatted("due_date") %}</span>
{% } %} {% } %}
{% } %} {% } %}
{% if(doc.outstanding_amount==0 && doc.docstatus==1) { %} {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %}
<span class="label label-success filterable" <span class="indicator green filterable"
title="{%= doc.get_formatted("due_date")%}" title="{%= doc.get_formatted("due_date")%}"
data-filter="outstanding_amount,=,0"> data-filter="outstanding_amount,=,0">
<i class="icon-ok-sign"></i> {%= __("Paid") %} {%= __("Paid") %}
</span> </span>
{% } %} {% } %}
{% if(doc.docstatus===0) { %} {% if(doc.docstatus===0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
data-filter="docstatus,=,0">{%= __("Draft") %}</span> data-filter="docstatus,=,0">{%= __("Draft") %}</span>
{% } %} {% } %}
</div> </div>
</div> <!-- <div class="col-xs-1 text-right">
<div class="col-xs-1 text-right">
{% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %} {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %}
{% include "templates/form_grid/includes/progress.html" %} {% include "templates/form_grid/includes/progress.html" %}
</div> </div> -->
<div class="col-xs-2 text-right"> <div class="col-xs-2 text-right">
<div class="text-ellipsis" title="{%= doc.get_formatted("grand_total_export") %}"> <div class="text-ellipsis" title="{%= doc.get_formatted("grand_total_export") %}">
{%= doc.get_formatted("grand_total_export") %} {%= doc.get_formatted("grand_total_export") %}

4
erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.json
View File

@ -12,7 +12,7 @@
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Title", "label": "Title",
"oldfieldname": "title", "oldfieldname": "title",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -80,7 +80,7 @@
], ],
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"modified": "2014-12-24 14:57:06.275853", "modified": "2015-01-05 11:12:09.596733",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Taxes and Charges Master", "name": "Sales Taxes and Charges Master",

4
erpnext/accounts/doctype/shipping_rule/shipping_rule.json
View File

@ -1,5 +1,5 @@
{ {
"autoname": "Prompt", "autoname": "field:label",
"creation": "2013-06-25 11:48:03", "creation": "2013-06-25 11:48:03",
"description": "Specify conditions to calculate shipping amount", "description": "Specify conditions to calculate shipping amount",
"docstatus": 0, "docstatus": 0,
@ -102,7 +102,7 @@
], ],
"icon": "icon-truck", "icon": "icon-truck",
"idx": 1, "idx": 1,
"modified": "2014-12-24 14:59:04.430010", "modified": "2015-01-05 14:59:25.045126",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Shipping Rule", "name": "Shipping Rule",

2
erpnext/buying/doctype/purchase_common/purchase_common.py
View File

@ -67,7 +67,7 @@ class PurchaseCommon(BuyingController):
frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx)) frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx))
# validate purchase item # validate purchase item
if not (obj.doctype=="Material Request" and getattr(obj, "material_request_type", None)=="Transfer"): if not (obj.doctype=="Material Request" and getattr(obj, "material_request_type", None)=="Material Transfer"):
if item[0][1] != 'Yes' and item[0][2] != 'Yes': if item[0][1] != 'Yes' and item[0][2] != 'Yes':
frappe.throw(_("{0} must be a Purchased or Sub-Contracted Item in row {1}").format(d.item_code, d.idx)) frappe.throw(_("{0} must be a Purchased or Sub-Contracted Item in row {1}").format(d.item_code, d.idx))

8
erpnext/buying/doctype/supplier/supplier_list.html
View File

@ -1,15 +1,15 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-12"> <div class="col-sm-8 col-xs-12 text-ellipsis">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
{% if(doc.supplier_name != doc.name) { %} {% if(doc.supplier_name != doc.name) { %}
<span style="margin-right: 8px; display: inline-block"> <span style="margin-right: 8px; display: inline-block">
{%= doc.supplier_name %}</span> {%= doc.supplier_name %}</span>
{% } %} {% } %}
<span class="label label-info filterable" </div>
<div class="col-sm-4 hidden-xs">
<span class="indicator darkgrey filterable"
data-filter="supplier_type,=,{%= doc.supplier_type %}"> data-filter="supplier_type,=,{%= doc.supplier_type %}">
{%= doc.supplier_type %} {%= doc.supplier_type %}
</span> </span>
</div> </div>
</div>
</div> </div>

2
erpnext/config/accounts.py
View File

@ -138,7 +138,7 @@ def get_data():
}, },
{ {
"type":"doctype", "type":"doctype",
"name": "Budget Distribution", "name": "Monthly Distribution",
"description": _("Seasonality for setting budgets.") "description": _("Seasonality for setting budgets.")
}, },
{ {

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

@ -19,7 +19,7 @@
{ {
"fieldname": "campaign_name", "fieldname": "campaign_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 0,
"label": "Campaign Name", "label": "Campaign Name",
"oldfieldname": "campaign_name", "oldfieldname": "campaign_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -48,7 +48,7 @@
], ],
"icon": "icon-bullhorn", "icon": "icon-bullhorn",
"idx": 1, "idx": 1,
"modified": "2014-05-27 03:49:08.416532", "modified": "2015-01-05 14:46:52.204964",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Campaign", "name": "Campaign",

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

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

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

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

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

@ -1,18 +1,12 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-12"> <div class="col-xs-12 col-sm-9 text-ellipsis">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block"> <span style="margin-right: 8px; display: inline-block">
{%= doc.company_name %}</span> {%= 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>
<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>
</div> </div>

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

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

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

@ -1,23 +1,10 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-12"> <div class="col-sm-9 col-xs-12 text-ellipsis">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block"> </div>
<span class="filterable" <div class="col-sm-3 hidden-xs text-ellipsis">
data-filter="{%= doc.enquiry_from.toLowerCase() %},=,{%= doc[doc.enquiry_from.toLowerCase()] %}"> <span class="indicator
{%= doc.customer_name %}</span> ({%= doc.enquiry_from %})</span> {%= doc.status=="Draft" ? "red" : "darkgrey" %} filterable"
<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> data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
</div> </div>
</div>
</div> </div>

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

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

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

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

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

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

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

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

4
erpnext/setup/doctype/brand/brand.json
View File

@ -10,7 +10,7 @@
{ {
"fieldname": "brand", "fieldname": "brand",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 0,
"label": "Brand Name", "label": "Brand Name",
"oldfieldname": "brand", "oldfieldname": "brand",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -33,7 +33,7 @@
"icon": "icon-certificate", "icon": "icon-certificate",
"idx": 1, "idx": 1,
"in_dialog": 0, "in_dialog": 0,
"modified": "2014-05-27 03:49:08.217867", "modified": "2015-01-05 16:15:25.811253",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Brand", "name": "Brand",

8
erpnext/setup/doctype/sales_partner/sales_partner.json
View File

@ -12,13 +12,13 @@
"fieldname": "partner_name", "fieldname": "partner_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Sales Partner Name", "label": "Sales Partner Name",
"oldfieldname": "partner_name", "oldfieldname": "partner_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 0
}, },
{ {
"fieldname": "partner_type", "fieldname": "partner_type",
@ -52,7 +52,7 @@
{ {
"fieldname": "commission_rate", "fieldname": "commission_rate",
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 0,
"label": "Commission Rate", "label": "Commission Rate",
"oldfieldname": "commission_rate", "oldfieldname": "commission_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@ -200,7 +200,7 @@
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"modified": "2015-01-01 14:30:05.641746", "modified": "2015-01-05 14:52:04.562481",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Sales Partner", "name": "Sales Partner",

6
erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
View File

@ -12,7 +12,7 @@
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Title", "label": "Title",
"oldfieldname": "title", "oldfieldname": "title",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -23,7 +23,7 @@
{ {
"fieldname": "terms", "fieldname": "terms",
"fieldtype": "Text Editor", "fieldtype": "Text Editor",
"in_list_view": 1, "in_list_view": 0,
"label": "Terms and Conditions", "label": "Terms and Conditions",
"oldfieldname": "terms", "oldfieldname": "terms",
"oldfieldtype": "Text Editor", "oldfieldtype": "Text Editor",
@ -32,7 +32,7 @@
], ],
"icon": "icon-legal", "icon": "icon-legal",
"idx": 1, "idx": 1,
"modified": "2014-05-27 03:49:20.923172", "modified": "2015-01-05 14:58:21.277113",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Terms and Conditions", "name": "Terms and Conditions",

6
erpnext/setup/doctype/uom/uom.json
View File

@ -9,7 +9,7 @@
{ {
"fieldname": "uom_name", "fieldname": "uom_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 0,
"label": "UOM Name", "label": "UOM Name",
"oldfieldname": "uom_name", "oldfieldname": "uom_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -20,14 +20,14 @@
"description": "Check this to disallow fractions. (for Nos)", "description": "Check this to disallow fractions. (for Nos)",
"fieldname": "must_be_whole_number", "fieldname": "must_be_whole_number",
"fieldtype": "Check", "fieldtype": "Check",
"in_list_view": 1, "in_list_view": 0,
"label": "Must be Whole Number", "label": "Must be Whole Number",
"permlevel": 0 "permlevel": 0
} }
], ],
"icon": "icon-compass", "icon": "icon-compass",
"idx": 1, "idx": 1,
"modified": "2014-05-27 03:49:22.050899", "modified": "2015-01-05 16:14:43.862637",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "UOM", "name": "UOM",

5
erpnext/stock/doctype/batch/batch.json
View File

@ -78,7 +78,7 @@
"icon": "icon-archive", "icon": "icon-archive",
"idx": 1, "idx": 1,
"max_attachments": 5, "max_attachments": 5,
"modified": "2014-12-15 17:37:01.781726", "modified": "2015-01-05 16:11:40.125703",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Batch", "name": "Batch",
@ -97,5 +97,6 @@
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
] ],
"title_field": "item"
} }

19
erpnext/stock/doctype/batch/batch_list.html
View File

@ -1,21 +1,18 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-12"> <div class="col-xs-12 col-sm-9 text-ellipsis">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span class="filterable" style="margin-right: 8px;" </div>
data-filter="item,=,{%= doc.item %}"> <div class="col-sm-3 hidden-xs text-ellipsis">
{%= doc.item %}</span>
{% if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { %} {% if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
data-filter="expiry_date,>=,Today"> data-filter="expiry_date,>=,Today">
{%= __("Expired") %}: {%= doc.get_formatted("expiry_date") %} {%= __("Expired") %}
</span> </span>
{% } else if(doc.expiry_date) { %} {% } else if(doc.expiry_date) { %}
<span class="label label-default filterable" <span class="indicator darkgrey filterable"
data-filter="expiry_date,=,{%= doc.expiry_date %}"> data-filter="expiry_date,=,{%= doc.expiry_date %}" title="{%= __("Expiry Date") %}">
{%= __("Expiry") %}: {%= doc.get_formatted("expiry_date") %} {%= doc.get_formatted("expiry_date") %}
</span> </span>
{% } %} {% } %}
</div> </div>
</div>
</div> </div>

5
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -1013,7 +1013,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-01-01 14:30:01.408528", "modified": "2015-01-05 15:51:31.663904",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",
@ -1098,5 +1098,6 @@
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status,customer,customer_name, territory,grand_total", "search_fields": "status,customer,customer_name, territory,grand_total",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "customer_name"
} }

21
erpnext/stock/doctype/delivery_note/delivery_note_list.html
View File

@ -1,11 +1,7 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-9"> <div class="col-xs-8">
<div class="text-ellipsis"> <div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= 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.transporter_name) { %} {% if(doc.transporter_name) { %}
<span style="margin-right: 8px;" <span style="margin-right: 8px;"
title="{%= doc.transporter_name %}" class="filterable" title="{%= doc.transporter_name %}" class="filterable"
@ -13,17 +9,18 @@
<i class="icon-truck text-muted"></i> <i class="icon-truck text-muted"></i>
</span> </span>
{% } %} {% } %}
</div>
</div>
<div class="col-sm-2 hidden-xs">
{% if(doc.docstatus===0) { %} {% if(doc.docstatus===0) { %}
<span class="label label-danger filterable" <span class="indicator red filterable"
data-filter="docstatus,=,0">{%= __("Draft") %}</span> data-filter="docstatus,=,0">{%= __("Draft") %}</span>
{% } else if(doc.docstatus===1) { %}
<span class="indicator blue filterable"
data-filter="docstatus,=,1">{%= __("Delivered") %}</span>
{% } %} {% } %}
</div> </div>
</div> <div class="col-sm-2 hidden-xs text-right">
<div class="col-xs-1 text-right">
{% var completed = doc.per_installed, title=__("% Installed") %}
{% 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="text-ellipsis" title="{%= doc.get_formatted('grand_total_export') %}">
{%= doc.get_formatted("grand_total_export") %} {%= doc.get_formatted("grand_total_export") %}
</div> </div>

2
erpnext/stock/doctype/delivery_note/delivery_note_list.js
View File

@ -1,4 +1,4 @@
frappe.listview_settings['Delivery Note'] = { frappe.listview_settings['Delivery Note'] = {
add_fields: ["customer", "customer_name", "grand_total", "per_installed", add_fields: ["customer", "customer_name", "grand_total", "per_installed",
"transporter_name"] "transporter_name", "grand_total_export"]
}; };

45
erpnext/stock/doctype/item/item_list.html
View File

@ -1,51 +1,18 @@
<div class="row"> <div class="row">
<div class="col-xs-11"> <div class="col-xs-11 col-sm-9">
<div class="text-ellipsis"> <div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
{% if(doc.item_name != doc.name) { %} {% if(doc.item_name != doc.name) { %}
<span style="margin-right: 8px;">{%= doc.item_name %}</span> <span style="margin-right: 8px;">{%= doc.item_name %}</span>
{% } %} {% } %}
{% if(doc.is_stock_item==="Yes") { %} </div>
<span style="margin-right: 8px;" </div>
title="{%= __("Stock Item") %}" class="filterable" <div class="hidden-xs col-sm-2 text-ellipsis">
data-filter="is_stock_item,=,Yes"> <span class="indicator darkgrey filterable"
<i class="icon-inbox text-muted"></i>
</span>
{% } %}
{% if(doc.is_sales_item==="Yes") { %}
<span style="margin-right: 8px;"
title="{%= __("Sales Item") %}" class="filterable"
data-filter="is_sales_item,=,Yes">
<i class="icon-tag text-muted"></i>
</span>
{% } %}
{% if(doc.is_purchase_item==="Yes") { %}
<span style="margin-right: 8px;"
title="{%= __("Purchase Item") %}" class="filterable"
data-filter="is_purchase_item,=,Yes">
<i class="icon-shopping-cart text-muted"></i>
</span>
{% } %}
{% if(doc.default_bom==="Yes") { %}
<span style="margin-right: 8px;"
title="{%= __("Manufactured Item") %}" class="filterable"
data-filter="default_bom,=,{%= doc.default_bom %}">
<i class="icon-site-map text-muted"></i>
</span>
{% } %}
{% if(doc.show_in_website) { %}
<span style="margin-right: 8px;"
title="{%= __("Shown in Website") %}" class="filterable"
data-filter="show_in_website,=,Yes">
<i class="icon-globe text-muted"></i>
</span>
{% } %}
<span class="label label-info filterable"
data-filter="item_group,=,{%= doc.item_group %}"> data-filter="item_group,=,{%= doc.item_group %}">
{%= doc.item_group %}</span> {%= doc.item_group %}</span>
</div> </div>
</div> <div class="col-xs-1 col-sm-1">
<div class="col-xs-1">
{% if(doc.image) { %} {% if(doc.image) { %}
<img src="{%= doc.image %}" class="img-responsive" style="margin-bottom: 4px;"> <img src="{%= doc.image %}" class="img-responsive" style="margin-bottom: 4px;">
{% } %} {% } %}

4
erpnext/stock/doctype/material_request/material_request.js
View File

@ -22,10 +22,8 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
cur_frm.dashboard.reset(); cur_frm.dashboard.reset();
if(doc.docstatus===1) { if(doc.docstatus===1) {
if(doc.status==="Stopped") { if(doc.status==="Stopped") {
cur_frm.dashboard.set_headline_alert(__("Stopped"), "alert-danger", "icon-stop") cur_frm.dashboard.set_headline_alert(__("Stopped"), "alert-danger", "octicon octicon-circle-slash")
} }
cur_frm.dashboard.add_progress(cint(doc.per_ordered) + "% "
+ __("Fulfilled"), cint(doc.per_ordered));
} }
if(doc.docstatus==0) { if(doc.docstatus==0) {

5
erpnext/stock/doctype/material_request/material_request.json
View File

@ -235,7 +235,7 @@
"icon": "icon-ticket", "icon": "icon-ticket",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-12-24 14:28:14.548275", "modified": "2015-01-05 15:17:13.466750",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",
@ -303,5 +303,6 @@
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status,transaction_date", "search_fields": "status,transaction_date",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "material_request_type"
} }

32
erpnext/stock/doctype/material_request/material_request_list.html
View File

@ -1,28 +1,20 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-10"> <div class="col-sm-10 col-xs-12 text-ellipsis">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span style="margin-right: 8px; display: inline-block" </div>
title="{%= doc.material_request_type %}" class="filterable" <div class="col-sm-2 hidden-xs">
data-filter="material_request_type,=,{%= doc.material_request_type %}">
{% if(doc.material_request_type==="Purchase") { %}
<i class="icon-shopping-cart"></i>
{% } else { %}
<i class="icon-truck"></i>
{% } %}
</span>
{% if(doc.status=="Draft") { %} {% if(doc.status=="Draft") { %}
<span class="label label-danger" <span class="indicator red filterable"
data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span> data-filter="status,=,{%= doc.status %}">{%= doc.status %}</span>
{% } %} {% } else if(doc.status=="Submitted" && doc.per_ordered < 100) { %}
{% if(doc.status=="Submitted" && doc.per_ordered < 100) { %} <span class="indicator orange filterable"
<span class="label label-warning filterable"
data-filter="per_ordered,<,100">{%= __("Pending") %}</span> data-filter="per_ordered,<,100">{%= __("Pending") %}</span>
{% } else if(doc.status=="Submitted" && doc.per_ordered == 100) { %}
<span class="indicator blue filterable"
data-filter="per_ordered,=,100">{%= __("Completed") %}</span>
{% } else if(doc.status=="Stopped") { %}
<span class="indicator red filterable"
data-filter="status,=,Stopped">{%= __("Stopped") %}</span>
{% } %} {% } %}
</div> </div>
</div>
<div class="col-xs-2">
{% var completed = doc.per_ordered, title = __("Ordered") %}
{% include "templates/form_grid/includes/progress.html" %}
</div>
</div> </div>

38
erpnext/stock/doctype/serial_no/serial_no.json
View File

@ -22,23 +22,6 @@
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
{
"default": "Not Available",
"description": "Only Serial Nos with status \"Available\" can be delivered.",
"fieldname": "status",
"fieldtype": "Select",
"in_filter": 1,
"in_list_view": 1,
"label": "Status",
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
"options": "Not Available\nAvailable\nDelivered\nPurchase Returned\nSales Returned",
"permlevel": 0,
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{ {
"fieldname": "serial_no", "fieldname": "serial_no",
"fieldtype": "Data", "fieldtype": "Data",
@ -66,6 +49,23 @@
"reqd": 1, "reqd": 1,
"search_index": 0 "search_index": 0
}, },
{
"default": "Not Available",
"description": "Only Serial Nos with status \"Available\" can be delivered.",
"fieldname": "status",
"fieldtype": "Select",
"in_filter": 1,
"in_list_view": 1,
"label": "Status",
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
"options": "Not Available\nAvailable\nDelivered\nPurchase Returned\nSales Returned",
"permlevel": 0,
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{ {
"description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt", "description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt",
"fieldname": "warehouse", "fieldname": "warehouse",
@ -91,7 +91,7 @@
{ {
"fieldname": "item_name", "fieldname": "item_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 0,
"label": "Item Name", "label": "Item Name",
"permlevel": 0, "permlevel": 0,
"read_only": 1 "read_only": 1
@ -417,7 +417,7 @@
"icon": "icon-barcode", "icon": "icon-barcode",
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"modified": "2015-01-01 14:30:05.865206", "modified": "2015-01-05 16:03:49.825174",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial No", "name": "Serial No",

28
erpnext/stock/doctype/serial_no/serial_no_list.html
View File

@ -1,28 +0,0 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-12">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span class="filterable" style="margin-right: 8px;"
data-filter="item_code,=,{%= doc.item_code %}">
{%= doc.item_code %}</span>
{% var icon = {
"Available": ["icon-ok", "label-success"],
"Not Available": ["icon-remove", "label-danger"],
"Delivered": ["icon-truck", "label-success"],
"Purchase Returned": ["icon-retweet", "label-warning"],
"Sales Returned": ["icon-retweet", "label-warning"],
}[doc.status]; %}
<span class="label {%= icon[1] %} filterable"
data-filter="status,=,{%= doc.status %}"
title="{%= doc.purpose %}">
<i class="{%= icon[0] %}"></i> {%= doc.status %}
</span>
{% if(doc.warehouse) { %}
<span class="label label-default filterable"
data-filter="warehouse,=,{%= doc.warehouse %}">
{%= doc.warehouse %}
</span>
{% } %}
</div>
</div>
</div>

3
erpnext/stock/doctype/serial_no/serial_no_list.js
View File

@ -1,3 +0,0 @@
frappe.listview_settings['Serial No'] = {
add_fields: ["status", "item_code", "warehouse"]
};

5
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@ -587,7 +587,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2014-12-24 16:43:51.886121", "modified": "2015-01-05 15:28:49.649079",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry", "name": "Stock Entry",
@ -656,5 +656,6 @@
"read_only_onload": 0, "read_only_onload": 0,
"search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks", "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "purpose"
} }

37
erpnext/stock/doctype/stock_entry/stock_entry_list.html
View File

@ -1,22 +1,10 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-12"> <div class="col-xs-12 col-sm-8">
<div class="text-ellipsis"> <div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
{% var icon = { </div>
"Material Issue": "icon-arrow-right", </div>
"Material Receipt": "icon-arrow-left", <div class="col-sm-4 hidden-xs">
"Material Transfer": "icon-resize-horizontal",
"Manufacture": "icon-wrench",
"Repack": "icon-wrench",
"Sales Return": "icon-warning-sign",
"Purchase Return": "icon-warning-sign",
"Subcontract": "icon-truck"
}[doc.purpose]; %}
<span class="label label-info filterable"
data-filter="purpose,=,{%= doc.purpose %}"
title="{%= doc.purpose %}">
<i class="{%= icon %}"></i>
</span>
{% if(doc.from_warehouse) { %} {% if(doc.from_warehouse) { %}
<span class="label label-default filterable" <span class="label label-default filterable"
data-filter="from_warehouse,=,{%= doc.from_warehouse %}"> data-filter="from_warehouse,=,{%= doc.from_warehouse %}">
@ -24,7 +12,7 @@
</span> </span>
{% } %} {% } %}
{% if(doc.from_warehouse || doc.to_warehouse) { %} {% if(doc.from_warehouse || doc.to_warehouse) { %}
<i class="icon-arrow-right text-muted"></i> <i class="octicon octicon-arrow-right text-muted"></i>
{% } %} {% } %}
{% if(doc.to_warehouse) { %} {% if(doc.to_warehouse) { %}
<span class="label label-primary filterable" <span class="label label-primary filterable"
@ -32,20 +20,5 @@
{%= doc.to_warehouse %} {%= doc.to_warehouse %}
</span> </span>
{% } %} {% } %}
{% if(doc.production_order) { %}
<span class="label label-info filterable"
data-filter="production_order,=,{%= doc.production_order %}"
title="{%= doc.production_order %}">
<i class="icon-wrench"></i>
</span>
{% } %}
{% if(doc.bom_no) { %}
<span class="label label-info filterable"
data-filter="bom_no,=,{%= doc.bom_no %}"
title="{%= doc.bom_no %}">
<i class="icon-sitemap"></i>
</span>
{% } %}
</div>
</div> </div>
</div> </div>

5
erpnext/stock/doctype/warehouse/warehouse.json
View File

@ -43,7 +43,7 @@
"description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.", "description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.",
"fieldname": "create_account_under", "fieldname": "create_account_under",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 0,
"label": "Parent Account", "label": "Parent Account",
"options": "Account", "options": "Account",
"permlevel": 0 "permlevel": 0
@ -103,6 +103,7 @@
{ {
"fieldname": "address_line_1", "fieldname": "address_line_1",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 0,
"label": "Address Line 1", "label": "Address Line 1",
"oldfieldname": "address_line_1", "oldfieldname": "address_line_1",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -150,7 +151,7 @@
], ],
"icon": "icon-building", "icon": "icon-building",
"idx": 1, "idx": 1,
"modified": "2014-09-15 02:55:16.750848", "modified": "2015-01-05 15:58:43.046509",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Warehouse", "name": "Warehouse",

9
erpnext/support/doctype/customer_issue/customer_issue.json
View File

@ -63,7 +63,7 @@
"fieldname": "customer", "fieldname": "customer",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Customer", "label": "Customer",
"oldfieldname": "customer", "oldfieldname": "customer",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -162,7 +162,7 @@
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Warranty / AMC Status", "label": "Warranty / AMC Status",
"options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC",
"permlevel": 0 "permlevel": 0
@ -396,7 +396,7 @@
"icon": "icon-bug", "icon": "icon-bug",
"idx": 1, "idx": 1,
"is_submittable": 0, "is_submittable": 0,
"modified": "2015-01-01 14:30:00.857711", "modified": "2015-01-05 16:21:50.525893",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Customer Issue", "name": "Customer Issue",
@ -419,5 +419,6 @@
], ],
"search_fields": "status,customer,customer_name,territory", "search_fields": "status,customer,customer_name,territory",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"title_field": "customer_name"
} }

24
erpnext/support/doctype/customer_issue/customer_issue_list.html
View File

@ -1,24 +0,0 @@
<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;" class="filterable"
data-filter="customer,=,{%= doc.customer %}">
{%= doc.customer %}</span>
<span class="label
label-{%= frappe.utils.guess_style(doc.status) %} filterable"
data-filter="status,=,{%= doc.status %}">
{%= doc.status %}
</span>
{% if(doc.item_code) { %}
<span class="label label-default filterable"
data-filter="item_code,=,{%= doc.item_code %}">
{%= doc.item_code %}
</span>
{% } %}
</div>
</div>
</div>

4
erpnext/support/doctype/issue/issue.json
View File

@ -27,7 +27,7 @@
"fieldname": "subject", "fieldname": "subject",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Subject", "label": "Subject",
"permlevel": 0, "permlevel": 0,
"report_hide": 0, "report_hide": 0,
@ -217,7 +217,7 @@
], ],
"icon": "icon-ticket", "icon": "icon-ticket",
"idx": 1, "idx": 1,
"modified": "2014-11-28 12:11:31.275053", "modified": "2015-01-05 16:16:58.927957",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Issue", "name": "Issue",

18
erpnext/support/doctype/issue/issue_list.html
View File

@ -1,18 +0,0 @@
<div class="row" style="max-height: 30px;">
<div class="col-xs-10">
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
<span class="label label-{%= frappe.utils.guess_style(doc.status) %} filterable"
data-filter="status,=,{%= doc.status %}">
{%= doc.status %}
</span>
</div>
</div>
<div class="col-xs-2">
<div class="text-ellipsis">
<span class="filterable text-muted small" style="margin-right: 8px;"
data-filter="raised_by,=,{%= doc.raised_by %}">
{%= doc.raised_by %}</span>
</div>
</div>
</div>

19
erpnext/support/doctype/newsletter/newsletter_list.html
View File

@ -1,16 +1,15 @@
<div class="row" style="max-height: 30px;"> <div class="row" style="max-height: 30px;">
<div class="col-xs-10"> <div class="col-xs-12 col-sm-9">
<div class="text-ellipsis"> <div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %} {%= list.get_avatar_and_id(doc) %}
<span class="label
label-{%= cint(doc.email_sent) ? "success" : "warning" %} filterable"
data-filter="email_sent,=,{%= cint(doc.email_sent) ? __("Yes") : __("No") %}">
{%= cint(doc.email_sent) ? __("Sent") : __("Not Sent") %}
</span>
<span class="label label-info filterable"
data-filter="send_to_type,=,{%= doc.send_to_type %}">
{%= doc.send_to_type %}
</span>
</div> </div>
</div> </div>
<div class="col-sm-3 hidden-xs">
{% if (!doc.email_sent) { %}
<span class="indicator orange filterable"
data-filter="email_sent,=,No">
{%= __("Not Sent") %}
</span>
{% } %}
</div>
</div> </div>

13
erpnext/utilities/doctype/address/address.json
View File

@ -17,7 +17,7 @@
"description": "Name of person or organization that this address belongs to.", "description": "Name of person or organization that this address belongs to.",
"fieldname": "address_title", "fieldname": "address_title",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 0,
"label": "Address Title", "label": "Address Title",
"permlevel": 0, "permlevel": 0,
"reqd": 0 "reqd": 0
@ -25,6 +25,7 @@
{ {
"fieldname": "address_type", "fieldname": "address_type",
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1,
"label": "Address Type", "label": "Address Type",
"options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
"permlevel": 0, "permlevel": 0,
@ -57,7 +58,7 @@
"fieldname": "state", "fieldname": "state",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "State", "label": "State",
"permlevel": 0, "permlevel": 0,
"search_index": 0 "search_index": 0
@ -66,7 +67,7 @@
"fieldname": "pincode", "fieldname": "pincode",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Pincode", "label": "Pincode",
"permlevel": 0, "permlevel": 0,
"search_index": 1 "search_index": 1
@ -75,7 +76,7 @@
"fieldname": "country", "fieldname": "country",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Country", "label": "Country",
"options": "Country", "options": "Country",
"permlevel": 0, "permlevel": 0,
@ -122,7 +123,7 @@
"description": "Check to make Shipping Address", "description": "Check to make Shipping Address",
"fieldname": "is_shipping_address", "fieldname": "is_shipping_address",
"fieldtype": "Check", "fieldtype": "Check",
"in_list_view": 1, "in_list_view": 0,
"label": "Preferred Shipping Address", "label": "Preferred Shipping Address",
"permlevel": 0 "permlevel": 0
}, },
@ -198,7 +199,7 @@
"icon": "icon-map-marker", "icon": "icon-map-marker",
"idx": 1, "idx": 1,
"in_dialog": 0, "in_dialog": 0,
"modified": "2014-09-15 03:49:07.273657", "modified": "2015-01-05 12:10:31.519685",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "Address", "name": "Address",