Merge branch 'master' of https://github.com/inventree/InvenTree into price-history

InvenTree/part/templates/part/bom.html

@@ -16,13 +16,13 @@
 <div class='alert alert-block alert-info'>
 {% else %}
 <div class='alert alert-block alert-danger'>
-    The BOM for <i>{{ part.full_name }}</i> has changed, and must be validated.<br>
+    {% blocktrans with part=part.full_name %}The BOM for <i>{{ part }}</i> has changed, and must be validated.<br>{% endblocktrans %}
 {% endif %}
-    The BOM for <i>{{ part.full_name }}</i> was last checked by {{ part.bom_checked_by }} on {{ part.bom_checked_date }}
+    {% blocktrans with part=part.full_name checker=part.bom_checked_by check_date=part.bom_checked_date %}The BOM for <i>{{ part }}</i> was last checked by {{ checker }} on {{ check_date }}{% endblocktrans %}
 </div>
 {% else %}
 <div class='alert alert-danger alert-block'>
-    <b>The BOM for <i>{{ part.full_name }}</i> has not been validated.</b>
+    <b>{% blocktrans with part=part.full_name %}The BOM for <i>{{ part }}</i> has not been validated.{% endblocktrans %}</b>
 </div>
 {% endif %}
 

InvenTree/part/templates/part/bom_upload/select_fields.html

@@ -44,7 +44,7 @@
                     <div>
                         <input type='hidden' name='col_name_{{ forloop.counter0 }}' value='{{ col.name }}'/>
                         {{ col.name }}
-                        <button class='btn btn-default btn-remove' onClick='removeColFromBomWizard()' id='del_col_{{ forloop.counter0 }}' style='display: inline; float: right;' title='Remove column'>
+                        <button class='btn btn-default btn-remove' onClick='removeColFromBomWizard()' id='del_col_{{ forloop.counter0 }}' style='display: inline; float: right;' title='{% trans "Remove column" %}'>
                             <span col_id='{{ forloop.counter0 }}' class='fas fa-trash-alt icon-red'></span>
                         </button>
                     </div>
@@ -73,7 +73,7 @@
             {% for row in bom_rows %}
             <tr>
                 <td>
-                    <button class='btn btn-default btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='Remove row'>
+                    <button class='btn btn-default btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='{% trans "Remove row" %}'>
                         <span row_id='{{ forloop.counter }}' class='fas fa-trash-alt icon-red'></span>
                     </button>
                 </td>

InvenTree/part/templates/part/bom_upload/upload_file.html

@@ -24,7 +24,7 @@
 </div>
 
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
-    <button type="submit" class="save btn btn-default">Upload File</button>
+    <button type="submit" class="save btn btn-default">{% trans 'Upload File' %}</button>
     {% csrf_token %}
     {% load crispy_forms_tags %}
 

InvenTree/part/templates/part/bom_validate.html

@@ -1,10 +1,12 @@
 {% extends "modal_form.html" %}
 
+{% load i18n %}
+
 {% block pre_form_content %}
-Confirm that the Bill of Materials (BOM) is valid for:<br><i>{{ part.full_name }}</i>
+{% blocktrans with part.full_name as part %}Confirm that the Bill of Materials (BOM) is valid for:<br><i>{{ part }}</i>{% endblocktrans %}
 
 <div class='alert alert-warning alert-block'>
-    This will validate each line in the BOM.
+    {% trans 'This will validate each line in the BOM.' %}
 </div>
 
 {% endblock %}

InvenTree/part/templates/part/params.html

@@ -65,8 +65,8 @@
             reload: true,
             secondary: [{
                 field: 'template',
-                label: 'New Template',
-                title: 'Create New Parameter Template',
+                label: '{% trans "New Template" %}',
+                title: '{% trans "Create New Parameter Template" %}',
                 url: "{% url 'part-param-template-create' %}"
             }],
         });

InvenTree/part/templates/part/part_base.html

@@ -246,7 +246,7 @@
         launchModalForm(
             "{% url 'part-pricing' part.id %}",
             {
-                submit_text: 'Calculate',
+                submit_text: '{% trans "Calculate" %}',
                 hideErrorMessage: true,
             }
         );

InvenTree/part/templates/part/part_pricing.html

@@ -4,33 +4,33 @@
 {% block pre_form_content %}
 
 <div class='alert alert-info alert-block'>
-Pricing information for:<br>
+{% trans 'Pricing information for:' %}<br>
 {{ part }}.
 </div>
 
-<h4>Quantity</h4>
+<h4>{% trans 'Quantity' %}</h4>
 <table class='table table-striped table-condensed'>
     <tr>
-        <td><b>Part</b></td>
+        <td><b>{% trans 'Part' %}</b></td>
         <td colspan='2'>{{ part  }}</td>
     </tr>
     <tr>
-        <td><b>Quantity</b></td>
+        <td><b>{% trans 'Quantity' %}</b></td>
         <td colspan='2'>{{ quantity }}</td>
     </tr>
 </table>
     {% if part.supplier_count > 0 %}
-    <h4>Supplier Pricing</h4>
+    <h4>{% trans 'Supplier Pricing' %}</h4>
 <table class='table table-striped table-condensed'>
     {% if min_total_buy_price %}
     <tr>
-        <td><b>Unit Cost</b></td>
+        <td><b>{% trans 'Unit Cost' %}</b></td>
         <td>Min: {% include "price.html" with price=min_unit_buy_price %}</td>
         <td>Max: {% include "price.html" with price=max_unit_buy_price %}</td>
     </tr>
     {% if quantity > 1 %}
     <tr>
-        <td><b>Total Cost</b></td>
+        <td><b>{% trans 'Total Cost' %}</b></td>
         <td>Min: {% include "price.html" with price=min_total_buy_price %}</td>
         <td>Max: {% include "price.html" with price=max_total_buy_price %}</td>
     </tr>
@@ -38,7 +38,7 @@ Pricing information for:<br>
     {% else %}
     <tr>
         <td colspan='3'>
-            <span class='warning-msg'><i>No supplier pricing available</i></span>
+            <span class='warning-msg'><i>{% trans 'No supplier pricing available' %}</i></span>
         </td>
     </tr>
     {% endif %}
@@ -46,17 +46,17 @@ Pricing information for:<br>
     {% endif %}
 
     {% if part.bom_count > 0 %}
-    <h4>BOM Pricing</h4>
+    <h4>{% trans 'BOM Pricing' %}</h4>
 <table class='table table-striped table-condensed'>
     {% if min_total_bom_price %}
     <tr>
-        <td><b>Unit Cost</b></td>
+        <td><b>{% trans 'Unit Cost' %}</b></td>
         <td>Min: {% include "price.html" with price=min_unit_bom_price %}</td>
         <td>Max: {% include "price.html" with price=max_unit_bom_price %}</td>
     </tr>
     {% if quantity > 1 %}
     <tr>
-        <td><b>Total Cost</b></td>
+        <td><b>{% trans 'Total Cost' %}</b></td>
         <td>Min: {% include "price.html" with price=min_total_bom_price %}</td>
         <td>Max: {% include "price.html" with price=max_total_bom_price %}</td>
     </tr>
@@ -64,14 +64,14 @@ Pricing information for:<br>
     {% if part.has_complete_bom_pricing == False %}
     <tr>
         <td colspan='3'>
-            <span class='warning-msg'><i>Note: BOM pricing is incomplete for this part</i></span>
+            <span class='warning-msg'><i>{% trans 'Note: BOM pricing is incomplete for this part' %}</i></span>
         </td>
     </tr>
     {% endif %}
     {% else %}
     <tr>
         <td colspan='3'>
-            <span class='warning-msg'><i>No BOM pricing available</i></span>
+            <span class='warning-msg'><i>{% trans 'No BOM pricing available' %}</i></span>
         </td>
     </tr>
     {% endif %}
@@ -151,7 +151,7 @@ Pricing information for:<br>
 {% if min_unit_buy_price or min_unit_bom_price %}
 {% else %}
 <div class='alert alert-danger alert-block'>
-    No pricing information is available for this part.
+    {% trans 'No pricing information is available for this part.' %}
 </div>
 {% endif %}
 

InvenTree/part/templates/part/stock.html

@@ -40,7 +40,7 @@
         params: {
             part: {{ part.id }},
             location_detail: true,
-            part_detail: true,
+            part_detail: false,
         },
         groupByField: 'location',
         buttons: [