Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part

InvenTree/company/forms.py

@@ -8,7 +8,7 @@ from __future__ import unicode_literals
 from InvenTree.forms import HelperForm
 from InvenTree.fields import RoundingDecimalFormField
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 import django.forms
 
 import djmoney.settings
@@ -35,6 +35,7 @@ class EditCompanyForm(HelperForm):
 
     currency = django.forms.ChoiceField(
         required=False,
+        label=_('Currency'),
         help_text=_('Default currency used for this company'),
         choices=[('', '----------')] + djmoney.settings.CURRENCY_CHOICES,
         initial=common.settings.currency_code_default,

InvenTree/company/migrations/0032_auto_20210403_1837.py

@@ -0,0 +1,69 @@
+# Generated by Django 3.0.7 on 2021-04-03 18:37
+
+import InvenTree.fields
+import company.models
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import markdownx.models
+import stdimage.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0031_auto_20210103_2215'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='company',
+            name='image',
+            field=stdimage.models.StdImageField(blank=True, null=True, upload_to=company.models.rename_company_image, verbose_name='Image'),
+        ),
+        migrations.AlterField(
+            model_name='company',
+            name='is_customer',
+            field=models.BooleanField(default=False, help_text='Do you sell items to this company?', verbose_name='is customer'),
+        ),
+        migrations.AlterField(
+            model_name='company',
+            name='is_manufacturer',
+            field=models.BooleanField(default=False, help_text='Does this company manufacture parts?', verbose_name='is manufacturer'),
+        ),
+        migrations.AlterField(
+            model_name='company',
+            name='is_supplier',
+            field=models.BooleanField(default=True, help_text='Do you purchase items from this company?', verbose_name='is supplier'),
+        ),
+        migrations.AlterField(
+            model_name='company',
+            name='link',
+            field=InvenTree.fields.InvenTreeURLField(blank=True, help_text='Link to external company information', verbose_name='Link'),
+        ),
+        migrations.AlterField(
+            model_name='company',
+            name='notes',
+            field=markdownx.models.MarkdownxField(blank=True, verbose_name='Notes'),
+        ),
+        migrations.AlterField(
+            model_name='supplierpart',
+            name='base_cost',
+            field=models.DecimalField(decimal_places=3, default=0, help_text='Minimum charge (e.g. stocking fee)', max_digits=10, validators=[django.core.validators.MinValueValidator(0)], verbose_name='base cost'),
+        ),
+        migrations.AlterField(
+            model_name='supplierpart',
+            name='multiple',
+            field=models.PositiveIntegerField(default=1, help_text='Order multiple', validators=[django.core.validators.MinValueValidator(1)], verbose_name='multiple'),
+        ),
+        migrations.AlterField(
+            model_name='supplierpart',
+            name='packaging',
+            field=models.CharField(blank=True, help_text='Part packaging', max_length=50, null=True, verbose_name='Packaging'),
+        ),
+        migrations.AlterField(
+            model_name='supplierpricebreak',
+            name='part',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pricebreaks', to='company.SupplierPart', verbose_name='Part'),
+        ),
+    ]

InvenTree/company/models.py

@@ -9,7 +9,7 @@ import os
 
 import math
 
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MinValueValidator
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -116,7 +116,7 @@ class Company(models.Model):
                                verbose_name=_('Contact'),
                                blank=True, help_text=_('Point of contact'))
 
-    link = InvenTreeURLField(blank=True, help_text=_('Link to external company information'))
+    link = InvenTreeURLField(blank=True, verbose_name=_('Link'), help_text=_('Link to external company information'))
 
     image = StdImageField(
         upload_to=rename_company_image,
@@ -124,15 +124,16 @@ class Company(models.Model):
         blank=True,
         variations={'thumbnail': (128, 128)},
         delete_orphans=True,
+        verbose_name=_('Image'),
     )
 
-    notes = MarkdownxField(blank=True)
+    notes = MarkdownxField(blank=True, verbose_name=_('Notes'))
 
-    is_customer = models.BooleanField(default=False, help_text=_('Do you sell items to this company?'))
+    is_customer = models.BooleanField(default=False, verbose_name=_('is customer'), help_text=_('Do you sell items to this company?'))
 
-    is_supplier = models.BooleanField(default=True, help_text=_('Do you purchase items from this company?'))
+    is_supplier = models.BooleanField(default=True, verbose_name=_('is supplier'), help_text=_('Do you purchase items from this company?'))
 
-    is_manufacturer = models.BooleanField(default=False, help_text=_('Does this company manufacture parts?'))
+    is_manufacturer = models.BooleanField(default=False, verbose_name=_('is manufacturer'), help_text=_('Does this company manufacture parts?'))
 
     currency = models.CharField(
         max_length=3,
@@ -495,11 +496,11 @@ class SupplierPart(models.Model):
         help_text=_('Notes')
     )
 
-    base_cost = models.DecimalField(max_digits=10, decimal_places=3, default=0, validators=[MinValueValidator(0)], help_text=_('Minimum charge (e.g. stocking fee)'))
+    base_cost = models.DecimalField(max_digits=10, decimal_places=3, default=0, validators=[MinValueValidator(0)], verbose_name=_('base cost'), help_text=_('Minimum charge (e.g. stocking fee)'))
 
-    packaging = models.CharField(max_length=50, blank=True, null=True, help_text=_('Part packaging'))
+    packaging = models.CharField(max_length=50, blank=True, null=True, verbose_name=_('Packaging'), help_text=_('Part packaging'))
     
-    multiple = models.PositiveIntegerField(default=1, validators=[MinValueValidator(1)], help_text=('Order multiple'))
+    multiple = models.PositiveIntegerField(default=1, validators=[MinValueValidator(1)], verbose_name=_('multiple'), help_text=_('Order multiple'))
 
     # TODO - Reimplement lead-time as a charfield with special validation (pattern matching).
     # lead_time = models.DurationField(blank=True, null=True)
@@ -660,7 +661,7 @@ class SupplierPriceBreak(common.models.PriceBreak):
         currency: Reference to the currency of this pricebreak (leave empty for base currency)
     """
 
-    part = models.ForeignKey(SupplierPart, on_delete=models.CASCADE, related_name='pricebreaks')
+    part = models.ForeignKey(SupplierPart, on_delete=models.CASCADE, related_name='pricebreaks', verbose_name=_('Part'),)
 
     class Meta:
         unique_together = ("part", "quantity")

InvenTree/company/templates/company/company_base.html

@@ -43,17 +43,17 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
 <p>{{ company.description }}</p>
 <div class='btn-group action-buttons'>
     {% if company.is_supplier and roles.purchase_order.add %}
-    <button type='button' class='btn btn-default' id='company-order-2' title='Create purchase order'>
+    <button type='button' class='btn btn-default' id='company-order-2' title='{% trans "Create Purchase Order" %}'>
         <span class='fas fa-shopping-cart'/>
     </button>
     {% endif %}
     {% if perms.company.change_company %}
-    <button type='button' class='btn btn-default' id='company-edit' title='Edit company information'>
+    <button type='button' class='btn btn-default' id='company-edit' title='{% trans "Edit company information" %}'>
         <span class='fas fa-edit icon-green'/>
     </button>
     {% endif %}
     {% if perms.company.delete_company %}
-    <button type='button' class='btn btn-default' id='company-delete' title='Delete company'>
+    <button type='button' class='btn btn-default' id='company-delete' title='{% trans "Delete Company" %}'>
         <span class='fas fa-trash-alt icon-red'/>
     </button>
     {% endif %}

InvenTree/company/templates/company/delete.html

@@ -1,14 +1,16 @@
 {% extends "modal_delete_form.html" %}
 
+{% load i18n %}
+
 {% block pre_form_content %}
 
-Are you sure you want to delete company '{{ company.name }}'?
+{% blocktrans with company.name as name %}Are you sure you want to delete company '{{ name }}'?{% endblocktrans %}
 
 <br>
 
 {% if company.supplied_part_count > 0 %}
-<p>There are {{ company.supplied_part_count }} parts sourced from this company.<br>
-If this supplier is deleted, these supplier part entries will also be deleted.</p>
+<p>{% blocktrans with company.supplied_part_count as count %}There are {{ count }} parts sourced from this company.<br>
+If this supplier is deleted, these supplier part entries will also be deleted.{% endblocktrans %}</p>
 <ul class='list-group'>
 {% for part in company.parts.all %}
 <li class='list-group-item'><b>{{ part.SKU }}</b> - <i>{{ part.part.full_name }}</i></li>

InvenTree/company/templates/company/detail_supplier_part.html

@@ -16,7 +16,7 @@
 {% if roles.purchase_order.change %}
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid'>
-        <div class='btn-group role='group'>
+        <div class='btn-group' role='group'>
             {% if roles.purchase_order.add %}
                 <button class="btn btn-success" id='supplier-part-create' title='{% trans "Create new supplier part" %}'>
                     <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}

InvenTree/company/templates/company/supplier_part_orders.html

@@ -14,7 +14,7 @@
 {% if roles.purchase_order.add %}
 <div id='button-bar'>
     <div class='btn-group'>
-        <button class='btn btn-primary' type='button' id='order-part2' title='Order part'>
+        <button class='btn btn-primary' type='button' id='order-part2' title='{% trans "Order part" %}'>
             <span class='fas fa-shopping-cart'></span> {% trans "Order Part" %}</button>
     </div>
 </div>

InvenTree/company/views.py

@@ -6,7 +6,7 @@ Django views for interacting with Company app
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.views.generic import DetailView, ListView, UpdateView
 
 from django.urls import reverse