From d0b7d91ca4e2157c2de67be53716107990813094 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 28 Oct 2020 18:30:38 +1100 Subject: [PATCH] Update multiple templates with fontawesome icons --- .../templates/company/assigned_stock.html | 2 +- .../templates/company/detail_part.html | 35 ++++++++++++------- .../templates/company/purchase_orders.html | 3 +- .../templates/company/sales_orders.html | 4 ++- .../order/templates/order/sales_orders.html | 3 +- InvenTree/part/templates/part/allocation.html | 8 ++--- InvenTree/part/templates/part/bom.html | 12 +++++-- InvenTree/part/templates/part/category.html | 32 +++++++++-------- InvenTree/part/templates/part/orders.html | 4 ++- InvenTree/part/templates/part/params.html | 4 ++- InvenTree/part/templates/part/supplier.html | 4 ++- InvenTree/stock/templates/stock/item.html | 4 ++- .../stock/templates/stock/item_tests.html | 12 +++++-- InvenTree/templates/attachment_table.html | 4 ++- InvenTree/templates/stock_table.html | 8 +++-- 15 files changed, 90 insertions(+), 49 deletions(-) diff --git a/InvenTree/company/templates/company/assigned_stock.html b/InvenTree/company/templates/company/assigned_stock.html index 392dcaa999..b1a98a155a 100644 --- a/InvenTree/company/templates/company/assigned_stock.html +++ b/InvenTree/company/templates/company/assigned_stock.html @@ -15,7 +15,7 @@ -
+
{% endblock %} diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html index 463bf5814d..d10da0b60c 100644 --- a/InvenTree/company/templates/company/detail_part.html +++ b/InvenTree/company/templates/company/detail_part.html @@ -10,21 +10,30 @@
{% if roles.purchase_order.change %} -
- {% if roles.purchase_order.add %} - - {% endif %} -
- - +
+
+ + +
+
+
{% endif %} diff --git a/InvenTree/company/templates/company/purchase_orders.html b/InvenTree/company/templates/company/purchase_orders.html index a0ef1612fa..ce0763ae74 100644 --- a/InvenTree/company/templates/company/purchase_orders.html +++ b/InvenTree/company/templates/company/purchase_orders.html @@ -12,7 +12,8 @@ {% if roles.purchase_order.add %}
- +
diff --git a/InvenTree/company/templates/company/sales_orders.html b/InvenTree/company/templates/company/sales_orders.html index 03c64d5b88..d84cfc1d73 100644 --- a/InvenTree/company/templates/company/sales_orders.html +++ b/InvenTree/company/templates/company/sales_orders.html @@ -12,7 +12,9 @@ {% if roles.sales_order.add %}
- +
diff --git a/InvenTree/order/templates/order/sales_orders.html b/InvenTree/order/templates/order/sales_orders.html index dfe09d5d0d..acfd875078 100644 --- a/InvenTree/order/templates/order/sales_orders.html +++ b/InvenTree/order/templates/order/sales_orders.html @@ -15,7 +15,8 @@ InvenTree | {% trans "Sales Orders" %}
{% if roles.sales_order.add %} - + {% endif %}
diff --git a/InvenTree/part/templates/part/allocation.html b/InvenTree/part/templates/part/allocation.html index 7892fe30e5..e574742ad5 100644 --- a/InvenTree/part/templates/part/allocation.html +++ b/InvenTree/part/templates/part/allocation.html @@ -17,15 +17,15 @@ {% for allocation in part.build_order_allocations %} - {% trans "Build Order" %}: {{ allocation.build.pk }} - {% trans "Stock Item" %}: {{ allocation.stock_item.id }} + {% trans "Build Order" %}: {{ allocation.build }} + {% trans "Stock Item" %}: {{ allocation.stock_item }} {% decimal allocation.quantity %} {% endfor %} {% for allocation in part.sales_order_allocations %} - {% trans "Sales Order" %}: {{ allocation.line.order.pk }} - {% trans "Stock Item" %}: {{ allocation.item.id }} + {% trans "Sales Order" %}: {{ allocation.line.order }} + {% trans "Stock Item" %}: {{ allocation.item }} {% decimal allocation.quantity %} {% endfor %} diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html index 7b687f9aa0..b0e7dde81d 100644 --- a/InvenTree/part/templates/part/bom.html +++ b/InvenTree/part/templates/part/bom.html @@ -49,12 +49,18 @@ {% elif part.active %} {% if roles.part.change %} - + {% if part.is_bom_valid == False %} - + {% endif %} {% endif %} - + {% endif %}
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html index d73aba0291..6992d9bac4 100644 --- a/InvenTree/part/templates/part/category.html +++ b/InvenTree/part/templates/part/category.html @@ -107,22 +107,24 @@
-
+
+ + {% if roles.part.add %} + + {% endif %}
- - {% if roles.part.add %} - - {% endif %} -
- - -
+ +
diff --git a/InvenTree/part/templates/part/orders.html b/InvenTree/part/templates/part/orders.html index 8fe5e71688..3611418c6c 100644 --- a/InvenTree/part/templates/part/orders.html +++ b/InvenTree/part/templates/part/orders.html @@ -11,7 +11,9 @@
- +
diff --git a/InvenTree/part/templates/part/params.html b/InvenTree/part/templates/part/params.html index ba8aa0566d..af1c4cdab6 100644 --- a/InvenTree/part/templates/part/params.html +++ b/InvenTree/part/templates/part/params.html @@ -11,7 +11,9 @@
{% if roles.part.add %} - + {% endif %}
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html index 4de56b0d2e..5d151eb4cc 100644 --- a/InvenTree/part/templates/part/supplier.html +++ b/InvenTree/part/templates/part/supplier.html @@ -10,7 +10,9 @@
- +
    diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html index b19887c8aa..8f8502af2a 100644 --- a/InvenTree/stock/templates/stock/item.html +++ b/InvenTree/stock/templates/stock/item.html @@ -14,7 +14,9 @@ {% if roles.stock.change %}
    - +
    {% endif %} diff --git a/InvenTree/stock/templates/stock/item_tests.html b/InvenTree/stock/templates/stock/item_tests.html index 6bc120711d..11ab443d0c 100644 --- a/InvenTree/stock/templates/stock/item_tests.html +++ b/InvenTree/stock/templates/stock/item_tests.html @@ -14,10 +14,16 @@
    {% if user.is_staff %} - + {% endif %} - - + +
    diff --git a/InvenTree/templates/attachment_table.html b/InvenTree/templates/attachment_table.html index f7d5411290..d13b7b33b1 100644 --- a/InvenTree/templates/attachment_table.html +++ b/InvenTree/templates/attachment_table.html @@ -3,7 +3,9 @@ {% if roles.stock.change %}
    - +
    {% endif %} diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html index b4b1b9d50f..9308f1912c 100644 --- a/InvenTree/templates/stock_table.html +++ b/InvenTree/templates/stock_table.html @@ -3,11 +3,15 @@
    - + {% if read_only %} {% else %} {% if roles.stock.add %} - + {% endif %} {% if roles.stock.change or roles.stock.delete %}