mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-01-19 08:39:34 +00:00
Merge 3408334a1f into 600686c32b
This commit is contained in:
commit
bd1163d6df
18 changed files with 275 additions and 7 deletions
|
|
@ -10,6 +10,8 @@
|
|||
{{ form_row(form.category) }}
|
||||
{{ form_row(form.tags) }}
|
||||
{{ form_row(form.minAmount) }}
|
||||
{{ form_row(form.orderAmount) }}
|
||||
{{ form_row(form.orderDelivery) }}
|
||||
|
||||
{{ form_row(form.footprint) }}
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,17 @@
|
|||
{% if part.expiredAmountSum > 0 %}
|
||||
<span title="{% trans %}part_lots.is_expired{% endtrans %}" class="text-muted">(+{{ part.expiredAmountSum }})</span>
|
||||
{% endif %}
|
||||
{% if part.orderAmount > 0 %}
|
||||
(+
|
||||
<span title="{% trans %}orderstock.label{% endtrans %}">{{ part.orderAmount | format_amount(part.partUnit) }}</span>
|
||||
{% if part.orderDelivery %}
|
||||
@
|
||||
<span class="badge bg-info mb-1" title="{% trans %}part.filter.orderDelivery{% endtrans %}">
|
||||
<i class="fas fa-calendar-alt fa-fw"></i> {{ part.orderDelivery | format_date() }}<br>
|
||||
</span>
|
||||
{% endif %}
|
||||
)
|
||||
{% endif %}
|
||||
/
|
||||
<span title="{% trans %}mininstock.label{% endtrans %}">{{ part.minAmount | format_amount(part.partUnit) }}</span>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,14 @@
|
|||
</a>
|
||||
{% endif %}
|
||||
|
||||
{% if is_granted('edit', part) %}
|
||||
<br>
|
||||
<a class="btn btn-info mt-2" href="{{ entity_url(part, 'delivered') }}">
|
||||
<i class="fas fa-cloud-arrow-down"></i>
|
||||
{% trans %}part.delivered.btn{% endtrans %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
|
||||
<form method="post" class="mt-2" action="{{ entity_url(part, 'delete') }}"
|
||||
{{ stimulus_controller('elements/delete_btn') }} {{ stimulus_action('elements/delete_btn', "submit", "submit") }}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,8 @@
|
|||
<div class="tab-pane pt-3" id="filter-stocks" role="tabpanel" aria-labelledby="filter-stocks-tab" tabindex="0">
|
||||
{{ form_row(filterForm.storelocation) }}
|
||||
{{ form_row(filterForm.minAmount) }}
|
||||
{{ form_row(filterForm.orderAmount) }}
|
||||
{{ form_row(filterForm.orderDelivery) }}
|
||||
{{ form_row(filterForm.amountSum) }}
|
||||
{{ form_row(filterForm.lessThanDesired) }}
|
||||
{{ form_row(filterForm.lotCount) }}
|
||||
|
|
@ -162,4 +164,4 @@
|
|||
{{ form_end(filterForm) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue