From 63b70614b68a3db117b006ec7ad2e1d2d416e33d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Feb 2020 10:42:45 +1100 Subject: [PATCH 1/6] Create 'tabs' for SupplierPart view --- .../company/templates/company/partdetail.html | 48 ++----------- .../templates/company/supplier_part_base.html | 68 +++++++++++++++++++ .../templates/company/supplier_part_tabs.html | 19 ++++++ 3 files changed, 91 insertions(+), 44 deletions(-) create mode 100644 InvenTree/company/templates/company/supplier_part_base.html create mode 100644 InvenTree/company/templates/company/supplier_part_tabs.html diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html index 1b101ec48e..2237f0848d 100644 --- a/InvenTree/company/templates/company/partdetail.html +++ b/InvenTree/company/templates/company/partdetail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "company/supplier_part_base.html" %} {% load static %} {% load i18n %} @@ -6,33 +6,9 @@ InvenTree | {{ company.name }} - {% trans "Parts" %} {% endblock %} -{% block content %} +{% block details %} -
-
-

{% trans "Supplier Part" %}

-
-
- - -
-
-
-
-
- -
-
-
+{% include "company/supplier_part_tabs.html" with tab='details' %}
@@ -120,23 +96,7 @@ InvenTree | {{ company.name }} - {% trans "Parts" %} {% block js_ready %} {{ block.super }} - $('#edit-part').click(function () { - launchModalForm( - "{% url 'supplier-part-edit' part.id %}", - { - reload: true - } - ); - }); - - $('#delete-part').click(function() { - launchModalForm( - "{% url 'supplier-part-delete' %}?part={{ part.id }}", - { - redirect: "{% url 'company-detail-parts' part.supplier.id %}" - } - ); - }); + $('#new-price-break').click(function() { launchModalForm("{% url 'price-break-create' %}", diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html new file mode 100644 index 0000000000..f7e6ce88cc --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_base.html @@ -0,0 +1,68 @@ +{% extends "base.html" %} +{% load static %} +{% load i18n %} + +{% block page_title %} +InvenTree | {% trans "Supplier Part" %} +{% endblock %} + +{% block content %} + +
+
+

{% trans "Supplier Part" %}

+
+
+ + +
+
+
+
+
+ +
+
+
+ +
+ +
+ {% block details %} + + {% endblock %} +
+ +{% endblock %} + +{% block js_ready %} +{{ block.super }} + +$('#edit-part').click(function () { + launchModalForm( + "{% url 'supplier-part-edit' part.id %}", + { + reload: true + } + ); +}); + +$('#delete-part').click(function() { + launchModalForm( + "{% url 'supplier-part-delete' %}?part={{ part.id }}", + { + redirect: "{% url 'company-detail-parts' part.supplier.id %}" + } + ); +}); + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_tabs.html b/InvenTree/company/templates/company/supplier_part_tabs.html new file mode 100644 index 0000000000..a7c33d22a5 --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_tabs.html @@ -0,0 +1,19 @@ +{% load i18n %} + + \ No newline at end of file From d9d21395d9c70ad040fec91e30cd256271aaaa8e Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Feb 2020 10:48:25 +1100 Subject: [PATCH 2/6] Add a 'pricing' tab for SupplierPart --- .../company/templates/company/partdetail.html | 132 ------------------ .../company/supplier_part_detail.html | 47 +++++++ .../company/supplier_part_pricing.html | 91 ++++++++++++ .../templates/company/supplier_part_tabs.html | 2 +- InvenTree/company/urls.py | 4 +- InvenTree/company/views.py | 2 +- 6 files changed, 143 insertions(+), 135 deletions(-) delete mode 100644 InvenTree/company/templates/company/partdetail.html create mode 100644 InvenTree/company/templates/company/supplier_part_detail.html create mode 100644 InvenTree/company/templates/company/supplier_part_pricing.html diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html deleted file mode 100644 index 2237f0848d..0000000000 --- a/InvenTree/company/templates/company/partdetail.html +++ /dev/null @@ -1,132 +0,0 @@ -{% extends "company/supplier_part_base.html" %} -{% load static %} -{% load i18n %} - -{% block page_title %} -InvenTree | {{ company.name }} - {% trans "Parts" %} -{% endblock %} - -{% block details %} - -{% include "company/supplier_part_tabs.html" with tab='details' %} - -
- -
-
-

{% trans "Supplier Part Details" %}

- - - - - - - - {% if part.URL %} - - {% endif %} - {% if part.description %} - - {% endif %} - {% if part.manufacturer %} - - - {% endif %} - {% if part.note %} - - {% endif %} -
{% trans "Internal Part" %} - {% if part.part %} - {{ part.part.full_name }} - {% endif %} -
{% trans "Supplier" %}{{ part.supplier.name }}
{% trans "SKU" %}{{ part.SKU }}
{% trans "URL" %}{{ part.URL }}
{% trans "Description" %}{{ part.description }}
{% trans "Manufacturer" %}{{ part.manufacturer }}
{% trans "MPN" %}{{ part.MPN }}
{% trans "Note" %}{{ part.note }}
-
- -
-

{% trans "Pricing Information" %}

- - - {% if part.base_cost > 0 %} - - {% endif %} - - - - - - - - - {% if part.price_breaks.all %} - {% for pb in part.price_breaks.all %} - - - - - {% endfor %} - {% else %} - - - - {% endif %} -
{% trans "Order Multiple" %}{{ part.multiple }}
{% trans "Base Price (Flat Fee)" %}{{ part.base_cost }}
{% trans "Price Breaks" %} -
- -
-
{% trans "Quantity" %}{% trans "Price" %}
{{ pb.quantity }} - {% if pb.currency %}{{ pb.currency.symbol }}{% endif %} - {{ pb.cost }} - {% if pb.currency %}{{ pb.currency.suffix }}{% endif %} -
- - -
-
- {% trans "No price breaks have been added for this part" %} -
-
-
- -
- -

{% trans "Purchase Orders" %}

-{% include "order/po_table.html" with orders=part.purchase_orders %} - -{% endblock %} - -{% block js_ready %} -{{ block.super }} - - - $('#new-price-break').click(function() { - launchModalForm("{% url 'price-break-create' %}", - { - reload: true, - data: { - part: {{ part.id }}, - } - } - ); - }); - - $('.pb-edit-button').click(function() { - var button = $(this); - - launchModalForm(button.attr('url'), - { - reload: true, - } - ); - }); - - $('.pb-delete-button').click(function() { - var button = $(this); - - launchModalForm(button.attr('url'), - { - reload: true, - } - ); - }); - -{% endblock %} \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_detail.html b/InvenTree/company/templates/company/supplier_part_detail.html new file mode 100644 index 0000000000..1e2b24c94b --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_detail.html @@ -0,0 +1,47 @@ +{% extends "company/supplier_part_base.html" %} +{% load static %} +{% load i18n %} + +{% block details %} + +{% include "company/supplier_part_tabs.html" with tab='details' %} + +
+ +

{% trans "Supplier Part Details" %}

+ + + + + + + +{% if part.URL %} + +{% endif %} +{% if part.description %} + +{% endif %} +{% if part.manufacturer %} + + +{% endif %} +{% if part.note %} + +{% endif %} +
{% trans "Internal Part" %} + {% if part.part %} + {{ part.part.full_name }} + {% endif %} +
{% trans "Supplier" %}{{ part.supplier.name }}
{% trans "SKU" %}{{ part.SKU }}
{% trans "URL" %}{{ part.URL }}
{% trans "Description" %}{{ part.description }}
{% trans "Manufacturer" %}{{ part.manufacturer }}
{% trans "MPN" %}{{ part.MPN }}
{% trans "Note" %}{{ part.note }}
+ +

{% trans "Purchase Orders" %}

+{% include "order/po_table.html" with orders=part.purchase_orders %} + +{% endblock %} + +{% block js_ready %} +{{ block.super }} + + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_pricing.html b/InvenTree/company/templates/company/supplier_part_pricing.html new file mode 100644 index 0000000000..354b76db86 --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_pricing.html @@ -0,0 +1,91 @@ +{% extends "company/supplier_part_base.html" %} +{% load static %} +{% load i18n %} +{% load inventree_extras %} + +{% block details %} + +{% include "company/supplier_part_tabs.html" with tab='pricing' %} + + +

{% trans "Pricing Information" %}

+ + + {% if part.base_cost > 0 %} + + {% endif %} + + + + + + + + + {% if part.price_breaks.all %} + {% for pb in part.price_breaks.all %} + + + + + {% endfor %} + {% else %} + + + + {% endif %} +
{% trans "Order Multiple" %}{{ part.multiple }}
{% trans "Base Price (Flat Fee)" %}{{ part.base_cost }}
{% trans "Price Breaks" %} +
+ +
+
{% trans "Quantity" %}{% trans "Price" %}
{% decimal pb.quantity %} + {% if pb.currency %}{{ pb.currency.symbol }}{% endif %} + {% decimal pb.cost %} + {% if pb.currency %}{{ pb.currency.suffix }}{% endif %} +
+ + +
+
+ {% trans "No price breaks have been added for this part" %} +
+ +{% endblock %} + +{% block js_ready %} +{{ block.super }} + + + +$('#new-price-break').click(function() { + launchModalForm("{% url 'price-break-create' %}", + { + reload: true, + data: { + part: {{ part.id }}, + } + } + ); +}); + +$('.pb-edit-button').click(function() { + var button = $(this); + + launchModalForm(button.attr('url'), + { + reload: true, + } + ); +}); + +$('.pb-delete-button').click(function() { + var button = $(this); + + launchModalForm(button.attr('url'), + { + reload: true, + } + ); +}); + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_tabs.html b/InvenTree/company/templates/company/supplier_part_tabs.html index a7c33d22a5..d9746b6df3 100644 --- a/InvenTree/company/templates/company/supplier_part_tabs.html +++ b/InvenTree/company/templates/company/supplier_part_tabs.html @@ -5,7 +5,7 @@ {% trans "Details" %} - {% trans "Pricing" %} + {% trans "Pricing" %} {% trans "Stock" %} diff --git a/InvenTree/company/urls.py b/InvenTree/company/urls.py index a7683b7bbc..f4251f4ceb 100644 --- a/InvenTree/company/urls.py +++ b/InvenTree/company/urls.py @@ -47,7 +47,9 @@ price_break_urls = [ ] supplier_part_detail_urls = [ - url(r'edit/?', views.SupplierPartEdit.as_view(), name='supplier-part-edit'), + url(r'^edit/?', views.SupplierPartEdit.as_view(), name='supplier-part-edit'), + + url(r'^pricing/', views.SupplierPartDetail.as_view(template_name='company/supplier_part_pricing.html'), name='supplier-part-pricing'), url('^.*$', views.SupplierPartDetail.as_view(), name='supplier-part-detail'), ] diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py index 24bce08bc9..d37b72e707 100644 --- a/InvenTree/company/views.py +++ b/InvenTree/company/views.py @@ -149,7 +149,7 @@ class CompanyDelete(AjaxDeleteView): class SupplierPartDetail(DetailView): """ Detail view for SupplierPart """ model = SupplierPart - template_name = 'company/partdetail.html' + template_name = 'company/supplier_part_detail.html' context_object_name = 'part' queryset = SupplierPart.objects.all() From 8dd8505a2c15e222a8470da4b1041c4e979650f6 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Feb 2020 11:09:37 +1100 Subject: [PATCH 3/6] More tab updates - Add Stock tab - Add Stock table for supplier part - Allow stock API to be filtered by supplier-part ID - Add Orders tab --- .../company/supplier_part_detail.html | 3 -- .../company/supplier_part_orders.html | 19 ++++++++++ .../company/supplier_part_pricing.html | 1 + .../company/supplier_part_stock.html | 36 +++++++++++++++++++ .../templates/company/supplier_part_tabs.html | 7 ++-- InvenTree/company/urls.py | 2 ++ InvenTree/stock/api.py | 9 ++++- 7 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 InvenTree/company/templates/company/supplier_part_orders.html create mode 100644 InvenTree/company/templates/company/supplier_part_stock.html diff --git a/InvenTree/company/templates/company/supplier_part_detail.html b/InvenTree/company/templates/company/supplier_part_detail.html index 1e2b24c94b..bb0dee177a 100644 --- a/InvenTree/company/templates/company/supplier_part_detail.html +++ b/InvenTree/company/templates/company/supplier_part_detail.html @@ -35,9 +35,6 @@ {% endif %} -

{% trans "Purchase Orders" %}

-{% include "order/po_table.html" with orders=part.purchase_orders %} - {% endblock %} {% block js_ready %} diff --git a/InvenTree/company/templates/company/supplier_part_orders.html b/InvenTree/company/templates/company/supplier_part_orders.html new file mode 100644 index 0000000000..02d85b1d99 --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_orders.html @@ -0,0 +1,19 @@ +{% extends "company/supplier_part_base.html" %} +{% load static %} +{% load i18n %} + +{% block details %} + +{% include "company/supplier_part_tabs.html" with tab='orders' %} + +
+ +

{% trans "Supplier Part Orders" %}

+ +{% include "order/po_table.html" with orders=part.purchase_orders %} + +{% endblock %} + +{% block js_ready %} +{{ block.super }} +{% endblock %} \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_pricing.html b/InvenTree/company/templates/company/supplier_part_pricing.html index 354b76db86..bed8d9ed35 100644 --- a/InvenTree/company/templates/company/supplier_part_pricing.html +++ b/InvenTree/company/templates/company/supplier_part_pricing.html @@ -7,6 +7,7 @@ {% include "company/supplier_part_tabs.html" with tab='pricing' %} +

{% trans "Pricing Information" %}

diff --git a/InvenTree/company/templates/company/supplier_part_stock.html b/InvenTree/company/templates/company/supplier_part_stock.html new file mode 100644 index 0000000000..f672d063a7 --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_stock.html @@ -0,0 +1,36 @@ +{% extends "company/supplier_part_base.html" %} +{% load static %} +{% load i18n %} + +{% block details %} + +{% include "company/supplier_part_tabs.html" with tab='stock' %} + +
+ +

{% trans "Supplier Part Stock" %}

+ +{% include "stock_table.html" %} + +{% endblock %} + +{% block js_load %} +{{ block.super }} + +{% endblock %} + +{% block js_ready %} +{{ block.super }} + + loadStockTable($("#stock-table"), { + params: { + supplier_part: {{ part.id }}, + location_detail: true, + part_detail: true, + }, + groupByField: 'location', + buttons: ['#stock-options'], + url: "{% url 'api-stock-list' %}", + }); + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_tabs.html b/InvenTree/company/templates/company/supplier_part_tabs.html index d9746b6df3..0bcd8aa4fa 100644 --- a/InvenTree/company/templates/company/supplier_part_tabs.html +++ b/InvenTree/company/templates/company/supplier_part_tabs.html @@ -8,12 +8,9 @@ {% trans "Pricing" %} - {% trans "Stock" %} + {% trans "Stock" %}
  • - {% trans "Orders" %} -
    • -
  • - {% trans "Notes" %} + {% trans "Orders" %}
    • \ No newline at end of file diff --git a/InvenTree/company/urls.py b/InvenTree/company/urls.py index f4251f4ceb..66cc0b9cd8 100644 --- a/InvenTree/company/urls.py +++ b/InvenTree/company/urls.py @@ -50,6 +50,8 @@ supplier_part_detail_urls = [ url(r'^edit/?', views.SupplierPartEdit.as_view(), name='supplier-part-edit'), url(r'^pricing/', views.SupplierPartDetail.as_view(template_name='company/supplier_part_pricing.html'), name='supplier-part-pricing'), + url(r'^orders/', views.SupplierPartDetail.as_view(template_name='company/supplier_part_orders.html'), name='supplier-part-orders'), + url(r'^stock/', views.SupplierPartDetail.as_view(template_name='company/supplier_part_stock.html'), name='supplier-part-stock'), url('^.*$', views.SupplierPartDetail.as_view(), name='supplier-part-detail'), ] diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py index b691041bde..af2d724f58 100644 --- a/InvenTree/stock/api.py +++ b/InvenTree/stock/api.py @@ -301,6 +301,7 @@ class StockList(generics.ListCreateAPIView): 'part__category', 'part__category__name', 'part__category__description', + 'supplier_part', ) # Reduce the number of lookups we need to do for categories @@ -371,7 +372,13 @@ class StockList(generics.ListCreateAPIView): except PartCategory.DoesNotExist: pass - # Filter by supplier + # Filter by supplier_part ID + supplier_part_id = self.request.query_params.get('supplier_part', None) + + if supplier_part_id: + stock_list = stock_list.filter(supplier_part=supplier_part_id) + + # Filter by supplier ID supplier_id = self.request.query_params.get('supplier', None) if supplier_id: From 6d80788618247756b649feaa0ecdc51d6fdfdac0 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Feb 2020 11:16:00 +1100 Subject: [PATCH 4/6] Allow stock-filtering and export using SupplierPart ID --- .../templates/company/supplier_part_stock.html | 15 +++++++++++++++ InvenTree/stock/views.py | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/InvenTree/company/templates/company/supplier_part_stock.html b/InvenTree/company/templates/company/supplier_part_stock.html index f672d063a7..2ad9adb97f 100644 --- a/InvenTree/company/templates/company/supplier_part_stock.html +++ b/InvenTree/company/templates/company/supplier_part_stock.html @@ -33,4 +33,19 @@ url: "{% url 'api-stock-list' %}", }); + $("#stock-export").click(function() { + launchModalForm("{% url 'stock-export-options' %}", { + submit_text: "Export", + success: function(response) { + var url = "{% url 'stock-export' %}"; + + url += "?format=" + response.format; + url += "&cascade=" + response.cascade; + url += "&supplier_part={{ part.id }}"; + + location.href = url; + }, + }); + }); + {% endblock %} \ No newline at end of file diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index 9d5e2b5dc4..fdfd59ca44 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -24,7 +24,7 @@ from InvenTree.helpers import ExtractSerialNumbers from decimal import Decimal, InvalidOperation from datetime import datetime -from company.models import Company +from company.models import Company, SupplierPart from part.models import Part from .models import StockItem, StockLocation, StockItemTracking @@ -212,6 +212,16 @@ class StockExport(AjaxView): except (ValueError, Company.DoesNotExist): pass + # Check if a particular supplier_part was specified + sup_part_id = request.GET.get('supplier_part', None) + supplier_part = None + + if sup_part_id: + try: + supplier_part = SupplierPart.objects.get(pk=sup_part_id) + except (ValueError, SupplierPart.DoesNotExist): + pass + # Check if a particular part was specified part_id = request.GET.get('part', None) part = None @@ -244,7 +254,11 @@ class StockExport(AjaxView): if supplier: stock_items = stock_items.filter(supplier_part__supplier=supplier) + if supplier_part: + stock_items = stock_items.filter(supplier_part=supplier_part) + # Filter out stock items that are not 'in stock' + # TODO - This might need some more thought in the future... stock_items = stock_items.filter(customer=None) stock_items = stock_items.filter(belongs_to=None) From 33d21594da200b0db2953bb26bca2b930c36991d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Feb 2020 11:32:01 +1100 Subject: [PATCH 5/6] Create new stock item from supplierpart stock page - Allow stock-item-create form to have supplierpart passed as initial data - Add some translations too --- .../company/supplier_part_stock.html | 23 +- InvenTree/locale/de/LC_MESSAGES/django.po | 222 ++++++++++++------ InvenTree/locale/en/LC_MESSAGES/django.po | 190 ++++++++++----- InvenTree/locale/es/LC_MESSAGES/django.po | 190 ++++++++++----- InvenTree/part/templates/part/stock.html | 15 +- InvenTree/stock/views.py | 24 +- InvenTree/templates/stock_table.html | 22 +- 7 files changed, 471 insertions(+), 215 deletions(-) diff --git a/InvenTree/company/templates/company/supplier_part_stock.html b/InvenTree/company/templates/company/supplier_part_stock.html index 2ad9adb97f..9f3157c0b5 100644 --- a/InvenTree/company/templates/company/supplier_part_stock.html +++ b/InvenTree/company/templates/company/supplier_part_stock.html @@ -35,7 +35,7 @@ $("#stock-export").click(function() { launchModalForm("{% url 'stock-export-options' %}", { - submit_text: "Export", + submit_text: '{% trans "Export" %}', success: function(response) { var url = "{% url 'stock-export' %}"; @@ -48,4 +48,25 @@ }); }); + $("#item-create").click(function() { + launchModalForm("{% url 'stock-item-create' %}", { + reload: true, + data: { + part: {{ part.part.id }}, + supplier_part: {{ part.id }}, + }, + secondary: [ + { + field: 'location', + label: '{% trans "New Location" %}', + title: '{% trans "Create New Location" %}', + url: "{% url 'stock-location-create' %}", + } + ] + }); + + return false; + }); + + {% endblock %} \ No newline at end of file diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po index 8547621b0d..06afa0b14d 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-02-11 23:25+0000\n" +"POT-Creation-Date: 2020-02-12 00:31+0000\n" "PO-Revision-Date: 2020-02-02 08:07+0100\n" "Last-Translator: Christian Schlüter \n" "Language-Team: C \n" @@ -254,7 +254,7 @@ msgstr "Teile bestellen" #: build/templates/build/allocate_view.html:18 #: company/templates/company/index.html:54 -#: company/templates/company/partdetail.html:57 +#: company/templates/company/supplier_part_detail.html:27 #: order/templates/order/purchase_order_detail.html:26 #: part/templates/part/detail.html:33 msgid "Description" @@ -281,7 +281,7 @@ msgid "Title" msgstr "Titel" #: build/templates/build/detail.html:20 -#: company/templates/company/partdetail.html:85 +#: company/templates/company/supplier_part_pricing.html:27 #: order/templates/order/purchase_order_detail.html:29 #: stock/templates/stock/item_base.html:90 #: stock/templates/stock/stock_adjust.html:18 @@ -308,7 +308,7 @@ msgstr "Los" #: build/templates/build/detail.html:42 #: company/templates/company/detail_part.html:90 -#: company/templates/company/partdetail.html:54 +#: company/templates/company/supplier_part_detail.html:24 #: part/templates/part/detail.html:50 part/templates/part/part_base.html:81 #: stock/templates/stock/item_base.html:120 msgid "URL" @@ -351,8 +351,9 @@ msgstr "Speichern" msgid "Edit notes" msgstr "Bermerkungen bearbeiten" -#: build/templates/build/tabs.html:5 company/templates/company/tabs.html:5 -#: part/templates/part/tabs.html:6 +#: build/templates/build/tabs.html:5 +#: company/templates/company/supplier_part_tabs.html:5 +#: company/templates/company/tabs.html:5 part/templates/part/tabs.html:6 msgid "Details" msgstr "Details" @@ -438,7 +439,7 @@ msgstr "Bau-Fertigstellung bestätigen" msgid "Invalid location selected" msgstr "Ungültige Teileauswahl" -#: build/views.py:290 stock/views.py:884 +#: build/views.py:290 stock/views.py:916 #, python-brace-format msgid "The following serial numbers already exist: ({sn})" msgstr "Die folgende Seriennummer existiert bereits: ({sn})" @@ -600,7 +601,7 @@ msgid "Supplier stock keeping unit" msgstr "Stock Keeping Units (SKU) des Zulieferers" #: company/models.py:240 company/templates/company/detail_part.html:81 -#: company/templates/company/partdetail.html:60 +#: company/templates/company/supplier_part_detail.html:30 msgid "Manufacturer" msgstr "Hersteller" @@ -662,7 +663,7 @@ msgstr "Kunde" #: company/templates/company/detail.html:17 #: company/templates/company/index.html:46 -#: company/templates/company/partdetail.html:51 +#: company/templates/company/supplier_part_detail.html:21 #: order/templates/order/order_base.html:67 #: stock/templates/stock/item_base.html:126 msgid "Supplier" @@ -674,12 +675,13 @@ msgid "Supplier Parts" msgstr "Zulieferer-Teile" #: company/templates/company/detail_part.html:13 +#: part/templates/part/stock.html:81 #, fuzzy #| msgid "Supplier Part" msgid "New Supplier Part" msgstr "Zulieferer-Teil" -#: company/templates/company/detail_part.html:15 +#: company/templates/company/detail_part.html:15 templates/stock_table.html:10 msgid "Options" msgstr "" @@ -690,12 +692,11 @@ msgid "Delete Parts" msgstr "Anhang löschen" #: company/templates/company/detail_part.html:73 -#: company/templates/company/partdetail.html:52 +#: company/templates/company/supplier_part_detail.html:22 msgid "SKU" msgstr "" #: company/templates/company/detail_purchase_orders.html:8 -#: company/templates/company/partdetail.html:116 #: company/templates/company/tabs.html:15 part/templates/part/tabs.html:43 msgid "Purchase Orders" msgstr "Bestellungen" @@ -713,6 +714,8 @@ msgid "Supplier Stock" msgstr "Zulieferer-Teil" #: company/templates/company/detail_stock.html:33 +#: company/templates/company/supplier_part_stock.html:38 +#: part/templates/part/stock.html:53 templates/stock_table.html:5 msgid "Export" msgstr "" @@ -733,10 +736,8 @@ msgstr "Zulieferer" msgid "ID" msgstr "" -#: company/templates/company/index.html:69 -#: company/templates/company/partdetail.html:6 -#: part/templates/part/category.html:73 templates/navbar.html:10 -#: templates/stats.html:7 templates/stats.html:10 +#: company/templates/company/index.html:69 part/templates/part/category.html:73 +#: templates/navbar.html:10 templates/stats.html:7 templates/stats.html:10 msgid "Parts" msgstr "Teile" @@ -750,71 +751,112 @@ msgid "Are you sure you want to delete the following Supplier Parts?" msgstr "" "Sind Sie sicher, dass sie die folgenden Zulieferer-Teile löschen möchten?" -#: company/templates/company/partdetail.html:13 +#: company/templates/company/supplier_part_base.html:6 +#: company/templates/company/supplier_part_base.html:13 #: stock/templates/stock/item_base.html:130 msgid "Supplier Part" msgstr "Zulieferer-Teil" -#: company/templates/company/partdetail.html:41 +#: company/templates/company/supplier_part_detail.html:11 #, fuzzy #| msgid "Supplier Parts" msgid "Supplier Part Details" msgstr "Zulieferer-Teile" -#: company/templates/company/partdetail.html:44 +#: company/templates/company/supplier_part_detail.html:14 #, fuzzy #| msgid "Internal Part Number" msgid "Internal Part" msgstr "Interne Teilenummer" -#: company/templates/company/partdetail.html:61 +#: company/templates/company/supplier_part_detail.html:31 #, fuzzy #| msgid "IPN" msgid "MPN" msgstr "IPN (Interne Produktnummer)" -#: company/templates/company/partdetail.html:64 +#: company/templates/company/supplier_part_detail.html:34 #: order/templates/order/purchase_order_detail.html:33 msgid "Note" msgstr "Notiz" -#: company/templates/company/partdetail.html:70 +#: company/templates/company/supplier_part_orders.html:11 +#, fuzzy +#| msgid "Supplier Parts" +msgid "Supplier Part Orders" +msgstr "Zulieferer-Teile" + +#: company/templates/company/supplier_part_pricing.html:12 #, fuzzy #| msgid "Show pricing information" msgid "Pricing Information" msgstr "Kosteninformationen ansehen" -#: company/templates/company/partdetail.html:72 +#: company/templates/company/supplier_part_pricing.html:14 #, fuzzy #| msgid "Order notes" msgid "Order Multiple" msgstr "Bestell-Notizen" -#: company/templates/company/partdetail.html:74 +#: company/templates/company/supplier_part_pricing.html:16 msgid "Base Price (Flat Fee)" msgstr "" -#: company/templates/company/partdetail.html:77 +#: company/templates/company/supplier_part_pricing.html:19 msgid "Price Breaks" msgstr "" -#: company/templates/company/partdetail.html:80 +#: company/templates/company/supplier_part_pricing.html:22 msgid "New Price Break" msgstr "" -#: company/templates/company/partdetail.html:86 +#: company/templates/company/supplier_part_pricing.html:28 msgid "Price" msgstr "" -#: company/templates/company/partdetail.html:106 +#: company/templates/company/supplier_part_pricing.html:48 msgid "No price breaks have been added for this part" msgstr "" +#: company/templates/company/supplier_part_stock.html:11 +#, fuzzy +#| msgid "Supplier part" +msgid "Supplier Part Stock" +msgstr "Zulieferer-Teil" + +#: company/templates/company/supplier_part_stock.html:61 +#: part/templates/part/stock.html:90 +#, fuzzy +#| msgid "Location" +msgid "New Location" +msgstr "Standort" + +#: company/templates/company/supplier_part_stock.html:62 +#: part/templates/part/stock.html:91 +#, fuzzy +#| msgid "Create new Stock Location" +msgid "Create New Location" +msgstr "Neuen Lager-Standort erstellen" + +#: company/templates/company/supplier_part_tabs.html:8 +#, fuzzy +#| msgid "Part packaging" +msgid "Pricing" +msgstr "Teile-Packaging" + +#: company/templates/company/supplier_part_tabs.html:11 #: company/templates/company/tabs.html:12 part/templates/part/tabs.html:17 #: templates/navbar.html:11 msgid "Stock" msgstr "Lagerbestand" +#: company/templates/company/supplier_part_tabs.html:14 +#: templates/navbar.html:14 +#, fuzzy +#| msgid "On Order" +msgid "Orders" +msgstr "bestellt" + #: company/templates/company/tabs.html:21 msgid "Sales Orders" msgstr "Bestellungen" @@ -871,7 +913,7 @@ msgstr "Firmenadresse" msgid "Edit Supplier Part" msgstr "Zulieferer-Teil" -#: company/views.py:179 +#: company/views.py:179 part/templates/part/stock.html:82 #, fuzzy #| msgid "Supplier Part" msgid "Create new Supplier Part" @@ -1547,6 +1589,18 @@ msgstr "Teil auswählen" msgid "Upload new image" msgstr "" +#: part/templates/part/stock.html:75 +#, fuzzy +#| msgid "Part" +msgid "New Part" +msgstr "Teil" + +#: part/templates/part/stock.html:76 +#, fuzzy +#| msgid "Create new Stock Item" +msgid "Create New Part" +msgstr "Neues Lagerobjekt hinzufügen" + #: part/templates/part/tabs.html:9 msgid "Parameters" msgstr "Parameter" @@ -2041,135 +2095,135 @@ msgstr "QR-Code für diesen Standort" msgid "Stock Export Options" msgstr "Lagerbestandsexportoptionen" -#: stock/views.py:264 +#: stock/views.py:278 msgid "Stock Item QR Code" msgstr "Lagerobjekt-QR-Code" -#: stock/views.py:287 +#: stock/views.py:301 msgid "Adjust Stock" msgstr "Lagerbestand anpassen" -#: stock/views.py:396 +#: stock/views.py:410 msgid "Move Stock Items" msgstr "Lagerobjekte bewegen" -#: stock/views.py:397 +#: stock/views.py:411 msgid "Count Stock Items" msgstr "Lagerobjekte zählen" -#: stock/views.py:398 +#: stock/views.py:412 msgid "Remove From Stock" msgstr "Aus Lagerbestand entfernen" -#: stock/views.py:399 +#: stock/views.py:413 msgid "Add Stock Items" msgstr "Lagerobjekte hinzufügen" -#: stock/views.py:400 +#: stock/views.py:414 msgid "Delete Stock Items" msgstr "Lagerobjekte löschen" -#: stock/views.py:428 +#: stock/views.py:442 msgid "Must enter integer value" msgstr "Nur Ganzzahl eingeben" -#: stock/views.py:433 +#: stock/views.py:447 msgid "Quantity must be positive" msgstr "Anzahl muss positiv sein" -#: stock/views.py:440 +#: stock/views.py:454 #, python-brace-format msgid "Quantity must not exceed {x}" msgstr "Anzahl darf {x} nicht überschreiten" -#: stock/views.py:448 +#: stock/views.py:462 msgid "Confirm stock adjustment" msgstr "Bestands-Anpassung bestätigen" -#: stock/views.py:519 +#: stock/views.py:533 #, python-brace-format msgid "Added stock to {n} items" msgstr "Vorrat zu {n} Lagerobjekten hinzugefügt" -#: stock/views.py:534 +#: stock/views.py:548 #, python-brace-format msgid "Removed stock from {n} items" msgstr "Vorrat von {n} Lagerobjekten entfernt" -#: stock/views.py:547 +#: stock/views.py:561 #, python-brace-format msgid "Counted stock for {n} items" msgstr "Bestand für {n} Objekte erfasst" -#: stock/views.py:575 +#: stock/views.py:589 msgid "No items were moved" msgstr "Keine Lagerobjekte wurden bewegt" -#: stock/views.py:578 +#: stock/views.py:592 #, python-brace-format msgid "Moved {n} items to {dest}" msgstr "{n} Teile nach {dest} bewegt" -#: stock/views.py:597 +#: stock/views.py:611 #, python-brace-format msgid "Deleted {n} stock items" msgstr "{n} Teile im Lager gelöscht" -#: stock/views.py:609 +#: stock/views.py:623 msgid "Edit Stock Item" msgstr "Lagerobjekt bearbeiten" -#: stock/views.py:645 +#: stock/views.py:659 msgid "Create new Stock Location" msgstr "Neuen Lager-Standort erstellen" -#: stock/views.py:666 +#: stock/views.py:680 msgid "Serialize Stock" msgstr "Lagerbestand erfassen" -#: stock/views.py:746 +#: stock/views.py:760 msgid "Create new Stock Item" msgstr "Neues Lagerobjekt hinzufügen" -#: stock/views.py:810 +#: stock/views.py:824 msgid "Copy Stock Item" msgstr "Lagerobjekt kopieren" -#: stock/views.py:860 +#: stock/views.py:892 msgid "Invalid quantity" msgstr "Ungültige Menge" -#: stock/views.py:863 +#: stock/views.py:895 msgid "Invalid part selection" msgstr "Ungültige Teileauswahl" -#: stock/views.py:910 +#: stock/views.py:942 #, fuzzy, python-brace-format #| msgid "Created new stock item" msgid "Created {n} new stock items" msgstr "Neues Lagerobjekt erstellt" -#: stock/views.py:927 stock/views.py:940 +#: stock/views.py:959 stock/views.py:972 msgid "Created new stock item" msgstr "Neues Lagerobjekt erstellt" -#: stock/views.py:957 +#: stock/views.py:989 msgid "Delete Stock Location" msgstr "Standort löschen" -#: stock/views.py:970 +#: stock/views.py:1002 msgid "Delete Stock Item" msgstr "Lagerobjekt löschen" -#: stock/views.py:981 +#: stock/views.py:1013 msgid "Delete Stock Tracking Entry" msgstr "Lagerbestands-Tracking-Eintrag löschen" -#: stock/views.py:998 +#: stock/views.py:1030 msgid "Edit Stock Tracking Entry" msgstr "Lagerbestands-Tracking-Eintrag bearbeiten" -#: stock/views.py:1007 +#: stock/views.py:1039 msgid "Add Stock Tracking Entry" msgstr "Lagerbestands-Tracking-Eintrag hinzufügen" @@ -2207,12 +2261,6 @@ msgstr "InvenTree-Dokumentation" msgid "View Code on GitHub" msgstr "Code auf GitHub ansehen" -#: templates/navbar.html:14 -#, fuzzy -#| msgid "On Order" -msgid "Orders" -msgstr "bestellt" - #: templates/navbar.html:23 msgid "Admin" msgstr "" @@ -2240,3 +2288,45 @@ msgstr "" #| msgid "Status" msgid "Statistics" msgstr "Status" + +#: templates/stock_table.html:7 +#, fuzzy +#| msgid "Stock Item" +msgid "New Stock Item" +msgstr "Lagerobjekt" + +#: templates/stock_table.html:12 +#, fuzzy +#| msgid "Add Stock Items" +msgid "Add stock" +msgstr "Lagerobjekte hinzufügen" + +#: templates/stock_table.html:13 +#, fuzzy +#| msgid "Remove From Stock" +msgid "Remove stock" +msgstr "Aus Lagerbestand entfernen" + +#: templates/stock_table.html:14 +#, fuzzy +#| msgid "Count Stock Items" +msgid "Count stock" +msgstr "Lagerobjekte zählen" + +#: templates/stock_table.html:15 +#, fuzzy +#| msgid "Move Stock Items" +msgid "Move stock" +msgstr "Lagerobjekte bewegen" + +#: templates/stock_table.html:16 +#, fuzzy +#| msgid "On Order" +msgid "Order stock" +msgstr "bestellt" + +#: templates/stock_table.html:17 +#, fuzzy +#| msgid "Delete Stock Item" +msgid "Delete Stock" +msgstr "Lagerobjekt löschen" diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po index f6daf1d37b..99c6de1be1 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-02-11 23:25+0000\n" +"POT-Creation-Date: 2020-02-12 00:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -250,7 +250,7 @@ msgstr "" #: build/templates/build/allocate_view.html:18 #: company/templates/company/index.html:54 -#: company/templates/company/partdetail.html:57 +#: company/templates/company/supplier_part_detail.html:27 #: order/templates/order/purchase_order_detail.html:26 #: part/templates/part/detail.html:33 msgid "Description" @@ -274,7 +274,7 @@ msgid "Title" msgstr "" #: build/templates/build/detail.html:20 -#: company/templates/company/partdetail.html:85 +#: company/templates/company/supplier_part_pricing.html:27 #: order/templates/order/purchase_order_detail.html:29 #: stock/templates/stock/item_base.html:90 #: stock/templates/stock/stock_adjust.html:18 @@ -301,7 +301,7 @@ msgstr "" #: build/templates/build/detail.html:42 #: company/templates/company/detail_part.html:90 -#: company/templates/company/partdetail.html:54 +#: company/templates/company/supplier_part_detail.html:24 #: part/templates/part/detail.html:50 part/templates/part/part_base.html:81 #: stock/templates/stock/item_base.html:120 msgid "URL" @@ -344,8 +344,9 @@ msgstr "" msgid "Edit notes" msgstr "" -#: build/templates/build/tabs.html:5 company/templates/company/tabs.html:5 -#: part/templates/part/tabs.html:6 +#: build/templates/build/tabs.html:5 +#: company/templates/company/supplier_part_tabs.html:5 +#: company/templates/company/tabs.html:5 part/templates/part/tabs.html:6 msgid "Details" msgstr "" @@ -415,7 +416,7 @@ msgstr "" msgid "Invalid location selected" msgstr "" -#: build/views.py:290 stock/views.py:884 +#: build/views.py:290 stock/views.py:916 #, python-brace-format msgid "The following serial numbers already exist: ({sn})" msgstr "" @@ -561,7 +562,7 @@ msgid "Supplier stock keeping unit" msgstr "" #: company/models.py:240 company/templates/company/detail_part.html:81 -#: company/templates/company/partdetail.html:60 +#: company/templates/company/supplier_part_detail.html:30 msgid "Manufacturer" msgstr "" @@ -621,7 +622,7 @@ msgstr "" #: company/templates/company/detail.html:17 #: company/templates/company/index.html:46 -#: company/templates/company/partdetail.html:51 +#: company/templates/company/supplier_part_detail.html:21 #: order/templates/order/order_base.html:67 #: stock/templates/stock/item_base.html:126 msgid "Supplier" @@ -633,10 +634,11 @@ msgid "Supplier Parts" msgstr "" #: company/templates/company/detail_part.html:13 +#: part/templates/part/stock.html:81 msgid "New Supplier Part" msgstr "" -#: company/templates/company/detail_part.html:15 +#: company/templates/company/detail_part.html:15 templates/stock_table.html:10 msgid "Options" msgstr "" @@ -645,12 +647,11 @@ msgid "Delete Parts" msgstr "" #: company/templates/company/detail_part.html:73 -#: company/templates/company/partdetail.html:52 +#: company/templates/company/supplier_part_detail.html:22 msgid "SKU" msgstr "" #: company/templates/company/detail_purchase_orders.html:8 -#: company/templates/company/partdetail.html:116 #: company/templates/company/tabs.html:15 part/templates/part/tabs.html:43 msgid "Purchase Orders" msgstr "" @@ -664,6 +665,8 @@ msgid "Supplier Stock" msgstr "" #: company/templates/company/detail_stock.html:33 +#: company/templates/company/supplier_part_stock.html:38 +#: part/templates/part/stock.html:53 templates/stock_table.html:5 msgid "Export" msgstr "" @@ -680,10 +683,8 @@ msgstr "" msgid "ID" msgstr "" -#: company/templates/company/index.html:69 -#: company/templates/company/partdetail.html:6 -#: part/templates/part/category.html:73 templates/navbar.html:10 -#: templates/stats.html:7 templates/stats.html:10 +#: company/templates/company/index.html:69 part/templates/part/category.html:73 +#: templates/navbar.html:10 templates/stats.html:7 templates/stats.html:10 msgid "Parts" msgstr "" @@ -696,61 +697,90 @@ msgstr "" msgid "Are you sure you want to delete the following Supplier Parts?" msgstr "" -#: company/templates/company/partdetail.html:13 +#: company/templates/company/supplier_part_base.html:6 +#: company/templates/company/supplier_part_base.html:13 #: stock/templates/stock/item_base.html:130 msgid "Supplier Part" msgstr "" -#: company/templates/company/partdetail.html:41 +#: company/templates/company/supplier_part_detail.html:11 msgid "Supplier Part Details" msgstr "" -#: company/templates/company/partdetail.html:44 +#: company/templates/company/supplier_part_detail.html:14 msgid "Internal Part" msgstr "" -#: company/templates/company/partdetail.html:61 +#: company/templates/company/supplier_part_detail.html:31 msgid "MPN" msgstr "" -#: company/templates/company/partdetail.html:64 +#: company/templates/company/supplier_part_detail.html:34 #: order/templates/order/purchase_order_detail.html:33 msgid "Note" msgstr "" -#: company/templates/company/partdetail.html:70 +#: company/templates/company/supplier_part_orders.html:11 +msgid "Supplier Part Orders" +msgstr "" + +#: company/templates/company/supplier_part_pricing.html:12 msgid "Pricing Information" msgstr "" -#: company/templates/company/partdetail.html:72 +#: company/templates/company/supplier_part_pricing.html:14 msgid "Order Multiple" msgstr "" -#: company/templates/company/partdetail.html:74 +#: company/templates/company/supplier_part_pricing.html:16 msgid "Base Price (Flat Fee)" msgstr "" -#: company/templates/company/partdetail.html:77 +#: company/templates/company/supplier_part_pricing.html:19 msgid "Price Breaks" msgstr "" -#: company/templates/company/partdetail.html:80 +#: company/templates/company/supplier_part_pricing.html:22 msgid "New Price Break" msgstr "" -#: company/templates/company/partdetail.html:86 +#: company/templates/company/supplier_part_pricing.html:28 msgid "Price" msgstr "" -#: company/templates/company/partdetail.html:106 +#: company/templates/company/supplier_part_pricing.html:48 msgid "No price breaks have been added for this part" msgstr "" +#: company/templates/company/supplier_part_stock.html:11 +msgid "Supplier Part Stock" +msgstr "" + +#: company/templates/company/supplier_part_stock.html:61 +#: part/templates/part/stock.html:90 +msgid "New Location" +msgstr "" + +#: company/templates/company/supplier_part_stock.html:62 +#: part/templates/part/stock.html:91 +msgid "Create New Location" +msgstr "" + +#: company/templates/company/supplier_part_tabs.html:8 +msgid "Pricing" +msgstr "" + +#: company/templates/company/supplier_part_tabs.html:11 #: company/templates/company/tabs.html:12 part/templates/part/tabs.html:17 #: templates/navbar.html:11 msgid "Stock" msgstr "" +#: company/templates/company/supplier_part_tabs.html:14 +#: templates/navbar.html:14 +msgid "Orders" +msgstr "" + #: company/templates/company/tabs.html:21 msgid "Sales Orders" msgstr "" @@ -791,7 +821,7 @@ msgstr "" msgid "Edit Supplier Part" msgstr "" -#: company/views.py:179 +#: company/views.py:179 part/templates/part/stock.html:82 msgid "Create new Supplier Part" msgstr "" @@ -1437,6 +1467,14 @@ msgstr "" msgid "Upload new image" msgstr "" +#: part/templates/part/stock.html:75 +msgid "New Part" +msgstr "" + +#: part/templates/part/stock.html:76 +msgid "Create New Part" +msgstr "" + #: part/templates/part/tabs.html:9 msgid "Parameters" msgstr "" @@ -1868,134 +1906,134 @@ msgstr "" msgid "Stock Export Options" msgstr "" -#: stock/views.py:264 +#: stock/views.py:278 msgid "Stock Item QR Code" msgstr "" -#: stock/views.py:287 +#: stock/views.py:301 msgid "Adjust Stock" msgstr "" -#: stock/views.py:396 +#: stock/views.py:410 msgid "Move Stock Items" msgstr "" -#: stock/views.py:397 +#: stock/views.py:411 msgid "Count Stock Items" msgstr "" -#: stock/views.py:398 +#: stock/views.py:412 msgid "Remove From Stock" msgstr "" -#: stock/views.py:399 +#: stock/views.py:413 msgid "Add Stock Items" msgstr "" -#: stock/views.py:400 +#: stock/views.py:414 msgid "Delete Stock Items" msgstr "" -#: stock/views.py:428 +#: stock/views.py:442 msgid "Must enter integer value" msgstr "" -#: stock/views.py:433 +#: stock/views.py:447 msgid "Quantity must be positive" msgstr "" -#: stock/views.py:440 +#: stock/views.py:454 #, python-brace-format msgid "Quantity must not exceed {x}" msgstr "" -#: stock/views.py:448 +#: stock/views.py:462 msgid "Confirm stock adjustment" msgstr "" -#: stock/views.py:519 +#: stock/views.py:533 #, python-brace-format msgid "Added stock to {n} items" msgstr "" -#: stock/views.py:534 +#: stock/views.py:548 #, python-brace-format msgid "Removed stock from {n} items" msgstr "" -#: stock/views.py:547 +#: stock/views.py:561 #, python-brace-format msgid "Counted stock for {n} items" msgstr "" -#: stock/views.py:575 +#: stock/views.py:589 msgid "No items were moved" msgstr "" -#: stock/views.py:578 +#: stock/views.py:592 #, python-brace-format msgid "Moved {n} items to {dest}" msgstr "" -#: stock/views.py:597 +#: stock/views.py:611 #, python-brace-format msgid "Deleted {n} stock items" msgstr "" -#: stock/views.py:609 +#: stock/views.py:623 msgid "Edit Stock Item" msgstr "" -#: stock/views.py:645 +#: stock/views.py:659 msgid "Create new Stock Location" msgstr "" -#: stock/views.py:666 +#: stock/views.py:680 msgid "Serialize Stock" msgstr "" -#: stock/views.py:746 +#: stock/views.py:760 msgid "Create new Stock Item" msgstr "" -#: stock/views.py:810 +#: stock/views.py:824 msgid "Copy Stock Item" msgstr "" -#: stock/views.py:860 +#: stock/views.py:892 msgid "Invalid quantity" msgstr "" -#: stock/views.py:863 +#: stock/views.py:895 msgid "Invalid part selection" msgstr "" -#: stock/views.py:910 +#: stock/views.py:942 #, python-brace-format msgid "Created {n} new stock items" msgstr "" -#: stock/views.py:927 stock/views.py:940 +#: stock/views.py:959 stock/views.py:972 msgid "Created new stock item" msgstr "" -#: stock/views.py:957 +#: stock/views.py:989 msgid "Delete Stock Location" msgstr "" -#: stock/views.py:970 +#: stock/views.py:1002 msgid "Delete Stock Item" msgstr "" -#: stock/views.py:981 +#: stock/views.py:1013 msgid "Delete Stock Tracking Entry" msgstr "" -#: stock/views.py:998 +#: stock/views.py:1030 msgid "Edit Stock Tracking Entry" msgstr "" -#: stock/views.py:1007 +#: stock/views.py:1039 msgid "Add Stock Tracking Entry" msgstr "" @@ -2031,10 +2069,6 @@ msgstr "" msgid "View Code on GitHub" msgstr "" -#: templates/navbar.html:14 -msgid "Orders" -msgstr "" - #: templates/navbar.html:23 msgid "Admin" msgstr "" @@ -2058,3 +2092,31 @@ msgstr "" #: templates/navbar.html:33 msgid "Statistics" msgstr "" + +#: templates/stock_table.html:7 +msgid "New Stock Item" +msgstr "" + +#: templates/stock_table.html:12 +msgid "Add stock" +msgstr "" + +#: templates/stock_table.html:13 +msgid "Remove stock" +msgstr "" + +#: templates/stock_table.html:14 +msgid "Count stock" +msgstr "" + +#: templates/stock_table.html:15 +msgid "Move stock" +msgstr "" + +#: templates/stock_table.html:16 +msgid "Order stock" +msgstr "" + +#: templates/stock_table.html:17 +msgid "Delete Stock" +msgstr "" diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po index f6daf1d37b..99c6de1be1 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-02-11 23:25+0000\n" +"POT-Creation-Date: 2020-02-12 00:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -250,7 +250,7 @@ msgstr "" #: build/templates/build/allocate_view.html:18 #: company/templates/company/index.html:54 -#: company/templates/company/partdetail.html:57 +#: company/templates/company/supplier_part_detail.html:27 #: order/templates/order/purchase_order_detail.html:26 #: part/templates/part/detail.html:33 msgid "Description" @@ -274,7 +274,7 @@ msgid "Title" msgstr "" #: build/templates/build/detail.html:20 -#: company/templates/company/partdetail.html:85 +#: company/templates/company/supplier_part_pricing.html:27 #: order/templates/order/purchase_order_detail.html:29 #: stock/templates/stock/item_base.html:90 #: stock/templates/stock/stock_adjust.html:18 @@ -301,7 +301,7 @@ msgstr "" #: build/templates/build/detail.html:42 #: company/templates/company/detail_part.html:90 -#: company/templates/company/partdetail.html:54 +#: company/templates/company/supplier_part_detail.html:24 #: part/templates/part/detail.html:50 part/templates/part/part_base.html:81 #: stock/templates/stock/item_base.html:120 msgid "URL" @@ -344,8 +344,9 @@ msgstr "" msgid "Edit notes" msgstr "" -#: build/templates/build/tabs.html:5 company/templates/company/tabs.html:5 -#: part/templates/part/tabs.html:6 +#: build/templates/build/tabs.html:5 +#: company/templates/company/supplier_part_tabs.html:5 +#: company/templates/company/tabs.html:5 part/templates/part/tabs.html:6 msgid "Details" msgstr "" @@ -415,7 +416,7 @@ msgstr "" msgid "Invalid location selected" msgstr "" -#: build/views.py:290 stock/views.py:884 +#: build/views.py:290 stock/views.py:916 #, python-brace-format msgid "The following serial numbers already exist: ({sn})" msgstr "" @@ -561,7 +562,7 @@ msgid "Supplier stock keeping unit" msgstr "" #: company/models.py:240 company/templates/company/detail_part.html:81 -#: company/templates/company/partdetail.html:60 +#: company/templates/company/supplier_part_detail.html:30 msgid "Manufacturer" msgstr "" @@ -621,7 +622,7 @@ msgstr "" #: company/templates/company/detail.html:17 #: company/templates/company/index.html:46 -#: company/templates/company/partdetail.html:51 +#: company/templates/company/supplier_part_detail.html:21 #: order/templates/order/order_base.html:67 #: stock/templates/stock/item_base.html:126 msgid "Supplier" @@ -633,10 +634,11 @@ msgid "Supplier Parts" msgstr "" #: company/templates/company/detail_part.html:13 +#: part/templates/part/stock.html:81 msgid "New Supplier Part" msgstr "" -#: company/templates/company/detail_part.html:15 +#: company/templates/company/detail_part.html:15 templates/stock_table.html:10 msgid "Options" msgstr "" @@ -645,12 +647,11 @@ msgid "Delete Parts" msgstr "" #: company/templates/company/detail_part.html:73 -#: company/templates/company/partdetail.html:52 +#: company/templates/company/supplier_part_detail.html:22 msgid "SKU" msgstr "" #: company/templates/company/detail_purchase_orders.html:8 -#: company/templates/company/partdetail.html:116 #: company/templates/company/tabs.html:15 part/templates/part/tabs.html:43 msgid "Purchase Orders" msgstr "" @@ -664,6 +665,8 @@ msgid "Supplier Stock" msgstr "" #: company/templates/company/detail_stock.html:33 +#: company/templates/company/supplier_part_stock.html:38 +#: part/templates/part/stock.html:53 templates/stock_table.html:5 msgid "Export" msgstr "" @@ -680,10 +683,8 @@ msgstr "" msgid "ID" msgstr "" -#: company/templates/company/index.html:69 -#: company/templates/company/partdetail.html:6 -#: part/templates/part/category.html:73 templates/navbar.html:10 -#: templates/stats.html:7 templates/stats.html:10 +#: company/templates/company/index.html:69 part/templates/part/category.html:73 +#: templates/navbar.html:10 templates/stats.html:7 templates/stats.html:10 msgid "Parts" msgstr "" @@ -696,61 +697,90 @@ msgstr "" msgid "Are you sure you want to delete the following Supplier Parts?" msgstr "" -#: company/templates/company/partdetail.html:13 +#: company/templates/company/supplier_part_base.html:6 +#: company/templates/company/supplier_part_base.html:13 #: stock/templates/stock/item_base.html:130 msgid "Supplier Part" msgstr "" -#: company/templates/company/partdetail.html:41 +#: company/templates/company/supplier_part_detail.html:11 msgid "Supplier Part Details" msgstr "" -#: company/templates/company/partdetail.html:44 +#: company/templates/company/supplier_part_detail.html:14 msgid "Internal Part" msgstr "" -#: company/templates/company/partdetail.html:61 +#: company/templates/company/supplier_part_detail.html:31 msgid "MPN" msgstr "" -#: company/templates/company/partdetail.html:64 +#: company/templates/company/supplier_part_detail.html:34 #: order/templates/order/purchase_order_detail.html:33 msgid "Note" msgstr "" -#: company/templates/company/partdetail.html:70 +#: company/templates/company/supplier_part_orders.html:11 +msgid "Supplier Part Orders" +msgstr "" + +#: company/templates/company/supplier_part_pricing.html:12 msgid "Pricing Information" msgstr "" -#: company/templates/company/partdetail.html:72 +#: company/templates/company/supplier_part_pricing.html:14 msgid "Order Multiple" msgstr "" -#: company/templates/company/partdetail.html:74 +#: company/templates/company/supplier_part_pricing.html:16 msgid "Base Price (Flat Fee)" msgstr "" -#: company/templates/company/partdetail.html:77 +#: company/templates/company/supplier_part_pricing.html:19 msgid "Price Breaks" msgstr "" -#: company/templates/company/partdetail.html:80 +#: company/templates/company/supplier_part_pricing.html:22 msgid "New Price Break" msgstr "" -#: company/templates/company/partdetail.html:86 +#: company/templates/company/supplier_part_pricing.html:28 msgid "Price" msgstr "" -#: company/templates/company/partdetail.html:106 +#: company/templates/company/supplier_part_pricing.html:48 msgid "No price breaks have been added for this part" msgstr "" +#: company/templates/company/supplier_part_stock.html:11 +msgid "Supplier Part Stock" +msgstr "" + +#: company/templates/company/supplier_part_stock.html:61 +#: part/templates/part/stock.html:90 +msgid "New Location" +msgstr "" + +#: company/templates/company/supplier_part_stock.html:62 +#: part/templates/part/stock.html:91 +msgid "Create New Location" +msgstr "" + +#: company/templates/company/supplier_part_tabs.html:8 +msgid "Pricing" +msgstr "" + +#: company/templates/company/supplier_part_tabs.html:11 #: company/templates/company/tabs.html:12 part/templates/part/tabs.html:17 #: templates/navbar.html:11 msgid "Stock" msgstr "" +#: company/templates/company/supplier_part_tabs.html:14 +#: templates/navbar.html:14 +msgid "Orders" +msgstr "" + #: company/templates/company/tabs.html:21 msgid "Sales Orders" msgstr "" @@ -791,7 +821,7 @@ msgstr "" msgid "Edit Supplier Part" msgstr "" -#: company/views.py:179 +#: company/views.py:179 part/templates/part/stock.html:82 msgid "Create new Supplier Part" msgstr "" @@ -1437,6 +1467,14 @@ msgstr "" msgid "Upload new image" msgstr "" +#: part/templates/part/stock.html:75 +msgid "New Part" +msgstr "" + +#: part/templates/part/stock.html:76 +msgid "Create New Part" +msgstr "" + #: part/templates/part/tabs.html:9 msgid "Parameters" msgstr "" @@ -1868,134 +1906,134 @@ msgstr "" msgid "Stock Export Options" msgstr "" -#: stock/views.py:264 +#: stock/views.py:278 msgid "Stock Item QR Code" msgstr "" -#: stock/views.py:287 +#: stock/views.py:301 msgid "Adjust Stock" msgstr "" -#: stock/views.py:396 +#: stock/views.py:410 msgid "Move Stock Items" msgstr "" -#: stock/views.py:397 +#: stock/views.py:411 msgid "Count Stock Items" msgstr "" -#: stock/views.py:398 +#: stock/views.py:412 msgid "Remove From Stock" msgstr "" -#: stock/views.py:399 +#: stock/views.py:413 msgid "Add Stock Items" msgstr "" -#: stock/views.py:400 +#: stock/views.py:414 msgid "Delete Stock Items" msgstr "" -#: stock/views.py:428 +#: stock/views.py:442 msgid "Must enter integer value" msgstr "" -#: stock/views.py:433 +#: stock/views.py:447 msgid "Quantity must be positive" msgstr "" -#: stock/views.py:440 +#: stock/views.py:454 #, python-brace-format msgid "Quantity must not exceed {x}" msgstr "" -#: stock/views.py:448 +#: stock/views.py:462 msgid "Confirm stock adjustment" msgstr "" -#: stock/views.py:519 +#: stock/views.py:533 #, python-brace-format msgid "Added stock to {n} items" msgstr "" -#: stock/views.py:534 +#: stock/views.py:548 #, python-brace-format msgid "Removed stock from {n} items" msgstr "" -#: stock/views.py:547 +#: stock/views.py:561 #, python-brace-format msgid "Counted stock for {n} items" msgstr "" -#: stock/views.py:575 +#: stock/views.py:589 msgid "No items were moved" msgstr "" -#: stock/views.py:578 +#: stock/views.py:592 #, python-brace-format msgid "Moved {n} items to {dest}" msgstr "" -#: stock/views.py:597 +#: stock/views.py:611 #, python-brace-format msgid "Deleted {n} stock items" msgstr "" -#: stock/views.py:609 +#: stock/views.py:623 msgid "Edit Stock Item" msgstr "" -#: stock/views.py:645 +#: stock/views.py:659 msgid "Create new Stock Location" msgstr "" -#: stock/views.py:666 +#: stock/views.py:680 msgid "Serialize Stock" msgstr "" -#: stock/views.py:746 +#: stock/views.py:760 msgid "Create new Stock Item" msgstr "" -#: stock/views.py:810 +#: stock/views.py:824 msgid "Copy Stock Item" msgstr "" -#: stock/views.py:860 +#: stock/views.py:892 msgid "Invalid quantity" msgstr "" -#: stock/views.py:863 +#: stock/views.py:895 msgid "Invalid part selection" msgstr "" -#: stock/views.py:910 +#: stock/views.py:942 #, python-brace-format msgid "Created {n} new stock items" msgstr "" -#: stock/views.py:927 stock/views.py:940 +#: stock/views.py:959 stock/views.py:972 msgid "Created new stock item" msgstr "" -#: stock/views.py:957 +#: stock/views.py:989 msgid "Delete Stock Location" msgstr "" -#: stock/views.py:970 +#: stock/views.py:1002 msgid "Delete Stock Item" msgstr "" -#: stock/views.py:981 +#: stock/views.py:1013 msgid "Delete Stock Tracking Entry" msgstr "" -#: stock/views.py:998 +#: stock/views.py:1030 msgid "Edit Stock Tracking Entry" msgstr "" -#: stock/views.py:1007 +#: stock/views.py:1039 msgid "Add Stock Tracking Entry" msgstr "" @@ -2031,10 +2069,6 @@ msgstr "" msgid "View Code on GitHub" msgstr "" -#: templates/navbar.html:14 -msgid "Orders" -msgstr "" - #: templates/navbar.html:23 msgid "Admin" msgstr "" @@ -2058,3 +2092,31 @@ msgstr "" #: templates/navbar.html:33 msgid "Statistics" msgstr "" + +#: templates/stock_table.html:7 +msgid "New Stock Item" +msgstr "" + +#: templates/stock_table.html:12 +msgid "Add stock" +msgstr "" + +#: templates/stock_table.html:13 +msgid "Remove stock" +msgstr "" + +#: templates/stock_table.html:14 +msgid "Count stock" +msgstr "" + +#: templates/stock_table.html:15 +msgid "Move stock" +msgstr "" + +#: templates/stock_table.html:16 +msgid "Order stock" +msgstr "" + +#: templates/stock_table.html:17 +msgid "Delete Stock" +msgstr "" diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html index 6050137b69..a692b11b01 100644 --- a/InvenTree/part/templates/part/stock.html +++ b/InvenTree/part/templates/part/stock.html @@ -1,5 +1,6 @@ {% extends "part/part_base.html" %} {% load static %} +{% load i18n %} {% block details %} {% include 'part/tabs.html' with tab='stock' %} @@ -49,7 +50,7 @@ $("#stock-export").click(function() { launchModalForm("{% url 'stock-export-options' %}", { - submit_text: "Export", + submit_text: "{% trans 'Export' %}", success: function(response) { var url = "{% url 'stock-export' %}"; @@ -71,14 +72,14 @@ secondary: [ { field: 'part', - label: 'New Part', - title: 'Create New Part', + label: '{% trans "New Part" %}', + title: '{% trans "Create New Part" %}', url: "{% url 'part-create' %}", }, { field: 'supplier_part', - label: 'New Supplier Part', - title: 'Create new Supplier Part', + label: '{% trans "New Supplier Part" %}', + title: '{% trans "Create new Supplier Part" %}', url: "{% url 'supplier-part-create' %}", data: { part: {{ part.id }} @@ -86,8 +87,8 @@ }, { field: 'location', - label: 'New Location', - title: 'Create New Location', + label: '{% trans "New Location" %}', + title: '{% trans "Create New Location" %}', url: "{% url 'stock-location-create' %}", } ] diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index fdfd59ca44..4ac415ef23 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -830,6 +830,11 @@ class StockItemCreate(AjaxCreateView): part_id = self.request.GET.get('part', None) loc_id = self.request.GET.get('location', None) + sup_part_id = self.request.GET.get('supplier_part', None) + + part = None + location = None + supplier_part = None # Part field has been specified if part_id: @@ -838,14 +843,27 @@ class StockItemCreate(AjaxCreateView): initials['part'] = part initials['location'] = part.get_default_location() initials['supplier_part'] = part.default_supplier - except Part.DoesNotExist: + except (ValueError, Part.DoesNotExist): + pass + + # SupplierPart field has been specified + # It must match the Part, if that has been supplied + if sup_part_id: + try: + supplier_part = SupplierPart.objects.get(pk=sup_part_id) + + if part is None or supplier_part.part == part: + initials['supplier_part'] = supplier_part + + except (ValueError, SupplierPart.DoesNotExist): pass # Location has been specified if loc_id: try: - initials['location'] = StockLocation.objects.get(pk=loc_id) - except StockLocation.DoesNotExist: + location = StockLocation.objects.get(pk=loc_id) + initials['location'] = location + except (ValueError, StockLocation.DoesNotExist): pass return initials diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html index b3b214c031..b7e84f24dd 100644 --- a/InvenTree/templates/stock_table.html +++ b/InvenTree/templates/stock_table.html @@ -1,18 +1,20 @@ +{% load i18n %} +
    - - {% if not part or part.is_template == False %} - + + {% if 1 or not part or part.is_template == False %} + {% endif %}
    - +
    From 7dcc94b10664a5593cb3f8072e3bfa55a55fae0d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 Feb 2020 12:44:52 +1100 Subject: [PATCH 6/6] Filter purchaseorder API by supplier part --- .../templates/company/supplier_part_orders.html | 14 +++++++++++++- InvenTree/order/api.py | 9 +++++++++ InvenTree/templates/stock_table.html | 2 -- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/InvenTree/company/templates/company/supplier_part_orders.html b/InvenTree/company/templates/company/supplier_part_orders.html index 02d85b1d99..381a2941e9 100644 --- a/InvenTree/company/templates/company/supplier_part_orders.html +++ b/InvenTree/company/templates/company/supplier_part_orders.html @@ -10,10 +10,22 @@

    {% trans "Supplier Part Orders" %}

    -{% include "order/po_table.html" with orders=part.purchase_orders %} +
    +
    + +
    +
    + +
    +
    {% endblock %} {% block js_ready %} {{ block.super }} + +loadPurchaseOrderTable($("#purchase-order-table"), { + url: "{% url 'api-po-list' %}?supplier_part={{ part.id }}", +}); + {% endblock %} \ No newline at end of file diff --git a/InvenTree/order/api.py b/InvenTree/order/api.py index 69580c3bb2..2e8deb05c8 100644 --- a/InvenTree/order/api.py +++ b/InvenTree/order/api.py @@ -18,6 +18,7 @@ from InvenTree.status_codes import OrderStatus import os from part.models import Part +from company.models import SupplierPart from .models import PurchaseOrder, PurchaseOrderLineItem from .serializers import POSerializer, POLineItemSerializer @@ -62,6 +63,14 @@ class POList(generics.ListCreateAPIView): except (Part.DoesNotExist, ValueError): pass + # Attempt to filter by supplier part + if 'supplier_part' in request.GET: + try: + supplier_part = SupplierPart.objects.get(pk=request.GET['supplier_part']) + queryset = queryset.filter(id__in=[p.id for p in supplier_part.purchase_orders()]) + except (ValueError, SupplierPart.DoesNotExist): + pass + data = queryset.values( 'pk', 'supplier', diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html index b7e84f24dd..31eaf30bb7 100644 --- a/InvenTree/templates/stock_table.html +++ b/InvenTree/templates/stock_table.html @@ -3,9 +3,7 @@
    - {% if 1 or not part or part.is_template == False %} - {% endif %}