| Board | {{ part.IPN }} |
| Description | {{ part.description }} |
| User | {{ user }} |
| Date | {{ date }} |
| Number of different components (codes) | {{ bom_items.count }} |
| {% trans "IPN" %} | -{% trans "MPN" %} | -{% trans "Manufacturer" %} | -{% trans "Quantity" %} | -{% trans "Reference" %} | -{% trans "Substitute" %} | -
|---|---|---|---|---|---|
| {{ line.sub_part.IPN }} | -{{ line.sub_part.name }} | -- {% for manf in line.sub_part.manufacturer_parts.all %} - {{ manf.manufacturer.name }} - {% endfor %} - | -{% decimal line.quantity %} | -{{ line.reference }} | -
- {% for sub in line.substitutes.all %}
- {{ sub.part.IPN }} - {% endfor %} - |
-
| Original IPN | -Allocated Part | -Location | -PCS | -|
|---|---|---|---|---|
| {{ line.bom_item.sub_part.IPN }} | - {% if line.stock_item.part.IPN != line.bom_item.sub_part.IPN %} -{{ line.stock_item.part.IPN }} | - {% else %} -{{ line.stock_item.part.IPN }} | - {% endif %} -{{ line.stock_item.location.pathstring }} | -{{ line.quantity }} | -
-
- | {% trans "Build Order" %} | -{% internal_link build.get_absolute_url build %} | -
|---|---|
| {% trans "Order" %} | -{{ reference }} | -
| {% trans "Part" %} | -{% internal_link part.get_absolute_url part.IPN %} | -
| {% trans "Quantity" %} | -{{ build.quantity }} | -
| {% trans "Description" %} | -{{ build.title }} | -
| {% trans "Issued" %} | -{% format_date build.creation_date %} | -
| {% trans "Target Date" %} | -- {% if build.target_date %} - {% format_date build.target_date %} - {% else %} - Not specified - {% endif %} - | -
| {% trans "Required For" %} | -{% internal_link build.parent.get_absolute_url build.parent %} | -
| {% trans "Issued By" %} | -{{ build.issued_by }} | -
| {% trans "Responsible" %} | -{{ build.responsible }} | -
| {% trans "Sub builds count" %} | -{{ build.sub_build_count }} | -
| {% trans "Sub Builds" %} | -{{ build.sub_builds }} | -
| {% trans "Overdue" %} | -{{ build.is_overdue }} | -
| {% trans "Can complete" %} | -{{ build.can_complete }} | -
| Original IPN | -Reference | -Replace width IPN | -
|---|---|---|
| {{ line.sub_part.IPN }} | -{{ line.reference }} | -{{ line.substitutes.all.0.part.IPN }} | -
|
- Build Order: {{ build.reference }} - Build Qty: {% decimal build.quantity %} - |
-
- |
-
|
- Part: {{ part.name }} - {% if part.IPN %} - IPN: {{ part.IPN }} - {% endif %} - Qty / Unit: {% decimal bom_item.quantity %} {% if part.units %}[{{ part.units }}]{% endif %} - Qty Total: {% decimal quantity %} {% if part.units %}[{{ part.units }}]{% endif %} - |
-
- |
-
-
-
-
-
-{% endraw %}
-```
-
-!!! warning "Asset Naming"
- If the requested asset name does not match the name of an uploaded asset, the template will continue without loading the image.
-
-!!! info "Assets location"
- You need to ensure your asset images to the report/assets directory in the [data directory](../start/intro.md#file-storage). Upload new assets via the [admin interface](../settings/admin.md) to ensure they are uploaded to the correct location on the server.
-
-
-## Report Snippets
-
-A powerful feature provided by the django / WeasyPrint templating framework is the ability to include external template files. This allows commonly used template features to be broken out into separate files and re-used across multiple templates.
-
-To support this, InvenTree provides report "snippets" - short (or not so short) template files which cannot be rendered by themselves, but can be called from other templates.
-
-Similar to assets files, snippet template files are uploaded via the admin interface.
-
-Snippets are included in a template as follows:
-
-```
-{% raw %}{% include 'snippets/| {{ item.part.full_name }} | -{{ item.quantity }} | -||||||||||||
| {{ item.part.full_name }} | +{{ item.quantity }} | +||||||||||||
| {{ sub_item.full_name }} | -Serial Number: {{ sub_item.serial }} | -Pass: {{ sub_item.passedAllRequiredTests }} | -
TEST LABEL{% endblock content %}' - ) - filestr.name = 'ExampleTemplate.html' - - response = self.post( - url, - data={ - 'name': 'New label', - 'description': 'A fancy new label created through API test', - 'label': filestr, - }, - format=None, - expected_code=201, - ) - - # Make sure the expected keys are in the response - self.assertIn('pk', response.data) - self.assertIn('name', response.data) - self.assertIn('description', response.data) - self.assertIn('label', response.data) - self.assertIn('filters', response.data) - self.assertIn('enabled', response.data) - - self.assertEqual(response.data['name'], 'New label') - self.assertEqual( - response.data['description'], 'A fancy new label created through API test' - ) - self.assertEqual(response.data['label'].count('ExampleTemplate'), 1) - - def test_detail_endpoint(self): - """Test that the DETAIL endpoint works for each label.""" - if not self.detail_url: - return - - # Create an item first - self.test_create_endpoint() - - labels = self.model.objects.all() - - n = len(labels) - - # Make sure at least one report defined - self.assertGreaterEqual(n, 1) - - # Check detail page for first report - response = self.get( - reverse(self.detail_url, kwargs={'pk': labels[0].pk}), expected_code=200 - ) - - # Make sure the expected keys are in the response - self.assertIn('pk', response.data) - self.assertIn('name', response.data) - self.assertIn('description', response.data) - self.assertIn('label', response.data) - self.assertIn('filters', response.data) - self.assertIn('enabled', response.data) - - filestr = StringIO( - '{% extends "label/label_base.html" %}{% block content %}
TEST LABEL{% endblock content %}' - ) - filestr.name = 'ExampleTemplate_Updated.html' - - # Check PATCH method - response = self.patch( - reverse(self.detail_url, kwargs={'pk': labels[0].pk}), - { - 'name': 'Changed name during test', - 'description': 'New version of the template', - 'label': filestr, - }, - format=None, - expected_code=200, - ) - - # Make sure the expected keys are in the response - self.assertIn('pk', response.data) - self.assertIn('name', response.data) - self.assertIn('description', response.data) - self.assertIn('label', response.data) - self.assertIn('filters', response.data) - self.assertIn('enabled', response.data) - - self.assertEqual(response.data['name'], 'Changed name during test') - self.assertEqual(response.data['description'], 'New version of the template') - - self.assertEqual(response.data['label'].count('ExampleTemplate_Updated'), 1) - - def test_delete(self): - """Test deleting, after other test are done.""" - if not self.detail_url: - return - - # Create an item first - self.test_create_endpoint() - - labels = self.model.objects.all() - n = len(labels) - # Make sure at least one label defined - self.assertGreaterEqual(n, 1) - - # Delete the last report - self.delete( - reverse(self.detail_url, kwargs={'pk': labels[n - 1].pk}), expected_code=204 - ) - - def test_print_label(self): - """Test printing a label.""" - if not self.print_url: - return - - # Create an item first - self.test_create_endpoint() - - labels = self.model.objects.all() - n = len(labels) - # Make sure at least one label defined - self.assertGreaterEqual(n, 1) - - url = reverse(self.print_url, kwargs={'pk': labels[0].pk}) - - # Try to print without providing a valid item - self.get(url, expected_code=400) - - # Try to print with an invalid item - self.get(url, {self.print_itemname: 9999}, expected_code=400) - - # Now print with a valid item - print(f'{self.print_itemmodel = }') - print(f'{self.print_itemmodel.objects.all() = }') - - item = self.print_itemmodel.objects.first() - self.assertIsNotNone(item) - - response = self.get(url, {self.print_itemname: item.pk}, expected_code=200) - - response_json = json.loads(response.content.decode('utf-8')) - - self.assertIn('file', response_json) - self.assertIn('success', response_json) - self.assertIn('message', response_json) - self.assertTrue(response_json['success']) - - def test_metadata_endpoint(self): - """Unit tests for the metadata field.""" - if not self.metadata_url: - return - - # Create an item first - self.test_create_endpoint() - - labels = self.model.objects.all() - n = len(labels) - # Make sure at least one label defined - self.assertGreaterEqual(n, 1) - - # Test getting metadata - response = self.get( - reverse(self.metadata_url, kwargs={'pk': labels[0].pk}), expected_code=200 - ) - - self.assertEqual(response.data, {'metadata': {}}) - - -class TestStockItemLabel(LabelTest): - """Unit testing class for the StockItemLabel model.""" - - model = label_models.StockItemLabel - - list_url = 'api-stockitem-label-list' - detail_url = 'api-stockitem-label-detail' - metadata_url = 'api-stockitem-label-metadata' - - print_url = 'api-stockitem-label-print' - print_itemname = 'item' - print_itemmodel = StockItem - - -class TestStockLocationLabel(LabelTest): - """Unit testing class for the StockLocationLabel model.""" - - model = label_models.StockLocationLabel - - list_url = 'api-stocklocation-label-list' - detail_url = 'api-stocklocation-label-detail' - metadata_url = 'api-stocklocation-label-metadata' - - print_url = 'api-stocklocation-label-print' - print_itemname = 'location' - print_itemmodel = StockLocation - - -class TestPartLabel(LabelTest): - """Unit testing class for the PartLabel model.""" - - model = label_models.PartLabel - - list_url = 'api-part-label-list' - detail_url = 'api-part-label-detail' - metadata_url = 'api-part-label-metadata' - - print_url = 'api-part-label-print' - print_itemname = 'part' - print_itemmodel = Part - - -class TestBuildLineLabel(LabelTest): - """Unit testing class for the BuildLine model.""" - - model = label_models.BuildLineLabel - - list_url = 'api-buildline-label-list' - detail_url = 'api-buildline-label-detail' - metadata_url = 'api-buildline-label-metadata' - - print_url = 'api-buildline-label-print' - print_itemname = 'line' - print_itemmodel = BuildLine diff --git a/src/backend/InvenTree/label/tests.py b/src/backend/InvenTree/label/tests.py deleted file mode 100644 index 62a84c6439b7..000000000000 --- a/src/backend/InvenTree/label/tests.py +++ /dev/null @@ -1,166 +0,0 @@ -"""Tests for labels.""" - -import io -import json - -from django.apps import apps -from django.conf import settings -from django.core.exceptions import ValidationError -from django.core.files.base import ContentFile -from django.http import JsonResponse -from django.urls import reverse - -from common.models import InvenTreeSetting -from InvenTree.helpers import validateFilterString -from InvenTree.unit_test import InvenTreeAPITestCase -from label.models import LabelOutput -from part.models import Part -from plugin.registry import registry -from stock.models import StockItem - -from .models import PartLabel, StockItemLabel, StockLocationLabel - - -class LabelTest(InvenTreeAPITestCase): - """Unit test class for label models.""" - - fixtures = ['category', 'part', 'location', 'stock'] - - @classmethod - def setUpTestData(cls): - """Ensure that some label instances exist as part of init routine.""" - super().setUpTestData() - apps.get_app_config('label').create_defaults() - - def test_default_labels(self): - """Test that the default label templates are copied across.""" - labels = StockItemLabel.objects.all() - - self.assertGreater(labels.count(), 0) - - labels = StockLocationLabel.objects.all() - - self.assertGreater(labels.count(), 0) - - def test_default_files(self): - """Test that label files exist in the MEDIA directory.""" - - def test_subdir(ref_name): - item_dir = settings.MEDIA_ROOT.joinpath('label', 'inventree', ref_name) - self.assertGreater(len([item_dir.iterdir()]), 0) - - test_subdir('stockitem') - test_subdir('stocklocation') - test_subdir('part') - - def test_filters(self): - """Test the label filters.""" - filter_string = 'part__pk=10' - - filters = validateFilterString(filter_string, model=StockItem) - - self.assertEqual(type(filters), dict) - - bad_filter_string = 'part_pk=10' - - with self.assertRaises(ValidationError): - validateFilterString(bad_filter_string, model=StockItem) - - def test_label_rendering(self): - """Test label rendering.""" - labels = PartLabel.objects.all() - part = Part.objects.first() - - for label in labels: - url = reverse('api-part-label-print', kwargs={'pk': label.pk}) - - # Check that label printing returns the correct response type - response = self.get(f'{url}?parts={part.pk}', expected_code=200) - self.assertIsInstance(response, JsonResponse) - data = json.loads(response.content) - - self.assertIn('message', data) - self.assertIn('file', data) - label_file = data['file'] - self.assertIn('/media/label/output/', label_file) - - def test_print_part_label(self): - """Actually 'print' a label, and ensure that the correct information is contained.""" - label_data = """ - {% load barcode %} - {% load report %} - - - - part: {{ part.pk }} - {{ part.name }} - - data: {{ qr_data|safe }} - - url: {{ qr_url|safe }} - - image: {% part_image part width=128 %} - - logo: {% logo_image %} - - """ - - buffer = io.StringIO() - buffer.write(label_data) - - template = ContentFile(buffer.getvalue(), 'label.html') - - # Construct a label template - label = PartLabel.objects.create( - name='test', description='Test label', enabled=True, label=template - ) - - # Ensure we are in "debug" mode (so the report is generated as HTML) - InvenTreeSetting.set_setting('REPORT_ENABLE', True, None) - - # Set the 'debug' setting for the plugin - plugin = registry.get_plugin('inventreelabel') - plugin.set_setting('DEBUG', True) - - # Print via the API (Note: will default to the builtin plugin if no plugin supplied) - url = reverse('api-part-label-print', kwargs={'pk': label.pk}) - - prt = Part.objects.first() - part_pk = prt.pk - part_name = prt.name - - response = self.get(f'{url}?parts={part_pk}', expected_code=200) - data = json.loads(response.content) - self.assertIn('file', data) - - # Find the generated file - output = LabelOutput.objects.last() - - # Open the file and read data - with open(output.label.path, 'r') as f: - content = f.read() - - # Test that each element has been rendered correctly - self.assertIn(f'part: {part_pk} - {part_name}', content) - self.assertIn(f'data: {{"part": {part_pk}}}', content) - if settings.ENABLE_CLASSIC_FRONTEND: - self.assertIn(f'http://testserver/part/{part_pk}/', content) - - # Check that a encoded image has been generated - self.assertIn('data:image/png;charset=utf-8;base64,', content) - - def test_metadata(self): - """Unit tests for the metadata field.""" - for model in [StockItemLabel, StockLocationLabel, PartLabel]: - p = model.objects.first() - - self.assertIsNone(p.get_metadata('test')) - self.assertEqual(p.get_metadata('test', backup_value=123), 123) - - # Test update via the set_metadata() method - p.set_metadata('test', 3) - self.assertEqual(p.get_metadata('test'), 3) - - for k in ['apple', 'banana', 'carrot', 'carrot', 'banana']: - p.set_metadata(k, k) - - self.assertEqual(len(p.metadata.keys()), 4) diff --git a/src/backend/InvenTree/machine/machine_types/label_printer.py b/src/backend/InvenTree/machine/machine_types/label_printer.py index bfbff04a4559..4fd7f044054c 100644 --- a/src/backend/InvenTree/machine/machine_types/label_printer.py +++ b/src/backend/InvenTree/machine/machine_types/label_printer.py @@ -2,6 +2,7 @@ from typing import Union, cast +from django.db import models from django.db.models.query import QuerySet from django.http import HttpResponse, JsonResponse from django.utils.translation import gettext_lazy as _ @@ -10,10 +11,10 @@ from rest_framework import serializers from rest_framework.request import Request -from label.models import LabelTemplate from machine.machine_type import BaseDriver, BaseMachineType, MachineStatus from plugin import registry as plg_registry -from plugin.base.label.mixins import LabelItemType, LabelPrintingMixin +from plugin.base.label.mixins import LabelPrintingMixin +from report.models import LabelTemplate from stock.models import StockLocation @@ -32,7 +33,7 @@ def print_label( self, machine: 'LabelPrinterMachine', label: LabelTemplate, - item: LabelItemType, + item: models.Model, request: Request, **kwargs, ) -> None: @@ -56,7 +57,7 @@ def print_labels( self, machine: 'LabelPrinterMachine', label: LabelTemplate, - items: QuerySet[LabelItemType], + items: QuerySet, request: Request, **kwargs, ) -> Union[None, JsonResponse]: @@ -83,7 +84,7 @@ def print_labels( self.print_label(machine, label, item, request, **kwargs) def get_printers( - self, label: LabelTemplate, items: QuerySet[LabelItemType], **kwargs + self, label: LabelTemplate, items: QuerySet, **kwargs ) -> list['LabelPrinterMachine']: """Get all printers that would be available to print this job. @@ -122,7 +123,7 @@ def machine_plugin(self) -> LabelPrintingMixin: return cast(LabelPrintingMixin, plg) def render_to_pdf( - self, label: LabelTemplate, item: LabelItemType, request: Request, **kwargs + self, label: LabelTemplate, item: models.Model, request: Request, **kwargs ) -> HttpResponse: """Helper method to render a label to PDF format for a specific item. @@ -137,7 +138,7 @@ def render_to_pdf( return response def render_to_pdf_data( - self, label: LabelTemplate, item: LabelItemType, request: Request, **kwargs + self, label: LabelTemplate, item: models.Model, request: Request, **kwargs ) -> bytes: """Helper method to render a label to PDF and return it as bytes for a specific item. @@ -153,7 +154,7 @@ def render_to_pdf_data( ) def render_to_html( - self, label: LabelTemplate, item: LabelItemType, request: Request, **kwargs + self, label: LabelTemplate, item: models.Model, request: Request, **kwargs ) -> str: """Helper method to render a label to HTML format for a specific item. @@ -168,7 +169,7 @@ def render_to_html( return html def render_to_png( - self, label: LabelTemplate, item: LabelItemType, request: Request, **kwargs + self, label: LabelTemplate, item: models.Model, request: Request, **kwargs ) -> Image: """Helper method to render a label to PNG format for a specific item. diff --git a/src/backend/InvenTree/machine/tests.py b/src/backend/InvenTree/machine/tests.py index ef37f5d5b376..992ca3fe0eff 100755 --- a/src/backend/InvenTree/machine/tests.py +++ b/src/backend/InvenTree/machine/tests.py @@ -10,7 +10,6 @@ from rest_framework import serializers from InvenTree.unit_test import InvenTreeAPITestCase -from label.models import PartLabel from machine.machine_type import BaseDriver, BaseMachineType, MachineStatus from machine.machine_types.label_printer import LabelPrinterBaseDriver from machine.models import MachineConfig @@ -18,6 +17,7 @@ from part.models import Part from plugin.models import PluginConfig from plugin.registry import registry as plg_registry +from report.models import LabelTemplate class TestMachineRegistryMixin(TestCase): @@ -247,31 +247,33 @@ def test_print_label(self): plugin_ref = 'inventreelabelmachine' # setup the label app - apps.get_app_config('label').create_defaults() # type: ignore + apps.get_app_config('report').create_default_labels() # type: ignore plg_registry.reload_plugins() config = cast(PluginConfig, plg_registry.get_plugin(plugin_ref).plugin_config()) # type: ignore config.active = True config.save() parts = Part.objects.all()[:2] - label = cast(PartLabel, PartLabel.objects.first()) + template = LabelTemplate.objects.filter(enabled=True, model_type='part').first() - url = reverse('api-part-label-print', kwargs={'pk': label.pk}) - url += f'/?plugin={plugin_ref}&part[]={parts[0].pk}&part[]={parts[1].pk}' + url = reverse('api-label-print') self.post( url, { + 'plugin': config.key, + 'items': [a.pk for a in parts], + 'template': template.pk, 'machine': str(self.machine.pk), 'driver_options': {'copies': '1', 'test_option': '2'}, }, - expected_code=200, + expected_code=201, ) # test the print labels method call self.print_labels.assert_called_once() self.assertEqual(self.print_labels.call_args.args[0], self.machine.machine) - self.assertEqual(self.print_labels.call_args.args[1], label) + self.assertEqual(self.print_labels.call_args.args[1], template) # TODO re-activate test # self.assertQuerySetEqual( diff --git a/src/backend/InvenTree/order/migrations/0001_initial.py b/src/backend/InvenTree/order/migrations/0001_initial.py index 642b321d4747..edceeffc1191 100644 --- a/src/backend/InvenTree/order/migrations/0001_initial.py +++ b/src/backend/InvenTree/order/migrations/0001_initial.py @@ -30,6 +30,7 @@ class Migration(migrations.Migration): ], options={ 'abstract': False, + 'verbose_name': 'Purchase Order' }, ), migrations.CreateModel( diff --git a/src/backend/InvenTree/order/migrations/0020_auto_20200420_0940.py b/src/backend/InvenTree/order/migrations/0020_auto_20200420_0940.py index aef57a343774..76e903b45aad 100644 --- a/src/backend/InvenTree/order/migrations/0020_auto_20200420_0940.py +++ b/src/backend/InvenTree/order/migrations/0020_auto_20200420_0940.py @@ -35,6 +35,7 @@ class Migration(migrations.Migration): ], options={ 'abstract': False, + 'verbose_name': 'Sales Order', }, ), migrations.AlterField( diff --git a/src/backend/InvenTree/order/migrations/0081_auto_20230314_0725.py b/src/backend/InvenTree/order/migrations/0081_auto_20230314_0725.py index 719a7a503759..f15b800ffebc 100644 --- a/src/backend/InvenTree/order/migrations/0081_auto_20230314_0725.py +++ b/src/backend/InvenTree/order/migrations/0081_auto_20230314_0725.py @@ -39,6 +39,7 @@ class Migration(migrations.Migration): ], options={ 'abstract': False, + 'verbose_name': 'Return Order', }, ), migrations.AlterField( diff --git a/src/backend/InvenTree/order/models.py b/src/backend/InvenTree/order/models.py index 8eae8562ed15..b149f31503df 100644 --- a/src/backend/InvenTree/order/models.py +++ b/src/backend/InvenTree/order/models.py @@ -30,6 +30,7 @@ import InvenTree.tasks import InvenTree.validators import order.validators +import report.mixins import stock.models import users.models as UserModels from common.notifications import InvenTreeNotificationBodies @@ -185,6 +186,7 @@ class Order( StateTransitionMixin, InvenTree.models.InvenTreeBarcodeMixin, InvenTree.models.InvenTreeNotesMixin, + report.mixins.InvenTreeReportMixin, InvenTree.models.MetadataMixin, InvenTree.models.ReferenceIndexingMixin, InvenTree.models.InvenTreeModel, @@ -246,6 +248,17 @@ def clean(self): 'contact': _('Contact does not match selected company') }) + def report_context(self): + """Generate context data for the reporting interface.""" + return { + 'description': self.description, + 'extra_lines': self.extra_lines, + 'lines': self.lines, + 'order': self, + 'reference': self.reference, + 'title': str(self), + } + @classmethod def overdue_filter(cls): """A generic implementation of an 'overdue' filter for the Model class. @@ -362,6 +375,15 @@ class PurchaseOrder(TotalPriceMixin, Order): REFERENCE_PATTERN_SETTING = 'PURCHASEORDER_REFERENCE_PATTERN' REQUIRE_RESPONSIBLE_SETTING = 'PURCHASEORDER_REQUIRE_RESPONSIBLE' + class Meta: + """Model meta options.""" + + verbose_name = _('Purchase Order') + + def report_context(self): + """Return report context data for this PurchaseOrder.""" + return {**super().report_context(), 'supplier': self.supplier} + def get_absolute_url(self): """Get the 'web' URL for this order.""" if settings.ENABLE_CLASSIC_FRONTEND: @@ -820,6 +842,15 @@ class SalesOrder(TotalPriceMixin, Order): REFERENCE_PATTERN_SETTING = 'SALESORDER_REFERENCE_PATTERN' REQUIRE_RESPONSIBLE_SETTING = 'SALESORDER_REQUIRE_RESPONSIBLE' + class Meta: + """Model meta options.""" + + verbose_name = _('Sales Order') + + def report_context(self): + """Generate report context data for this SalesOrder.""" + return {**super().report_context(), 'customer': self.customer} + def get_absolute_url(self): """Get the 'web' URL for this order.""" if settings.ENABLE_CLASSIC_FRONTEND: @@ -1977,6 +2008,15 @@ class ReturnOrder(TotalPriceMixin, Order): REFERENCE_PATTERN_SETTING = 'RETURNORDER_REFERENCE_PATTERN' REQUIRE_RESPONSIBLE_SETTING = 'RETURNORDER_REQUIRE_RESPONSIBLE' + class Meta: + """Model meta options.""" + + verbose_name = _('Return Order') + + def report_context(self): + """Generate report context data for this ReturnOrder.""" + return {**super().report_context(), 'customer': self.customer} + def get_absolute_url(self): """Get the 'web' URL for this order.""" if settings.ENABLE_CLASSIC_FRONTEND: diff --git a/src/backend/InvenTree/order/templates/order/order_base.html b/src/backend/InvenTree/order/templates/order/order_base.html index 173eaeb11944..af422e679456 100644 --- a/src/backend/InvenTree/order/templates/order/order_base.html +++ b/src/backend/InvenTree/order/templates/order/order_base.html @@ -253,11 +253,7 @@ {% if report_enabled %} $('#print-order-report').click(function() { - printReports({ - items: [{{ order.pk }}], - key: 'order', - url: '{% url "api-po-report-list" %}', - }); + printReports('purchaseorder', [{{ order.pk }}]); }); {% endif %} diff --git a/src/backend/InvenTree/order/templates/order/return_order_base.html b/src/backend/InvenTree/order/templates/order/return_order_base.html index eb80a70d53e2..32ccd23f85d7 100644 --- a/src/backend/InvenTree/order/templates/order/return_order_base.html +++ b/src/backend/InvenTree/order/templates/order/return_order_base.html @@ -248,11 +248,7 @@ {% if report_enabled %} $('#print-order-report').click(function() { - printReports({ - items: [{{ order.pk }}], - key: 'order', - url: '{% url "api-return-order-report-list" %}', - }); + printReports('returnorder', [{{ order.pk }}]); }); {% endif %} diff --git a/src/backend/InvenTree/order/templates/order/sales_order_base.html b/src/backend/InvenTree/order/templates/order/sales_order_base.html index e1ed302804c0..6bfb9b098934 100644 --- a/src/backend/InvenTree/order/templates/order/sales_order_base.html +++ b/src/backend/InvenTree/order/templates/order/sales_order_base.html @@ -310,11 +310,7 @@ {% if report_enabled %} $('#print-order-report').click(function() { - printReports({ - items: [{{ order.pk }}], - key: 'order', - url: '{% url "api-so-report-list" %}', - }); + printReports('salesorder', [{{ order.pk }}]); }); {% endif %} diff --git a/src/backend/InvenTree/part/models.py b/src/backend/InvenTree/part/models.py index 80254c61cf72..6364683c5d63 100644 --- a/src/backend/InvenTree/part/models.py +++ b/src/backend/InvenTree/part/models.py @@ -7,7 +7,7 @@ import logging import os import re -from datetime import datetime, timedelta +from datetime import timedelta from decimal import Decimal, InvalidOperation from django.conf import settings @@ -43,6 +43,7 @@ import InvenTree.tasks import part.helpers as part_helpers import part.settings as part_settings +import report.mixins import users.models from build import models as BuildModels from common.models import InvenTreeSetting @@ -340,6 +341,7 @@ def get_queryset(self): class Part( InvenTree.models.InvenTreeBarcodeMixin, InvenTree.models.InvenTreeNotesMixin, + report.mixins.InvenTreeReportMixin, InvenTree.models.MetadataMixin, InvenTree.models.PluginValidationMixin, MPTTModel, @@ -409,8 +411,28 @@ def api_instance_filters(self): """Return API query filters for limiting field results against this instance.""" return {'variant_of': {'exclude_tree': self.pk}} + def report_context(self): + """Return custom report context information.""" + return { + 'bom_items': self.get_bom_items(), + 'category': self.category, + 'description': self.description, + 'IPN': self.IPN, + 'name': self.name, + 'parameters': self.parameters_map(), + 'part': self, + 'qr_data': self.format_barcode(brief=True), + 'qr_url': self.get_absolute_url(), + 'revision': self.revision, + 'test_template_list': self.getTestTemplates(), + 'test_templates': self.getTestTemplates(), + } + def get_context_data(self, request, **kwargs): - """Return some useful context data about this part for template rendering.""" + """Return some useful context data about this part for template rendering. + + TODO: 2024-04-21 - Remove this method once the legacy UI code is removed + """ context = {} context['disabled'] = not self.active diff --git a/src/backend/InvenTree/part/serializers.py b/src/backend/InvenTree/part/serializers.py index 7bed55d416e0..e2182b163541 100644 --- a/src/backend/InvenTree/part/serializers.py +++ b/src/backend/InvenTree/part/serializers.py @@ -432,6 +432,11 @@ class DuplicatePartSerializer(serializers.Serializer): The fields in this serializer control how the Part is duplicated. """ + class Meta: + """Metaclass options.""" + + fields = ['part', 'copy_image', 'copy_bom', 'copy_parameters', 'copy_notes'] + part = serializers.PrimaryKeyRelatedField( queryset=Part.objects.all(), label=_('Original Part'), @@ -471,6 +476,11 @@ class DuplicatePartSerializer(serializers.Serializer): class InitialStockSerializer(serializers.Serializer): """Serializer for creating initial stock quantity.""" + class Meta: + """Metaclass options.""" + + fields = ['quantity', 'location'] + quantity = serializers.DecimalField( max_digits=15, decimal_places=5, @@ -494,6 +504,11 @@ class InitialStockSerializer(serializers.Serializer): class InitialSupplierSerializer(serializers.Serializer): """Serializer for adding initial supplier / manufacturer information.""" + class Meta: + """Metaclass options.""" + + fields = ['supplier', 'sku', 'manufacturer', 'mpn'] + supplier = serializers.PrimaryKeyRelatedField( queryset=company.models.Company.objects.all(), label=_('Supplier'), diff --git a/src/backend/InvenTree/part/templates/part/detail.html b/src/backend/InvenTree/part/templates/part/detail.html index 4cf36dc387bf..1e0c8d471852 100644 --- a/src/backend/InvenTree/part/templates/part/detail.html +++ b/src/backend/InvenTree/part/templates/part/detail.html @@ -629,11 +629,7 @@
| {% trans "Part" %} | +{% trans "Serial Number" %} | +{% trans "Reference" %} | +{% trans "Note" %} | +
|---|---|---|---|
|
+
+
+
+ {{ line.item.part.full_name }}
+
+ |
+ {{ line.item.serial }} | +{{ line.reference }} | +{{ line.notes }} | +
| {% trans "Extra Line Items" %} | |||
| + | + | {{ line.reference }} | +{{ line.notes }} | +
| {% trans "Part" %} | -{% trans "Serial Number" %} | -{% trans "Reference" %} | -{% trans "Note" %} | -
|---|---|---|---|
|
-
-
-
- {{ line.item.part.full_name }}
-
- |
- {{ line.item.serial }} | -{{ line.reference }} | -{{ line.notes }} | -
| {% trans "Extra Line Items" %} | |||
| - | - | {{ line.reference }} | -{{ line.notes }} | -
{{ part.description }}
+{{ stock_item.location }}
+Stock Item ID: {{ stock_item.pk }}
+| {% trans "Test" %} | +{% trans "Result" %} | +{% trans "Value" %} | +{% trans "User" %} | +{% trans "Date" %} | +|||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + {% if test_template %} + {% render_html_text test_template.test_name bold=test_template.required %} + {% elif test_result %} + {% render_html_text test_result.test italic=True %} + {% else %} + + {{ key }} + {% endif %} + | + {% if test_result %} + {% if test_result.result %} +{% trans "Pass" %} | + {% else %} +{% trans "Fail" %} | + {% endif %} +{{ test_result.value }} | +{{ test_result.user.username }} | +{% format_date test_result.date.date %} | + {% else %} + {% if test_template.required %} +{% trans "No result (required)" %} | + {% else %} +{% trans "No result" %} | + {% endif %} + {% endif %} +||||||
|
+ |
+ + {% if sub_item.serialized %} + {% trans "Serial" %}: {{ sub_item.serial }} + {% else %} + {% trans "Quantity" %}: {% decimal sub_item.quantity %} + {% endif %} + | +
{{ part.description }}
-{{ stock_item.location }}
-Stock Item ID: {{ stock_item.pk }}
-| {% trans "Test" %} | -{% trans "Result" %} | -{% trans "Value" %} | -{% trans "User" %} | -{% trans "Date" %} | -|||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - {% if test_template %} - {% render_html_text test_template.test_name bold=test_template.required %} - {% elif test_result %} - {% render_html_text test_result.test italic=True %} - {% else %} - - {{ key }} - {% endif %} - | - {% if test_result %} - {% if test_result.result %} -{% trans "Pass" %} | - {% else %} -{% trans "Fail" %} | - {% endif %} -{{ test_result.value }} | -{{ test_result.user.username }} | -{% format_date test_result.date.date %} | - {% else %} - {% if test_template.required %} -{% trans "No result (required)" %} | - {% else %} -{% trans "No result" %} | - {% endif %} - {% endif %} -||||||
|
- |
- - {% if sub_item.serialized %} - {% trans "Serial" %}: {{ sub_item.serial }} - {% else %} - {% trans "Quantity" %}: {% decimal sub_item.quantity %} - {% endif %} - | -