mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-18 22:12:14 +00:00
Arona Jones
82a30ca77d
* FIX #388: Prevent assets losing supplier data on edit * FEAT: Add associated assets to supplier detail view * FIX: Tweak supplier list to make detail view accessible * Potential fix for #380 No idea if it works because I can't reproduce locally. S/O Reckons it should... :P * FEAT #386: Asset search searches serial number. Pending addition of advanced search. * FIX: Order asset categories/statuses alphabetically Instead of by pk because that's silly. * FEAT: Statuses can have a CSS class defined in the admin panel This replaces the hardcoding of colours in the asset list. * FIX: Squash migrations * Fixed supplier not working on all the create asset template * Refactored away "assets" property on "Supplier" by using "related_name" instead Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
90 lines
3.3 KiB
HTML
90 lines
3.3 KiB
HTML
{% load widget_tweaks %}
|
|
{% load asset_templatetags %}
|
|
{% load static %}
|
|
|
|
|
|
{% block css %}
|
|
<link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
|
|
<link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
|
|
{% endblock %}
|
|
|
|
{% block preload_js %}
|
|
<script src="{% static "js/bootstrap-select.js" %}"></script>
|
|
<script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
|
|
{% endblock %}
|
|
|
|
{% block js %}
|
|
<script src="{% static "js/autocompleter.js" %}"></script>
|
|
{% endblock %}
|
|
|
|
<div class="panel panel-default">
|
|
<div class="panel-heading">
|
|
Purchase Details
|
|
</div>
|
|
<div class="panel-body">
|
|
{% if create or edit or duplicate %}
|
|
<div class="form-group">
|
|
<label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
|
|
<select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
|
|
{% if object.purchased_from %}
|
|
<option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
|
|
{% endif %}
|
|
</select>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
|
|
<div class="input-group">
|
|
<span class="input-group-addon">£</span>
|
|
{% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
|
|
<div class="input-group">
|
|
<span class="input-group-addon">£</span>
|
|
{% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
|
|
{% if object.date_acquired%}
|
|
{% with date_acq=object.date_acquired|date:"Y-m-d" %}
|
|
{% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %}
|
|
{% endwith %}
|
|
{% else %}
|
|
<input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
|
|
class="form-control" id="id_date_acquired">
|
|
{% endif %}
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
|
|
{% with date_sol=object.form.date_sold|date:"Y-m-d" %}
|
|
{% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=date_sol %}
|
|
{% endwith %}
|
|
</div>
|
|
{% else %}
|
|
<dl>
|
|
<dt>Purchased From</dt>
|
|
<dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
|
|
|
|
<dt>Purchase Price</dt>
|
|
<dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
|
|
|
|
<dt>Salvage Value</dt>
|
|
<dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
|
|
|
|
<dt>Date Acquired</dt>
|
|
<dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
|
|
{% if object.date_sold %}
|
|
<dt>Date Sold</dt>
|
|
<dd>{{ object.date_sold|default_if_none:'-' }}</dd>
|
|
{% endif %}
|
|
</dl>
|
|
{% endif %}
|
|
</div>
|
|
</div>
|