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

fix: replace indicator color darkgrey with darkgray

Browse Source
This commit is contained in:
prssanna 2020-08-27 17:06:10 +05:30
parent 99dfb9556d
commit 744169833c
32 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/payment_request/payment_request_list.js
View File

@ -2,7 +2,7 @@ frappe.listview_settings['Payment Request'] = {
add_fields: ["status"],
get_indicator: function(doc) {
if(doc.status == "Draft") {
return [__("Draft"), "darkgrey", "status,=,Draft"];
return [__("Draft"), "darkgray", "status,=,Draft"];
}
if(doc.status == "Requested") {
return [__("Requested"), "green", "status,=,Requested"];
@ -19,5 +19,5 @@ frappe.listview_settings['Payment Request'] = {
else if(doc.status == "Cancelled") {
return [__("Cancelled"), "red", "status,=,Cancelled"];
}
}
}
}

8
erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
View File

@ -7,19 +7,19 @@ frappe.listview_settings['Purchase Invoice'] = {
"currency", "is_return", "release_date", "on_hold"],
get_indicator: function(doc) {
if( (flt(doc.outstanding_amount) <= 0) && doc.docstatus == 1 && doc.status == 'Debit Note Issued') {
return [__("Debit Note Issued"), "darkgrey", "outstanding_amount,<=,0"];
return [__("Debit Note Issued"), "darkgray", "outstanding_amount,<=,0"];
} else if(flt(doc.outstanding_amount) > 0 && doc.docstatus==1) {
if(cint(doc.on_hold) && !doc.release_date) {
return [__("On Hold"), "darkgrey"];
return [__("On Hold"), "darkgray"];
} else if(cint(doc.on_hold) && doc.release_date && frappe.datetime.get_diff(doc.release_date, frappe.datetime.nowdate()) > 0) {
return [__("Temporarily on Hold"), "darkgrey"];
return [__("Temporarily on Hold"), "darkgray"];
} else if(frappe.datetime.get_diff(doc.due_date) < 0) {
return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<,Today"];
} else {
return [__("Unpaid"), "orange", "outstanding_amount,>,0|due_date,>=,Today"];
}
} else if(cint(doc.is_return)) {
return [__("Return"), "darkgrey", "is_return,=,Yes"];
return [__("Return"), "darkgray", "is_return,=,Yes"];
} else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
return [__("Paid"), "green", "outstanding_amount,=,0"];
}

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -53,7 +53,7 @@ class SalesInvoice(SellingController):
"""Set indicator for portal"""
if self.outstanding_amount < 0:
self.indicator_title = _("Credit Note Issued")
self.indicator_color = "darkgrey"
self.indicator_color = "darkgray"
elif self.outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()):
self.indicator_color = "orange"
self.indicator_title = _("Unpaid")
@ -62,7 +62,7 @@ class SalesInvoice(SellingController):
self.indicator_title = _("Overdue")
elif cint(self.is_return) == 1:
self.indicator_title = _("Return")
self.indicator_color = "darkgrey"
self.indicator_color = "darkgray"
else:
self.indicator_color = "green"
self.indicator_title = _("Paid")

4
erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
View File

@ -10,8 +10,8 @@ frappe.listview_settings['Sales Invoice'] = {
"Draft": "grey",
"Unpaid": "orange",
"Paid": "green",
"Return": "darkgrey",
"Credit Note Issued": "darkgrey",
"Return": "darkgray",
"Credit Note Issued": "darkgray",
"Unpaid and Discounted": "orange",
"Overdue and Discounted": "red",
"Overdue": "red"

2
erpnext/accounts/doctype/subscription/subscription_list.js
View File

@ -11,7 +11,7 @@ frappe.listview_settings['Subscription'] = {
} else if(doc.status === 'Unpaid') {
return [__("Unpaid"), "red"];
} else if(doc.status === 'Cancelled') {
return [__("Cancelled"), "darkgrey"];
return [__("Cancelled"), "darkgray"];
}
}
};

4
erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js
View File

@ -4,9 +4,9 @@ frappe.listview_settings['Supplier Quotation'] = {
if(doc.status==="Ordered") {
return [__("Ordered"), "green", "status,=,Ordered"];
} else if(doc.status==="Rejected") {
return [__("Lost"), "darkgrey", "status,=,Lost"];
return [__("Lost"), "darkgray", "status,=,Lost"];
} else if(doc.status==="Expired") {
return [__("Expired"), "darkgrey", "status,=,Expired"];
return [__("Expired"), "darkgray", "status,=,Expired"];
}
}
};

2
erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js
View File

@ -10,7 +10,7 @@ frappe.listview_settings["Supplier Scorecard"] = {
if (doc.indicator_color) {
return [__(doc.status), doc.indicator_color.toLowerCase(), "status,=," + doc.status];
} else {
return [__("Unknown"), "darkgrey", "status,=,''"];
return [__("Unknown"), "darkgray", "status,=,''"];
}
},

2
erpnext/crm/doctype/contract/contract_list.js
View File

@ -6,7 +6,7 @@ frappe.listview_settings['Contract'] = {
} else if (doc.status == "Active") {
return [__(doc.status), "green", "status,=," + doc.status];
} else if (doc.status == "Inactive") {
return [__(doc.status), "darkgrey", "status,=," + doc.status];
return [__(doc.status), "darkgray", "status,=," + doc.status];
}
},
};

2
erpnext/education/doctype/student_admission/templates/student_admission.html
View File

@ -21,7 +21,7 @@
{% elif frappe.utils.getdate(doc.admission_start_date) > today %}
blue"> Application will open
{% else %}
darkgrey
darkgray
{% endif %}
</span>
</div>

2
erpnext/education/doctype/student_admission/templates/student_admission_row.html
View File

@ -11,7 +11,7 @@
{% elif frappe.utils.getdate(doc.admission_start_date) > today %}
blue
{% else %}
darkgrey
darkgray
{% endif %}
">{{ doc.title }}</span>
</div>

2
erpnext/hr/doctype/employee/employee_list.js
View File

@ -3,7 +3,7 @@ frappe.listview_settings['Employee'] = {
filters: [["status","=", "Active"]],
get_indicator: function(doc) {
var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
indicator[1] = {"Active": "green", "Temporary Leave": "red", "Left": "darkgrey"}[doc.status];
indicator[1] = {"Active": "green", "Temporary Leave": "red", "Left": "darkgray"}[doc.status];
return indicator;
}
};

2
erpnext/hr/doctype/leave_allocation/leave_allocation_list.js
View File

@ -5,7 +5,7 @@
frappe.listview_settings['Leave Allocation'] = {
get_indicator: function(doc) {
if(doc.status==="Expired") {
return [__("Expired"), "darkgrey", "expired, =, 1"];
return [__("Expired"), "darkgray", "expired, =, 1"];
}
},
};

2
erpnext/hr/page/team_updates/team_updates.js
View File

@ -41,7 +41,7 @@ frappe.team_updates = {
me.add_row(d);
});
} else {
frappe.show_alert({message:__('No more updates'), indicator:'darkgrey'});
frappe.show_alert({message:__('No more updates'), indicator:'darkgray'});
me.more.parent().addClass('hidden');
}
}

2
erpnext/manufacturing/doctype/bom/bom_list.js
View File

@ -8,7 +8,7 @@ frappe.listview_settings['BOM'] = {
} else if(doc.is_active) {
return [__("Active"), "blue", "is_active,=,Yes"];
} else if(!doc.is_active) {
return [__("Not active"), "darkgrey", "is_active,=,No"];
return [__("Not active"), "darkgray", "is_active,=,No"];
}
}
};

4
erpnext/manufacturing/doctype/production_plan/production_plan_list.js
View File

@ -9,8 +9,8 @@ frappe.listview_settings['Production Plan'] = {
"Draft": "red",
"In Process": "orange",
"Completed": "green",
"Material Requested": "darkgrey",
"Cancelled": "darkgrey"
"Material Requested": "darkgray",
"Cancelled": "darkgray"
}[doc.status], "status,=," + doc.status];
}
}

2
erpnext/manufacturing/doctype/work_order/work_order_list.js
View File

@ -12,7 +12,7 @@ frappe.listview_settings['Work Order'] = {
"Not Started": "red",
"In Process": "orange",
"Completed": "green",
"Cancelled": "darkgrey"
"Cancelled": "darkgray"
}[doc.status], "status,=," + doc.status];
}
}

2
erpnext/selling/doctype/quotation/quotation.py
View File

@ -19,7 +19,7 @@ class Quotation(SellingController):
self.indicator_color = 'blue'
self.indicator_title = 'Submitted'
if self.valid_till and getdate(self.valid_till) < getdate(nowdate()):
self.indicator_color = 'darkgrey'
self.indicator_color = 'darkgray'
self.indicator_title = 'Expired'
def validate(self):

4
erpnext/selling/doctype/quotation/quotation_list.js
View File

@ -20,9 +20,9 @@ frappe.listview_settings['Quotation'] = {
} else if(doc.status==="Ordered") {
return [__("Ordered"), "green", "status,=,Ordered"];
} else if(doc.status==="Lost") {
return [__("Lost"), "darkgrey", "status,=,Lost"];
return [__("Lost"), "darkgray", "status,=,Lost"];
} else if(doc.status==="Expired") {
return [__("Expired"), "darkgrey", "status,=,Expired"];
return [__("Expired"), "darkgray", "status,=,Expired"];
}
}
};

4
erpnext/stock/doctype/batch/batch_list.js
View File

@ -2,9 +2,9 @@ frappe.listview_settings['Batch'] = {
add_fields: ["item", "expiry_date", "batch_qty", "disabled"],
get_indicator: (doc) => {
if (doc.disabled) {
return [__("Disabled"), "darkgrey", "disabled,=,1"];
return [__("Disabled"), "darkgray", "disabled,=,1"];
} else if (!doc.batch_qty) {
return [__("Empty"), "darkgrey", "batch_qty,=,0|disabled,=,0"];
return [__("Empty"), "darkgray", "batch_qty,=,0|disabled,=,0"];
} else if (doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date, frappe.datetime.nowdate()) <= 0) {
return [__("Expired"), "red", "expiry_date,not in,|expiry_date,<=,Today|batch_qty,>,0|disabled,=,0"]
} else {

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

@ -3,7 +3,7 @@ frappe.listview_settings['Delivery Note'] = {
"transporter_name", "grand_total", "is_return", "status", "currency"],
get_indicator: function(doc) {
if(cint(doc.is_return)==1) {
return [__("Return"), "darkgrey", "is_return,=,Yes"];
return [__("Return"), "darkgray", "is_return,=,Yes"];
} else if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"];
} else if (flt(doc.per_billed, 2) < 100) {

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
View File

@ -3,7 +3,7 @@ frappe.listview_settings['Purchase Receipt'] = {
"transporter_name", "is_return", "status", "per_billed", "currency"],
get_indicator: function(doc) {
if(cint(doc.is_return)==1) {
return [__("Return"), "darkgrey", "is_return,=,Yes"];
return [__("Return"), "darkgray", "is_return,=,Yes"];
} else if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"];
} else if (flt(doc.grand_total) !== 0 && flt(doc.per_billed, 2) < 100) {

2
erpnext/support/doctype/issue/issue_list.js
View File

@ -28,7 +28,7 @@ frappe.listview_settings['Issue'] = {
} else if (doc.status === 'Closed') {
return [__(doc.status), "green", "status,=," + doc.status];
} else {
return [__(doc.status), "darkgrey", "status,=," + doc.status];
return [__(doc.status), "darkgray", "status,=," + doc.status];
}
}
}

2
erpnext/templates/includes/address_row.html
View File

@ -2,7 +2,7 @@
<a href="/addresses?name={{ doc.name | urlencode }}" class="no-underline text-reset">
<div class="row">
<div class="col-3">
<span class="indicator {{ "red" if doc.address_type=="Office" else "green" if doc.address_type=="Billing" else "blue" if doc.address_type=="Shipping" else "darkgrey" }}">{{ doc.address_title }}</span>
<span class="indicator {{ "red" if doc.address_type=="Office" else "green" if doc.address_type=="Billing" else "blue" if doc.address_type=="Shipping" else "darkgray" }}">{{ doc.address_title }}</span>
</div>
<div class="col-2"> {{ _(doc.address_type) }} </div>
<div class="col-2"> {{ doc.city }} </div>

4
erpnext/templates/includes/issue_row.html
View File

@ -2,7 +2,7 @@
<a href="/issues?name={{ doc.name }}" class="no-underline">
<div class="row py-4 border-bottom">
<div class="col-3 d-flex align-items-center">
{% set indicator = 'red' if doc.status == 'Open' else 'darkgrey' %}
{% set indicator = 'red' if doc.status == 'Open' else 'darkgray' %}
{% set indicator = 'green' if doc.status == 'Closed' else indicator %}
<span class="d-inline-flex indicator {{ indicator }}"></span>
{{ doc.name }}
@ -10,7 +10,7 @@
<div class="col-5 text-muted">
{{ doc.subject }}</div>
<div class="col-2 d-flex align-items-center text-muted">
{% set indicator = 'red' if doc.status == 'Open' else 'darkgrey' %}
{% set indicator = 'red' if doc.status == 'Open' else 'darkgray' %}
{% set indicator = 'green' if doc.status == 'Closed' else indicator %}
{% set indicator = 'orange' if doc.status == 'Open' and doc.priority == 'Medium' else indicator %}
{% set indicator = 'yellow' if doc.status == 'Open' and doc.priority == 'Low' else indicator %}

2
erpnext/templates/includes/projects/project_row.html
View File

@ -15,7 +15,7 @@
</div>
</div>
{% else %}
<span class="indicator {{ "red" if doc.status=="Open" else "darkgrey" }}">
<span class="indicator {{ "red" if doc.status=="Open" else "darkgray" }}">
{{ doc.status }}</span>
{% endif %}
</div>

6
erpnext/templates/includes/projects/project_tasks.html
View File

@ -3,7 +3,7 @@
<a class="no-decoration task-link {{ task.css_seen }}" href="/tasks?name={{ task.name }}">
<div class='row project-item'>
<div class='col-xs-9'>
<span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgrey" }}" title="{{ task.status }}" > {{ task.subject }}</span>
<span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgray" }}" title="{{ task.status }}" > {{ task.subject }}</span>
<div class="small text-muted item-timestamp"
title="{{ frappe.utils.pretty_date(task.modified) }}">
{{ _("modified") }} {{ frappe.utils.pretty_date(task.modified) }}
@ -16,9 +16,9 @@
</span>
{% else %}
<span class="avatar avatar-small standard-image" title="Assigned to {{ task.todo.owner }}">
</span>
{% endif %}
{% endif %}
{% endif %} </div>
<div class='col-xs-2'>
<span class="pull-right list-comment-count small {{ "text-extra-muted" if task.comment_count==0 else "text-muted" }}">

6
erpnext/templates/includes/projects/project_timesheets.html
View File

@ -3,19 +3,19 @@
<a class="no-decoration timesheet-link {{ timesheet.css_seen }}" href="/timesheet/{{ timesheet.info.name}}">
<div class='row project-item'>
<div class='col-xs-10'>
<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}" > {{ timesheet.info.name }} </span>
<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgray" }}" title="{{ timesheet.info.status }}" > {{ timesheet.info.name }} </span>
<div class="small text-muted item-timestamp">
{{ _("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ _("to") }} {{ frappe.format_date(timesheet.to_time) }}
</div>
</div>
<div class='col-xs-1' style="margin-right:-30px;">
<span class="avatar avatar-small" title="{{ timesheet.info.modified_by }}"> <img src="{{ timesheet.info.user_image }}" style="display:flex;"></span>
</div>
</div>
<div class='col-xs-1'>
<span class="pull-right list-comment-count small {{ "text-extra-muted" if timesheet.comment_count==0 else "text-muted" }}">
<i class="octicon octicon-comment-discussion"></i>
{{ timesheet.info.comment_count }}
</span>
</span>
</div>
</div>
</a>

2
erpnext/templates/includes/timesheet/timesheet_row.html
View File

@ -1,7 +1,7 @@
<div class="web-list-item transaction-list-item">
<div class="row">
<div class="col-xs-3">
<span class='indicator {{ "red" if doc.status=="Cancelled" else "green" if doc.status=="Billed" else "blue" if doc.status=="Submitted" else "darkgrey" }} small'>
<span class='indicator {{ "red" if doc.status=="Cancelled" else "green" if doc.status=="Billed" else "blue" if doc.status=="Submitted" else "darkgray" }} small'>
{{ doc.name }}
</span>
</div>

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

@ -1,7 +1,7 @@
<div class="web-list-item transaction-list-item">
<div class="row">
<div class="col-sm-4">
<span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
<span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgray") }}">
{{ doc.name }}</span>
<div class="small text-muted transaction-time"
title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">

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

@ -20,7 +20,7 @@
<div class="row transaction-subheading">
<div class="col-xs-6">
<span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
<span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgray") }}">
{{ _(doc.get('indicator_title')) or _(doc.status) or _("Submitted") }}
</span>
</div>

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

@ -34,7 +34,7 @@
<div class="row transaction-subheading">
<div class="col-6">
<span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
<span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgray") }}">
{{ _(doc.get('indicator_title')) or _(doc.status) or _("Submitted") }}
</span>
</div>

6
erpnext/templates/pages/rfq.html
View File

@ -77,13 +77,13 @@
<div class="web-list-item transaction-list-item quotations" idx="{{d.name}}">
<div class="row">
<div class="col-sm-6">
<span class="indicator darkgrey">{{d.name}}</span>
<span class="indicator darkgray">{{d.name}}</span>
</div>
<div class="col-sm-3">
<span class="small darkgrey">{{d.status}}</span>
<span class="small darkgray">{{d.status}}</span>
</div>
<div class="col-sm-3">
<span class="small darkgrey">{{d.transaction_date}}</span>
<span class="small darkgray">{{d.transaction_date}}</span>
</div>
</div>
<a class="transaction-item-link" href="/quotations/{{d.name}}">Link</a>