aboutsummaryrefslogtreecommitdiffstats
path: root/servo/templates/products
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2015-11-26 23:20:10 +0200
committerFilipp Lepalaan <filipp@mac.com>2015-11-26 23:20:10 +0200
commit3f38c74a145e587a257fab0e0f27a03ca3c2c9eb (patch)
treede699e89769cbda7040a414004b3af13bca8c03a /servo/templates/products
parentb299a35443a70c8262fd0ec49d8fddb4fe73f7eb (diff)
downloadServo-3f38c74a145e587a257fab0e0f27a03ca3c2c9eb.tar.gz
Servo-3f38c74a145e587a257fab0e0f27a03ca3c2c9eb.tar.bz2
Servo-3f38c74a145e587a257fab0e0f27a03ca3c2c9eb.zip
WIP adding location-based stocking report
Diffstat (limited to 'servo/templates/products')
-rwxr-xr-xservo/templates/products/index.html8
-rwxr-xr-xservo/templates/products/view.html8
2 files changed, 8 insertions, 8 deletions
diff --git a/servo/templates/products/index.html b/servo/templates/products/index.html
index 1bb75db..be5f8f2 100755
--- a/servo/templates/products/index.html
+++ b/servo/templates/products/index.html
@@ -26,15 +26,15 @@
<i class="icon-cog"></i> <span class="caret"></span>
</a>
<ul class="dropdown-menu">
- {% if group.pk and perms.servo.add_product %}
+ {% if group.pk and perms.servo.add_product %}
<li><a href="{% url 'products-edit_category' group.slug %}" data-modal="#modal">{% trans "Edit Category" %}</a></li>
<li><a href="{% url 'products-delete_category' group.slug %}" data-modal="#modal">{% trans "Delete Category" %}</a></li>
- {% else %}
+ {% else %}
<li class="disabled"><a href="#">{% trans "Edit Category" %}</a></li>
<li class="disabled"><a href="#">{% trans "Delete Category" %}</a></li>
- {% endif %}
+ {% endif %}
<li class="divider"></li>
- <li><a href="{% url 'products-download' %}">{% trans "Download Products" %}</a></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-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>
diff --git a/servo/templates/products/view.html b/servo/templates/products/view.html
index 589e7f1..740621d 100755
--- a/servo/templates/products/view.html
+++ b/servo/templates/products/view.html
@@ -135,13 +135,13 @@
</thead>
{% for i in sales %}
<tr>
- {% with i.order as order %}
+ {% with i.order as order %}
<td><a href="{{ order.get_absolute_url }}">{{ order.code }}</a></td>
<td>{{ order.customer_name|default:"-" }}</td>
<td>{{ i.price|currency }}</td>
<td>{{ i.created_at|date:"SHORT_DATE_FORMAT" }}</td>
<td>{{ i.dispatched_at|date:"SHORT_DATE_FORMAT" }}</td>
- {% endwith %}
+ {% endwith %}
</tr>
{% empty %}
<tr><td colspan="5" class="empty muted">{% trans "No Sales Orders" %}</td></tr>
@@ -188,9 +188,9 @@
{% for i in invoices %}
<tr>
<td><a href="{{ i.invoice.get_absolute_url }}">{{ i.invoice.pk|safe }}</a></td>
- {% with i.invoice.order as order %}
+ {% with i.invoice.order as order %}
<td><a href="{{ order.get_absolute_url }}">{{ order.code }}</a></td>
- {% endwith %}
+ {% endwith %}
<td>{{ i.created_at|date:"SHORT_DATE_FORMAT" }}</td>
<td>{{ i.price|currency }}</td>
</tr>