inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

Merge remote-tracking branch 'inventree/master' into partial-shipment

Browse Source
This commit is contained in:
Oliver 2021-11-26 22:08:17 +11:00
commit 760c80dbb6
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/templates/part/detail.html
View File

@ -763,10 +763,12 @@
part_2: { part_2: {
label: '{% trans "Related Part" %}', label: '{% trans "Related Part" %}',
filters: { filters: {
exclude_id: {{ part.pk }},
exclude_related: {{ part.pk }}, exclude_related: {{ part.pk }},
} }
} }
}, },
focus: 'part_2',
title: '{% trans "Add Related Part" %}', title: '{% trans "Add Related Part" %}',
onSuccess: function() { onSuccess: function() {
$('#related-parts-table').bootstrapTable('refresh'); $('#related-parts-table').bootstrapTable('refresh');

2
InvenTree/templates/InvenTree/settings/user.html
View File

@ -210,6 +210,7 @@
<div class='input-group-append'> <div class='input-group-append'>
<input type="submit" value="{% trans 'Set Language' %}" class="btn btn btn-primary"> <input type="submit" value="{% trans 'Set Language' %}" class="btn btn btn-primary">
</div> </div>
</div>
<p>{% trans "Some languages are not complete" %} <p>{% trans "Some languages are not complete" %}
{% if ALL_LANG %} {% if ALL_LANG %}
. <a href="{% url 'settings' %}">{% trans "Show only sufficent" %}</a> . <a href="{% url 'settings' %}">{% trans "Show only sufficent" %}</a>
@ -217,7 +218,6 @@
{% trans "and hidden." %} <a href="?alllang">{% trans "Show them too" %}</a> {% trans "and hidden." %} <a href="?alllang">{% trans "Show them too" %}</a>
{% endif %} {% endif %}
</p> </p>
</div>
</form> </form>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">

3
docker/init.sh
View File

@ -38,5 +38,8 @@ fi
cd ${INVENTREE_HOME} cd ${INVENTREE_HOME}
# Collect translation file stats
invoke translate-stats
# Launch the CMD *after* the ENTRYPOINT completes # Launch the CMD *after* the ENTRYPOINT completes
exec "$@" exec "$@"