inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-20 22:06:28 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425

Browse Source
This commit is contained in:
Matthias
2021-05-06 14:54:26 +02:00
parent 66f198baa9 39d4129157
commit b09f49aaa5
8 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@
{% if part.salable and roles.sales_order.view %}
<li class='list-group-item {% if tab == "sales-prices" %}active{% endif %}' title='{% trans "Sales Price Information" %}'>
<a href='{% url "part-sale-prices" part.id %}'>
<span class='menu-tab-icon fas fa-dollar-sign'></span>
<span class='menu-tab-icon fas fa-dollar-sign' style='width: 20px;'></span>
{% trans "Sale Price" %}
</a>
</li>

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

@ -2,7 +2,7 @@
{% load static %}
{% load i18n %}
{% block menubar %}}
{% block menubar %}
{% include 'part/navbar.html' with tab='sales-prices' %}
{% endblock %}

2
InvenTree/part/views.py
View File

@ -884,7 +884,7 @@ class PartImageDownloadFromURL(AjaxUpdateView):
# Check for valid response code
if not response.status_code == 200:
form.add_error('url', f"{_('Invalid response')}: {response.status_code}")
form.add_error('url', _('Invalid response: {code}').format(code=response.status_code))
return
response.raw.decode_content = True