From 63b0fc6269b38edf7234b9f151b80d81f614c0a3 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Tue, 4 Aug 2015 10:11:24 +0300 Subject: Initial commit First public commit --- .../templates/shipments/add_to_return-results.html | 8 ++ servo/templates/shipments/add_to_return.html | 14 +++ servo/templates/shipments/edit_bulk_return.html | 101 +++++++++++++++++++++ servo/templates/shipments/index.html | 46 ++++++++++ servo/templates/shipments/list_bulk_returns.html | 37 ++++++++ servo/templates/shipments/list_incoming.html | 61 +++++++++++++ servo/templates/shipments/list_returns.html | 44 +++++++++ servo/templates/shipments/submit_bulk_return.html | 15 +++ servo/templates/shipments/update_part.html | 14 +++ servo/templates/shipments/view_bulk_return.html | 35 +++++++ 10 files changed, 375 insertions(+) create mode 100755 servo/templates/shipments/add_to_return-results.html create mode 100755 servo/templates/shipments/add_to_return.html create mode 100755 servo/templates/shipments/edit_bulk_return.html create mode 100755 servo/templates/shipments/index.html create mode 100755 servo/templates/shipments/list_bulk_returns.html create mode 100755 servo/templates/shipments/list_incoming.html create mode 100755 servo/templates/shipments/list_returns.html create mode 100755 servo/templates/shipments/submit_bulk_return.html create mode 100755 servo/templates/shipments/update_part.html create mode 100755 servo/templates/shipments/view_bulk_return.html (limited to 'servo/templates/shipments') diff --git a/servo/templates/shipments/add_to_return-results.html b/servo/templates/shipments/add_to_return-results.html new file mode 100755 index 0000000..0f1d94e --- /dev/null +++ b/servo/templates/shipments/add_to_return-results.html @@ -0,0 +1,8 @@ +{% load i18n %} + diff --git a/servo/templates/shipments/add_to_return.html b/servo/templates/shipments/add_to_return.html new file mode 100755 index 0000000..c1ca9da --- /dev/null +++ b/servo/templates/shipments/add_to_return.html @@ -0,0 +1,14 @@ +{% extends "modal.html" %} +{% load i18n %} + +{% block header %} +{% trans "Add part to return" %} +{% endblock header %} + +{% block body %} +
+ {% csrf_token %} + +
+
+{% endblock body %} diff --git a/servo/templates/shipments/edit_bulk_return.html b/servo/templates/shipments/edit_bulk_return.html new file mode 100755 index 0000000..588a998 --- /dev/null +++ b/servo/templates/shipments/edit_bulk_return.html @@ -0,0 +1,101 @@ +{% extends "shipments/list_returns.html" %} +{% load servo_tags %} +{% load i18n %} + +{% block toolbar %} + {% trans "Add Part" %} + +{% endblock toolbar %} + +{% block second_column %} + +
+
+ {% block return_info %} + {% csrf_token %} + {{ formset.management_form }} +
+ +
+ {{ form.carrier }} +
+
+
+ +
+ {{ form.tracking_id }} +
+
+
+ +
+ {{ form.length }} {{ form.width }} {{ form.height }} +
+
+
+ +
+ {{ form.weight }} +
+
+ {% endblock return_info %} +
+
+ + + + + + + + + + {% block return_parts %} + {% for f in formset %} + + {{ f.id }} + {{ f.part_number }} + {{ f.part_title }} + {{ f.service_order }} + {{ f.return_order }} + {% with f.instance as p %} + + {% if p.order_item %} + + {% else %} + + {% endif %} + + + + {% endwith %} + + {% empty %} + + + + {% endfor %} + {% endblock return_parts %} + +
{% trans "Part" %}{% trans "Reference" %}{% trans "Return Order" %}{% trans "Overpack" %}
{{ p.part_number }}
{{ p.part_title }}		{{ p.reference }}{{ p.reference }}{{ f.return_order.value }}{% include "snippets/control_group.html" with field=f.box_number %}
{% trans "No parts registered for this shipment" %}
+ {% block form_controls %} +
+ + +
+ {% endblock form_controls %} +
+
+{% endblock second_column %} diff --git a/servo/templates/shipments/index.html b/servo/templates/shipments/index.html new file mode 100755 index 0000000..1584f65 --- /dev/null +++ b/servo/templates/shipments/index.html @@ -0,0 +1,46 @@ +{% extends "products/index.html" %} +{% load i18n %} +{% load servo_tags %} + +{% block toolbar %}{% endblock toolbar %} + +{% block content %} +
+
+
+
+ + +
+
+
+
+{% include "products/tabs.html" %} + +
+ {% block second_row %} +
+ {% block first_column %} + +
+
+ {% block second_column %} + {% endblock second_column %} +
+ {% endblock second_row %} +
+ +{% endblock content %} + +{% block breadcrumb %} + +{% endblock breadcrumb %} diff --git a/servo/templates/shipments/list_bulk_returns.html b/servo/templates/shipments/list_bulk_returns.html new file mode 100755 index 0000000..f2c4843 --- /dev/null +++ b/servo/templates/shipments/list_bulk_returns.html @@ -0,0 +1,37 @@ +{% extends "shipments/list_returns.html" %} +{% load servo_tags %} +{% load i18n %} + +{% block second_column %} + + + + + + + + + + + + {% for i in returns %} + + {% if i.return_id %} + + {% else %} + + {% endif %} + + + + + + {% endfor %} + +
{% trans "ID" %}{% trans "Tracking ID" %}{% trans "Tracking URL" %}{% trans "Parts" %}{% trans "Returned" %}
{{ i.return_id }}{{ i.tracking_id }}{{ i.get_carrier_display }}{{ i.num_parts }}{{ i.dispatched_by }}
{{ i.dispatched_at|date:"SHORT_DATETIME_FORMAT" }}
+{% include "pagination.html" with items=returns %} +{% endblock second_column %} + +{% block breadcrumb %} +
  • / {% trans "Browse Returns" %}
    • +{% endblock breadcrumb %} diff --git a/servo/templates/shipments/list_incoming.html b/servo/templates/shipments/list_incoming.html new file mode 100755 index 0000000..5d2d784 --- /dev/null +++ b/servo/templates/shipments/list_incoming.html @@ -0,0 +1,61 @@ +{% extends "shipments/index.html" %} +{% load i18n %} + +{% block toolbar %} +{% endblock toolbar %} + +{% block second_column %} +{% include "snippets/filtering_form.html" %} +
    + {% csrf_token %} + + + + {% if can_receive %} + + {% endif %} + + + + + + + + {% for i in inventory %} + + {% if can_receive %} + + {% endif %} + {% with i.product as p %} + + {% endwith %} + {% with i.purchase_order as po %} + + + + {% endwith %} + + {% empty %} + + {% endfor %} + +
    {% trans "Part" %}{% trans "Service Order" %}{% trans "Confirmation" %}{% trans "Ordered" %}
    + {{ p.code }}
    {{ p.title }} +     		+ {% if po.sales_order %} + {{ po.sales_order.code }} + {% endif %} +
    {{ po.reference }} +     		{{ po.confirmation }}{{ po.created_by }}
    {{ po.submitted_at|date:"SHORT_DATE_FORMAT" }}
    {% trans "No incoming products" %}
    + {% if can_receive %} +
    + +
    + {% endif %} +
    +{% include "pagination.html" with items=inventory %} +{% endblock second_column %} + +{% block breadcrumb %} +
  • /{% trans "Incoming" %}
    • +{% endblock breadcrumb %} diff --git a/servo/templates/shipments/list_returns.html b/servo/templates/shipments/list_returns.html new file mode 100755 index 0000000..7d57286 --- /dev/null +++ b/servo/templates/shipments/list_returns.html @@ -0,0 +1,44 @@ +{% extends "shipments/index.html" %} +{% load servo_tags %} +{% load i18n %} + +{% block second_column %} +
    + {% csrf_token %} + + + + + + + + + + + + + + {% for p in parts %} + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "Code" %}{% trans "Title" %}{% trans "Order" %}{% trans "Return Order" %}{% trans "Register For Return" %}{% trans "Serial Number" %}
    {{ p.partNumber }}{{ p.partDescription|truncatechars:42 }}{{ p.purchaseOrderNumber }}{{ p.returnOrderNumber }}{{ p.registeredForReturn }}{{ p.kbbSerialNumber }}
    {% trans "No parts pending return" %}
    + +
    +{% endblock second_column %} + +{% block breadcrumb %} +
  • / {% trans "Parts Pending Return" %}
    • +{% endblock breadcrumb %} diff --git a/servo/templates/shipments/submit_bulk_return.html b/servo/templates/shipments/submit_bulk_return.html new file mode 100755 index 0000000..ee897c4 --- /dev/null +++ b/servo/templates/shipments/submit_bulk_return.html @@ -0,0 +1,15 @@ +{% extends "modal.html" %} +{% load i18n %} +{% block header %} + {% trans "Submit the bulk return?" %} +{% endblock header %} + +{% block body %} + +{% endblock body %} + +{% block footer %} +
    + +
    +{% endblock footer %} diff --git a/servo/templates/shipments/update_part.html b/servo/templates/shipments/update_part.html new file mode 100755 index 0000000..8c0d266 --- /dev/null +++ b/servo/templates/shipments/update_part.html @@ -0,0 +1,14 @@ +{% extends "modal.html" %} +{% load i18n %} + +{% block header %} + {{ title }} +{% endblock header %} + +{% block body %} +{{ msg }} +
    + {% csrf_token %} + {% include "form_snippet.html" %} +
    +{% endblock body %} diff --git a/servo/templates/shipments/view_bulk_return.html b/servo/templates/shipments/view_bulk_return.html new file mode 100755 index 0000000..e5b935c --- /dev/null +++ b/servo/templates/shipments/view_bulk_return.html @@ -0,0 +1,35 @@ +{% extends "shipments/edit_bulk_return.html" %} +{% load i18n %} + +{% block return_info %} +
    +
    {% trans "Carrier" %}
    +
    {{ shipment.get_carrier_display }}
    +
    {% trans "Tracking" %}
    +
    {{ shipment.tracking_id }}
    +
    {% trans "Dimensions" %}
    +
    {{ shipment.length }} x {{ shipment.width }} x {{ shipment.height }}
    +
    {% trans "Weight" %}
    +
    {{ shipment.weight }} kg
    +
    + {% trans "Open Packing List" %} +{% endblock return_info %} + +{% block return_parts %} +{% for p in shipment.servicepart_set.all %} + + {{ p.part_number }}
    {{ p.part_title }} + {{ p.service_order }} + {{ p.return_order }} + {{ p.box_number|default:"Individual" }} + +{% empty %} + + {% trans "No parts registered for this shipment" %} + +{% endfor %} +{% endblock return_parts %} + +{% block form_controls %} + +{% endblock form_controls %} -- cgit v1.2.3