From 918e1f3befb4fd4c0a2af4961342873087355a3d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 15 Mar 2023 23:12:29 +1100 Subject: [PATCH] Adds default example report file for ReturnOrder - Requires some more work :) --- InvenTree/report/apps.py | 6 +- .../report/inventree_order_report_base.html | 70 +++++++++++++++++++ .../report/inventree_po_report_base.html | 66 +---------------- .../report/inventree_return_order_report.html | 1 + .../inventree_return_order_report_base.html | 15 ++++ .../report/inventree_so_report_base.html | 65 +---------------- 6 files changed, 94 insertions(+), 129 deletions(-) create mode 100644 InvenTree/report/templates/report/inventree_order_report_base.html create mode 100644 InvenTree/report/templates/report/inventree_return_order_report.html create mode 100644 InvenTree/report/templates/report/inventree_return_order_report_base.html diff --git a/InvenTree/report/apps.py b/InvenTree/report/apps.py index 4561259e41..dc93007b43 100644 --- a/InvenTree/report/apps.py +++ b/InvenTree/report/apps.py @@ -187,7 +187,11 @@ class ReportConfig(AppConfig): # List of templates to copy across reports = [ - # TODO + { + 'file': 'inventree_return_order_report.html', + 'name': 'InvenTree Return Order', + 'description': 'Return Order example report', + } ] self.create_default_reports(ReturnOrderReport, reports) diff --git a/InvenTree/report/templates/report/inventree_order_report_base.html b/InvenTree/report/templates/report/inventree_order_report_base.html new file mode 100644 index 0000000000..f9adc114cd --- /dev/null +++ b/InvenTree/report/templates/report/inventree_order_report_base.html @@ -0,0 +1,70 @@ +{% extends "report/inventree_report_base.html" %} + +{% load i18n %} +{% load report %} +{% load barcode %} +{% load inventree_extras %} +{% load markdownify %} + +{% block page_margin %} +margin: 2cm; +margin-top: 4cm; +{% endblock %} + +{% block bottom_left %} +content: "v{{report_revision}} - {{ date.isoformat }}"; +{% endblock %} + +{% block bottom_center %} +content: "{% inventree_version shortstring=True %}"; +{% endblock %} + +{% block style %} + +.header-right { + text-align: right; + float: right; +} + +.logo { + height: 20mm; + vertical-align: middle; +} + +.thumb-container { + width: 32px; + display: inline; +} + + +.part-thumb { + max-width: 32px; + max-height: 32px; + display: inline; +} + +.part-text { + display: inline; +} + +table { + border: 1px solid #eee; + border-radius: 3px; + border-collapse: collapse; + width: 100%; + font-size: 80%; +} + +table td { + border: 1px solid #eee; +} + +table td.shrink { + white-space: nowrap +} + +table td.expand { + width: 99% +} + +{% endblock %} diff --git a/InvenTree/report/templates/report/inventree_po_report_base.html b/InvenTree/report/templates/report/inventree_po_report_base.html index 0aa77f6c3b..d6c5ee3ee3 100644 --- a/InvenTree/report/templates/report/inventree_po_report_base.html +++ b/InvenTree/report/templates/report/inventree_po_report_base.html @@ -1,72 +1,10 @@ -{% extends "report/inventree_report_base.html" %} +{% extends "report/inventree_order_report_base.html" %} {% load i18n %} {% load report %} {% load barcode %} {% load inventree_extras %} - -{% block page_margin %} -margin: 2cm; -margin-top: 4cm; -{% endblock %} - -{% block bottom_left %} -content: "v{{report_revision}} - {{ date.isoformat }}"; -{% endblock %} - -{% block bottom_center %} -content: "{% inventree_version shortstring=True %}"; -{% endblock %} - -{% block style %} - -.header-right { - text-align: right; - float: right; -} - -.logo { - height: 20mm; - vertical-align: middle; -} - -.thumb-container { - width: 32px; - display: inline; -} - - -.part-thumb { - max-width: 32px; - max-height: 32px; - display: inline; -} - -.part-text { - display: inline; -} - -table { - border: 1px solid #eee; - border-radius: 3px; - border-collapse: collapse; - width: 100%; - font-size: 80%; -} - -table td { - border: 1px solid #eee; -} - -table td.shrink { - white-space: nowrap -} - -table td.expand { - width: 99% -} - -{% endblock %} +{% load markdownify %} {% block header_content %} diff --git a/InvenTree/report/templates/report/inventree_return_order_report.html b/InvenTree/report/templates/report/inventree_return_order_report.html new file mode 100644 index 0000000000..cece937a0e --- /dev/null +++ b/InvenTree/report/templates/report/inventree_return_order_report.html @@ -0,0 +1 @@ +{% extends "report/inventree_return_order_report_base.html" %} diff --git a/InvenTree/report/templates/report/inventree_return_order_report_base.html b/InvenTree/report/templates/report/inventree_return_order_report_base.html new file mode 100644 index 0000000000..60371d4936 --- /dev/null +++ b/InvenTree/report/templates/report/inventree_return_order_report_base.html @@ -0,0 +1,15 @@ +{% extends "report/inventree_order_report_base.html" %} + +{% load i18n %} +{% load report %} +{% load barcode %} +{% load inventree_extras %} +{% load markdownify %} + +{% block header_content %} +HEADER GOES HERE +{% endblock header_content %} + +{% block page_content %} +PAGE CONTENT GOES HERE +{% endblock page_content %} diff --git a/InvenTree/report/templates/report/inventree_so_report_base.html b/InvenTree/report/templates/report/inventree_so_report_base.html index 4869a5453c..7ee4ca0edd 100644 --- a/InvenTree/report/templates/report/inventree_so_report_base.html +++ b/InvenTree/report/templates/report/inventree_so_report_base.html @@ -1,4 +1,4 @@ -{% extends "report/inventree_report_base.html" %} +{% extends "report/inventree_order_report_base.html" %} {% load i18n %} {% load report %} @@ -6,69 +6,6 @@ {% load inventree_extras %} {% load markdownify %} -{% block page_margin %} -margin: 2cm; -margin-top: 4cm; -{% endblock %} - -{% block bottom_left %} -content: "v{{report_revision}} - {{ date.isoformat }}"; -{% endblock %} - -{% block bottom_center %} -content: "{% inventree_version shortstring=True %}"; -{% endblock %} - -{% block style %} - -.header-right { - text-align: right; - float: right; -} - -.logo { - height: 20mm; - vertical-align: middle; -} - -.thumb-container { - width: 32px; - display: inline; -} - - -.part-thumb { - max-width: 32px; - max-height: 32px; - display: inline; -} - -.part-text { - display: inline; -} - -table { - border: 1px solid #eee; - border-radius: 3px; - border-collapse: collapse; - width: 100%; - font-size: 80%; -} - -table td { - border: 1px solid #eee; -} - -table td.shrink { - white-space: nowrap -} - -table td.expand { - width: 99% -} - -{% endblock %} - {% block header_content %}