Inventory bug fixes

and performance enhancements

3 files changed, 15 insertions, 16 deletions

diff --git a/servo/templates/orders/reserve_products.html b/servo/templates/orders/reserve_products.html
index 318a28d..08640b5 100755
--- a/servo/templates/orders/reserve_products.html
+++ b/servo/templates/orders/reserve_products.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 
 {% block header %}
-    {% blocktrans with id=order.code %}Reserve all products in order {{ id }}?{% endblocktrans %}
+    {% blocktrans with id=order.code %}Reserve products in order {{ id }}{% endblocktrans %}
 {% endblock header %}
 
 {% block footer %}
-<form action="{{ action }}" method="post" accept-charset="utf-8">
+<form action="{{ request.path }}" method="post" accept-charset="utf-8">
     {% csrf_token %}
     <button class="btn btn-primary" type="submit">{% trans "Reserve" %}</button>
 </form>
diff --git a/servo/templates/products/get_info.html b/servo/templates/products/get_info.html
index be024e2..262d1e8 100755
--- a/servo/templates/products/get_info.html
+++ b/servo/templates/products/get_info.html
@@ -38,7 +38,7 @@
 {% endifchanged %}
 <dl class="dl-horizontal">
   <dt>{% trans "Stocked" %}</dt>
-  <dd>{{ i.amount_stocked }}</dd>
+  <dd>{{ i.amount_stocked|default:"-" }}</dd>
   <dt>{% trans "Ordered" %}</dt>
   <dd>{{ i.amount_ordered|default:"-" }}</dd>
   <dt>{% trans "Reserved" %}</dt>
@@ -56,4 +56,4 @@
   <a class="btn btn-default" href="{% url 'products-edit_product' pk=product.pk group='all' %}">{% trans "Edit" %}</a>
 {% endif %}
   <button type="submit" class="btn btn-primary" data-dismiss="modal">{% trans "Done" %}</button>
-{% endblock footer %}
\ No newline at end of file
+{% endblock footer %}
diff --git a/servo/templates/shipments/list_incoming.html b/servo/templates/shipments/list_incoming.html
index 3c9da41..96289aa 100755
--- a/servo/templates/shipments/list_incoming.html
+++ b/servo/templates/shipments/list_incoming.html
@@ -1,8 +1,7 @@
 {% extends "shipments/index.html" %}
 {% load i18n %}
 
-{% block toolbar %}
-{% endblock toolbar %}
+{% block toolbar %}{% endblock toolbar %}
 
 {% block second_column %}
 {% include "snippets/filtering_form.html" %}
@@ -26,24 +25,24 @@
       {% if can_receive %}
         <td><input type="checkbox" name="id" value="{{ i.pk|safe }}" class="toggle-submit"/></td>
       {% endif %}
-      {% with i.product as p %}
-        <td data-value="{{ p.code }}">
-          <strong><a href="{% url 'shipments-view_incoming' i.pk %}" data-modal="#modal">{{ p.code }}</a></strong><br/>{{ p.title }}
+        <td data-value="{{ i.code }}">
+          <strong><a href="{% url 'shipments-view_incoming' i.pk %}" data-modal="#modal">{{ i.code }}</a></strong><br/>{{ i.title }}
         </td>
-      {% endwith %}
       {% with i.purchase_order as po %}
-        <td data-value="{{ po.sales_order.code }}">
-        {% if po.sales_order %}
-          <a href="{% url 'orders-edit' po.sales_order.pk %}">{{ po.sales_order.code }}</a>
+        <td data-value="{{ i.sales_order_ref }}">
+        {% if i.sales_order %}
+          <a href="{% url 'orders-edit' i.sales_order_id %}">{{ i.sales_order_ref }}</a>
         {% endif %}
-          <br/><small class="muted">{{ po.reference }}</small>
+          <br/><small class="muted">{{ i.purchase_order_ref }}</small>
         </td>
         <td>{{ po.confirmation }}</td>
-        <td>{{ po.created_by }}<br/><small class="muted">{{ po.submitted_at|date:"SHORT_DATE_FORMAT" }}</small></td>
+        <td>{{ i.user_fullname }}<br/><small class="muted">{{ i.created_at|date:"SHORT_DATE_FORMAT" }}</small></td>
       {% endwith %}
       </tr>
       {% empty %}
-      <tr><td colspan="7" class="muted empty">{% trans "No incoming products" %}</td></tr>
+      <tr>
+        <td colspan="7" class="muted empty">{% trans "No incoming products" %}</td>
+      </tr>
       {% endfor %}
     </tbody>
   </table>