mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-10-31 05:05:42 +00:00 
			
		
		
		
	Migrate more pages to the two_column template
This commit is contained in:
		| @@ -19,7 +19,9 @@ InvenTree | {% trans "Company" %} - {{ company.name }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block page_data %} | ||||
| <h3>{{ company.name }}</h3> | ||||
| <h3>{% trans "Company" %}</h3> | ||||
| <hr> | ||||
| <h4>{{ company.name }}</h4> | ||||
| <p>{{ company.description }}</p> | ||||
| <div class='btn-group'> | ||||
|     {% if company.is_supplier %} | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| {% extends "base.html" %} | ||||
| {% extends "two_column.html" %} | ||||
| {% load static %} | ||||
| {% load i18n %} | ||||
|  | ||||
| @@ -6,104 +6,86 @@ | ||||
| InvenTree | {% trans "Supplier Part" %} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block content %} | ||||
| {% block thumbnail %} | ||||
| <img class='part-thumb' | ||||
| {% if part.part.image %} | ||||
| src='{{ part.part.image.url }}' | ||||
| {% else %} | ||||
| src="{% static 'img/blank_image.png' %}" | ||||
| {% endif %}/> | ||||
| {% endblock %} | ||||
|  | ||||
| <div class='row'> | ||||
|     <div class='col-sm-6'> | ||||
|         <div class='media'> | ||||
|             <div class='media-left'> | ||||
|                 <img class='part-thumb' | ||||
|                 {% if part.part.image %} | ||||
|                 src='{{ part.part.image.url }}' | ||||
|                 {% else %} | ||||
|                 src="{% static 'img/blank_image.png' %}" | ||||
|                 {% endif %}/> | ||||
|             </div> | ||||
|             <div class='media-body'> | ||||
|                 <h3>{% trans "Supplier Part" %}</h3> | ||||
|                 <div class='btn-row'> | ||||
|                     <div class='btn-group'> | ||||
|                         <button type='button' class='btn btn-default btn-glyph' id='edit-part' title='Edit supplier part'> | ||||
|                             <span class='glyphicon glyphicon-edit'/> | ||||
|                         </button> | ||||
|                         <button type='button' class='btn btn-default btn-glyph' id='delete-part' title='Delete supplier part'> | ||||
|                             <span class='glyphicon glyphicon-trash'/> | ||||
|                         </button> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class='col-sm-6'> | ||||
|         <h4>{% trans "Supplier Part Details" %}</h4> | ||||
|         <table class="table table-striped table-condensed"> | ||||
|             <col width='25'> | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-shapes'></span></td> | ||||
|                     <td>{% trans "Internal Part" %}</td> | ||||
|                     <td> | ||||
|                         {% if part.part %} | ||||
|                         <a href="{% url 'part-suppliers' part.part.id %}">{{ part.part.full_name }}</a> | ||||
|                         {% endif %} | ||||
|                     </td> | ||||
|                 </tr> | ||||
|                 {% if part.description %} | ||||
|                 <tr> | ||||
|                     <td></td> | ||||
|                     <td>{% trans "Description" %}</td> | ||||
|                     <td>{{ part.description }}</td> | ||||
|                 </tr> | ||||
|                 {% endif %} | ||||
|                 {% if part.link %} | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-link'></span></td> | ||||
|                     <td>{% trans "External Link" %}</td> | ||||
|                     <td><a href="{{ part.link }}">{{ part.link }}</a></td> | ||||
|                 </tr> | ||||
|                 {% endif %} | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-building'></span></td> | ||||
|                     <td>{% trans "Supplier" %}</td> | ||||
|                     <td><a href="{% url 'company-detail-parts' part.supplier.id %}">{{ part.supplier.name }}</a></td></tr> | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-hashtag'></span></td> | ||||
|                     <td>{% trans "SKU" %}</td> | ||||
|                     <td>{{ part.SKU }}</tr> | ||||
|                 </tr> | ||||
|                 {% if part.manufacturer %} | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-industry'></span></td> | ||||
|                     <td>{% trans "Manufacturer" %}</td> | ||||
|                     <td><a href="{% url 'company-detail-parts' part.manufacturer.id %}">{{ part.manufacturer.name }}</a></td></tr> | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-hashtag'></span></td> | ||||
|                     <td>{% trans "MPN" %}</td> | ||||
|                     <td>{{ part.MPN }}</td> | ||||
|                 </tr> | ||||
|                 {% endif %} | ||||
|                 {% if part.note %} | ||||
|                 <tr> | ||||
|                     <td><span class='fas fa-sticky-note'></span></td> | ||||
|                     <td>{% trans "Note" %}</td> | ||||
|                     <td>{{ part.note }}</td> | ||||
|                 </tr> | ||||
|                 {% endif %} | ||||
|         </table> | ||||
| {% block page_data %} | ||||
| <h3>{% trans "Supplier Part" %}</h3> | ||||
| <p>{{ part.supplier.name }} - {{ part.SKU }}</p> | ||||
| <div class='btn-row'> | ||||
|     <div class='btn-group'> | ||||
|         <button type='button' class='btn btn-default btn-glyph' id='edit-part' title='Edit supplier part'> | ||||
|             <span class='glyphicon glyphicon-edit'/> | ||||
|         </button> | ||||
|         <button type='button' class='btn btn-default btn-glyph' id='delete-part' title='Delete supplier part'> | ||||
|             <span class='glyphicon glyphicon-trash'/> | ||||
|         </button> | ||||
|     </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block page_details %} | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| <hr> | ||||
|  | ||||
| <div class='container-fluid'> | ||||
|     {% block details %} | ||||
|     <!-- Particular SupplierPart page goes here ... --> | ||||
|     {% endblock %} | ||||
| </div> | ||||
|  | ||||
| <h4>{% trans "Supplier Part Details" %}</h4> | ||||
| <table class="table table-striped table-condensed"> | ||||
|     <col width='25'> | ||||
|         <tr> | ||||
|             <td><span class='fas fa-shapes'></span></td> | ||||
|             <td>{% trans "Internal Part" %}</td> | ||||
|             <td> | ||||
|                 {% if part.part %} | ||||
|                 <a href="{% url 'part-suppliers' part.part.id %}">{{ part.part.full_name }}</a> | ||||
|                 {% endif %} | ||||
|             </td> | ||||
|         </tr> | ||||
|         {% if part.description %} | ||||
|         <tr> | ||||
|             <td></td> | ||||
|             <td>{% trans "Description" %}</td> | ||||
|             <td>{{ part.description }}</td> | ||||
|         </tr> | ||||
|         {% endif %} | ||||
|         {% if part.link %} | ||||
|         <tr> | ||||
|             <td><span class='fas fa-link'></span></td> | ||||
|             <td>{% trans "External Link" %}</td> | ||||
|             <td><a href="{{ part.link }}">{{ part.link }}</a></td> | ||||
|         </tr> | ||||
|         {% endif %} | ||||
|         <tr> | ||||
|             <td><span class='fas fa-building'></span></td> | ||||
|             <td>{% trans "Supplier" %}</td> | ||||
|             <td><a href="{% url 'company-detail-parts' part.supplier.id %}">{{ part.supplier.name }}</a></td></tr> | ||||
|         <tr> | ||||
|             <td><span class='fas fa-hashtag'></span></td> | ||||
|             <td>{% trans "SKU" %}</td> | ||||
|             <td>{{ part.SKU }}</tr> | ||||
|         </tr> | ||||
|         {% if part.manufacturer %} | ||||
|         <tr> | ||||
|             <td><span class='fas fa-industry'></span></td> | ||||
|             <td>{% trans "Manufacturer" %}</td> | ||||
|             <td><a href="{% url 'company-detail-parts' part.manufacturer.id %}">{{ part.manufacturer.name }}</a></td></tr> | ||||
|         <tr> | ||||
|             <td><span class='fas fa-hashtag'></span></td> | ||||
|             <td>{% trans "MPN" %}</td> | ||||
|             <td>{{ part.MPN }}</td> | ||||
|         </tr> | ||||
|         {% endif %} | ||||
|         {% if part.note %} | ||||
|         <tr> | ||||
|             <td><span class='fas fa-sticky-note'></span></td> | ||||
|             <td>{% trans "Note" %}</td> | ||||
|             <td>{{ part.note }}</td> | ||||
|         </tr> | ||||
|         {% endif %} | ||||
| </table> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block js_ready %} | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| {% extends "base.html" %} | ||||
| {% extends "two_column.html" %} | ||||
|  | ||||
| {% load i18n %} | ||||
| {% load static %} | ||||
| @@ -9,120 +9,105 @@ | ||||
| InvenTree | {% trans "Purchase Order" %} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block content %} | ||||
| {% block thumbnail %} | ||||
| <img class='part-thumb' | ||||
| {% if order.supplier.image %} | ||||
| src="{{ order.supplier.image.url }}" | ||||
| {% else %} | ||||
| src="{% static 'img/blank_image.png' %}" | ||||
| {% endif %} | ||||
| /> | ||||
| {% endblock %} | ||||
|  | ||||
| <div class='row'> | ||||
|     <div class='col-sm-6'> | ||||
|         <div class='media'> | ||||
|             <div class='media-left'> | ||||
|                 <img class='part-thumb' | ||||
|                 {% if order.supplier.image %} | ||||
|                 src="{{ order.supplier.image.url }}" | ||||
|                 {% else %} | ||||
|                 src="{% static 'img/blank_image.png' %}" | ||||
|                 {% endif %} | ||||
|                 /> | ||||
|             </div> | ||||
|             <div class='media-body'> | ||||
|                 <h4>{{ order }}</h4> | ||||
|                 <p>{{ order.description }}</p> | ||||
|                 <p> | ||||
|                     <div class='btn-row'> | ||||
|                         <div class='btn-group'> | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='edit-order' title='Edit order information'> | ||||
|                                 <span class='glyphicon glyphicon-edit'></span> | ||||
|                             </button> | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='export-order' title='Export order to file'> | ||||
|                                 <span class='glyphicon glyphicon-download-alt'></span> | ||||
|                             </button> | ||||
|                             {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %} | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='place-order' title='Place order'> | ||||
|                                 <span class='glyphicon glyphicon-send'></span> | ||||
|                             </button> | ||||
|                             {% elif order.status == OrderStatus.PLACED %} | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='receive-order' title='Receive items'> | ||||
|                                 <span class='glyphicon glyphicon-check'></span> | ||||
|                             </button> | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='complete-order' title='Mark order as complete'> | ||||
|                                 <span class='glyphicon glyphicon-ok'></span> | ||||
|                             </button> | ||||
|                             {% endif %} | ||||
|                             {% if order.status == OrderStatus.PENDING or order.status == OrderStatus.PLACED %} | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='cancel-order' title='Cancel order'> | ||||
|                                 <span class='glyphicon glyphicon-remove'></span> | ||||
|                             </button> | ||||
|                             {% endif %} | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </p> | ||||
|             </div> | ||||
| {% block page_data %} | ||||
| <h3>{% trans "Purchase Order" %}</h3> | ||||
| <hr> | ||||
| <h4>{{ order }}</h4> | ||||
| <p>{{ order.description }}</p> | ||||
| <p> | ||||
|     <div class='btn-row'> | ||||
|         <div class='btn-group'> | ||||
|             <button type='button' class='btn btn-default btn-glyph' id='edit-order' title='Edit order information'> | ||||
|                 <span class='glyphicon glyphicon-edit'></span> | ||||
|             </button> | ||||
|             <button type='button' class='btn btn-default btn-glyph' id='export-order' title='Export order to file'> | ||||
|                 <span class='glyphicon glyphicon-download-alt'></span> | ||||
|             </button> | ||||
|             {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %} | ||||
|             <button type='button' class='btn btn-default btn-glyph' id='place-order' title='Place order'> | ||||
|                 <span class='glyphicon glyphicon-send'></span> | ||||
|             </button> | ||||
|             {% elif order.status == OrderStatus.PLACED %} | ||||
|             <button type='button' class='btn btn-default btn-glyph' id='receive-order' title='Receive items'> | ||||
|                 <span class='glyphicon glyphicon-check'></span> | ||||
|             </button> | ||||
|             <button type='button' class='btn btn-default btn-glyph' id='complete-order' title='Mark order as complete'> | ||||
|                 <span class='glyphicon glyphicon-ok'></span> | ||||
|             </button> | ||||
|             {% endif %} | ||||
|             {% if order.status == OrderStatus.PENDING or order.status == OrderStatus.PLACED %} | ||||
|             <button type='button' class='btn btn-default btn-glyph' id='cancel-order' title='Cancel order'> | ||||
|                 <span class='glyphicon glyphicon-remove'></span> | ||||
|             </button> | ||||
|             {% endif %} | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class='col-sm-6'> | ||||
|         <h4>{% trans "Purchase Order Details" %}</h4> | ||||
|         <table class='table'> | ||||
|             <col width='25'> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-hashtag'></span></td> | ||||
|                 <td>{% trans "Order Reference" %}</td> | ||||
|                 <td>{{ order.reference }}</td> | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-info'></span></td> | ||||
|                 <td>{% trans "Order Status" %}</td> | ||||
|                 <td>{% order_status order.status %}</td> | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-building'></span></td> | ||||
|                 <td>{% trans "Supplier" %}</td> | ||||
|                 <td><a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a></td> | ||||
|             </tr> | ||||
|             {% if order.supplier_reference %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-hashtag'></span></td> | ||||
|                 <td>{% trans "Supplier Reference" %}</td> | ||||
|                 <td>{{ order.supplier_reference }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if order.link %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-link'></span></td> | ||||
|                 <td>External Link</td> | ||||
|                 <td><a href="{{ order.link }}">{{ order.link }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Created" %}</td> | ||||
|                 <td>{{ order.creation_date }}<span class='badge'>{{ order.created_by }}</span></td> | ||||
|             </tr> | ||||
|             {% if order.issue_date %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Issued" %}</td> | ||||
|                 <td>{{ order.issue_date }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if order.status == OrderStatus.COMPLETE %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Received" %}</td> | ||||
|                 <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|         </table> | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| <hr> | ||||
| <div class='container-fluid'> | ||||
| {% block details %} | ||||
|  | ||||
| <!-- Specific order details to go here --> | ||||
|  | ||||
| </p> | ||||
| {% endblock %} | ||||
| </div> | ||||
|  | ||||
| {% block page_details %} | ||||
| <h4>{% trans "Purchase Order Details" %}</h4> | ||||
| <table class='table'> | ||||
|     <col width='25'> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-hashtag'></span></td> | ||||
|         <td>{% trans "Order Reference" %}</td> | ||||
|         <td>{{ order.reference }}</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-info'></span></td> | ||||
|         <td>{% trans "Order Status" %}</td> | ||||
|         <td>{% order_status order.status %}</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-building'></span></td> | ||||
|         <td>{% trans "Supplier" %}</td> | ||||
|         <td><a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a></td> | ||||
|     </tr> | ||||
|     {% if order.supplier_reference %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-hashtag'></span></td> | ||||
|         <td>{% trans "Supplier Reference" %}</td> | ||||
|         <td>{{ order.supplier_reference }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if order.link %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-link'></span></td> | ||||
|         <td>External Link</td> | ||||
|         <td><a href="{{ order.link }}">{{ order.link }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Created" %}</td> | ||||
|         <td>{{ order.creation_date }}<span class='badge'>{{ order.created_by }}</span></td> | ||||
|     </tr> | ||||
|     {% if order.issue_date %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Issued" %}</td> | ||||
|         <td>{{ order.issue_date }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if order.status == OrderStatus.COMPLETE %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Received" %}</td> | ||||
|         <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
| </table> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block js_ready %} | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| {% extends "base.html" %} | ||||
| {% extends "two_column.html" %} | ||||
|  | ||||
| {% load i18n %} | ||||
| {% load static %} | ||||
| @@ -9,99 +9,83 @@ | ||||
| InvenTree | {% trans "Sales Order" %} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block content %} | ||||
|  | ||||
|  | ||||
| <div class='row'> | ||||
|     <div class='col-sm-6'> | ||||
|         <div class='media'> | ||||
|             <div class='media-left'> | ||||
|                 <img class='part-thumb' | ||||
|                 {% if order.customer.image %} | ||||
|                 src="{{ order.customer.image.url }}" | ||||
|                 {% else %} | ||||
|                 src="{% static 'img/blank_image.png' %}" | ||||
|                 {% endif %} | ||||
|                 /> | ||||
|             </div> | ||||
|             <div class='media-body'> | ||||
|                 <h3>{{ order }}</h3> | ||||
|                 <p>{{ order.description }}</p> | ||||
|                 <p> | ||||
|                     <div class='btn-row'> | ||||
|                         <div class='btn-group'> | ||||
|                             <button type='button' class='btn btn-default btn-glyph' id='edit-order' title='Edit order information'> | ||||
|                                 <span class='glyphicon glyphicon-edit'></span> | ||||
|                             </button> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </p> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class='col-sm-6'> | ||||
|         <h4>{% trans "Sales Order Details" %}</h4> | ||||
|         <table class='table'> | ||||
|             <col width='25'> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-hashtag'></span></td> | ||||
|                 <td>{% trans "Order Reference" %}</td> | ||||
|                 <td>{{ order.reference }}</td> | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-info'></span></td> | ||||
|                 <td>{% trans "Order Status" %}</td> | ||||
|                 <td>{% order_status order.status %}</td> | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-building'></span></td> | ||||
|                 <td>{% trans "Customer" %}</td> | ||||
|                 <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a></td> | ||||
|             </tr> | ||||
|             {% if order.customer_reference %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-hashtag'></span></td> | ||||
|                 <td>{% trans "Customer Reference" %}</td> | ||||
|                 <td>{{ order.customer_reference }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if order.link %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-link'></span></td> | ||||
|                 <td>External Link</td> | ||||
|                 <td><a href="{{ order.link }}">{{ order.link }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Created" %}</td> | ||||
|                 <td>{{ order.creation_date }}<span class='badge'>{{ order.created_by }}</span></td> | ||||
|             </tr> | ||||
|             {% if order.issue_date %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Issued" %}</td> | ||||
|                 <td>{{ order.issue_date }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if order.status == OrderStatus.COMPLETE %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Received" %}</td> | ||||
|                 <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|         </table> | ||||
|     </div> | ||||
| </div> | ||||
| {% block thumbnail %} | ||||
| <img class='part-thumb' | ||||
| {% if order.customer.image %} | ||||
| src="{{ order.customer.image.url }}" | ||||
| {% else %} | ||||
| src="{% static 'img/blank_image.png' %}" | ||||
| {% endif %} | ||||
| /> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block page_data %} | ||||
| <h3>{% trans "Sales Order" %}</h3> | ||||
| <hr> | ||||
| <div class='container-fluid'> | ||||
|     {% block details %} | ||||
|     <!-- sales order details go here --> | ||||
|     {% endblock %} | ||||
| <h4>{{ order }}</h4> | ||||
| <p>{{ order.description }}</p> | ||||
| <div class='btn-row'> | ||||
|     <div class='btn-group'> | ||||
|         <button type='button' class='btn btn-default btn-glyph' id='edit-order' title='Edit order information'> | ||||
|             <span class='glyphicon glyphicon-edit'></span> | ||||
|         </button> | ||||
|     </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block page_details %} | ||||
| <h4>{% trans "Sales Order Details" %}</h4> | ||||
| <table class='table'> | ||||
|     <col width='25'> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-hashtag'></span></td> | ||||
|         <td>{% trans "Order Reference" %}</td> | ||||
|         <td>{{ order.reference }}</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-info'></span></td> | ||||
|         <td>{% trans "Order Status" %}</td> | ||||
|         <td>{% order_status order.status %}</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-building'></span></td> | ||||
|         <td>{% trans "Customer" %}</td> | ||||
|         <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a></td> | ||||
|     </tr> | ||||
|     {% if order.customer_reference %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-hashtag'></span></td> | ||||
|         <td>{% trans "Customer Reference" %}</td> | ||||
|         <td>{{ order.customer_reference }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if order.link %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-link'></span></td> | ||||
|         <td>External Link</td> | ||||
|         <td><a href="{{ order.link }}">{{ order.link }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Created" %}</td> | ||||
|         <td>{{ order.creation_date }}<span class='badge'>{{ order.created_by }}</span></td> | ||||
|     </tr> | ||||
|     {% if order.issue_date %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Issued" %}</td> | ||||
|         <td>{{ order.issue_date }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if order.status == OrderStatus.COMPLETE %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Received" %}</td> | ||||
|         <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
| </table> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block js_ready %} | ||||
|   | ||||
| @@ -1,9 +1,19 @@ | ||||
| {% extends "stock/stock_app_base.html" %} | ||||
| {% extends "two_column.html" %} | ||||
| {% load static %} | ||||
| {% load inventree_extras %} | ||||
| {% load status_codes %} | ||||
| {% load i18n %} | ||||
| {% block content %} | ||||
|  | ||||
| {% block page_title %} | ||||
| InvenTree | {% trans "Stock Item" %} - {{ item }} | ||||
| {% endblock %} | ||||
|  | ||||
| {% block sidenav %} | ||||
| <div id='stock-tree'></div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block pre_content %} | ||||
| {% include 'stock/loc_link.html' with location=item.location %} | ||||
|  | ||||
| {% if item.sales_order_line %} | ||||
| <div class='alert alert-block alert-info'> | ||||
| @@ -12,200 +22,212 @@ | ||||
| </div> | ||||
| {% endif %} | ||||
|  | ||||
| <div class='row'> | ||||
|     <div class='col-sm-6'> | ||||
|         <h3>{% trans "Stock Item Details" %}</h3> | ||||
|         {% if item.serialized %} | ||||
|         <p><i>{{ item.part.full_name}} # {{ item.serial }}</i></p> | ||||
|         {% else %} | ||||
|         <p><i>{% decimal item.quantity %} × {{ item.part.full_name }}</i></p> | ||||
|         {% endif %} | ||||
|         <p> | ||||
|             <div class='btn-group'> | ||||
|                 {% include "qr_button.html" %} | ||||
|                 {% if item.in_stock %} | ||||
|                 {% if not item.serialized %} | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-add' title='Add to stock'> | ||||
|                     <span class='glyphicon glyphicon-plus-sign' style='color: #1a1;'/> | ||||
|                 </button> | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-remove' title='Take from stock'> | ||||
|                     <span class='glyphicon glyphicon-minus-sign' style='color: #a11;'/> | ||||
|                 </button> | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-count' title='Count stock'> | ||||
|                     <span class='glyphicon glyphicon-ok-circle'/> | ||||
|                 </button> | ||||
|                 {% if item.part.trackable %} | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-serialize' title='Serialize stock'> | ||||
|                     <span class='glyphicon glyphicon-th-list'/> | ||||
|                 </button> | ||||
|                 {% endif %} | ||||
|                 {% endif %} | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'> | ||||
|                     <span class='glyphicon glyphicon-transfer' style='color: #11a;'/> | ||||
|                 </button> | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-duplicate' title='Duplicate stock item'> | ||||
|                     <span class='glyphicon glyphicon-duplicate'/> | ||||
|                 </button> | ||||
|                 {% endif %} | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-edit' title='Edit stock item'> | ||||
|                     <span class='glyphicon glyphicon-edit'/> | ||||
|                 </button> | ||||
|                 {% if item.can_delete %} | ||||
|                 <button type='button' class='btn btn-default btn-glyph' id='stock-delete' title='Edit stock item'> | ||||
|                     <span class='glyphicon glyphicon-trash'/> | ||||
|                 </button> | ||||
|                 {% endif %} | ||||
|             </div> | ||||
|         </p> | ||||
|         {% if item.serialized %} | ||||
|         <div class='alert alert-block alert-info'> | ||||
|             {% trans "This stock item is serialized - it has a unique serial number and the quantity cannot be adjusted." %} | ||||
|         </div> | ||||
|         {% elif item.child_count > 0 %} | ||||
|         <div class='alert alert-block alert-warning'> | ||||
|             {% trans "This stock item cannot be deleted as it has child items" %} | ||||
|         </div> | ||||
|         {% elif item.delete_on_deplete %} | ||||
|         <div class='alert alert-block alert-warning'> | ||||
|             {% trans "This stock item will be automatically deleted when all stock is depleted." %} | ||||
|         </div> | ||||
|         {% endif %} | ||||
|         {% if item.parent %} | ||||
|         <div class='alert alert-block alert-info'> | ||||
|             {% trans "This stock item was split from " %}<a href="{% url 'stock-item-detail' item.parent.id %}">{{ item.parent }}</a> | ||||
|         </div> | ||||
|         {% endif %} | ||||
|         </div> | ||||
|      | ||||
|     <div class='row'> | ||||
|         <div class='col-sm-6'> | ||||
|             <table class="table table-striped"> | ||||
|             <col width='25'> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-shapes'></span></td> | ||||
|                 <td>Part</td> | ||||
|                 <td> | ||||
|                     {% include "hover_image.html" with image=item.part.image hover=True %} | ||||
|                     <a href="{% url 'part-stock' item.part.id %}">{{ item.part.full_name }} | ||||
|                 </td> | ||||
|             </tr> | ||||
|             {% if item.belongs_to %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-box'></span></td> | ||||
|                 <td>{% trans "Belongs To" %}</td> | ||||
|                 <td><a href="{% url 'stock-item-detail' item.belongs_to.id %}">{{ item.belongs_to }}</a></td> | ||||
|             </tr> | ||||
|             {% elif item.location %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-map-marker-alt'></span></td> | ||||
|                 <td>{% trans "Location" %}</td> | ||||
|                 <td><a href="{% url 'stock-location-detail' item.location.id %}">{{ item.location.name }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.uid %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-barcode'></span></td> | ||||
|                 <td>{% trans "Unique Identifier" %}</td> | ||||
|                 <td>{{ item.uid }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.serialized %} | ||||
|             <tr> | ||||
|                 <td></td> | ||||
|                 <td>{% trans "Serial Number" %}</td> | ||||
|                 <td>{{ item.serial }}</td> | ||||
|             </tr> | ||||
|             {% else %} | ||||
|             <tr> | ||||
|                 <td></td> | ||||
|                 <td>{% trans "Quantity" %}</td> | ||||
|                 <td>{% decimal item.quantity %} {% if item.part.units %}{{ item.part.units }}{% endif %}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.batch %} | ||||
|             <tr> | ||||
|                 <td></td> | ||||
|                 <td>{% trans "Batch" %}</td> | ||||
|                 <td>{{ item.batch }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.build %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-tools'></span></td> | ||||
|                 <td>{% trans "Build" %}</td> | ||||
|                 <td><a href="{% url 'build-detail' item.build.id %}">{{ item.build }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.purchase_order %} | ||||
|             <tr> | ||||
|                 <td></td> | ||||
|                 <td>{% trans "Purchase Order" %}</td> | ||||
|                 <td><a href="{% url 'po-detail' item.purchase_order.id %}">{{ item.purchase_order }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.customer %} | ||||
|             <tr> | ||||
|                 <td></td> | ||||
|                 <td>{% trans "Customer" %}</td> | ||||
|                 <td>{{ item.customer.name }}</td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.link %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-link'></span> | ||||
|                 <td>{% trans "External Link" %}</td> | ||||
|                 <td><a href="{{ item.link }}">{{ item.link }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             {% if item.supplier_part %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-industry'></span></td> | ||||
|                 <td>{% trans "Supplier" %}</td> | ||||
|                 <td><a href="{% url 'company-detail' item.supplier_part.supplier.id %}">{{ item.supplier_part.supplier.name }}</a></td> | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-shapes'></span></td> | ||||
|                 <td>{% trans "Supplier Part" %}</td> | ||||
|                 <td><a href="{% url 'supplier-part-detail' item.supplier_part.id %}">{{ item.supplier_part.SKU }}</a></td> | ||||
|             </tr> | ||||
|             {% endif %} | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Last Updated" %}</td> | ||||
|                 <td>{{ item.updated }}</td> | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-calendar-alt'></span></td> | ||||
|                 <td>{% trans "Last Stocktake" %}</td> | ||||
|                 {% if item.stocktake_date %} | ||||
|                 <td>{{ item.stocktake_date }} <span class='badge'>{{ item.stocktake_user }}</span></td> | ||||
|                 {% else %} | ||||
|                 <td>{% trans "No stocktake performed" %}</td> | ||||
|                 {% endif %} | ||||
|             </tr> | ||||
|             <tr> | ||||
|                 <td><span class='fas fa-info'></span></td> | ||||
|                 <td>{% trans "Status" %}</td> | ||||
|                 <td>{% stock_status item.status %}</td> | ||||
|             </tr> | ||||
|             </table> | ||||
|         </div> | ||||
|     </div> | ||||
| {% if item.serialized %} | ||||
| <div class='alert alert-block alert-info'> | ||||
|     {% trans "This stock item is serialized - it has a unique serial number and the quantity cannot be adjusted." %} | ||||
| </div> | ||||
| {% elif item.child_count > 0 %} | ||||
| <div class='alert alert-block alert-warning'> | ||||
|     {% trans "This stock item cannot be deleted as it has child items" %} | ||||
| </div> | ||||
| {% elif item.delete_on_deplete %} | ||||
| <div class='alert alert-block alert-warning'> | ||||
|     {% trans "This stock item will be automatically deleted when all stock is depleted." %} | ||||
| </div> | ||||
| {% endif %} | ||||
| {% if item.parent %} | ||||
| <div class='alert alert-block alert-info'> | ||||
|     {% trans "This stock item was split from " %}<a href="{% url 'stock-item-detail' item.parent.id %}">{{ item.parent }}</a> | ||||
| </div> | ||||
| {% endif %} | ||||
|  | ||||
|  | ||||
| <hr> | ||||
| <div class='container-fluid'> | ||||
| {% block details %} | ||||
| <!-- Stock item details go here --> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block thumbnail %} | ||||
| <img class='part-thumb' {% if item.part.image %}src="{{ item.part.image.url }}"{% else %}src="{% static 'img/blank_image.png' %}"{% endif %}/> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block page_data %} | ||||
| <h3>{% trans "Stock Item" %}</h3> | ||||
| <hr> | ||||
| <h4> | ||||
| {% if item.serialized %} | ||||
| {{ item.part.full_name}} # {{ item.serial }} | ||||
| {% else %} | ||||
| {% decimal item.quantity %} × {{ item.part.full_name }} | ||||
| {% endif %} | ||||
| </h4> | ||||
|  | ||||
| <div class='btn-group'> | ||||
|     {% include "qr_button.html" %} | ||||
|     {% if item.in_stock %} | ||||
|     {% if not item.serialized %} | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-add' title='Add to stock'> | ||||
|         <span class='glyphicon glyphicon-plus-sign' style='color: #1a1;'/> | ||||
|     </button> | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-remove' title='Take from stock'> | ||||
|         <span class='glyphicon glyphicon-minus-sign' style='color: #a11;'/> | ||||
|     </button> | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-count' title='Count stock'> | ||||
|         <span class='glyphicon glyphicon-ok-circle'/> | ||||
|     </button> | ||||
|     {% if item.part.trackable %} | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-serialize' title='Serialize stock'> | ||||
|         <span class='glyphicon glyphicon-th-list'/> | ||||
|     </button> | ||||
|     {% endif %} | ||||
|     {% endif %} | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'> | ||||
|         <span class='glyphicon glyphicon-transfer' style='color: #11a;'/> | ||||
|     </button> | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-duplicate' title='Duplicate stock item'> | ||||
|         <span class='glyphicon glyphicon-duplicate'/> | ||||
|     </button> | ||||
|     {% endif %} | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-edit' title='Edit stock item'> | ||||
|         <span class='glyphicon glyphicon-edit'/> | ||||
|     </button> | ||||
|     {% if item.can_delete %} | ||||
|     <button type='button' class='btn btn-default btn-glyph' id='stock-delete' title='Edit stock item'> | ||||
|         <span class='glyphicon glyphicon-trash'/> | ||||
|     </button> | ||||
|     {% endif %} | ||||
| </div> | ||||
|  | ||||
| {% endblock %} | ||||
|  | ||||
| {% block page_details %} | ||||
| <h4>{% trans "Stock Item Details" %}</h4> | ||||
| <table class="table table-striped"> | ||||
|     <col width='25'> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-shapes'></span></td> | ||||
|         <td>Part</td> | ||||
|         <td> | ||||
|             {% include "hover_image.html" with image=item.part.image hover=True %} | ||||
|             <a href="{% url 'part-stock' item.part.id %}">{{ item.part.full_name }} | ||||
|         </td> | ||||
|     </tr> | ||||
|     {% if item.belongs_to %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-box'></span></td> | ||||
|         <td>{% trans "Belongs To" %}</td> | ||||
|         <td><a href="{% url 'stock-item-detail' item.belongs_to.id %}">{{ item.belongs_to }}</a></td> | ||||
|     </tr> | ||||
|     {% elif item.location %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-map-marker-alt'></span></td> | ||||
|         <td>{% trans "Location" %}</td> | ||||
|         <td><a href="{% url 'stock-location-detail' item.location.id %}">{{ item.location.name }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.uid %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-barcode'></span></td> | ||||
|         <td>{% trans "Unique Identifier" %}</td> | ||||
|         <td>{{ item.uid }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.serialized %} | ||||
|     <tr> | ||||
|         <td></td> | ||||
|         <td>{% trans "Serial Number" %}</td> | ||||
|         <td>{{ item.serial }}</td> | ||||
|     </tr> | ||||
|     {% else %} | ||||
|     <tr> | ||||
|         <td></td> | ||||
|         <td>{% trans "Quantity" %}</td> | ||||
|         <td>{% decimal item.quantity %} {% if item.part.units %}{{ item.part.units }}{% endif %}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.batch %} | ||||
|     <tr> | ||||
|         <td></td> | ||||
|         <td>{% trans "Batch" %}</td> | ||||
|         <td>{{ item.batch }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.build %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-tools'></span></td> | ||||
|         <td>{% trans "Build" %}</td> | ||||
|         <td><a href="{% url 'build-detail' item.build.id %}">{{ item.build }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.purchase_order %} | ||||
|     <tr> | ||||
|         <td></td> | ||||
|         <td>{% trans "Purchase Order" %}</td> | ||||
|         <td><a href="{% url 'po-detail' item.purchase_order.id %}">{{ item.purchase_order }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.customer %} | ||||
|     <tr> | ||||
|         <td></td> | ||||
|         <td>{% trans "Customer" %}</td> | ||||
|         <td>{{ item.customer.name }}</td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.link %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-link'></span> | ||||
|         <td>{% trans "External Link" %}</td> | ||||
|         <td><a href="{{ item.link }}">{{ item.link }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     {% if item.supplier_part %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-industry'></span></td> | ||||
|         <td>{% trans "Supplier" %}</td> | ||||
|         <td><a href="{% url 'company-detail' item.supplier_part.supplier.id %}">{{ item.supplier_part.supplier.name }}</a></td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-shapes'></span></td> | ||||
|         <td>{% trans "Supplier Part" %}</td> | ||||
|         <td><a href="{% url 'supplier-part-detail' item.supplier_part.id %}">{{ item.supplier_part.SKU }}</a></td> | ||||
|     </tr> | ||||
|     {% endif %} | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Last Updated" %}</td> | ||||
|         <td>{{ item.updated }}</td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-calendar-alt'></span></td> | ||||
|         <td>{% trans "Last Stocktake" %}</td> | ||||
|         {% if item.stocktake_date %} | ||||
|         <td>{{ item.stocktake_date }} <span class='badge'>{{ item.stocktake_user }}</span></td> | ||||
|         {% else %} | ||||
|         <td>{% trans "No stocktake performed" %}</td> | ||||
|         {% endif %} | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td><span class='fas fa-info'></span></td> | ||||
|         <td>{% trans "Status" %}</td> | ||||
|         <td>{% stock_status item.status %}</td> | ||||
|     </tr> | ||||
| </table> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block js_ready %} | ||||
|  | ||||
| {{ block.super }} | ||||
|  | ||||
| loadTree("{% url 'api-stock-tree' %}", | ||||
|         "#stock-tree", | ||||
|         { | ||||
|             name: 'stock', | ||||
|         } | ||||
|     ); | ||||
|  | ||||
|     $("#toggle-stock-tree").click(function() { | ||||
|         toggleSideNav("#sidenav"); | ||||
|         return false; | ||||
|     }) | ||||
|  | ||||
|     initSideNav(); | ||||
|  | ||||
| $("#stock-serialize").click(function() { | ||||
|     launchModalForm( | ||||
|         "{% url 'stock-item-serialize' item.id %}", | ||||
|   | ||||
| @@ -3,9 +3,7 @@ | ||||
| {% load i18n %} | ||||
|  | ||||
| {% block page_title %} | ||||
| {% if item %} | ||||
| InvenTree | {% trans "Stock Item" %} - {{ item }} | ||||
| {% elif location %} | ||||
| {% if location %} | ||||
| InvenTree | {% trans "Stock Location" %} - {{ location }} | ||||
| {% else %} | ||||
| InvenTree | Stock | ||||
|   | ||||
| @@ -17,7 +17,6 @@ | ||||
|             <!-- Data next to image goes here --> | ||||
|             {% endblock %} | ||||
|         </div> | ||||
|  | ||||
|     </div> | ||||
|     <div class='col-sm-6'> | ||||
|         {% block page_details %} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user