aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xservo/templates/orders/products.html5
-rwxr-xr-xservo/templates/orders/toolbar.html6
2 files changed, 6 insertions, 5 deletions
diff --git a/servo/templates/orders/products.html b/servo/templates/orders/products.html
index 4476ae8..72540ab 100755
--- a/servo/templates/orders/products.html
+++ b/servo/templates/orders/products.html
@@ -88,7 +88,10 @@
{% endfor %}
</tbody>
</table>
-<a href="{% url 'products-choose' order_id=order.pk %}" data-modal="#modal" class="btn {% if not order.is_editable %}disabled{% endif %} pull-right"><i class="icon-plus"></i> {% trans "Add Product" %}</a>
+<div class="pull-right">
+ <a class="btn {% if not order.can_order_products %}disabled{% endif %}" href="{% url 'orders-reserve_products' order.pk %}" data-modal="#modal">{% trans "Reserve Products" %}</a>
+ <a href="{% url 'products-choose' order_id=order.pk %}" data-modal="#modal" class="btn {% if not order.is_editable %}disabled{% endif %}"><i class="icon-plus"></i> {% trans "Add Product" %}</a>
+</div>
{% endwith %}
<p class="clearfix">
<hr/>
diff --git a/servo/templates/orders/toolbar.html b/servo/templates/orders/toolbar.html
index 6588a52..40a1405 100755
--- a/servo/templates/orders/toolbar.html
+++ b/servo/templates/orders/toolbar.html
@@ -98,11 +98,9 @@
</li>
<li class="divider"></li>
{% if order.can_order_products %}
- <li><a href="{% url 'orders-reserve_products' order.pk %}" data-modal="#modal">{% trans "Reserve Products" %}</a></li>
- <li><a href="{% url 'purchases-create_po' order_id=order.pk %}">{% trans "Order Products" %}</a></li>
+ <li><a href="{% url 'purchases-create_po' order_id=order.pk %}">{% trans "Create Purchase Order" %}</a></li>
{% else %}
- <li class="disabled"><a href="#">{% trans "Reserve Products" %}</a></li>
- <li class="disabled"><a href="#">{% trans "Order Products" %}</a></li>
+ <li class="disabled"><a href="#">{% trans "Create Purchase Order" %}</a></li>
{% endif %}
<li class="divider"></li>
{% if perms.servo.delete_order and order.is_editable %}