aboutsummaryrefslogtreecommitdiffstats
path: root/servo/templates
diff options
context:
space:
mode:
Diffstat (limited to 'servo/templates')
-rwxr-xr-xservo/templates/orders/products.html12
-rwxr-xr-xservo/templates/products/index.html2
2 files changed, 7 insertions, 7 deletions
diff --git a/servo/templates/orders/products.html b/servo/templates/orders/products.html
index e8185af..7088945 100755
--- a/servo/templates/orders/products.html
+++ b/servo/templates/orders/products.html
@@ -25,7 +25,7 @@
<strong><a href="{% url 'products-get_info' item.code order.location.pk %}" data-modal="#modal">{{ product.code }}</a></strong><br/>
<div>{{ item.title }}</div>
{% if item.sn or item.kbb_sn %}
- <p><small class="muted">{% trans "Serial Number" %}: {{ item.sn }}{% if item.kbb_sn %}, KBB: {{ item.kbb_sn }}{% endif %}</small></p>
+ <p><small class="muted">{% trans "Serial Number" %}: {{ item.sn|default:"-" }}{% if item.kbb_sn %}, KBB: {{ item.kbb_sn }}{% endif %}</small></p>
{% endif %}
{% if product.is_apple_part %}
{% for repair in order.get_repairs %}
@@ -57,11 +57,11 @@
<td style="width:125px">
{% if order.is_editable %}
<div class="btn-group">
- {% if item.should_report %}
+ {% if item.should_report %}
<a href="{% url 'orders-report_product' pk=order.id item_id=item.id %}" title="Toggle report flag" class="btn btn-small btn-success nofollow active" data-toggle="button"><i class="icon-ok"></i></a>
- {% else %}
+ {% else %}
<a href="{% url 'orders-report_product' pk=order.id item_id=item.id %}" title="Toggle report flag" class="btn btn-small btn-success nofollow" data-toggle="button"><i class="icon-ok icon-white"></i></a>
- {% endif %}
+ {% endif %}
</div>
<div class="btn-group">
<a href="{% url 'orders-edit_product' pk=order.id item_id=item.id %}" class="btn btn-small" title="{% trans "Edit" %}" data-modal="#modal"><i class="icon-pencil"></i></a>
@@ -95,7 +95,7 @@
{% endwith %}
<p class="clearfix">
<hr/>
- {% if order.serviceorderitem_set.count %}
+{% if order.serviceorderitem_set.count %}
<h3 class="pull-right">{% trans "Order Total" %}: <a href="#" class="tt" title="{{ order.net_total|currency }}">{{ order.gross_total|currency }}</a></h3>
- {% endif %}
+{% endif %}
</p>
diff --git a/servo/templates/products/index.html b/servo/templates/products/index.html
index be5f8f2..24c4d5f 100755
--- a/servo/templates/products/index.html
+++ b/servo/templates/products/index.html
@@ -35,7 +35,7 @@
{% endif %}
<li class="divider"></li>
<li><a href="{% url 'products-download' group.slug %}">{% trans "Download Products" %}</a></li>
- <li class="disabled"><a href="{% url 'products-get_inventory_report' %}">{% trans "Download Inventory Report" %}</a></li>
+ <li><a href="{% url 'products-get_inventory_report' %}">{% trans "Download Inventory Report" %}</a></li>
<li><a href="{% url 'products-upload_products' %}" data-modal="#modal">{% trans "Upload Products" %}</a></li>
<li><a href="{% url 'products-upload_gsx_parts' %}" data-modal="#modal">{% trans "Upload Parts Database" %}</a></li>
</ul>