Merge pull request #1897 from matmair/price-terms

updating language to be clearer
This commit is contained in:
Oliver 2021-08-04 09:03:13 +10:00 committed by GitHub
commit 8daf601f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -899,7 +899,7 @@
{% for line in price_history %}'{{ line.date }}',{% endfor %} {% for line in price_history %}'{{ line.date }}',{% endfor %}
], ],
datasets: [{ datasets: [{
label: '{% blocktrans %}Single Price - {{currency}}{% endblocktrans %}', label: '{% blocktrans %}Purchase Unit Price - {{currency}}{% endblocktrans %}',
backgroundColor: 'rgba(255, 99, 132, 0.2)', backgroundColor: 'rgba(255, 99, 132, 0.2)',
borderColor: 'rgb(255, 99, 132)', borderColor: 'rgb(255, 99, 132)',
yAxisID: 'y', yAxisID: 'y',
@ -911,7 +911,7 @@
}, },
{% if 'price_diff' in price_history.0 %} {% if 'price_diff' in price_history.0 %}
{ {
label: '{% blocktrans %}Single Price Difference - {{currency}}{% endblocktrans %}', label: '{% blocktrans %}Unit Price-Cost Difference - {{currency}}{% endblocktrans %}',
backgroundColor: 'rgba(68, 157, 68, 0.2)', backgroundColor: 'rgba(68, 157, 68, 0.2)',
borderColor: 'rgb(68, 157, 68)', borderColor: 'rgb(68, 157, 68)',
yAxisID: 'y2', yAxisID: 'y2',
@ -923,7 +923,7 @@
hidden: true, hidden: true,
}, },
{ {
label: '{% blocktrans %}Part Single Price - {{currency}}{% endblocktrans %}', label: '{% blocktrans %}Supplier Unit Cost - {{currency}}{% endblocktrans %}',
backgroundColor: 'rgba(70, 127, 155, 0.2)', backgroundColor: 'rgba(70, 127, 155, 0.2)',
borderColor: 'rgb(70, 127, 155)', borderColor: 'rgb(70, 127, 155)',
yAxisID: 'y', yAxisID: 'y',

View File

@ -161,7 +161,7 @@
<div class='panel-content'> <div class='panel-content'>
<h4>{% trans 'Stock Pricing' %} <h4>{% trans 'Stock Pricing' %}
<i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part. <i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.
The part single price is the current purchase price for that supplier part."></i> The Supplier Unit Cost is the current purchase price for that supplier part."></i>
</h4> </h4>
{% if price_history|length > 0 %} {% if price_history|length > 0 %}
<div style="max-width: 99%; min-height: 300px"> <div style="max-width: 99%; min-height: 300px">

View File

@ -262,13 +262,13 @@ function loadBomTable(table, options) {
cols.push( cols.push(
{ {
field: 'price_range', field: 'price_range',
title: '{% trans "Buy Price" %}', title: '{% trans "Supplier Cost" %}',
sortable: true, sortable: true,
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
if (value) { if (value) {
return value; return value;
} else { } else {
return "<span class='warning-msg'>{% trans 'No pricing available' %}</span>"; return "<span class='warning-msg'>{% trans 'No supplier pricing available' %}</span>";
} }
} }
}); });