diff --git a/src/backend/InvenTree/InvenTree/api_version.py b/src/backend/InvenTree/InvenTree/api_version.py index ab288f9d24..4f6e538ceb 100644 --- a/src/backend/InvenTree/InvenTree/api_version.py +++ b/src/backend/InvenTree/InvenTree/api_version.py @@ -1,11 +1,14 @@ """InvenTree API version information.""" # InvenTree API version -INVENTREE_API_VERSION = 441 +INVENTREE_API_VERSION = 442 """Increment this API version number whenever there is a significant change to the API that any clients need to know about.""" INVENTREE_API_TEXT = """ +v442 -> 2026-01-17 : https://github.com/inventree/InvenTree/pull/11157 + - Typo fixes, no functional changes + v441 -> 2026-01-17 : https://github.com/inventree/InvenTree/pull/11153 - Allow export of supplier part pricing data diff --git a/src/backend/InvenTree/build/migrations/0012_build_sales_order.py b/src/backend/InvenTree/build/migrations/0012_build_sales_order.py index 6b4a845a6e..cd2860919f 100644 --- a/src/backend/InvenTree/build/migrations/0012_build_sales_order.py +++ b/src/backend/InvenTree/build/migrations/0012_build_sales_order.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='build', name='sales_order', - field=models.ForeignKey(blank=True, help_text='SalesOrder to which this build is allocated', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='builds', to='order.SalesOrder'), + field=models.ForeignKey(blank=True, help_text='Sales Order to which this build is allocated', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='builds', to='order.SalesOrder'), ), ] diff --git a/src/backend/InvenTree/build/migrations/0014_auto_20200425_1243.py b/src/backend/InvenTree/build/migrations/0014_auto_20200425_1243.py index af65a12cb3..88fece94ba 100644 --- a/src/backend/InvenTree/build/migrations/0014_auto_20200425_1243.py +++ b/src/backend/InvenTree/build/migrations/0014_auto_20200425_1243.py @@ -50,7 +50,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='build', name='sales_order', - field=models.ForeignKey(blank=True, help_text='SalesOrder to which this build is allocated', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='builds', to='order.SalesOrder', verbose_name='Sales Order Reference'), + field=models.ForeignKey(blank=True, help_text='Sales Order to which this build is allocated', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='builds', to='order.SalesOrder', verbose_name='Sales Order Reference'), ), migrations.AlterField( model_name='build', diff --git a/src/backend/InvenTree/build/migrations/0021_auto_20201020_0908_squashed_0026_auto_20201023_1228.py b/src/backend/InvenTree/build/migrations/0021_auto_20201020_0908_squashed_0026_auto_20201023_1228.py index 5094d74c6d..db2803f53f 100644 --- a/src/backend/InvenTree/build/migrations/0021_auto_20201020_0908_squashed_0026_auto_20201023_1228.py +++ b/src/backend/InvenTree/build/migrations/0021_auto_20201020_0908_squashed_0026_auto_20201023_1228.py @@ -37,7 +37,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='build', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, help_text='BuildOrder to which this build is allocated', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='children', to='build.Build', verbose_name='Parent Build'), + field=mptt.fields.TreeForeignKey(blank=True, help_text='Build Order to which this build is allocated', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='children', to='build.Build', verbose_name='Parent Build'), ), migrations.AlterField( model_name='build', diff --git a/src/backend/InvenTree/build/migrations/0024_auto_20201201_1023.py b/src/backend/InvenTree/build/migrations/0024_auto_20201201_1023.py index fde4114af5..4e995fdf80 100644 --- a/src/backend/InvenTree/build/migrations/0024_auto_20201201_1023.py +++ b/src/backend/InvenTree/build/migrations/0024_auto_20201201_1023.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='build', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, help_text='BuildOrder to which this build is allocated', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='build.Build', verbose_name='Parent Build'), + field=mptt.fields.TreeForeignKey(blank=True, help_text='Build Order to which this build is allocated', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='build.Build', verbose_name='Parent Build'), ), ] diff --git a/src/backend/InvenTree/build/models.py b/src/backend/InvenTree/build/models.py index 32a6883258..4834e8b1e0 100644 --- a/src/backend/InvenTree/build/models.py +++ b/src/backend/InvenTree/build/models.py @@ -263,7 +263,7 @@ class Build( null=True, related_name='children', verbose_name=_('Parent Build'), - help_text=_('BuildOrder to which this build is allocated'), + help_text=_('Build Order to which this build is allocated'), ) part = models.ForeignKey( @@ -282,7 +282,7 @@ class Build( related_name='builds', null=True, blank=True, - help_text=_('SalesOrder to which this build is allocated'), + help_text=_('Sales Order to which this build is allocated'), ) take_from = models.ForeignKey( diff --git a/src/backend/InvenTree/order/migrations/0085_auto_20230322_1056.py b/src/backend/InvenTree/order/migrations/0085_auto_20230322_1056.py index ea3ad7223d..283af0886b 100644 --- a/src/backend/InvenTree/order/migrations/0085_auto_20230322_1056.py +++ b/src/backend/InvenTree/order/migrations/0085_auto_20230322_1056.py @@ -34,7 +34,7 @@ class Migration(migrations.Migration): ('reference', models.CharField(blank=True, help_text='Line item reference', max_length=100, verbose_name='Reference')), ('notes', models.CharField(blank=True, help_text='Line item notes', max_length=500, verbose_name='Notes')), ('target_date', models.DateField(blank=True, help_text='Target date for this line item (leave blank to use the target date from the order)', null=True, verbose_name='Target Date')), - ('received_date', models.DateField(blank=True, help_text='The date this this return item was received', null=True, verbose_name='Received Date')), + ('received_date', models.DateField(blank=True, help_text='The date this return item was received', null=True, verbose_name='Received Date')), ('outcome', models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'Return'), (30, 'Repair'), (50, 'Refund'), (40, 'Replace'), (60, 'Reject')], default=10, help_text='Outcome for this line item', verbose_name='Outcome')), ('price_currency', djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3)), ('price', InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=6, default_currency='', help_text='Cost associated with return or repair for this line item', max_digits=19, null=True, validators=[djmoney.models.validators.MinMoneyValidator(0)], verbose_name='Price')), diff --git a/src/backend/InvenTree/order/models.py b/src/backend/InvenTree/order/models.py index ddb0a5d9cd..6a54c2b277 100644 --- a/src/backend/InvenTree/order/models.py +++ b/src/backend/InvenTree/order/models.py @@ -3022,7 +3022,7 @@ class ReturnOrderLineItem(StatusCodeMixin, OrderLineItem): null=True, blank=True, verbose_name=_('Received Date'), - help_text=_('The date this this return item was received'), + help_text=_('The date this return item was received'), ) @property diff --git a/src/backend/InvenTree/plugin/builtin/integration/core_notifications.py b/src/backend/InvenTree/plugin/builtin/integration/core_notifications.py index 3634c2b3e0..a35df5739d 100644 --- a/src/backend/InvenTree/plugin/builtin/integration/core_notifications.py +++ b/src/backend/InvenTree/plugin/builtin/integration/core_notifications.py @@ -128,7 +128,7 @@ class InvenTreeSlackNotifications(NotificationMixin, SettingsMixin, InvenTreePlu SETTINGS = { 'NOTIFICATION_SLACK_URL': { - 'name': _('Slack incoming webhook url'), + 'name': _('Slack incoming webhook URL'), 'description': _('URL that is used to send messages to a slack channel'), 'protected': True, } diff --git a/src/backend/InvenTree/plugin/migrations/0001_initial.py b/src/backend/InvenTree/plugin/migrations/0001_initial.py index 1dd7032f69..bdaa89afc1 100644 --- a/src/backend/InvenTree/plugin/migrations/0001_initial.py +++ b/src/backend/InvenTree/plugin/migrations/0001_initial.py @@ -16,7 +16,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('key', models.CharField(help_text='Key of plugin', max_length=255, unique=True, verbose_name='Key')), - ('name', models.CharField(blank=True, help_text='PluginName of the plugin', max_length=255, null=True, verbose_name='Name')), + ('name', models.CharField(blank=True, help_text='Name of the plugin', max_length=255, null=True, verbose_name='Name')), ('active', models.BooleanField(default=False, help_text='Is the plugin active', verbose_name='Active')), ], ), diff --git a/src/backend/InvenTree/plugin/models.py b/src/backend/InvenTree/plugin/models.py index 06923f5ba7..bed2d80c8b 100644 --- a/src/backend/InvenTree/plugin/models.py +++ b/src/backend/InvenTree/plugin/models.py @@ -24,7 +24,7 @@ class PluginConfig(InvenTree.models.MetadataMixin, models.Model): Attributes: key: slug of the plugin (this must be unique across all installed plugins!) - name: PluginName of the plugin - serves for a manual double check if the right plugin is used + name: Name of the plugin - serves for a manual double check if the right plugin is used active: Should the plugin be loaded? """ @@ -52,7 +52,7 @@ class PluginConfig(InvenTree.models.MetadataMixin, models.Model): blank=True, max_length=255, verbose_name=_('Name'), - help_text=_('PluginName of the plugin'), + help_text=_('Name of the plugin'), ) package_name = models.CharField( diff --git a/src/backend/InvenTree/plugin/serializers.py b/src/backend/InvenTree/plugin/serializers.py index 88fc9f7746..5fbff385b4 100644 --- a/src/backend/InvenTree/plugin/serializers.py +++ b/src/backend/InvenTree/plugin/serializers.py @@ -149,7 +149,7 @@ class PluginConfigInstallSerializer(serializers.Serializer): if not data.get('confirm'): raise ValidationError({'confirm': _('Installation not confirmed')}) if (not data.get('url')) and (not data.get('packagename')): - msg = _('Either packagename of URL must be provided') + msg = _('Either packagename or URL must be provided') raise ValidationError({'url': msg, 'packagename': msg}) return data diff --git a/src/backend/InvenTree/plugin/test_api.py b/src/backend/InvenTree/plugin/test_api.py index e1dc292124..ca6c312670 100644 --- a/src/backend/InvenTree/plugin/test_api.py +++ b/src/backend/InvenTree/plugin/test_api.py @@ -17,7 +17,7 @@ class PluginDetailAPITest(PluginMixin, InvenTreeAPITestCase): def setUp(self): """Setup for all tests.""" - self.MSG_NO_PKG = 'Either packagename of URL must be provided' + self.MSG_NO_PKG = 'Either packagename or URL must be provided' self.PKG_NAME = 'inventree-brother-plugin' self.PKG_URL = 'git+https://github.com/inventree/inventree-brother-plugin'