From 1c97aaf87a4474df73198b2b6d46f702ff802b66 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 6 Oct 2020 19:46:53 +1100 Subject: [PATCH 1/5] Set permissions for order views --- InvenTree/InvenTree/views.py | 8 ++- .../templates/order/sales_order_base.html | 2 +- InvenTree/order/views.py | 53 ++++++++++++++++--- InvenTree/users/models.py | 4 ++ 4 files changed, 58 insertions(+), 9 deletions(-) diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py index 198903db9a..bb7c1e6f5d 100644 --- a/InvenTree/InvenTree/views.py +++ b/InvenTree/InvenTree/views.py @@ -22,7 +22,7 @@ from django.views.generic.base import TemplateView from part.models import Part, PartCategory from stock.models import StockLocation, StockItem from common.models import InvenTreeSetting, ColorTheme -from users.models import check_user_role +from users.models import check_user_role, RuleSet from .forms import DeleteForm, EditUserForm, SetPasswordForm, ColorThemeSelectForm from .helpers import str2bool @@ -147,7 +147,13 @@ class InvenTreeRoleMixin(PermissionRequiredMixin): for required in roles_required: (role, permission) = required.split('.') + + if role not in RuleSet.RULESET_NAMES: + raise ValueError(f"Role '{role}' is not a valid role") + if permission not in RuleSet.RULESET_PERMISSIONS: + raise ValueError(f"Permission '{permission}' is not a valid permission") + # Return False if the user does not have *any* of the required roles if not check_user_role(user, role, permission): return False diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index 0572104e09..52856cadbd 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -44,7 +44,7 @@ src="{% static 'img/blank_image.png' %}" - {% if order.status == SalesOrderStatus.PENDING %} diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 5d140fb77c..28b8416b65 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -28,19 +28,22 @@ from . import forms as order_forms from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView from InvenTree.helpers import DownloadFile, str2bool +from InvenTree.views import InvenTreeRoleMixin from InvenTree.status_codes import PurchaseOrderStatus, SalesOrderStatus, StockStatus logger = logging.getLogger(__name__) -class PurchaseOrderIndex(ListView): +class PurchaseOrderIndex(InvenTreeRoleMixin, ListView): """ List view for all purchase orders """ model = PurchaseOrder template_name = 'order/purchase_orders.html' context_object_name = 'orders' + role_required = 'purchase_order.view' + def get_queryset(self): """ Retrieve the list of purchase orders, ensure that the most recent ones are returned first. """ @@ -55,19 +58,21 @@ class PurchaseOrderIndex(ListView): return ctx -class SalesOrderIndex(ListView): +class SalesOrderIndex(InvenTreeRoleMixin, ListView): model = SalesOrder template_name = 'order/sales_orders.html' context_object_name = 'orders' + role_required = 'sales_order.view' -class PurchaseOrderDetail(DetailView): +class PurchaseOrderDetail(InvenTreeRoleMixin, DetailView): """ Detail view for a PurchaseOrder object """ context_object_name = 'order' queryset = PurchaseOrder.objects.all().prefetch_related('lines') template_name = 'order/purchase_order_detail.html' + role_required = 'purchase_order.view' def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) @@ -75,12 +80,13 @@ class PurchaseOrderDetail(DetailView): return ctx -class SalesOrderDetail(DetailView): +class SalesOrderDetail(InvenTreeRoleMixin, DetailView): """ Detail view for a SalesOrder object """ context_object_name = 'order' queryset = SalesOrder.objects.all().prefetch_related('lines') template_name = 'order/sales_order_detail.html' + role_required = 'sales_order.view' class PurchaseOrderAttachmentCreate(AjaxCreateView): @@ -92,6 +98,7 @@ class PurchaseOrderAttachmentCreate(AjaxCreateView): form_class = order_forms.EditPurchaseOrderAttachmentForm ajax_form_title = _("Add Purchase Order Attachment") ajax_template_name = "modal_form.html" + role_required = 'purchase_order.add' def post_save(self, **kwargs): self.object.user = self.request.user @@ -139,6 +146,7 @@ class SalesOrderAttachmentCreate(AjaxCreateView): model = SalesOrderAttachment form_class = order_forms.EditSalesOrderAttachmentForm ajax_form_title = _('Add Sales Order Attachment') + role_required = 'sales_order.add' def post_save(self, **kwargs): self.object.user = self.request.user @@ -174,6 +182,7 @@ class PurchaseOrderAttachmentEdit(AjaxUpdateView): model = PurchaseOrderAttachment form_class = order_forms.EditPurchaseOrderAttachmentForm ajax_form_title = _("Edit Attachment") + role_required = 'purchase_order.change' def get_data(self): return { @@ -195,6 +204,7 @@ class SalesOrderAttachmentEdit(AjaxUpdateView): model = SalesOrderAttachment form_class = order_forms.EditSalesOrderAttachmentForm ajax_form_title = _("Edit Attachment") + role_required = 'sales_order.change' def get_data(self): return { @@ -216,6 +226,7 @@ class PurchaseOrderAttachmentDelete(AjaxDeleteView): ajax_form_title = _("Delete Attachment") ajax_template_name = "order/delete_attachment.html" context_object_name = "attachment" + role_required = 'purchase_order.delete' def get_data(self): return { @@ -230,6 +241,7 @@ class SalesOrderAttachmentDelete(AjaxDeleteView): ajax_form_title = _("Delete Attachment") ajax_template_name = "order/delete_attachment.html" context_object_name = "attachment" + role_required = 'sales_order.delete' def get_data(self): return { @@ -237,12 +249,13 @@ class SalesOrderAttachmentDelete(AjaxDeleteView): } -class PurchaseOrderNotes(UpdateView): +class PurchaseOrderNotes(InvenTreeRoleMixin, UpdateView): """ View for updating the 'notes' field of a PurchaseOrder """ context_object_name = 'order' template_name = 'order/order_notes.html' model = PurchaseOrder + role_required = 'purchase_order.change' fields = ['notes'] @@ -259,12 +272,13 @@ class PurchaseOrderNotes(UpdateView): return ctx -class SalesOrderNotes(UpdateView): +class SalesOrderNotes(InvenTreeRoleMixin, UpdateView): """ View for editing the 'notes' field of a SalesORder """ context_object_name = 'order' template_name = 'order/sales_order_notes.html' model = SalesOrder + role_required = 'sales_order.view' fields = ['notes'] @@ -286,6 +300,7 @@ class PurchaseOrderCreate(AjaxCreateView): model = PurchaseOrder ajax_form_title = _("Create Purchase Order") form_class = order_forms.EditPurchaseOrderForm + role_required = 'purchase_order.add' def get_initial(self): initials = super().get_initial().copy() @@ -317,6 +332,7 @@ class SalesOrderCreate(AjaxCreateView): model = SalesOrder ajax_form_title = _("Create Sales Order") form_class = order_forms.EditSalesOrderForm + role_required = 'sales_order.add' def get_initial(self): initials = super().get_initial().copy() @@ -347,6 +363,7 @@ class PurchaseOrderEdit(AjaxUpdateView): model = PurchaseOrder ajax_form_title = _('Edit Purchase Order') form_class = order_forms.EditPurchaseOrderForm + role_required = 'purchase_order.change' def get_form(self): @@ -367,6 +384,7 @@ class SalesOrderEdit(AjaxUpdateView): model = SalesOrder ajax_form_title = _('Edit Sales Order') form_class = order_forms.EditSalesOrderForm + role_required = 'sales_order.change' def get_form(self): form = super().get_form() @@ -384,6 +402,7 @@ class PurchaseOrderCancel(AjaxUpdateView): ajax_form_title = _('Cancel Order') ajax_template_name = 'order/order_cancel.html' form_class = order_forms.CancelPurchaseOrderForm + role_required = 'purchase_order.change' def post(self, request, *args, **kwargs): """ Mark the PO as 'CANCELLED' """ @@ -417,6 +436,7 @@ class SalesOrderCancel(AjaxUpdateView): ajax_form_title = _("Cancel sales order") ajax_template_name = "order/sales_order_cancel.html" form_class = order_forms.CancelSalesOrderForm + role_required = 'sales_order.change' def post(self, request, *args, **kwargs): @@ -451,6 +471,7 @@ class PurchaseOrderIssue(AjaxUpdateView): ajax_form_title = _('Issue Order') ajax_template_name = "order/order_issue.html" form_class = order_forms.IssuePurchaseOrderForm + role_required = 'purchase_order.change' def post(self, request, *args, **kwargs): """ Mark the purchase order as 'PLACED' """ @@ -486,6 +507,7 @@ class PurchaseOrderComplete(AjaxUpdateView): ajax_template_name = "order/order_complete.html" ajax_form_title = _("Complete Order") context_object_name = 'order' + role_required = 'purchase_order.change' def get_context_data(self): @@ -520,6 +542,7 @@ class SalesOrderShip(AjaxUpdateView): context_object_name = 'order' ajax_template_name = 'order/sales_order_ship.html' ajax_form_title = _('Ship Order') + role_required = 'sales_order.change' def post(self, request, *args, **kwargs): @@ -563,6 +586,7 @@ class PurchaseOrderExport(AjaxView): """ model = PurchaseOrder + role_required = 'purchase_order.view' def get(self, request, *args, **kwargs): @@ -594,6 +618,7 @@ class PurchaseOrderReceive(AjaxUpdateView): form_class = order_forms.ReceivePurchaseOrderForm ajax_form_title = _("Receive Parts") ajax_template_name = "order/receive_parts.html" + role_required = 'purchase_order.change' # Where the parts will be going (selected in POST request) destination = None @@ -779,6 +804,11 @@ class OrderParts(AjaxView): ajax_form_title = _("Order Parts") ajax_template_name = 'order/order_wizard/select_parts.html' + role_required = [ + 'part.view', + 'purchase_order.change', + ] + # List of Parts we wish to order parts = [] suppliers = [] @@ -1085,6 +1115,7 @@ class POLineItemCreate(AjaxCreateView): context_object_name = 'line' form_class = order_forms.EditPurchaseOrderLineItemForm ajax_form_title = _('Add Line Item') + role_required = 'purchase_order.add' def post(self, request, *arg, **kwargs): @@ -1199,6 +1230,7 @@ class SOLineItemCreate(AjaxCreateView): context_order_name = 'line' form_class = order_forms.EditSalesOrderLineItemForm ajax_form_title = _('Add Line Item') + role_required = 'sales_order.add' def get_form(self, *args, **kwargs): @@ -1250,6 +1282,7 @@ class SOLineItemEdit(AjaxUpdateView): model = SalesOrderLineItem form_class = order_forms.EditSalesOrderLineItemForm ajax_form_title = _('Edit Line Item') + role_required = 'sales_order.change' def get_form(self): form = super().get_form() @@ -1268,6 +1301,7 @@ class POLineItemEdit(AjaxUpdateView): form_class = order_forms.EditPurchaseOrderLineItemForm ajax_template_name = 'modal_form.html' ajax_form_title = _('Edit Line Item') + role_required = 'purchase_order.change' def get_form(self): form = super().get_form() @@ -1285,7 +1319,8 @@ class POLineItemDelete(AjaxDeleteView): model = PurchaseOrderLineItem ajax_form_title = _('Delete Line Item') ajax_template_name = 'order/po_lineitem_delete.html' - + role_required = 'purchase_order.delete' + def get_data(self): return { 'danger': _('Deleted line item'), @@ -1297,6 +1332,7 @@ class SOLineItemDelete(AjaxDeleteView): model = SalesOrderLineItem ajax_form_title = _("Delete Line Item") ajax_template_name = "order/so_lineitem_delete.html" + role_required = 'sales_order.delete' def get_data(self): return { @@ -1310,6 +1346,7 @@ class SalesOrderAllocationCreate(AjaxCreateView): model = SalesOrderAllocation form_class = order_forms.EditSalesOrderAllocationForm ajax_form_title = _('Allocate Stock to Order') + role_required = 'sales_order.add' def get_initial(self): initials = super().get_initial().copy() @@ -1379,6 +1416,7 @@ class SalesOrderAllocationEdit(AjaxUpdateView): model = SalesOrderAllocation form_class = order_forms.EditSalesOrderAllocationForm ajax_form_title = _('Edit Allocation Quantity') + role_required = 'sales_order.change' def get_form(self): form = super().get_form() @@ -1396,3 +1434,4 @@ class SalesOrderAllocationDelete(AjaxDeleteView): ajax_form_title = _("Remove allocation") context_object_name = 'allocation' ajax_template_name = "order/so_allocation_delete.html" + role_required = 'sales_order.delete' diff --git a/InvenTree/users/models.py b/InvenTree/users/models.py index fcf137bb01..d3c713d07d 100644 --- a/InvenTree/users/models.py +++ b/InvenTree/users/models.py @@ -36,6 +36,10 @@ class RuleSet(models.Model): choice[0] for choice in RULESET_CHOICES ] + RULESET_PERMISSIONS = [ + 'view', 'add', 'change', 'delete', + ] + RULESET_MODELS = { 'admin': [ 'auth_group', From 9abb211cdf35331e5f525d9a70ec9cf3af794148 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 6 Oct 2020 20:09:55 +1100 Subject: [PATCH 2/5] Update template permissions --- .../order/templates/order/order_base.html | 18 ++++++++++-------- .../order/templates/order/order_notes.html | 2 ++ .../order/templates/order/po_attachments.html | 1 - .../templates/order/purchase_order_detail.html | 6 +++--- .../order/templates/order/purchase_orders.html | 2 ++ .../templates/order/sales_order_base.html | 8 +++++--- .../order/templates/order/sales_orders.html | 2 ++ 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html index 71e3455722..3b199c1840 100644 --- a/InvenTree/order/templates/order/order_base.html +++ b/InvenTree/order/templates/order/order_base.html @@ -32,29 +32,31 @@ src="{% static 'img/blank_image.png' %}"

- - {% if order.status == PurchaseOrderStatus.PENDING and order.lines.count > 0 %} - {% elif order.status == PurchaseOrderStatus.PLACED %} - - {% endif %} {% if order.status == PurchaseOrderStatus.PENDING or order.status == PurchaseOrderStatus.PLACED %} - {% endif %} + {% endif %} +

diff --git a/InvenTree/order/templates/order/order_notes.html b/InvenTree/order/templates/order/order_notes.html index 237098e10d..0b45a5da4b 100644 --- a/InvenTree/order/templates/order/order_notes.html +++ b/InvenTree/order/templates/order/order_notes.html @@ -28,9 +28,11 @@

{% trans "Order Notes" %}

+ {% if roles.purchase_order.change %}
+ {% endif %}
diff --git a/InvenTree/order/templates/order/po_attachments.html b/InvenTree/order/templates/order/po_attachments.html index f5421e8760..d60d605771 100644 --- a/InvenTree/order/templates/order/po_attachments.html +++ b/InvenTree/order/templates/order/po_attachments.html @@ -14,7 +14,6 @@ {% include "attachment_table.html" with attachments=order.attachments.all %} - {% endblock %} {% block js_ready %} diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 9b9eddb887..642ff96d4a 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -12,7 +12,7 @@
- {% if order.status == PurchaseOrderStatus.PENDING %} + {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %} {% endif %}
@@ -209,12 +209,12 @@ $("#po-table").inventreeTable({ var pk = row.pk; - {% if order.status == PurchaseOrderStatus.PENDING %} + {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.delete %} html += makeIconButton('fa-edit icon-blue', 'button-line-edit', pk, '{% trans "Edit line item" %}'); html += makeIconButton('fa-trash-alt icon-red', 'button-line-delete', pk, '{% trans "Delete line item" %}'); {% endif %} - {% if order.status == PurchaseOrderStatus.PLACED %} + {% if order.status == PurchaseOrderStatus.PLACED and roles.purchase_order.change %} if (row.received < row.quantity) { html += makeIconButton('fa-clipboard-check', 'button-line-receive', pk, '{% trans "Receive line item" %}'); } diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html index 1019092151..d02af36ff5 100644 --- a/InvenTree/order/templates/order/purchase_orders.html +++ b/InvenTree/order/templates/order/purchase_orders.html @@ -14,7 +14,9 @@ InvenTree | {% trans "Purchase Orders" %}
+ {% if roles.purchase_order.add %} + {% endif %}
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index 52856cadbd..2eb13eaa64 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -41,12 +41,10 @@ src="{% static 'img/blank_image.png' %}"

{{ order.description }}

+ {% if roles.sales_order.change %} - {% if order.status == SalesOrderStatus.PENDING %} {% endif %} + {% endif %} +
{% endblock %} diff --git a/InvenTree/order/templates/order/sales_orders.html b/InvenTree/order/templates/order/sales_orders.html index 4e29156773..dfe09d5d0d 100644 --- a/InvenTree/order/templates/order/sales_orders.html +++ b/InvenTree/order/templates/order/sales_orders.html @@ -14,7 +14,9 @@ InvenTree | {% trans "Sales Orders" %}
+ {% if roles.sales_order.add %} + {% endif %}
From 2325b1e4bad9a0fb21449992831337f2c7bc12c5 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 6 Oct 2020 20:10:14 +1100 Subject: [PATCH 3/5] Unit test fixes --- InvenTree/order/test_views.py | 17 ++++++++++++++++- InvenTree/order/views.py | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/InvenTree/order/test_views.py b/InvenTree/order/test_views.py index 932cac9060..246cc2dd48 100644 --- a/InvenTree/order/test_views.py +++ b/InvenTree/order/test_views.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals from django.test import TestCase from django.urls import reverse from django.contrib.auth import get_user_model +from django.contrib.auth.models import Group from InvenTree.status_codes import PurchaseOrderStatus @@ -32,7 +33,21 @@ class OrderViewTestCase(TestCase): # Create a user User = get_user_model() - User.objects.create_user('username', 'user@email.com', 'password') + user = User.objects.create_user('username', 'user@email.com', 'password') + + # Ensure that the user has the correct permissions! + g = Group.objects.create(name='orders') + user.groups.add(g) + + for rule in g.rule_sets.all(): + if rule.name in ['purchase_order', 'sales_order']: + rule.can_change = True + rule.can_add = True + rule.can_delete = True + + rule.save() + + g.save() self.client.login(username='username', password='password') diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 28b8416b65..d2d02bb2c9 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -255,7 +255,7 @@ class PurchaseOrderNotes(InvenTreeRoleMixin, UpdateView): context_object_name = 'order' template_name = 'order/order_notes.html' model = PurchaseOrder - role_required = 'purchase_order.change' + role_required = 'purchase_order.view' fields = ['notes'] From b80e4302baffe5cc79aedca35aaf85cc5ef61eff Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 6 Oct 2020 20:29:16 +1100 Subject: [PATCH 4/5] Update permissions for build app --- .../build/templates/build/build_base.html | 12 ++--- InvenTree/build/tests.py | 45 ++++++++++++++++++- InvenTree/build/views.py | 18 +++++++- 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index ed3da576d5..f076013def 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -41,19 +41,21 @@ src="{% static 'img/blank_image.png' %}"
- {% if build.is_active %} - - {% endif %} - {% if build.status == BuildStatus.CANCELLED %} - {% endif %} diff --git a/InvenTree/build/tests.py b/InvenTree/build/tests.py index 9b6d51c33a..92ca034a4a 100644 --- a/InvenTree/build/tests.py +++ b/InvenTree/build/tests.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals from django.test import TestCase from django.urls import reverse from django.contrib.auth import get_user_model +from django.contrib.auth.models import Group from rest_framework.test import APITestCase from rest_framework import status @@ -30,6 +31,20 @@ class BuildTestSimple(TestCase): User.objects.create_user('testuser', 'test@testing.com', 'password') self.user = User.objects.get(username='testuser') + + g = Group.objects.create(name='builders') + self.user.groups.add(g) + + for rule in g.rule_sets.all(): + if rule.name == 'build': + rule.can_change = True + rule.can_add = True + rule.can_delete = True + + rule.save() + + g.save() + self.client.login(username='testuser', password='password') def test_build_objects(self): @@ -94,7 +109,20 @@ class TestBuildAPI(APITestCase): def setUp(self): # Create a user for auth User = get_user_model() - User.objects.create_user('testuser', 'test@testing.com', 'password') + user = User.objects.create_user('testuser', 'test@testing.com', 'password') + + g = Group.objects.create(name='builders') + user.groups.add(g) + + for rule in g.rule_sets.all(): + if rule.name == 'build': + rule.can_change = True + rule.can_add = True + rule.can_delete = True + + rule.save() + + g.save() self.client.login(username='testuser', password='password') @@ -131,7 +159,20 @@ class TestBuildViews(TestCase): # Create a user User = get_user_model() - User.objects.create_user('username', 'user@email.com', 'password') + user = User.objects.create_user('username', 'user@email.com', 'password') + + g = Group.objects.create(name='builders') + user.groups.add(g) + + for rule in g.rule_sets.all(): + if rule.name == 'build': + rule.can_change = True + rule.can_add = True + rule.can_delete = True + + rule.save() + + g.save() self.client.login(username='username', password='password') diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py index 88dc66085f..b2b8b24502 100644 --- a/InvenTree/build/views.py +++ b/InvenTree/build/views.py @@ -17,16 +17,18 @@ from . import forms from stock.models import StockLocation, StockItem from InvenTree.views import AjaxUpdateView, AjaxCreateView, AjaxDeleteView +from InvenTree.views import InvenTreeRoleMixin from InvenTree.helpers import str2bool, ExtractSerialNumbers from InvenTree.status_codes import BuildStatus -class BuildIndex(ListView): +class BuildIndex(InvenTreeRoleMixin, ListView): """ View for displaying list of Builds """ model = Build template_name = 'build/index.html' context_object_name = 'builds' + role_required = 'build.view' def get_queryset(self): """ Return all Build objects (order by date, newest first) """ @@ -56,6 +58,7 @@ class BuildCancel(AjaxUpdateView): ajax_form_title = _('Cancel Build') context_object_name = 'build' form_class = forms.CancelBuildForm + role_required = 'build.change' def post(self, request, *args, **kwargs): """ Handle POST request. Mark the build status as CANCELLED """ @@ -94,6 +97,7 @@ class BuildAutoAllocate(AjaxUpdateView): context_object_name = 'build' ajax_form_title = _('Allocate Stock') ajax_template_name = 'build/auto_allocate.html' + role_required = 'build.change' def get_context_data(self, *args, **kwargs): """ Get the context data for form rendering. """ @@ -147,6 +151,7 @@ class BuildUnallocate(AjaxUpdateView): form_class = forms.ConfirmBuildForm ajax_form_title = _("Unallocate Stock") ajax_template_name = "build/unallocate.html" + form_required = 'build.change' def post(self, request, *args, **kwargs): @@ -184,6 +189,7 @@ class BuildComplete(AjaxUpdateView): context_object_name = "build" ajax_form_title = _("Complete Build") ajax_template_name = "build/complete.html" + role_required = 'build.change' def get_form(self): """ Get the form object. @@ -325,6 +331,7 @@ class BuildNotes(UpdateView): context_object_name = 'build' template_name = 'build/notes.html' model = Build + role_required = 'build.view' fields = ['notes'] @@ -342,9 +349,11 @@ class BuildNotes(UpdateView): class BuildDetail(DetailView): """ Detail view of a single Build object. """ + model = Build template_name = 'build/detail.html' context_object_name = 'build' + role_required = 'build.view' def get_context_data(self, **kwargs): @@ -363,6 +372,7 @@ class BuildAllocate(DetailView): model = Build context_object_name = 'build' template_name = 'build/allocate.html' + role_required = ['build.change'] def get_context_data(self, **kwargs): """ Provide extra context information for the Build allocation page """ @@ -392,6 +402,7 @@ class BuildCreate(AjaxCreateView): form_class = forms.EditBuildForm ajax_form_title = _('Start new Build') ajax_template_name = 'modal_form.html' + role_required = 'build.add' def get_initial(self): """ Get initial parameters for Build creation. @@ -427,6 +438,7 @@ class BuildUpdate(AjaxUpdateView): context_object_name = 'build' ajax_form_title = _('Edit Build Details') ajax_template_name = 'modal_form.html' + role_required = 'build.change' def get_data(self): return { @@ -440,6 +452,7 @@ class BuildDelete(AjaxDeleteView): model = Build ajax_template_name = 'build/delete_build.html' ajax_form_title = _('Delete Build') + role_required = 'build.delete' class BuildItemDelete(AjaxDeleteView): @@ -451,6 +464,7 @@ class BuildItemDelete(AjaxDeleteView): ajax_template_name = 'build/delete_build_item.html' ajax_form_title = _('Unallocate Stock') context_object_name = 'item' + role_required = 'build.delete' def get_data(self): return { @@ -465,6 +479,7 @@ class BuildItemCreate(AjaxCreateView): form_class = forms.EditBuildItemForm ajax_template_name = 'build/create_build_item.html' ajax_form_title = _('Allocate new Part') + role_required = 'build.add' part = None available_stock = None @@ -618,6 +633,7 @@ class BuildItemEdit(AjaxUpdateView): ajax_template_name = 'modal_form.html' form_class = forms.EditBuildItemForm ajax_form_title = _('Edit Stock Allocation') + role_required = 'build.change' def get_data(self): return { From 8b37229e4b3b84c5e241f5e4418e2f1eaee3fc29 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 6 Oct 2020 20:31:38 +1100 Subject: [PATCH 5/5] The real translations are the ones we made along the way --- InvenTree/locale/de/LC_MESSAGES/django.po | 442 ++++++++++++---------- InvenTree/locale/en/LC_MESSAGES/django.po | 416 ++++++++++---------- InvenTree/locale/es/LC_MESSAGES/django.po | 416 ++++++++++---------- 3 files changed, 668 insertions(+), 606 deletions(-) diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po index 7632fadc4c..7f955ffea2 100644 --- a/InvenTree/locale/de/LC_MESSAGES/django.po +++ b/InvenTree/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-05 13:20+0000\n" +"POT-Creation-Date: 2020-10-06 09:31+0000\n" "PO-Revision-Date: 2020-05-03 11:32+0200\n" "Last-Translator: Christian Schlüter \n" "Language-Team: C \n" @@ -17,11 +17,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 19.12.0\n" -#: InvenTree/api.py:83 +#: InvenTree/api.py:85 msgid "No action specified" msgstr "Keine Aktion angegeben" -#: InvenTree/api.py:97 +#: InvenTree/api.py:99 msgid "No matching action found" msgstr "Keine passende Aktion gefunden" @@ -49,35 +49,35 @@ msgstr "" msgid "Apply Theme" msgstr "" -#: InvenTree/helpers.py:337 order/models.py:187 order/models.py:261 +#: InvenTree/helpers.py:339 order/models.py:187 order/models.py:261 msgid "Invalid quantity provided" msgstr "Keine gültige Menge" -#: InvenTree/helpers.py:340 +#: InvenTree/helpers.py:342 msgid "Empty serial number string" msgstr "Keine Seriennummer angegeben" -#: InvenTree/helpers.py:361 +#: InvenTree/helpers.py:363 #, python-brace-format msgid "Duplicate serial: {n}" msgstr "Doppelte Seriennummer: {n}" -#: InvenTree/helpers.py:365 InvenTree/helpers.py:368 InvenTree/helpers.py:371 +#: InvenTree/helpers.py:367 InvenTree/helpers.py:370 InvenTree/helpers.py:373 #, python-brace-format msgid "Invalid group: {g}" msgstr "Ungültige Gruppe: {g}" -#: InvenTree/helpers.py:376 +#: InvenTree/helpers.py:378 #, fuzzy, python-brace-format #| msgid "Duplicate serial: {n}" msgid "Duplicate serial: {g}" msgstr "Doppelte Seriennummer: {n}" -#: InvenTree/helpers.py:384 +#: InvenTree/helpers.py:386 msgid "No serial numbers found" msgstr "Keine Seriennummern gefunden" -#: InvenTree/helpers.py:388 +#: InvenTree/helpers.py:390 #, python-brace-format msgid "Number of unique serial number ({s}) must match quantity ({q})" msgstr "" @@ -107,19 +107,19 @@ msgstr "Name" msgid "Description (optional)" msgstr "Firmenbeschreibung" -#: InvenTree/settings.py:343 +#: InvenTree/settings.py:348 msgid "English" msgstr "Englisch" -#: InvenTree/settings.py:344 +#: InvenTree/settings.py:349 msgid "German" msgstr "Deutsch" -#: InvenTree/settings.py:345 +#: InvenTree/settings.py:350 msgid "French" msgstr "Französisch" -#: InvenTree/settings.py:346 +#: InvenTree/settings.py:351 msgid "Polish" msgstr "Polnisch" @@ -152,7 +152,7 @@ msgid "Returned" msgstr "Zurückgegeben" #: InvenTree/status_codes.py:136 -#: order/templates/order/sales_order_base.html:103 +#: order/templates/order/sales_order_base.html:105 msgid "Shipped" msgstr "Versendet" @@ -207,7 +207,7 @@ msgstr "Überschuss darf 100% nicht überschreiten" msgid "Overage must be an integer value or a percentage" msgstr "Überschuss muss eine Ganzzahl oder ein Prozentwert sein" -#: InvenTree/views.py:661 +#: InvenTree/views.py:703 msgid "Database Statistics" msgstr "Datenbankstatistiken" @@ -281,7 +281,7 @@ msgstr "Bau-Fertigstellung bestätigen" msgid "Build quantity must be integer value for trackable parts" msgstr "Überschuss muss eine Ganzzahl oder ein Prozentwert sein" -#: build/models.py:73 build/templates/build/build_base.html:70 +#: build/models.py:73 build/templates/build/build_base.html:72 msgid "Build Title" msgstr "Bau-Titel" @@ -289,7 +289,7 @@ msgstr "Bau-Titel" msgid "Brief description of the build" msgstr "Kurze Beschreibung des Baus" -#: build/models.py:84 build/templates/build/build_base.html:91 +#: build/models.py:84 build/templates/build/build_base.html:93 msgid "Parent Build" msgstr "Eltern-Bau" @@ -299,7 +299,7 @@ msgstr "Eltern-Bau, dem dieser Bau zugewiesen ist" #: build/models.py:90 build/templates/build/allocate.html:329 #: build/templates/build/auto_allocate.html:19 -#: build/templates/build/build_base.html:75 +#: build/templates/build/build_base.html:77 #: build/templates/build/detail.html:22 order/models.py:501 #: order/templates/order/order_wizard/select_parts.html:30 #: order/templates/order/purchase_order_detail.html:147 @@ -424,7 +424,7 @@ msgid "Stock quantity to allocate to build" msgstr "Lagerobjekt-Anzahl dem Bau zuweisen" #: build/templates/build/allocate.html:17 -#: company/templates/company/detail_part.html:18 order/views.py:779 +#: company/templates/company/detail_part.html:18 order/views.py:804 #: part/templates/part/category.html:122 msgid "Order Parts" msgstr "Teile bestellen" @@ -458,7 +458,7 @@ msgstr "Seriennummer" #: build/templates/build/allocate.html:172 #: build/templates/build/auto_allocate.html:20 -#: build/templates/build/build_base.html:80 +#: build/templates/build/build_base.html:82 #: build/templates/build/detail.html:27 #: company/templates/company/supplier_part_pricing.html:71 #: order/templates/order/order_wizard/select_parts.html:32 @@ -598,11 +598,29 @@ msgstr "Dieser Bau ist Kind von Bau" msgid "Admin view" msgstr "Admin" -#: build/templates/build/build_base.html:66 build/templates/build/detail.html:9 +#: build/templates/build/build_base.html:45 +#, fuzzy +#| msgid "Edited build" +msgid "Edit Build" +msgstr "Bau bearbeitet" + +#: build/templates/build/build_base.html:49 build/views.py:190 +msgid "Complete Build" +msgstr "Bau fertigstellen" + +#: build/templates/build/build_base.html:52 build/views.py:58 +msgid "Cancel Build" +msgstr "Bau abbrechen" + +#: build/templates/build/build_base.html:58 build/views.py:454 +msgid "Delete Build" +msgstr "Bau entfernt" + +#: build/templates/build/build_base.html:68 build/templates/build/detail.html:9 msgid "Build Details" msgstr "Bau-Status" -#: build/templates/build/build_base.html:85 +#: build/templates/build/build_base.html:87 #: build/templates/build/detail.html:42 #: order/templates/order/receive_parts.html:24 #: stock/templates/stock/item_base.html:276 templates/InvenTree/search.html:175 @@ -612,7 +630,7 @@ msgstr "Bau-Status" msgid "Status" msgstr "Status" -#: build/templates/build/build_base.html:98 order/models.py:499 +#: build/templates/build/build_base.html:100 order/models.py:499 #: order/templates/order/sales_order_base.html:9 #: order/templates/order/sales_order_base.html:33 #: order/templates/order/sales_order_notes.html:10 @@ -622,15 +640,15 @@ msgstr "Status" msgid "Sales Order" msgstr "Bestellung" -#: build/templates/build/build_base.html:104 +#: build/templates/build/build_base.html:106 msgid "BOM Price" msgstr "Stücklistenpreis" -#: build/templates/build/build_base.html:109 +#: build/templates/build/build_base.html:111 msgid "BOM pricing is incomplete" msgstr "Stücklistenbepreisung ist unvollständig" -#: build/templates/build/build_base.html:112 +#: build/templates/build/build_base.html:114 msgid "No pricing information" msgstr "Keine Preisinformation" @@ -694,8 +712,8 @@ msgid "Batch" msgstr "Los" #: build/templates/build/detail.html:61 -#: order/templates/order/order_base.html:98 -#: order/templates/order/sales_order_base.html:97 templates/js/build.html:71 +#: order/templates/order/order_base.html:100 +#: order/templates/order/sales_order_base.html:99 templates/js/build.html:71 msgid "Created" msgstr "Erstellt" @@ -737,7 +755,7 @@ msgid "Save" msgstr "Speichern" #: build/templates/build/notes.html:33 company/templates/company/notes.html:30 -#: order/templates/order/order_notes.html:32 +#: order/templates/order/order_notes.html:33 #: order/templates/order/sales_order_notes.html:37 #: part/templates/part/notes.html:33 stock/templates/stock/item_notes.html:33 msgid "Edit notes" @@ -757,100 +775,88 @@ msgid "Are you sure you wish to unallocate all stock for this build?" msgstr "" "Sind Sie sicher, dass sie alle Lagerobjekte von diesem Bau entfernen möchten?" -#: build/views.py:56 -msgid "Cancel Build" -msgstr "Bau abbrechen" - -#: build/views.py:74 +#: build/views.py:77 msgid "Confirm build cancellation" msgstr "Bauabbruch bestätigen" -#: build/views.py:79 +#: build/views.py:82 msgid "Build was cancelled" msgstr "Bau wurde abgebrochen" -#: build/views.py:95 +#: build/views.py:98 msgid "Allocate Stock" msgstr "Lagerbestand zuweisen" -#: build/views.py:108 +#: build/views.py:112 msgid "No matching build found" msgstr "Kein passender Bau gefunden" -#: build/views.py:127 +#: build/views.py:131 msgid "Confirm stock allocation" msgstr "Lagerbestandszuordnung bestätigen" -#: build/views.py:128 +#: build/views.py:132 msgid "Check the confirmation box at the bottom of the list" msgstr "Bestätigunsbox am Ende der Liste bestätigen" -#: build/views.py:148 build/views.py:452 +#: build/views.py:152 build/views.py:465 msgid "Unallocate Stock" msgstr "Zuweisung aufheben" -#: build/views.py:161 +#: build/views.py:166 msgid "Confirm unallocation of build stock" msgstr "Zuweisungsaufhebung bestätigen" -#: build/views.py:162 stock/views.py:405 +#: build/views.py:167 stock/views.py:405 msgid "Check the confirmation box" msgstr "Bestätigungsbox bestätigen" -#: build/views.py:185 -msgid "Complete Build" -msgstr "Bau fertigstellen" - -#: build/views.py:264 +#: build/views.py:270 msgid "Confirm completion of build" msgstr "Baufertigstellung bestätigen" -#: build/views.py:271 +#: build/views.py:277 msgid "Invalid location selected" msgstr "Ungültige Ortsauswahl" -#: build/views.py:296 stock/views.py:1621 +#: build/views.py:302 stock/views.py:1621 #, python-brace-format msgid "The following serial numbers already exist: ({sn})" msgstr "Die folgende Seriennummer existiert bereits: ({sn})" -#: build/views.py:317 +#: build/views.py:323 msgid "Build marked as COMPLETE" msgstr "Bau als FERTIG markiert" -#: build/views.py:393 +#: build/views.py:403 msgid "Start new Build" msgstr "Neuen Bau beginnen" -#: build/views.py:418 +#: build/views.py:429 msgid "Created new build" msgstr "Neuen Bau angelegt" -#: build/views.py:428 +#: build/views.py:439 msgid "Edit Build Details" msgstr "Baudetails bearbeiten" -#: build/views.py:433 +#: build/views.py:445 msgid "Edited build" msgstr "Bau bearbeitet" -#: build/views.py:442 -msgid "Delete Build" -msgstr "Bau entfernt" - -#: build/views.py:457 +#: build/views.py:471 msgid "Removed parts from build allocation" msgstr "Teile von Bauzuordnung entfernt" -#: build/views.py:467 +#: build/views.py:481 msgid "Allocate new Part" msgstr "Neues Teil zuordnen" -#: build/views.py:620 +#: build/views.py:635 msgid "Edit Stock Allocation" msgstr "Teilzuordnung bearbeiten" -#: build/views.py:624 +#: build/views.py:640 msgid "Updated Build Item" msgstr "Bauobjekt aktualisiert" @@ -1055,7 +1061,7 @@ msgstr "Hersteller" #: company/templates/company/detail.html:21 #: company/templates/company/supplier_part_base.html:66 #: company/templates/company/supplier_part_detail.html:21 -#: order/templates/order/order_base.html:79 +#: order/templates/order/order_base.html:81 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:170 #: stock/templates/stock/item_base.html:251 templates/js/company.html:48 #: templates/js/company.html:162 templates/js/order.html:146 @@ -1063,7 +1069,7 @@ msgid "Supplier" msgstr "Zulieferer" #: company/templates/company/detail.html:26 -#: order/templates/order/sales_order_base.html:78 stock/models.py:370 +#: order/templates/order/sales_order_base.html:80 stock/models.py:370 #: stock/models.py:371 stock/templates/stock/item_base.html:169 #: templates/js/company.html:40 templates/js/order.html:221 msgid "Customer" @@ -1169,12 +1175,12 @@ msgid "Purchase Orders" msgstr "Bestellungen" #: company/templates/company/purchase_orders.html:14 -#: order/templates/order/purchase_orders.html:17 +#: order/templates/order/purchase_orders.html:18 msgid "Create new purchase order" msgstr "Neue Bestellung anlegen" #: company/templates/company/purchase_orders.html:14 -#: order/templates/order/purchase_orders.html:17 +#: order/templates/order/purchase_orders.html:18 msgid "New Purchase Order" msgstr "Neue Bestellung" @@ -1188,12 +1194,12 @@ msgid "Sales Orders" msgstr "Bestellungen" #: company/templates/company/sales_orders.html:14 -#: order/templates/order/sales_orders.html:17 +#: order/templates/order/sales_orders.html:18 msgid "Create new sales order" msgstr "Neuen Auftrag anlegen" #: company/templates/company/sales_orders.html:14 -#: order/templates/order/sales_orders.html:17 +#: order/templates/order/sales_orders.html:18 msgid "New Sales Order" msgstr "Neuer Auftrag" @@ -1251,7 +1257,7 @@ msgid "Pricing Information" msgstr "Preisinformationen ansehen" #: company/templates/company/supplier_part_pricing.html:15 company/views.py:399 -#: part/templates/part/sale_prices.html:13 part/views.py:2226 +#: part/templates/part/sale_prices.html:13 part/views.py:2228 msgid "Add Price Break" msgstr "Preisstaffel hinzufügen" @@ -1382,17 +1388,17 @@ msgstr "Neues Zuliefererteil anlegen" msgid "Delete Supplier Part" msgstr "Zuliefererteil entfernen" -#: company/views.py:404 part/views.py:2232 +#: company/views.py:404 part/views.py:2234 #, fuzzy #| msgid "Add Price Break" msgid "Added new price break" msgstr "Preisstaffel hinzufügen" -#: company/views.py:441 part/views.py:2277 +#: company/views.py:441 part/views.py:2279 msgid "Edit Price Break" msgstr "Preisstaffel bearbeiten" -#: company/views.py:456 part/views.py:2293 +#: company/views.py:456 part/views.py:2295 msgid "Delete Price Break" msgstr "Preisstaffel löschen" @@ -1424,20 +1430,20 @@ msgstr "" msgid "Enabled" msgstr "" -#: order/forms.py:24 +#: order/forms.py:24 order/templates/order/order_base.html:40 msgid "Place order" msgstr "Bestellung aufgeben" -#: order/forms.py:35 +#: order/forms.py:35 order/templates/order/order_base.html:47 msgid "Mark order as complete" msgstr "Bestellung als vollständig markieren" -#: order/forms.py:46 order/forms.py:57 -#: order/templates/order/sales_order_base.html:54 +#: order/forms.py:46 order/forms.py:57 order/templates/order/order_base.html:52 +#: order/templates/order/sales_order_base.html:52 msgid "Cancel order" msgstr "Bestellung stornieren" -#: order/forms.py:68 order/templates/order/sales_order_base.html:51 +#: order/forms.py:68 order/templates/order/sales_order_base.html:49 msgid "Ship order" msgstr "Bestellung versenden" @@ -1497,7 +1503,7 @@ msgstr "" msgid "Date order was completed" msgstr "Bestellung als vollständig markieren" -#: order/models.py:185 order/models.py:259 part/views.py:1343 +#: order/models.py:185 order/models.py:259 part/views.py:1345 #: stock/models.py:241 stock/models.py:805 msgid "Quantity must be greater than zero" msgstr "Anzahl muss größer Null sein" @@ -1578,32 +1584,48 @@ msgstr "Zuordnungsanzahl eingeben" msgid "Are you sure you want to delete this attachment?" msgstr "Sind Sie sicher, dass Sie diesen Anhang löschen wollen?" -#: order/templates/order/order_base.html:64 +#: order/templates/order/order_base.html:36 +#, fuzzy +#| msgid "Edited company information" +msgid "Edit order information" +msgstr "Firmeninformation bearbeitet" + +#: order/templates/order/order_base.html:44 +#, fuzzy +#| msgid "Receive line item" +msgid "Receive items" +msgstr "Position empfangen" + +#: order/templates/order/order_base.html:57 +msgid "Export order to file" +msgstr "" + +#: order/templates/order/order_base.html:66 msgid "Purchase Order Details" msgstr "Bestelldetails" -#: order/templates/order/order_base.html:69 -#: order/templates/order/sales_order_base.html:68 +#: order/templates/order/order_base.html:71 +#: order/templates/order/sales_order_base.html:70 msgid "Order Reference" msgstr "Bestellreferenz" -#: order/templates/order/order_base.html:74 -#: order/templates/order/sales_order_base.html:73 +#: order/templates/order/order_base.html:76 +#: order/templates/order/sales_order_base.html:75 msgid "Order Status" msgstr "Bestellstatus" -#: order/templates/order/order_base.html:85 templates/js/order.html:153 +#: order/templates/order/order_base.html:87 templates/js/order.html:153 msgid "Supplier Reference" msgstr "Zuliefererreferenz" -#: order/templates/order/order_base.html:104 +#: order/templates/order/order_base.html:106 msgid "Issued" msgstr "Aufgegeben" -#: order/templates/order/order_base.html:111 +#: order/templates/order/order_base.html:113 #: order/templates/order/purchase_order_detail.html:182 #: order/templates/order/receive_parts.html:22 -#: order/templates/order/sales_order_base.html:110 +#: order/templates/order/sales_order_base.html:112 msgid "Received" msgstr "Empfangen" @@ -1672,8 +1694,8 @@ msgid "Attachments" msgstr "Anhänge" #: order/templates/order/purchase_order_detail.html:16 -#: order/templates/order/sales_order_detail.html:17 order/views.py:1087 -#: order/views.py:1201 +#: order/templates/order/sales_order_detail.html:17 order/views.py:1117 +#: order/views.py:1232 msgid "Add Line Item" msgstr "Position hinzufügen" @@ -1743,15 +1765,15 @@ msgstr "" msgid "This SalesOrder has not been fully allocated" msgstr "Dieser Auftrag ist nicht vollständig zugeordnet" -#: order/templates/order/sales_order_base.html:47 +#: order/templates/order/sales_order_base.html:57 msgid "Packing List" msgstr "Packliste" -#: order/templates/order/sales_order_base.html:63 +#: order/templates/order/sales_order_base.html:65 msgid "Sales Order Details" msgstr "Auftragsdetails" -#: order/templates/order/sales_order_base.html:84 templates/js/order.html:228 +#: order/templates/order/sales_order_base.html:86 templates/js/order.html:228 msgid "Customer Reference" msgstr "Kundenreferenz" @@ -1819,147 +1841,147 @@ msgstr "Sind Sie sicher, dass Sie diese Position löschen möchten?" msgid "Order Items" msgstr "Bestellungspositionen" -#: order/views.py:93 +#: order/views.py:99 msgid "Add Purchase Order Attachment" msgstr "Bestellanhang hinzufügen" -#: order/views.py:102 order/views.py:149 part/views.py:90 stock/views.py:167 +#: order/views.py:109 order/views.py:157 part/views.py:92 stock/views.py:167 msgid "Added attachment" msgstr "Anhang hinzugefügt" -#: order/views.py:141 +#: order/views.py:148 msgid "Add Sales Order Attachment" msgstr "Auftragsanhang hinzufügen" -#: order/views.py:176 order/views.py:197 +#: order/views.py:184 order/views.py:206 msgid "Edit Attachment" msgstr "Anhang bearbeiten" -#: order/views.py:180 order/views.py:201 +#: order/views.py:189 order/views.py:211 msgid "Attachment updated" msgstr "Anhang aktualisiert" -#: order/views.py:216 order/views.py:230 +#: order/views.py:226 order/views.py:241 msgid "Delete Attachment" msgstr "Anhang löschen" -#: order/views.py:222 order/views.py:236 stock/views.py:223 +#: order/views.py:233 order/views.py:248 stock/views.py:223 msgid "Deleted attachment" msgstr "Anhang gelöscht" -#: order/views.py:287 +#: order/views.py:301 msgid "Create Purchase Order" msgstr "Bestellung anlegen" -#: order/views.py:318 +#: order/views.py:333 msgid "Create Sales Order" msgstr "Auftrag anlegen" -#: order/views.py:348 +#: order/views.py:364 msgid "Edit Purchase Order" msgstr "Bestellung bearbeiten" -#: order/views.py:368 +#: order/views.py:385 msgid "Edit Sales Order" msgstr "Auftrag bearbeiten" -#: order/views.py:384 +#: order/views.py:402 msgid "Cancel Order" msgstr "Bestellung stornieren" -#: order/views.py:399 order/views.py:431 +#: order/views.py:418 order/views.py:451 msgid "Confirm order cancellation" msgstr "Bestellstornierung bestätigen" -#: order/views.py:417 +#: order/views.py:436 msgid "Cancel sales order" msgstr "Auftrag stornieren" -#: order/views.py:437 +#: order/views.py:457 msgid "Could not cancel order" msgstr "Stornierung fehlgeschlagen" -#: order/views.py:451 +#: order/views.py:471 msgid "Issue Order" msgstr "Bestellung aufgeben" -#: order/views.py:466 +#: order/views.py:487 msgid "Confirm order placement" msgstr "Bestellungstätigung bestätigen" -#: order/views.py:487 +#: order/views.py:508 msgid "Complete Order" msgstr "Auftrag fertigstellen" -#: order/views.py:522 +#: order/views.py:544 msgid "Ship Order" msgstr "Versenden" -#: order/views.py:538 +#: order/views.py:561 msgid "Confirm order shipment" msgstr "Versand bestätigen" -#: order/views.py:544 +#: order/views.py:567 msgid "Could not ship order" msgstr "Versand fehlgeschlagen" -#: order/views.py:595 +#: order/views.py:619 msgid "Receive Parts" msgstr "Teile empfangen" -#: order/views.py:662 +#: order/views.py:687 msgid "Items received" msgstr "Anzahl empfangener Positionen" -#: order/views.py:676 +#: order/views.py:701 msgid "No destination set" msgstr "Kein Ziel gesetzt" -#: order/views.py:721 +#: order/views.py:746 msgid "Error converting quantity to number" msgstr "Fehler beim Konvertieren zu Zahl" -#: order/views.py:727 +#: order/views.py:752 msgid "Receive quantity less than zero" msgstr "Anzahl kleiner null empfangen" -#: order/views.py:733 +#: order/views.py:758 msgid "No lines specified" msgstr "Keine Zeilen angegeben" -#: order/views.py:1107 +#: order/views.py:1138 msgid "Invalid Purchase Order" msgstr "Ungültige Bestellung" -#: order/views.py:1115 +#: order/views.py:1146 msgid "Supplier must match for Part and Order" msgstr "Zulieferer muss zum Teil und zur Bestellung passen" -#: order/views.py:1120 +#: order/views.py:1151 msgid "Invalid SupplierPart selection" msgstr "Ungültige Wahl des Zulieferer-Teils" -#: order/views.py:1252 order/views.py:1270 +#: order/views.py:1284 order/views.py:1303 msgid "Edit Line Item" msgstr "Position bearbeiten" -#: order/views.py:1286 order/views.py:1298 +#: order/views.py:1320 order/views.py:1333 msgid "Delete Line Item" msgstr "Position löschen" -#: order/views.py:1291 order/views.py:1303 +#: order/views.py:1326 order/views.py:1339 msgid "Deleted line item" msgstr "Position gelöscht" -#: order/views.py:1312 +#: order/views.py:1348 msgid "Allocate Stock to Order" msgstr "Lagerbestand dem Auftrag zuweisen" -#: order/views.py:1381 +#: order/views.py:1418 msgid "Edit Allocation Quantity" msgstr "Zuordnung bearbeiten" -#: order/views.py:1396 +#: order/views.py:1434 msgid "Remove allocation" msgstr "Zuordnung entfernen" @@ -2339,7 +2361,7 @@ msgstr "Notizen zum Stücklisten-Objekt" msgid "BOM line checksum" msgstr "Prüfsumme der Stückliste" -#: part/models.py:1612 part/views.py:1349 part/views.py:1401 +#: part/models.py:1612 part/views.py:1351 part/views.py:1403 #: stock/models.py:231 #, fuzzy #| msgid "Overage must be an integer value or a percentage" @@ -2410,7 +2432,7 @@ msgstr "Stückliste bearbeiten" msgid "Validate Bill of Materials" msgstr "Stückliste validieren" -#: part/templates/part/bom.html:48 part/views.py:1640 +#: part/templates/part/bom.html:48 part/views.py:1642 msgid "Export Bill of Materials" msgstr "Stückliste exportieren" @@ -2526,7 +2548,7 @@ msgstr "Neuen Bau beginnen" msgid "All parts" msgstr "Alle Teile" -#: part/templates/part/category.html:24 part/views.py:2043 +#: part/templates/part/category.html:24 part/views.py:2045 msgid "Create new part category" msgstr "Teilkategorie anlegen" @@ -2570,7 +2592,7 @@ msgstr "Teile (inklusive Unter-Kategorien)" msgid "Export Part Data" msgstr "" -#: part/templates/part/category.html:114 part/views.py:511 +#: part/templates/part/category.html:114 part/views.py:513 msgid "Create new part" msgstr "Neues Teil anlegen" @@ -2815,7 +2837,7 @@ msgid "Edit" msgstr "Bearbeiten" #: part/templates/part/params.html:39 part/templates/part/supplier.html:17 -#: users/models.py:141 +#: users/models.py:145 msgid "Delete" msgstr "Löschen" @@ -3051,184 +3073,184 @@ msgstr "Neues Teil hinzufügen" msgid "New Variant" msgstr "Varianten" -#: part/views.py:78 +#: part/views.py:80 msgid "Add part attachment" msgstr "Teilanhang hinzufügen" -#: part/views.py:129 templates/attachment_table.html:30 +#: part/views.py:131 templates/attachment_table.html:30 msgid "Edit attachment" msgstr "Anhang bearbeiten" -#: part/views.py:135 +#: part/views.py:137 msgid "Part attachment updated" msgstr "Teilanhang aktualisiert" -#: part/views.py:150 +#: part/views.py:152 msgid "Delete Part Attachment" msgstr "Teilanhang löschen" -#: part/views.py:158 +#: part/views.py:160 msgid "Deleted part attachment" msgstr "Teilanhang gelöscht" -#: part/views.py:167 +#: part/views.py:169 #, fuzzy #| msgid "Create Part Parameter Template" msgid "Create Test Template" msgstr "Teilparametervorlage anlegen" -#: part/views.py:196 +#: part/views.py:198 #, fuzzy #| msgid "Edit Template" msgid "Edit Test Template" msgstr "Vorlage bearbeiten" -#: part/views.py:212 +#: part/views.py:214 #, fuzzy #| msgid "Delete Template" msgid "Delete Test Template" msgstr "Vorlage löschen" -#: part/views.py:221 +#: part/views.py:223 msgid "Set Part Category" msgstr "Teilkategorie auswählen" -#: part/views.py:271 +#: part/views.py:273 #, python-brace-format msgid "Set category for {n} parts" msgstr "Kategorie für {n} Teile setzen" -#: part/views.py:306 +#: part/views.py:308 msgid "Create Variant" msgstr "Variante anlegen" -#: part/views.py:386 +#: part/views.py:388 msgid "Duplicate Part" msgstr "Teil duplizieren" -#: part/views.py:393 +#: part/views.py:395 msgid "Copied part" msgstr "Teil kopiert" -#: part/views.py:518 +#: part/views.py:520 msgid "Created new part" msgstr "Neues Teil angelegt" -#: part/views.py:733 +#: part/views.py:735 msgid "Part QR Code" msgstr "Teil-QR-Code" -#: part/views.py:752 +#: part/views.py:754 msgid "Upload Part Image" msgstr "Teilbild hochladen" -#: part/views.py:760 part/views.py:797 +#: part/views.py:762 part/views.py:799 msgid "Updated part image" msgstr "Teilbild aktualisiert" -#: part/views.py:769 +#: part/views.py:771 msgid "Select Part Image" msgstr "Teilbild auswählen" -#: part/views.py:800 +#: part/views.py:802 msgid "Part image not found" msgstr "Teilbild nicht gefunden" -#: part/views.py:811 +#: part/views.py:813 msgid "Edit Part Properties" msgstr "Teileigenschaften bearbeiten" -#: part/views.py:835 +#: part/views.py:837 msgid "Validate BOM" msgstr "BOM validieren" -#: part/views.py:1002 +#: part/views.py:1004 msgid "No BOM file provided" msgstr "Keine Stückliste angegeben" -#: part/views.py:1352 +#: part/views.py:1354 msgid "Enter a valid quantity" msgstr "Bitte eine gültige Anzahl eingeben" -#: part/views.py:1377 part/views.py:1380 +#: part/views.py:1379 part/views.py:1382 msgid "Select valid part" msgstr "Bitte ein gültiges Teil auswählen" -#: part/views.py:1386 +#: part/views.py:1388 msgid "Duplicate part selected" msgstr "Teil doppelt ausgewählt" -#: part/views.py:1424 +#: part/views.py:1426 msgid "Select a part" msgstr "Teil auswählen" -#: part/views.py:1430 +#: part/views.py:1432 #, fuzzy #| msgid "Select part to be used in BOM" msgid "Selected part creates a circular BOM" msgstr "Teil für die Nutzung in der Stückliste auswählen" -#: part/views.py:1434 +#: part/views.py:1436 msgid "Specify quantity" msgstr "Anzahl angeben" -#: part/views.py:1690 +#: part/views.py:1692 msgid "Confirm Part Deletion" msgstr "Löschen des Teils bestätigen" -#: part/views.py:1699 +#: part/views.py:1701 msgid "Part was deleted" msgstr "Teil wurde gelöscht" -#: part/views.py:1708 +#: part/views.py:1710 msgid "Part Pricing" msgstr "Teilbepreisung" -#: part/views.py:1834 +#: part/views.py:1836 msgid "Create Part Parameter Template" msgstr "Teilparametervorlage anlegen" -#: part/views.py:1844 +#: part/views.py:1846 msgid "Edit Part Parameter Template" msgstr "Teilparametervorlage bearbeiten" -#: part/views.py:1853 +#: part/views.py:1855 msgid "Delete Part Parameter Template" msgstr "Teilparametervorlage löschen" -#: part/views.py:1863 +#: part/views.py:1865 msgid "Create Part Parameter" msgstr "Teilparameter anlegen" -#: part/views.py:1915 +#: part/views.py:1917 msgid "Edit Part Parameter" msgstr "Teilparameter bearbeiten" -#: part/views.py:1931 +#: part/views.py:1933 msgid "Delete Part Parameter" msgstr "Teilparameter löschen" -#: part/views.py:1990 +#: part/views.py:1992 msgid "Edit Part Category" msgstr "Teilkategorie bearbeiten" -#: part/views.py:2027 +#: part/views.py:2029 msgid "Delete Part Category" msgstr "Teilkategorie löschen" -#: part/views.py:2035 +#: part/views.py:2037 msgid "Part category was deleted" msgstr "Teilekategorie wurde gelöscht" -#: part/views.py:2098 +#: part/views.py:2100 msgid "Create BOM item" msgstr "BOM-Position anlegen" -#: part/views.py:2166 +#: part/views.py:2168 msgid "Edit BOM item" msgstr "BOM-Position beaarbeiten" -#: part/views.py:2216 +#: part/views.py:2218 msgid "Confim BOM item deletion" msgstr "Löschung von BOM-Position bestätigen" @@ -5009,76 +5031,84 @@ msgstr "Position löschen" msgid "Delete Stock" msgstr "Bestand löschen" -#: users/admin.py:62 +#: users/admin.py:61 #, fuzzy #| msgid "User" msgid "Users" msgstr "Benutzer" -#: users/admin.py:63 +#: users/admin.py:62 msgid "Select which users are assigned to this group" msgstr "" -#: users/admin.py:124 +#: users/admin.py:120 #, fuzzy #| msgid "External Link" msgid "Personal info" msgstr "Externer Link" -#: users/admin.py:125 +#: users/admin.py:121 #, fuzzy #| msgid "Revision" msgid "Permissions" msgstr "Revision" -#: users/admin.py:128 +#: users/admin.py:124 #, fuzzy #| msgid "Import BOM data" msgid "Important dates" msgstr "Stückliste importieren" -#: users/models.py:124 +#: users/models.py:128 msgid "Permission set" msgstr "" -#: users/models.py:132 +#: users/models.py:136 msgid "Group" msgstr "" -#: users/models.py:135 +#: users/models.py:139 msgid "View" msgstr "" -#: users/models.py:135 +#: users/models.py:139 msgid "Permission to view items" msgstr "" -#: users/models.py:137 -#, fuzzy -#| msgid "Created" -msgid "Create" -msgstr "Erstellt" - -#: users/models.py:137 -msgid "Permission to add items" -msgstr "" - -#: users/models.py:139 -#, fuzzy -#| msgid "Last Updated" -msgid "Update" -msgstr "Zuletzt aktualisiert" - -#: users/models.py:139 -msgid "Permissions to edit items" -msgstr "" - #: users/models.py:141 #, fuzzy +#| msgid "Address" +msgid "Add" +msgstr "Adresse" + +#: users/models.py:141 +msgid "Permission to add items" +msgstr "" + +#: users/models.py:143 +msgid "Change" +msgstr "" + +#: users/models.py:143 +msgid "Permissions to edit items" +msgstr "" + +#: users/models.py:145 +#, fuzzy #| msgid "Remove selected BOM items" msgid "Permission to delete items" msgstr "Ausgewählte Stücklistenpositionen entfernen" +#, fuzzy +#~| msgid "Created" +#~ msgid "Create" +#~ msgstr "Erstellt" + +#, fuzzy +#~| msgid "Last Updated" +#~ msgid "Update" +#~ msgstr "Zuletzt aktualisiert" + #~ msgid "Belongs To" #~ msgstr "Gehört zu" diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po index 0f38022f92..74b435c791 100644 --- a/InvenTree/locale/en/LC_MESSAGES/django.po +++ b/InvenTree/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-05 13:20+0000\n" +"POT-Creation-Date: 2020-10-06 09:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: InvenTree/api.py:83 +#: InvenTree/api.py:85 msgid "No action specified" msgstr "" -#: InvenTree/api.py:97 +#: InvenTree/api.py:99 msgid "No matching action found" msgstr "" @@ -46,34 +46,34 @@ msgstr "" msgid "Apply Theme" msgstr "" -#: InvenTree/helpers.py:337 order/models.py:187 order/models.py:261 +#: InvenTree/helpers.py:339 order/models.py:187 order/models.py:261 msgid "Invalid quantity provided" msgstr "" -#: InvenTree/helpers.py:340 +#: InvenTree/helpers.py:342 msgid "Empty serial number string" msgstr "" -#: InvenTree/helpers.py:361 +#: InvenTree/helpers.py:363 #, python-brace-format msgid "Duplicate serial: {n}" msgstr "" -#: InvenTree/helpers.py:365 InvenTree/helpers.py:368 InvenTree/helpers.py:371 +#: InvenTree/helpers.py:367 InvenTree/helpers.py:370 InvenTree/helpers.py:373 #, python-brace-format msgid "Invalid group: {g}" msgstr "" -#: InvenTree/helpers.py:376 +#: InvenTree/helpers.py:378 #, python-brace-format msgid "Duplicate serial: {g}" msgstr "" -#: InvenTree/helpers.py:384 +#: InvenTree/helpers.py:386 msgid "No serial numbers found" msgstr "" -#: InvenTree/helpers.py:388 +#: InvenTree/helpers.py:390 #, python-brace-format msgid "Number of unique serial number ({s}) must match quantity ({q})" msgstr "" @@ -99,19 +99,19 @@ msgstr "" msgid "Description (optional)" msgstr "" -#: InvenTree/settings.py:343 +#: InvenTree/settings.py:348 msgid "English" msgstr "" -#: InvenTree/settings.py:344 +#: InvenTree/settings.py:349 msgid "German" msgstr "" -#: InvenTree/settings.py:345 +#: InvenTree/settings.py:350 msgid "French" msgstr "" -#: InvenTree/settings.py:346 +#: InvenTree/settings.py:351 msgid "Polish" msgstr "" @@ -144,7 +144,7 @@ msgid "Returned" msgstr "" #: InvenTree/status_codes.py:136 -#: order/templates/order/sales_order_base.html:103 +#: order/templates/order/sales_order_base.html:105 msgid "Shipped" msgstr "" @@ -199,7 +199,7 @@ msgstr "" msgid "Overage must be an integer value or a percentage" msgstr "" -#: InvenTree/views.py:661 +#: InvenTree/views.py:703 msgid "Database Statistics" msgstr "" @@ -263,7 +263,7 @@ msgstr "" msgid "Build quantity must be integer value for trackable parts" msgstr "" -#: build/models.py:73 build/templates/build/build_base.html:70 +#: build/models.py:73 build/templates/build/build_base.html:72 msgid "Build Title" msgstr "" @@ -271,7 +271,7 @@ msgstr "" msgid "Brief description of the build" msgstr "" -#: build/models.py:84 build/templates/build/build_base.html:91 +#: build/models.py:84 build/templates/build/build_base.html:93 msgid "Parent Build" msgstr "" @@ -281,7 +281,7 @@ msgstr "" #: build/models.py:90 build/templates/build/allocate.html:329 #: build/templates/build/auto_allocate.html:19 -#: build/templates/build/build_base.html:75 +#: build/templates/build/build_base.html:77 #: build/templates/build/detail.html:22 order/models.py:501 #: order/templates/order/order_wizard/select_parts.html:30 #: order/templates/order/purchase_order_detail.html:147 @@ -403,7 +403,7 @@ msgid "Stock quantity to allocate to build" msgstr "" #: build/templates/build/allocate.html:17 -#: company/templates/company/detail_part.html:18 order/views.py:779 +#: company/templates/company/detail_part.html:18 order/views.py:804 #: part/templates/part/category.html:122 msgid "Order Parts" msgstr "" @@ -437,7 +437,7 @@ msgstr "" #: build/templates/build/allocate.html:172 #: build/templates/build/auto_allocate.html:20 -#: build/templates/build/build_base.html:80 +#: build/templates/build/build_base.html:82 #: build/templates/build/detail.html:27 #: company/templates/company/supplier_part_pricing.html:71 #: order/templates/order/order_wizard/select_parts.html:32 @@ -570,11 +570,27 @@ msgstr "" msgid "Admin view" msgstr "" -#: build/templates/build/build_base.html:66 build/templates/build/detail.html:9 +#: build/templates/build/build_base.html:45 +msgid "Edit Build" +msgstr "" + +#: build/templates/build/build_base.html:49 build/views.py:190 +msgid "Complete Build" +msgstr "" + +#: build/templates/build/build_base.html:52 build/views.py:58 +msgid "Cancel Build" +msgstr "" + +#: build/templates/build/build_base.html:58 build/views.py:454 +msgid "Delete Build" +msgstr "" + +#: build/templates/build/build_base.html:68 build/templates/build/detail.html:9 msgid "Build Details" msgstr "" -#: build/templates/build/build_base.html:85 +#: build/templates/build/build_base.html:87 #: build/templates/build/detail.html:42 #: order/templates/order/receive_parts.html:24 #: stock/templates/stock/item_base.html:276 templates/InvenTree/search.html:175 @@ -584,7 +600,7 @@ msgstr "" msgid "Status" msgstr "" -#: build/templates/build/build_base.html:98 order/models.py:499 +#: build/templates/build/build_base.html:100 order/models.py:499 #: order/templates/order/sales_order_base.html:9 #: order/templates/order/sales_order_base.html:33 #: order/templates/order/sales_order_notes.html:10 @@ -594,15 +610,15 @@ msgstr "" msgid "Sales Order" msgstr "" -#: build/templates/build/build_base.html:104 +#: build/templates/build/build_base.html:106 msgid "BOM Price" msgstr "" -#: build/templates/build/build_base.html:109 +#: build/templates/build/build_base.html:111 msgid "BOM pricing is incomplete" msgstr "" -#: build/templates/build/build_base.html:112 +#: build/templates/build/build_base.html:114 msgid "No pricing information" msgstr "" @@ -664,8 +680,8 @@ msgid "Batch" msgstr "" #: build/templates/build/detail.html:61 -#: order/templates/order/order_base.html:98 -#: order/templates/order/sales_order_base.html:97 templates/js/build.html:71 +#: order/templates/order/order_base.html:100 +#: order/templates/order/sales_order_base.html:99 templates/js/build.html:71 msgid "Created" msgstr "" @@ -707,7 +723,7 @@ msgid "Save" msgstr "" #: build/templates/build/notes.html:33 company/templates/company/notes.html:30 -#: order/templates/order/order_notes.html:32 +#: order/templates/order/order_notes.html:33 #: order/templates/order/sales_order_notes.html:37 #: part/templates/part/notes.html:33 stock/templates/stock/item_notes.html:33 msgid "Edit notes" @@ -726,100 +742,88 @@ msgstr "" msgid "Are you sure you wish to unallocate all stock for this build?" msgstr "" -#: build/views.py:56 -msgid "Cancel Build" -msgstr "" - -#: build/views.py:74 +#: build/views.py:77 msgid "Confirm build cancellation" msgstr "" -#: build/views.py:79 +#: build/views.py:82 msgid "Build was cancelled" msgstr "" -#: build/views.py:95 +#: build/views.py:98 msgid "Allocate Stock" msgstr "" -#: build/views.py:108 +#: build/views.py:112 msgid "No matching build found" msgstr "" -#: build/views.py:127 +#: build/views.py:131 msgid "Confirm stock allocation" msgstr "" -#: build/views.py:128 +#: build/views.py:132 msgid "Check the confirmation box at the bottom of the list" msgstr "" -#: build/views.py:148 build/views.py:452 +#: build/views.py:152 build/views.py:465 msgid "Unallocate Stock" msgstr "" -#: build/views.py:161 +#: build/views.py:166 msgid "Confirm unallocation of build stock" msgstr "" -#: build/views.py:162 stock/views.py:405 +#: build/views.py:167 stock/views.py:405 msgid "Check the confirmation box" msgstr "" -#: build/views.py:185 -msgid "Complete Build" -msgstr "" - -#: build/views.py:264 +#: build/views.py:270 msgid "Confirm completion of build" msgstr "" -#: build/views.py:271 +#: build/views.py:277 msgid "Invalid location selected" msgstr "" -#: build/views.py:296 stock/views.py:1621 +#: build/views.py:302 stock/views.py:1621 #, python-brace-format msgid "The following serial numbers already exist: ({sn})" msgstr "" -#: build/views.py:317 +#: build/views.py:323 msgid "Build marked as COMPLETE" msgstr "" -#: build/views.py:393 +#: build/views.py:403 msgid "Start new Build" msgstr "" -#: build/views.py:418 +#: build/views.py:429 msgid "Created new build" msgstr "" -#: build/views.py:428 +#: build/views.py:439 msgid "Edit Build Details" msgstr "" -#: build/views.py:433 +#: build/views.py:445 msgid "Edited build" msgstr "" -#: build/views.py:442 -msgid "Delete Build" -msgstr "" - -#: build/views.py:457 +#: build/views.py:471 msgid "Removed parts from build allocation" msgstr "" -#: build/views.py:467 +#: build/views.py:481 msgid "Allocate new Part" msgstr "" -#: build/views.py:620 +#: build/views.py:635 msgid "Edit Stock Allocation" msgstr "" -#: build/views.py:624 +#: build/views.py:640 msgid "Updated Build Item" msgstr "" @@ -1014,7 +1018,7 @@ msgstr "" #: company/templates/company/detail.html:21 #: company/templates/company/supplier_part_base.html:66 #: company/templates/company/supplier_part_detail.html:21 -#: order/templates/order/order_base.html:79 +#: order/templates/order/order_base.html:81 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:170 #: stock/templates/stock/item_base.html:251 templates/js/company.html:48 #: templates/js/company.html:162 templates/js/order.html:146 @@ -1022,7 +1026,7 @@ msgid "Supplier" msgstr "" #: company/templates/company/detail.html:26 -#: order/templates/order/sales_order_base.html:78 stock/models.py:370 +#: order/templates/order/sales_order_base.html:80 stock/models.py:370 #: stock/models.py:371 stock/templates/stock/item_base.html:169 #: templates/js/company.html:40 templates/js/order.html:221 msgid "Customer" @@ -1123,12 +1127,12 @@ msgid "Purchase Orders" msgstr "" #: company/templates/company/purchase_orders.html:14 -#: order/templates/order/purchase_orders.html:17 +#: order/templates/order/purchase_orders.html:18 msgid "Create new purchase order" msgstr "" #: company/templates/company/purchase_orders.html:14 -#: order/templates/order/purchase_orders.html:17 +#: order/templates/order/purchase_orders.html:18 msgid "New Purchase Order" msgstr "" @@ -1142,12 +1146,12 @@ msgid "Sales Orders" msgstr "" #: company/templates/company/sales_orders.html:14 -#: order/templates/order/sales_orders.html:17 +#: order/templates/order/sales_orders.html:18 msgid "Create new sales order" msgstr "" #: company/templates/company/sales_orders.html:14 -#: order/templates/order/sales_orders.html:17 +#: order/templates/order/sales_orders.html:18 msgid "New Sales Order" msgstr "" @@ -1205,7 +1209,7 @@ msgid "Pricing Information" msgstr "" #: company/templates/company/supplier_part_pricing.html:15 company/views.py:399 -#: part/templates/part/sale_prices.html:13 part/views.py:2226 +#: part/templates/part/sale_prices.html:13 part/views.py:2228 msgid "Add Price Break" msgstr "" @@ -1330,15 +1334,15 @@ msgstr "" msgid "Delete Supplier Part" msgstr "" -#: company/views.py:404 part/views.py:2232 +#: company/views.py:404 part/views.py:2234 msgid "Added new price break" msgstr "" -#: company/views.py:441 part/views.py:2277 +#: company/views.py:441 part/views.py:2279 msgid "Edit Price Break" msgstr "" -#: company/views.py:456 part/views.py:2293 +#: company/views.py:456 part/views.py:2295 msgid "Delete Price Break" msgstr "" @@ -1366,20 +1370,20 @@ msgstr "" msgid "Enabled" msgstr "" -#: order/forms.py:24 +#: order/forms.py:24 order/templates/order/order_base.html:40 msgid "Place order" msgstr "" -#: order/forms.py:35 +#: order/forms.py:35 order/templates/order/order_base.html:47 msgid "Mark order as complete" msgstr "" -#: order/forms.py:46 order/forms.py:57 -#: order/templates/order/sales_order_base.html:54 +#: order/forms.py:46 order/forms.py:57 order/templates/order/order_base.html:52 +#: order/templates/order/sales_order_base.html:52 msgid "Cancel order" msgstr "" -#: order/forms.py:68 order/templates/order/sales_order_base.html:51 +#: order/forms.py:68 order/templates/order/sales_order_base.html:49 msgid "Ship order" msgstr "" @@ -1431,7 +1435,7 @@ msgstr "" msgid "Date order was completed" msgstr "" -#: order/models.py:185 order/models.py:259 part/views.py:1343 +#: order/models.py:185 order/models.py:259 part/views.py:1345 #: stock/models.py:241 stock/models.py:805 msgid "Quantity must be greater than zero" msgstr "" @@ -1512,32 +1516,44 @@ msgstr "" msgid "Are you sure you want to delete this attachment?" msgstr "" -#: order/templates/order/order_base.html:64 +#: order/templates/order/order_base.html:36 +msgid "Edit order information" +msgstr "" + +#: order/templates/order/order_base.html:44 +msgid "Receive items" +msgstr "" + +#: order/templates/order/order_base.html:57 +msgid "Export order to file" +msgstr "" + +#: order/templates/order/order_base.html:66 msgid "Purchase Order Details" msgstr "" -#: order/templates/order/order_base.html:69 -#: order/templates/order/sales_order_base.html:68 +#: order/templates/order/order_base.html:71 +#: order/templates/order/sales_order_base.html:70 msgid "Order Reference" msgstr "" -#: order/templates/order/order_base.html:74 -#: order/templates/order/sales_order_base.html:73 +#: order/templates/order/order_base.html:76 +#: order/templates/order/sales_order_base.html:75 msgid "Order Status" msgstr "" -#: order/templates/order/order_base.html:85 templates/js/order.html:153 +#: order/templates/order/order_base.html:87 templates/js/order.html:153 msgid "Supplier Reference" msgstr "" -#: order/templates/order/order_base.html:104 +#: order/templates/order/order_base.html:106 msgid "Issued" msgstr "" -#: order/templates/order/order_base.html:111 +#: order/templates/order/order_base.html:113 #: order/templates/order/purchase_order_detail.html:182 #: order/templates/order/receive_parts.html:22 -#: order/templates/order/sales_order_base.html:110 +#: order/templates/order/sales_order_base.html:112 msgid "Received" msgstr "" @@ -1605,8 +1621,8 @@ msgid "Attachments" msgstr "" #: order/templates/order/purchase_order_detail.html:16 -#: order/templates/order/sales_order_detail.html:17 order/views.py:1087 -#: order/views.py:1201 +#: order/templates/order/sales_order_detail.html:17 order/views.py:1117 +#: order/views.py:1232 msgid "Add Line Item" msgstr "" @@ -1674,15 +1690,15 @@ msgstr "" msgid "This SalesOrder has not been fully allocated" msgstr "" -#: order/templates/order/sales_order_base.html:47 +#: order/templates/order/sales_order_base.html:57 msgid "Packing List" msgstr "" -#: order/templates/order/sales_order_base.html:63 +#: order/templates/order/sales_order_base.html:65 msgid "Sales Order Details" msgstr "" -#: order/templates/order/sales_order_base.html:84 templates/js/order.html:228 +#: order/templates/order/sales_order_base.html:86 templates/js/order.html:228 msgid "Customer Reference" msgstr "" @@ -1746,147 +1762,147 @@ msgstr "" msgid "Order Items" msgstr "" -#: order/views.py:93 +#: order/views.py:99 msgid "Add Purchase Order Attachment" msgstr "" -#: order/views.py:102 order/views.py:149 part/views.py:90 stock/views.py:167 +#: order/views.py:109 order/views.py:157 part/views.py:92 stock/views.py:167 msgid "Added attachment" msgstr "" -#: order/views.py:141 +#: order/views.py:148 msgid "Add Sales Order Attachment" msgstr "" -#: order/views.py:176 order/views.py:197 +#: order/views.py:184 order/views.py:206 msgid "Edit Attachment" msgstr "" -#: order/views.py:180 order/views.py:201 +#: order/views.py:189 order/views.py:211 msgid "Attachment updated" msgstr "" -#: order/views.py:216 order/views.py:230 +#: order/views.py:226 order/views.py:241 msgid "Delete Attachment" msgstr "" -#: order/views.py:222 order/views.py:236 stock/views.py:223 +#: order/views.py:233 order/views.py:248 stock/views.py:223 msgid "Deleted attachment" msgstr "" -#: order/views.py:287 +#: order/views.py:301 msgid "Create Purchase Order" msgstr "" -#: order/views.py:318 +#: order/views.py:333 msgid "Create Sales Order" msgstr "" -#: order/views.py:348 +#: order/views.py:364 msgid "Edit Purchase Order" msgstr "" -#: order/views.py:368 +#: order/views.py:385 msgid "Edit Sales Order" msgstr "" -#: order/views.py:384 +#: order/views.py:402 msgid "Cancel Order" msgstr "" -#: order/views.py:399 order/views.py:431 +#: order/views.py:418 order/views.py:451 msgid "Confirm order cancellation" msgstr "" -#: order/views.py:417 +#: order/views.py:436 msgid "Cancel sales order" msgstr "" -#: order/views.py:437 +#: order/views.py:457 msgid "Could not cancel order" msgstr "" -#: order/views.py:451 +#: order/views.py:471 msgid "Issue Order" msgstr "" -#: order/views.py:466 +#: order/views.py:487 msgid "Confirm order placement" msgstr "" -#: order/views.py:487 +#: order/views.py:508 msgid "Complete Order" msgstr "" -#: order/views.py:522 +#: order/views.py:544 msgid "Ship Order" msgstr "" -#: order/views.py:538 +#: order/views.py:561 msgid "Confirm order shipment" msgstr "" -#: order/views.py:544 +#: order/views.py:567 msgid "Could not ship order" msgstr "" -#: order/views.py:595 +#: order/views.py:619 msgid "Receive Parts" msgstr "" -#: order/views.py:662 +#: order/views.py:687 msgid "Items received" msgstr "" -#: order/views.py:676 +#: order/views.py:701 msgid "No destination set" msgstr "" -#: order/views.py:721 +#: order/views.py:746 msgid "Error converting quantity to number" msgstr "" -#: order/views.py:727 +#: order/views.py:752 msgid "Receive quantity less than zero" msgstr "" -#: order/views.py:733 +#: order/views.py:758 msgid "No lines specified" msgstr "" -#: order/views.py:1107 +#: order/views.py:1138 msgid "Invalid Purchase Order" msgstr "" -#: order/views.py:1115 +#: order/views.py:1146 msgid "Supplier must match for Part and Order" msgstr "" -#: order/views.py:1120 +#: order/views.py:1151 msgid "Invalid SupplierPart selection" msgstr "" -#: order/views.py:1252 order/views.py:1270 +#: order/views.py:1284 order/views.py:1303 msgid "Edit Line Item" msgstr "" -#: order/views.py:1286 order/views.py:1298 +#: order/views.py:1320 order/views.py:1333 msgid "Delete Line Item" msgstr "" -#: order/views.py:1291 order/views.py:1303 +#: order/views.py:1326 order/views.py:1339 msgid "Deleted line item" msgstr "" -#: order/views.py:1312 +#: order/views.py:1348 msgid "Allocate Stock to Order" msgstr "" -#: order/views.py:1381 +#: order/views.py:1418 msgid "Edit Allocation Quantity" msgstr "" -#: order/views.py:1396 +#: order/views.py:1434 msgid "Remove allocation" msgstr "" @@ -2226,7 +2242,7 @@ msgstr "" msgid "BOM line checksum" msgstr "" -#: part/models.py:1612 part/views.py:1349 part/views.py:1401 +#: part/models.py:1612 part/views.py:1351 part/views.py:1403 #: stock/models.py:231 msgid "Quantity must be integer value for trackable parts" msgstr "" @@ -2293,7 +2309,7 @@ msgstr "" msgid "Validate Bill of Materials" msgstr "" -#: part/templates/part/bom.html:48 part/views.py:1640 +#: part/templates/part/bom.html:48 part/views.py:1642 msgid "Export Bill of Materials" msgstr "" @@ -2385,7 +2401,7 @@ msgstr "" msgid "All parts" msgstr "" -#: part/templates/part/category.html:24 part/views.py:2043 +#: part/templates/part/category.html:24 part/views.py:2045 msgid "Create new part category" msgstr "" @@ -2425,7 +2441,7 @@ msgstr "" msgid "Export Part Data" msgstr "" -#: part/templates/part/category.html:114 part/views.py:511 +#: part/templates/part/category.html:114 part/views.py:513 msgid "Create new part" msgstr "" @@ -2642,7 +2658,7 @@ msgid "Edit" msgstr "" #: part/templates/part/params.html:39 part/templates/part/supplier.html:17 -#: users/models.py:141 +#: users/models.py:145 msgid "Delete" msgstr "" @@ -2842,176 +2858,176 @@ msgstr "" msgid "New Variant" msgstr "" -#: part/views.py:78 +#: part/views.py:80 msgid "Add part attachment" msgstr "" -#: part/views.py:129 templates/attachment_table.html:30 +#: part/views.py:131 templates/attachment_table.html:30 msgid "Edit attachment" msgstr "" -#: part/views.py:135 +#: part/views.py:137 msgid "Part attachment updated" msgstr "" -#: part/views.py:150 +#: part/views.py:152 msgid "Delete Part Attachment" msgstr "" -#: part/views.py:158 +#: part/views.py:160 msgid "Deleted part attachment" msgstr "" -#: part/views.py:167 +#: part/views.py:169 msgid "Create Test Template" msgstr "" -#: part/views.py:196 +#: part/views.py:198 msgid "Edit Test Template" msgstr "" -#: part/views.py:212 +#: part/views.py:214 msgid "Delete Test Template" msgstr "" -#: part/views.py:221 +#: part/views.py:223 msgid "Set Part Category" msgstr "" -#: part/views.py:271 +#: part/views.py:273 #, python-brace-format msgid "Set category for {n} parts" msgstr "" -#: part/views.py:306 +#: part/views.py:308 msgid "Create Variant" msgstr "" -#: part/views.py:386 +#: part/views.py:388 msgid "Duplicate Part" msgstr "" -#: part/views.py:393 +#: part/views.py:395 msgid "Copied part" msgstr "" -#: part/views.py:518 +#: part/views.py:520 msgid "Created new part" msgstr "" -#: part/views.py:733 +#: part/views.py:735 msgid "Part QR Code" msgstr "" -#: part/views.py:752 +#: part/views.py:754 msgid "Upload Part Image" msgstr "" -#: part/views.py:760 part/views.py:797 +#: part/views.py:762 part/views.py:799 msgid "Updated part image" msgstr "" -#: part/views.py:769 +#: part/views.py:771 msgid "Select Part Image" msgstr "" -#: part/views.py:800 +#: part/views.py:802 msgid "Part image not found" msgstr "" -#: part/views.py:811 +#: part/views.py:813 msgid "Edit Part Properties" msgstr "" -#: part/views.py:835 +#: part/views.py:837 msgid "Validate BOM" msgstr "" -#: part/views.py:1002 +#: part/views.py:1004 msgid "No BOM file provided" msgstr "" -#: part/views.py:1352 +#: part/views.py:1354 msgid "Enter a valid quantity" msgstr "" -#: part/views.py:1377 part/views.py:1380 +#: part/views.py:1379 part/views.py:1382 msgid "Select valid part" msgstr "" -#: part/views.py:1386 +#: part/views.py:1388 msgid "Duplicate part selected" msgstr "" -#: part/views.py:1424 +#: part/views.py:1426 msgid "Select a part" msgstr "" -#: part/views.py:1430 +#: part/views.py:1432 msgid "Selected part creates a circular BOM" msgstr "" -#: part/views.py:1434 +#: part/views.py:1436 msgid "Specify quantity" msgstr "" -#: part/views.py:1690 +#: part/views.py:1692 msgid "Confirm Part Deletion" msgstr "" -#: part/views.py:1699 +#: part/views.py:1701 msgid "Part was deleted" msgstr "" -#: part/views.py:1708 +#: part/views.py:1710 msgid "Part Pricing" msgstr "" -#: part/views.py:1834 +#: part/views.py:1836 msgid "Create Part Parameter Template" msgstr "" -#: part/views.py:1844 +#: part/views.py:1846 msgid "Edit Part Parameter Template" msgstr "" -#: part/views.py:1853 +#: part/views.py:1855 msgid "Delete Part Parameter Template" msgstr "" -#: part/views.py:1863 +#: part/views.py:1865 msgid "Create Part Parameter" msgstr "" -#: part/views.py:1915 +#: part/views.py:1917 msgid "Edit Part Parameter" msgstr "" -#: part/views.py:1931 +#: part/views.py:1933 msgid "Delete Part Parameter" msgstr "" -#: part/views.py:1990 +#: part/views.py:1992 msgid "Edit Part Category" msgstr "" -#: part/views.py:2027 +#: part/views.py:2029 msgid "Delete Part Category" msgstr "" -#: part/views.py:2035 +#: part/views.py:2037 msgid "Part category was deleted" msgstr "" -#: part/views.py:2098 +#: part/views.py:2100 msgid "Create BOM item" msgstr "" -#: part/views.py:2166 +#: part/views.py:2168 msgid "Edit BOM item" msgstr "" -#: part/views.py:2216 +#: part/views.py:2218 msgid "Confim BOM item deletion" msgstr "" @@ -4497,58 +4513,58 @@ msgstr "" msgid "Delete Stock" msgstr "" -#: users/admin.py:62 +#: users/admin.py:61 msgid "Users" msgstr "" -#: users/admin.py:63 +#: users/admin.py:62 msgid "Select which users are assigned to this group" msgstr "" -#: users/admin.py:124 +#: users/admin.py:120 msgid "Personal info" msgstr "" -#: users/admin.py:125 +#: users/admin.py:121 msgid "Permissions" msgstr "" -#: users/admin.py:128 +#: users/admin.py:124 msgid "Important dates" msgstr "" -#: users/models.py:124 +#: users/models.py:128 msgid "Permission set" msgstr "" -#: users/models.py:132 +#: users/models.py:136 msgid "Group" msgstr "" -#: users/models.py:135 +#: users/models.py:139 msgid "View" msgstr "" -#: users/models.py:135 +#: users/models.py:139 msgid "Permission to view items" msgstr "" -#: users/models.py:137 -msgid "Create" -msgstr "" - -#: users/models.py:137 -msgid "Permission to add items" -msgstr "" - -#: users/models.py:139 -msgid "Update" -msgstr "" - -#: users/models.py:139 -msgid "Permissions to edit items" +#: users/models.py:141 +msgid "Add" msgstr "" #: users/models.py:141 +msgid "Permission to add items" +msgstr "" + +#: users/models.py:143 +msgid "Change" +msgstr "" + +#: users/models.py:143 +msgid "Permissions to edit items" +msgstr "" + +#: users/models.py:145 msgid "Permission to delete items" msgstr "" diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po index 0f38022f92..74b435c791 100644 --- a/InvenTree/locale/es/LC_MESSAGES/django.po +++ b/InvenTree/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-05 13:20+0000\n" +"POT-Creation-Date: 2020-10-06 09:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: InvenTree/api.py:83 +#: InvenTree/api.py:85 msgid "No action specified" msgstr "" -#: InvenTree/api.py:97 +#: InvenTree/api.py:99 msgid "No matching action found" msgstr "" @@ -46,34 +46,34 @@ msgstr "" msgid "Apply Theme" msgstr "" -#: InvenTree/helpers.py:337 order/models.py:187 order/models.py:261 +#: InvenTree/helpers.py:339 order/models.py:187 order/models.py:261 msgid "Invalid quantity provided" msgstr "" -#: InvenTree/helpers.py:340 +#: InvenTree/helpers.py:342 msgid "Empty serial number string" msgstr "" -#: InvenTree/helpers.py:361 +#: InvenTree/helpers.py:363 #, python-brace-format msgid "Duplicate serial: {n}" msgstr "" -#: InvenTree/helpers.py:365 InvenTree/helpers.py:368 InvenTree/helpers.py:371 +#: InvenTree/helpers.py:367 InvenTree/helpers.py:370 InvenTree/helpers.py:373 #, python-brace-format msgid "Invalid group: {g}" msgstr "" -#: InvenTree/helpers.py:376 +#: InvenTree/helpers.py:378 #, python-brace-format msgid "Duplicate serial: {g}" msgstr "" -#: InvenTree/helpers.py:384 +#: InvenTree/helpers.py:386 msgid "No serial numbers found" msgstr "" -#: InvenTree/helpers.py:388 +#: InvenTree/helpers.py:390 #, python-brace-format msgid "Number of unique serial number ({s}) must match quantity ({q})" msgstr "" @@ -99,19 +99,19 @@ msgstr "" msgid "Description (optional)" msgstr "" -#: InvenTree/settings.py:343 +#: InvenTree/settings.py:348 msgid "English" msgstr "" -#: InvenTree/settings.py:344 +#: InvenTree/settings.py:349 msgid "German" msgstr "" -#: InvenTree/settings.py:345 +#: InvenTree/settings.py:350 msgid "French" msgstr "" -#: InvenTree/settings.py:346 +#: InvenTree/settings.py:351 msgid "Polish" msgstr "" @@ -144,7 +144,7 @@ msgid "Returned" msgstr "" #: InvenTree/status_codes.py:136 -#: order/templates/order/sales_order_base.html:103 +#: order/templates/order/sales_order_base.html:105 msgid "Shipped" msgstr "" @@ -199,7 +199,7 @@ msgstr "" msgid "Overage must be an integer value or a percentage" msgstr "" -#: InvenTree/views.py:661 +#: InvenTree/views.py:703 msgid "Database Statistics" msgstr "" @@ -263,7 +263,7 @@ msgstr "" msgid "Build quantity must be integer value for trackable parts" msgstr "" -#: build/models.py:73 build/templates/build/build_base.html:70 +#: build/models.py:73 build/templates/build/build_base.html:72 msgid "Build Title" msgstr "" @@ -271,7 +271,7 @@ msgstr "" msgid "Brief description of the build" msgstr "" -#: build/models.py:84 build/templates/build/build_base.html:91 +#: build/models.py:84 build/templates/build/build_base.html:93 msgid "Parent Build" msgstr "" @@ -281,7 +281,7 @@ msgstr "" #: build/models.py:90 build/templates/build/allocate.html:329 #: build/templates/build/auto_allocate.html:19 -#: build/templates/build/build_base.html:75 +#: build/templates/build/build_base.html:77 #: build/templates/build/detail.html:22 order/models.py:501 #: order/templates/order/order_wizard/select_parts.html:30 #: order/templates/order/purchase_order_detail.html:147 @@ -403,7 +403,7 @@ msgid "Stock quantity to allocate to build" msgstr "" #: build/templates/build/allocate.html:17 -#: company/templates/company/detail_part.html:18 order/views.py:779 +#: company/templates/company/detail_part.html:18 order/views.py:804 #: part/templates/part/category.html:122 msgid "Order Parts" msgstr "" @@ -437,7 +437,7 @@ msgstr "" #: build/templates/build/allocate.html:172 #: build/templates/build/auto_allocate.html:20 -#: build/templates/build/build_base.html:80 +#: build/templates/build/build_base.html:82 #: build/templates/build/detail.html:27 #: company/templates/company/supplier_part_pricing.html:71 #: order/templates/order/order_wizard/select_parts.html:32 @@ -570,11 +570,27 @@ msgstr "" msgid "Admin view" msgstr "" -#: build/templates/build/build_base.html:66 build/templates/build/detail.html:9 +#: build/templates/build/build_base.html:45 +msgid "Edit Build" +msgstr "" + +#: build/templates/build/build_base.html:49 build/views.py:190 +msgid "Complete Build" +msgstr "" + +#: build/templates/build/build_base.html:52 build/views.py:58 +msgid "Cancel Build" +msgstr "" + +#: build/templates/build/build_base.html:58 build/views.py:454 +msgid "Delete Build" +msgstr "" + +#: build/templates/build/build_base.html:68 build/templates/build/detail.html:9 msgid "Build Details" msgstr "" -#: build/templates/build/build_base.html:85 +#: build/templates/build/build_base.html:87 #: build/templates/build/detail.html:42 #: order/templates/order/receive_parts.html:24 #: stock/templates/stock/item_base.html:276 templates/InvenTree/search.html:175 @@ -584,7 +600,7 @@ msgstr "" msgid "Status" msgstr "" -#: build/templates/build/build_base.html:98 order/models.py:499 +#: build/templates/build/build_base.html:100 order/models.py:499 #: order/templates/order/sales_order_base.html:9 #: order/templates/order/sales_order_base.html:33 #: order/templates/order/sales_order_notes.html:10 @@ -594,15 +610,15 @@ msgstr "" msgid "Sales Order" msgstr "" -#: build/templates/build/build_base.html:104 +#: build/templates/build/build_base.html:106 msgid "BOM Price" msgstr "" -#: build/templates/build/build_base.html:109 +#: build/templates/build/build_base.html:111 msgid "BOM pricing is incomplete" msgstr "" -#: build/templates/build/build_base.html:112 +#: build/templates/build/build_base.html:114 msgid "No pricing information" msgstr "" @@ -664,8 +680,8 @@ msgid "Batch" msgstr "" #: build/templates/build/detail.html:61 -#: order/templates/order/order_base.html:98 -#: order/templates/order/sales_order_base.html:97 templates/js/build.html:71 +#: order/templates/order/order_base.html:100 +#: order/templates/order/sales_order_base.html:99 templates/js/build.html:71 msgid "Created" msgstr "" @@ -707,7 +723,7 @@ msgid "Save" msgstr "" #: build/templates/build/notes.html:33 company/templates/company/notes.html:30 -#: order/templates/order/order_notes.html:32 +#: order/templates/order/order_notes.html:33 #: order/templates/order/sales_order_notes.html:37 #: part/templates/part/notes.html:33 stock/templates/stock/item_notes.html:33 msgid "Edit notes" @@ -726,100 +742,88 @@ msgstr "" msgid "Are you sure you wish to unallocate all stock for this build?" msgstr "" -#: build/views.py:56 -msgid "Cancel Build" -msgstr "" - -#: build/views.py:74 +#: build/views.py:77 msgid "Confirm build cancellation" msgstr "" -#: build/views.py:79 +#: build/views.py:82 msgid "Build was cancelled" msgstr "" -#: build/views.py:95 +#: build/views.py:98 msgid "Allocate Stock" msgstr "" -#: build/views.py:108 +#: build/views.py:112 msgid "No matching build found" msgstr "" -#: build/views.py:127 +#: build/views.py:131 msgid "Confirm stock allocation" msgstr "" -#: build/views.py:128 +#: build/views.py:132 msgid "Check the confirmation box at the bottom of the list" msgstr "" -#: build/views.py:148 build/views.py:452 +#: build/views.py:152 build/views.py:465 msgid "Unallocate Stock" msgstr "" -#: build/views.py:161 +#: build/views.py:166 msgid "Confirm unallocation of build stock" msgstr "" -#: build/views.py:162 stock/views.py:405 +#: build/views.py:167 stock/views.py:405 msgid "Check the confirmation box" msgstr "" -#: build/views.py:185 -msgid "Complete Build" -msgstr "" - -#: build/views.py:264 +#: build/views.py:270 msgid "Confirm completion of build" msgstr "" -#: build/views.py:271 +#: build/views.py:277 msgid "Invalid location selected" msgstr "" -#: build/views.py:296 stock/views.py:1621 +#: build/views.py:302 stock/views.py:1621 #, python-brace-format msgid "The following serial numbers already exist: ({sn})" msgstr "" -#: build/views.py:317 +#: build/views.py:323 msgid "Build marked as COMPLETE" msgstr "" -#: build/views.py:393 +#: build/views.py:403 msgid "Start new Build" msgstr "" -#: build/views.py:418 +#: build/views.py:429 msgid "Created new build" msgstr "" -#: build/views.py:428 +#: build/views.py:439 msgid "Edit Build Details" msgstr "" -#: build/views.py:433 +#: build/views.py:445 msgid "Edited build" msgstr "" -#: build/views.py:442 -msgid "Delete Build" -msgstr "" - -#: build/views.py:457 +#: build/views.py:471 msgid "Removed parts from build allocation" msgstr "" -#: build/views.py:467 +#: build/views.py:481 msgid "Allocate new Part" msgstr "" -#: build/views.py:620 +#: build/views.py:635 msgid "Edit Stock Allocation" msgstr "" -#: build/views.py:624 +#: build/views.py:640 msgid "Updated Build Item" msgstr "" @@ -1014,7 +1018,7 @@ msgstr "" #: company/templates/company/detail.html:21 #: company/templates/company/supplier_part_base.html:66 #: company/templates/company/supplier_part_detail.html:21 -#: order/templates/order/order_base.html:79 +#: order/templates/order/order_base.html:81 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:170 #: stock/templates/stock/item_base.html:251 templates/js/company.html:48 #: templates/js/company.html:162 templates/js/order.html:146 @@ -1022,7 +1026,7 @@ msgid "Supplier" msgstr "" #: company/templates/company/detail.html:26 -#: order/templates/order/sales_order_base.html:78 stock/models.py:370 +#: order/templates/order/sales_order_base.html:80 stock/models.py:370 #: stock/models.py:371 stock/templates/stock/item_base.html:169 #: templates/js/company.html:40 templates/js/order.html:221 msgid "Customer" @@ -1123,12 +1127,12 @@ msgid "Purchase Orders" msgstr "" #: company/templates/company/purchase_orders.html:14 -#: order/templates/order/purchase_orders.html:17 +#: order/templates/order/purchase_orders.html:18 msgid "Create new purchase order" msgstr "" #: company/templates/company/purchase_orders.html:14 -#: order/templates/order/purchase_orders.html:17 +#: order/templates/order/purchase_orders.html:18 msgid "New Purchase Order" msgstr "" @@ -1142,12 +1146,12 @@ msgid "Sales Orders" msgstr "" #: company/templates/company/sales_orders.html:14 -#: order/templates/order/sales_orders.html:17 +#: order/templates/order/sales_orders.html:18 msgid "Create new sales order" msgstr "" #: company/templates/company/sales_orders.html:14 -#: order/templates/order/sales_orders.html:17 +#: order/templates/order/sales_orders.html:18 msgid "New Sales Order" msgstr "" @@ -1205,7 +1209,7 @@ msgid "Pricing Information" msgstr "" #: company/templates/company/supplier_part_pricing.html:15 company/views.py:399 -#: part/templates/part/sale_prices.html:13 part/views.py:2226 +#: part/templates/part/sale_prices.html:13 part/views.py:2228 msgid "Add Price Break" msgstr "" @@ -1330,15 +1334,15 @@ msgstr "" msgid "Delete Supplier Part" msgstr "" -#: company/views.py:404 part/views.py:2232 +#: company/views.py:404 part/views.py:2234 msgid "Added new price break" msgstr "" -#: company/views.py:441 part/views.py:2277 +#: company/views.py:441 part/views.py:2279 msgid "Edit Price Break" msgstr "" -#: company/views.py:456 part/views.py:2293 +#: company/views.py:456 part/views.py:2295 msgid "Delete Price Break" msgstr "" @@ -1366,20 +1370,20 @@ msgstr "" msgid "Enabled" msgstr "" -#: order/forms.py:24 +#: order/forms.py:24 order/templates/order/order_base.html:40 msgid "Place order" msgstr "" -#: order/forms.py:35 +#: order/forms.py:35 order/templates/order/order_base.html:47 msgid "Mark order as complete" msgstr "" -#: order/forms.py:46 order/forms.py:57 -#: order/templates/order/sales_order_base.html:54 +#: order/forms.py:46 order/forms.py:57 order/templates/order/order_base.html:52 +#: order/templates/order/sales_order_base.html:52 msgid "Cancel order" msgstr "" -#: order/forms.py:68 order/templates/order/sales_order_base.html:51 +#: order/forms.py:68 order/templates/order/sales_order_base.html:49 msgid "Ship order" msgstr "" @@ -1431,7 +1435,7 @@ msgstr "" msgid "Date order was completed" msgstr "" -#: order/models.py:185 order/models.py:259 part/views.py:1343 +#: order/models.py:185 order/models.py:259 part/views.py:1345 #: stock/models.py:241 stock/models.py:805 msgid "Quantity must be greater than zero" msgstr "" @@ -1512,32 +1516,44 @@ msgstr "" msgid "Are you sure you want to delete this attachment?" msgstr "" -#: order/templates/order/order_base.html:64 +#: order/templates/order/order_base.html:36 +msgid "Edit order information" +msgstr "" + +#: order/templates/order/order_base.html:44 +msgid "Receive items" +msgstr "" + +#: order/templates/order/order_base.html:57 +msgid "Export order to file" +msgstr "" + +#: order/templates/order/order_base.html:66 msgid "Purchase Order Details" msgstr "" -#: order/templates/order/order_base.html:69 -#: order/templates/order/sales_order_base.html:68 +#: order/templates/order/order_base.html:71 +#: order/templates/order/sales_order_base.html:70 msgid "Order Reference" msgstr "" -#: order/templates/order/order_base.html:74 -#: order/templates/order/sales_order_base.html:73 +#: order/templates/order/order_base.html:76 +#: order/templates/order/sales_order_base.html:75 msgid "Order Status" msgstr "" -#: order/templates/order/order_base.html:85 templates/js/order.html:153 +#: order/templates/order/order_base.html:87 templates/js/order.html:153 msgid "Supplier Reference" msgstr "" -#: order/templates/order/order_base.html:104 +#: order/templates/order/order_base.html:106 msgid "Issued" msgstr "" -#: order/templates/order/order_base.html:111 +#: order/templates/order/order_base.html:113 #: order/templates/order/purchase_order_detail.html:182 #: order/templates/order/receive_parts.html:22 -#: order/templates/order/sales_order_base.html:110 +#: order/templates/order/sales_order_base.html:112 msgid "Received" msgstr "" @@ -1605,8 +1621,8 @@ msgid "Attachments" msgstr "" #: order/templates/order/purchase_order_detail.html:16 -#: order/templates/order/sales_order_detail.html:17 order/views.py:1087 -#: order/views.py:1201 +#: order/templates/order/sales_order_detail.html:17 order/views.py:1117 +#: order/views.py:1232 msgid "Add Line Item" msgstr "" @@ -1674,15 +1690,15 @@ msgstr "" msgid "This SalesOrder has not been fully allocated" msgstr "" -#: order/templates/order/sales_order_base.html:47 +#: order/templates/order/sales_order_base.html:57 msgid "Packing List" msgstr "" -#: order/templates/order/sales_order_base.html:63 +#: order/templates/order/sales_order_base.html:65 msgid "Sales Order Details" msgstr "" -#: order/templates/order/sales_order_base.html:84 templates/js/order.html:228 +#: order/templates/order/sales_order_base.html:86 templates/js/order.html:228 msgid "Customer Reference" msgstr "" @@ -1746,147 +1762,147 @@ msgstr "" msgid "Order Items" msgstr "" -#: order/views.py:93 +#: order/views.py:99 msgid "Add Purchase Order Attachment" msgstr "" -#: order/views.py:102 order/views.py:149 part/views.py:90 stock/views.py:167 +#: order/views.py:109 order/views.py:157 part/views.py:92 stock/views.py:167 msgid "Added attachment" msgstr "" -#: order/views.py:141 +#: order/views.py:148 msgid "Add Sales Order Attachment" msgstr "" -#: order/views.py:176 order/views.py:197 +#: order/views.py:184 order/views.py:206 msgid "Edit Attachment" msgstr "" -#: order/views.py:180 order/views.py:201 +#: order/views.py:189 order/views.py:211 msgid "Attachment updated" msgstr "" -#: order/views.py:216 order/views.py:230 +#: order/views.py:226 order/views.py:241 msgid "Delete Attachment" msgstr "" -#: order/views.py:222 order/views.py:236 stock/views.py:223 +#: order/views.py:233 order/views.py:248 stock/views.py:223 msgid "Deleted attachment" msgstr "" -#: order/views.py:287 +#: order/views.py:301 msgid "Create Purchase Order" msgstr "" -#: order/views.py:318 +#: order/views.py:333 msgid "Create Sales Order" msgstr "" -#: order/views.py:348 +#: order/views.py:364 msgid "Edit Purchase Order" msgstr "" -#: order/views.py:368 +#: order/views.py:385 msgid "Edit Sales Order" msgstr "" -#: order/views.py:384 +#: order/views.py:402 msgid "Cancel Order" msgstr "" -#: order/views.py:399 order/views.py:431 +#: order/views.py:418 order/views.py:451 msgid "Confirm order cancellation" msgstr "" -#: order/views.py:417 +#: order/views.py:436 msgid "Cancel sales order" msgstr "" -#: order/views.py:437 +#: order/views.py:457 msgid "Could not cancel order" msgstr "" -#: order/views.py:451 +#: order/views.py:471 msgid "Issue Order" msgstr "" -#: order/views.py:466 +#: order/views.py:487 msgid "Confirm order placement" msgstr "" -#: order/views.py:487 +#: order/views.py:508 msgid "Complete Order" msgstr "" -#: order/views.py:522 +#: order/views.py:544 msgid "Ship Order" msgstr "" -#: order/views.py:538 +#: order/views.py:561 msgid "Confirm order shipment" msgstr "" -#: order/views.py:544 +#: order/views.py:567 msgid "Could not ship order" msgstr "" -#: order/views.py:595 +#: order/views.py:619 msgid "Receive Parts" msgstr "" -#: order/views.py:662 +#: order/views.py:687 msgid "Items received" msgstr "" -#: order/views.py:676 +#: order/views.py:701 msgid "No destination set" msgstr "" -#: order/views.py:721 +#: order/views.py:746 msgid "Error converting quantity to number" msgstr "" -#: order/views.py:727 +#: order/views.py:752 msgid "Receive quantity less than zero" msgstr "" -#: order/views.py:733 +#: order/views.py:758 msgid "No lines specified" msgstr "" -#: order/views.py:1107 +#: order/views.py:1138 msgid "Invalid Purchase Order" msgstr "" -#: order/views.py:1115 +#: order/views.py:1146 msgid "Supplier must match for Part and Order" msgstr "" -#: order/views.py:1120 +#: order/views.py:1151 msgid "Invalid SupplierPart selection" msgstr "" -#: order/views.py:1252 order/views.py:1270 +#: order/views.py:1284 order/views.py:1303 msgid "Edit Line Item" msgstr "" -#: order/views.py:1286 order/views.py:1298 +#: order/views.py:1320 order/views.py:1333 msgid "Delete Line Item" msgstr "" -#: order/views.py:1291 order/views.py:1303 +#: order/views.py:1326 order/views.py:1339 msgid "Deleted line item" msgstr "" -#: order/views.py:1312 +#: order/views.py:1348 msgid "Allocate Stock to Order" msgstr "" -#: order/views.py:1381 +#: order/views.py:1418 msgid "Edit Allocation Quantity" msgstr "" -#: order/views.py:1396 +#: order/views.py:1434 msgid "Remove allocation" msgstr "" @@ -2226,7 +2242,7 @@ msgstr "" msgid "BOM line checksum" msgstr "" -#: part/models.py:1612 part/views.py:1349 part/views.py:1401 +#: part/models.py:1612 part/views.py:1351 part/views.py:1403 #: stock/models.py:231 msgid "Quantity must be integer value for trackable parts" msgstr "" @@ -2293,7 +2309,7 @@ msgstr "" msgid "Validate Bill of Materials" msgstr "" -#: part/templates/part/bom.html:48 part/views.py:1640 +#: part/templates/part/bom.html:48 part/views.py:1642 msgid "Export Bill of Materials" msgstr "" @@ -2385,7 +2401,7 @@ msgstr "" msgid "All parts" msgstr "" -#: part/templates/part/category.html:24 part/views.py:2043 +#: part/templates/part/category.html:24 part/views.py:2045 msgid "Create new part category" msgstr "" @@ -2425,7 +2441,7 @@ msgstr "" msgid "Export Part Data" msgstr "" -#: part/templates/part/category.html:114 part/views.py:511 +#: part/templates/part/category.html:114 part/views.py:513 msgid "Create new part" msgstr "" @@ -2642,7 +2658,7 @@ msgid "Edit" msgstr "" #: part/templates/part/params.html:39 part/templates/part/supplier.html:17 -#: users/models.py:141 +#: users/models.py:145 msgid "Delete" msgstr "" @@ -2842,176 +2858,176 @@ msgstr "" msgid "New Variant" msgstr "" -#: part/views.py:78 +#: part/views.py:80 msgid "Add part attachment" msgstr "" -#: part/views.py:129 templates/attachment_table.html:30 +#: part/views.py:131 templates/attachment_table.html:30 msgid "Edit attachment" msgstr "" -#: part/views.py:135 +#: part/views.py:137 msgid "Part attachment updated" msgstr "" -#: part/views.py:150 +#: part/views.py:152 msgid "Delete Part Attachment" msgstr "" -#: part/views.py:158 +#: part/views.py:160 msgid "Deleted part attachment" msgstr "" -#: part/views.py:167 +#: part/views.py:169 msgid "Create Test Template" msgstr "" -#: part/views.py:196 +#: part/views.py:198 msgid "Edit Test Template" msgstr "" -#: part/views.py:212 +#: part/views.py:214 msgid "Delete Test Template" msgstr "" -#: part/views.py:221 +#: part/views.py:223 msgid "Set Part Category" msgstr "" -#: part/views.py:271 +#: part/views.py:273 #, python-brace-format msgid "Set category for {n} parts" msgstr "" -#: part/views.py:306 +#: part/views.py:308 msgid "Create Variant" msgstr "" -#: part/views.py:386 +#: part/views.py:388 msgid "Duplicate Part" msgstr "" -#: part/views.py:393 +#: part/views.py:395 msgid "Copied part" msgstr "" -#: part/views.py:518 +#: part/views.py:520 msgid "Created new part" msgstr "" -#: part/views.py:733 +#: part/views.py:735 msgid "Part QR Code" msgstr "" -#: part/views.py:752 +#: part/views.py:754 msgid "Upload Part Image" msgstr "" -#: part/views.py:760 part/views.py:797 +#: part/views.py:762 part/views.py:799 msgid "Updated part image" msgstr "" -#: part/views.py:769 +#: part/views.py:771 msgid "Select Part Image" msgstr "" -#: part/views.py:800 +#: part/views.py:802 msgid "Part image not found" msgstr "" -#: part/views.py:811 +#: part/views.py:813 msgid "Edit Part Properties" msgstr "" -#: part/views.py:835 +#: part/views.py:837 msgid "Validate BOM" msgstr "" -#: part/views.py:1002 +#: part/views.py:1004 msgid "No BOM file provided" msgstr "" -#: part/views.py:1352 +#: part/views.py:1354 msgid "Enter a valid quantity" msgstr "" -#: part/views.py:1377 part/views.py:1380 +#: part/views.py:1379 part/views.py:1382 msgid "Select valid part" msgstr "" -#: part/views.py:1386 +#: part/views.py:1388 msgid "Duplicate part selected" msgstr "" -#: part/views.py:1424 +#: part/views.py:1426 msgid "Select a part" msgstr "" -#: part/views.py:1430 +#: part/views.py:1432 msgid "Selected part creates a circular BOM" msgstr "" -#: part/views.py:1434 +#: part/views.py:1436 msgid "Specify quantity" msgstr "" -#: part/views.py:1690 +#: part/views.py:1692 msgid "Confirm Part Deletion" msgstr "" -#: part/views.py:1699 +#: part/views.py:1701 msgid "Part was deleted" msgstr "" -#: part/views.py:1708 +#: part/views.py:1710 msgid "Part Pricing" msgstr "" -#: part/views.py:1834 +#: part/views.py:1836 msgid "Create Part Parameter Template" msgstr "" -#: part/views.py:1844 +#: part/views.py:1846 msgid "Edit Part Parameter Template" msgstr "" -#: part/views.py:1853 +#: part/views.py:1855 msgid "Delete Part Parameter Template" msgstr "" -#: part/views.py:1863 +#: part/views.py:1865 msgid "Create Part Parameter" msgstr "" -#: part/views.py:1915 +#: part/views.py:1917 msgid "Edit Part Parameter" msgstr "" -#: part/views.py:1931 +#: part/views.py:1933 msgid "Delete Part Parameter" msgstr "" -#: part/views.py:1990 +#: part/views.py:1992 msgid "Edit Part Category" msgstr "" -#: part/views.py:2027 +#: part/views.py:2029 msgid "Delete Part Category" msgstr "" -#: part/views.py:2035 +#: part/views.py:2037 msgid "Part category was deleted" msgstr "" -#: part/views.py:2098 +#: part/views.py:2100 msgid "Create BOM item" msgstr "" -#: part/views.py:2166 +#: part/views.py:2168 msgid "Edit BOM item" msgstr "" -#: part/views.py:2216 +#: part/views.py:2218 msgid "Confim BOM item deletion" msgstr "" @@ -4497,58 +4513,58 @@ msgstr "" msgid "Delete Stock" msgstr "" -#: users/admin.py:62 +#: users/admin.py:61 msgid "Users" msgstr "" -#: users/admin.py:63 +#: users/admin.py:62 msgid "Select which users are assigned to this group" msgstr "" -#: users/admin.py:124 +#: users/admin.py:120 msgid "Personal info" msgstr "" -#: users/admin.py:125 +#: users/admin.py:121 msgid "Permissions" msgstr "" -#: users/admin.py:128 +#: users/admin.py:124 msgid "Important dates" msgstr "" -#: users/models.py:124 +#: users/models.py:128 msgid "Permission set" msgstr "" -#: users/models.py:132 +#: users/models.py:136 msgid "Group" msgstr "" -#: users/models.py:135 +#: users/models.py:139 msgid "View" msgstr "" -#: users/models.py:135 +#: users/models.py:139 msgid "Permission to view items" msgstr "" -#: users/models.py:137 -msgid "Create" -msgstr "" - -#: users/models.py:137 -msgid "Permission to add items" -msgstr "" - -#: users/models.py:139 -msgid "Update" -msgstr "" - -#: users/models.py:139 -msgid "Permissions to edit items" +#: users/models.py:141 +msgid "Add" msgstr "" #: users/models.py:141 +msgid "Permission to add items" +msgstr "" + +#: users/models.py:143 +msgid "Change" +msgstr "" + +#: users/models.py:143 +msgid "Permissions to edit items" +msgstr "" + +#: users/models.py:145 msgid "Permission to delete items" msgstr ""