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

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

Browse Source
This commit is contained in:
Matthias
2021-04-18 12:58:19 +02:00
parent 337f680c89 3bb0f7dde0
commit 6c3a66f7d6
26 changed files with 2829 additions and 2075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/order/templates/order/order_complete.html
View File

@ -7,8 +7,8 @@
{% trans 'Mark this order as complete?' %}
{% if not order.is_complete %}
<div class='alert alert-warning alert-block'>
{%trans 'This order has line items which have not been marked as received.
Marking this order as complete will remove these line items.' %}
{% trans 'This order has line items which have not been marked as received.' %}
{% trans 'Marking this order as complete will remove these line items.' %}
</div>
{% endif %}

2
InvenTree/order/templates/order/order_wizard/select_parts.html
View File

@ -54,7 +54,7 @@
</select>
</div>
{% if not part.order_supplier %}
<span class='help-inline'>{% trans "Select a supplier for" %} <i>{{ part.name }}</i></span>
<span class='help-inline'>{% blocktrans with name=part.name %}Select a supplier for <i>{{name}}</i>{% endblocktrans %}</span>
{% endif %}
</div>
</td>

4
InvenTree/order/templates/order/order_wizard/select_pos.html
View File

@ -42,7 +42,7 @@
<button
class='btn btn-default btn-create'
id='new_po_{{ supplier.id }}'
title='{% trans "Create new purchase order for {{ supplier.name }}" %}'
title='{% blocktrans with name=supplier.name %}Create new purchase order for {{name}}{% endblocktrans %}'
type='button'
supplierid='{{ supplier.id }}'
onclick='newPurchaseOrderFromOrderWizard()'>
@ -65,7 +65,7 @@
</select>
</div>
{% if not supplier.selected_purchase_order %}
<span class='help-inline'>{% trans "Select a purchase order for" %} {{ supplier.name }}</span>
<span class='help-inline'>{% blocktrans with name=supplier.name %}Select a purchase order for {{name}}{% endblocktrans %}</span>
{% endif %}
</div>
</td>

2
InvenTree/order/templates/order/receive_parts.html
View File

@ -5,7 +5,7 @@
{% block form %}
{% trans "Receive outstanding parts for" %} <b>{{ order }}</b> - <i>{{ order.description }}</i>
{% blocktrans with desc=order.description %}Receive outstanding parts for <b>{{order}}</b> - <i>{{desc}}</i>{% endblocktrans %}
<form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
{% csrf_token %}