-This will remove {{ item.quantity }} parts from build '{{ item.build.title }}'. +This will remove {% decimal item.quantity %} parts from build '{{ item.build.title }}'. {% endblock %} \ No newline at end of file diff --git a/InvenTree/build/templates/build/unallocate.html b/InvenTree/build/templates/build/unallocate.html index 503bc354f6..f6543b3732 100644 --- a/InvenTree/build/templates/build/unallocate.html +++ b/InvenTree/build/templates/build/unallocate.html @@ -1,9 +1,10 @@ {% extends "modal_form.html" %} - +{% load i18n %} +{% load inventree_extras %} {% block pre_form_content %} {{ block.super }} -Are you sure you wish to unallocate all stock for this build? +{% trans "Are you sure you wish to unallocate all stock for this build?" %} {% endblock %} \ No newline at end of file diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py index 6a09a3234e..feda6ee9eb 100644 --- a/InvenTree/build/views.py +++ b/InvenTree/build/views.py @@ -53,7 +53,7 @@ class BuildCancel(AjaxUpdateView): model = Build ajax_template_name = 'build/cancel.html' - ajax_form_title = 'Cancel Build' + ajax_form_title = _('Cancel Build') context_object_name = 'build' form_class = forms.CancelBuildForm @@ -71,12 +71,12 @@ class BuildCancel(AjaxUpdateView): if confirm: build.cancelBuild(request.user) else: - form.errors['confirm_cancel'] = ['Confirm build cancellation'] + form.errors['confirm_cancel'] = [_('Confirm build cancellation')] valid = False data = { 'form_valid': valid, - 'danger': 'Build was cancelled' + 'danger': _('Build was cancelled') } return self.renderJsonResponse(request, form, data=data) @@ -92,7 +92,7 @@ class BuildAutoAllocate(AjaxUpdateView): model = Build form_class = forms.ConfirmBuildForm context_object_name = 'build' - ajax_form_title = 'Allocate Stock' + ajax_form_title = _('Allocate Stock') ajax_template_name = 'build/auto_allocate.html' def get_context_data(self, *args, **kwargs): @@ -105,7 +105,7 @@ class BuildAutoAllocate(AjaxUpdateView): context['build'] = build context['allocations'] = build.getAutoAllocations() except Build.DoesNotExist: - context['error'] = 'No matching build found' + context['error'] = _('No matching build found') return context @@ -124,8 +124,8 @@ class BuildAutoAllocate(AjaxUpdateView): valid = False if confirm is False: - form.errors['confirm'] = ['Confirm stock allocation'] - form.non_field_errors = 'Check the confirmation box at the bottom of the list' + form.errors['confirm'] = [_('Confirm stock allocation')] + form.non_field_errors = _('Check the confirmation box at the bottom of the list') else: build.autoAllocate() valid = True @@ -145,7 +145,7 @@ class BuildUnallocate(AjaxUpdateView): model = Build form_class = forms.ConfirmBuildForm - ajax_form_title = "Unallocate Stock" + ajax_form_title = _("Unallocate Stock") ajax_template_name = "build/unallocate.html" def post(self, request, *args, **kwargs): @@ -158,8 +158,8 @@ class BuildUnallocate(AjaxUpdateView): valid = False if confirm is False: - form.errors['confirm'] = ['Confirm unallocation of build stock'] - form.non_field_errors = 'Check the confirmation box' + form.errors['confirm'] = [_('Confirm unallocation of build stock')] + form.non_field_errors = _('Check the confirmation box') else: build.unallocateStock() valid = True @@ -182,7 +182,7 @@ class BuildComplete(AjaxUpdateView): model = Build form_class = forms.CompleteBuildForm context_object_name = "build" - ajax_form_title = "Complete Build" + ajax_form_title = _("Complete Build") ajax_template_name = "build/complete.html" def get_form(self): @@ -255,14 +255,14 @@ class BuildComplete(AjaxUpdateView): if confirm is False: form.errors['confirm'] = [ - 'Confirm completion of build', + _('Confirm completion of build'), ] else: try: location = StockLocation.objects.get(id=loc_id) valid = True except StockLocation.DoesNotExist: - form.errors['location'] = ['Invalid location selected'] + form.errors['location'] = [_('Invalid location selected')] serials = [] @@ -306,7 +306,7 @@ class BuildComplete(AjaxUpdateView): def get_data(self): """ Provide feedback data back to the form """ return { - 'info': 'Build marked as COMPLETE' + 'info': _('Build marked as COMPLETE') } @@ -382,7 +382,7 @@ class BuildCreate(AjaxCreateView): model = Build context_object_name = 'build' form_class = forms.EditBuildForm - ajax_form_title = 'Start new Build' + ajax_form_title = _('Start new Build') ajax_template_name = 'modal_form.html' def get_initial(self): @@ -405,7 +405,7 @@ class BuildCreate(AjaxCreateView): def get_data(self): return { - 'success': 'Created new build', + 'success': _('Created new build'), } @@ -415,12 +415,12 @@ class BuildUpdate(AjaxUpdateView): model = Build form_class = forms.EditBuildForm context_object_name = 'build' - ajax_form_title = 'Edit Build Details' + ajax_form_title = _('Edit Build Details') ajax_template_name = 'modal_form.html' def get_data(self): return { - 'info': 'Edited build', + 'info': _('Edited build'), } @@ -429,7 +429,7 @@ class BuildDelete(AjaxDeleteView): model = Build ajax_template_name = 'build/delete_build.html' - ajax_form_title = 'Delete Build' + ajax_form_title = _('Delete Build') class BuildItemDelete(AjaxDeleteView): @@ -439,12 +439,12 @@ class BuildItemDelete(AjaxDeleteView): model = BuildItem ajax_template_name = 'build/delete_build_item.html' - ajax_form_title = 'Unallocate Stock' + ajax_form_title = _('Unallocate Stock') context_object_name = 'item' def get_data(self): return { - 'danger': 'Removed parts from build allocation' + 'danger': _('Removed parts from build allocation') } @@ -454,7 +454,7 @@ class BuildItemCreate(AjaxCreateView): model = BuildItem form_class = forms.EditBuildItemForm ajax_template_name = 'build/create_build_item.html' - ajax_form_title = 'Allocate new Part' + ajax_form_title = _('Allocate new Part') part = None available_stock = None @@ -570,11 +570,11 @@ class BuildItemEdit(AjaxUpdateView): model = BuildItem ajax_template_name = 'modal_form.html' form_class = forms.EditBuildItemForm - ajax_form_title = 'Edit Stock Allocation' + ajax_form_title = _('Edit Stock Allocation') def get_data(self): return { - 'info': 'Updated Build Item', + 'info': _('Updated Build Item'), } def get_form(self): diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py index 9e72818a36..5da634c6d3 100644 --- a/InvenTree/common/views.py +++ b/InvenTree/common/views.py @@ -5,6 +5,8 @@ Django views for interacting with common models # -*- coding: utf-8 -*- from __future__ import unicode_literals +from django.utils.translation import ugettext as _ + from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView from . import models @@ -16,7 +18,7 @@ class CurrencyCreate(AjaxCreateView): model = models.Currency form_class = forms.CurrencyEditForm - ajax_form_title = 'Create new Currency' + ajax_form_title = _('Create new Currency') class CurrencyEdit(AjaxUpdateView): @@ -24,12 +26,12 @@ class CurrencyEdit(AjaxUpdateView): model = models.Currency form_class = forms.CurrencyEditForm - ajax_form_title = 'Edit Currency' + ajax_form_title = _('Edit Currency') class CurrencyDelete(AjaxDeleteView): """ View for deleting an existing Currency object """ model = models.Currency - ajax_form_title = 'Delete Currency' + ajax_form_title = _('Delete Currency') ajax_template_name = "common/delete_currency.html" diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html deleted file mode 100644 index 1b101ec48e..0000000000 --- a/InvenTree/company/templates/company/partdetail.html +++ /dev/null @@ -1,172 +0,0 @@ -{% extends "base.html" %} -{% load static %} -{% load i18n %} - -{% block page_title %} -InvenTree | {{ company.name }} - {% trans "Parts" %} -{% endblock %} - -{% block content %} - -
-
-
-
-
- {% trans "Supplier Part" %}
-
-
-
-
-
-
-
-
-
- 
-
-
- - -
-
-
-
-
-
-
-
-{% trans "Supplier Part Details" %}
-| {% 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" %}
-| {% 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 }} - $('#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' %}", - { - 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_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_detail.html b/InvenTree/company/templates/company/supplier_part_detail.html
new file mode 100644
index 0000000000..bb0dee177a
--- /dev/null
+++ b/InvenTree/company/templates/company/supplier_part_detail.html
@@ -0,0 +1,44 @@
+{% 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" %}
+| {% 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 "Supplier Part Orders" %}
+ + + ++ +
{% trans "Pricing Information" %}
+| {% 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" %} + | +|
+ +
{% 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' %}", + }); + + $("#stock-export").click(function() { + launchModalForm("{% url 'stock-export-options' %}", { + submit_text: '{% trans "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; + }, + }); + }); + + $("#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/company/templates/company/supplier_part_tabs.html b/InvenTree/company/templates/company/supplier_part_tabs.html new file mode 100644 index 0000000000..0bcd8aa4fa --- /dev/null +++ b/InvenTree/company/templates/company/supplier_part_tabs.html @@ -0,0 +1,16 @@ +{% load i18n %} + + \ No newline at end of file diff --git a/InvenTree/company/urls.py b/InvenTree/company/urls.py index a7683b7bbc..66cc0b9cd8 100644 --- a/InvenTree/company/urls.py +++ b/InvenTree/company/urls.py @@ -47,7 +47,11 @@ 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(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/company/views.py b/InvenTree/company/views.py index 0fa7a2c712..d37b72e707 100644 --- a/InvenTree/company/views.py +++ b/InvenTree/company/views.py @@ -6,6 +6,7 @@ Django views for interacting with Company app # -*- coding: utf-8 -*- from __future__ import unicode_literals +from django.utils.translation import ugettext as _ from django.views.generic import DetailView, ListView, UpdateView from django.urls import reverse @@ -93,12 +94,12 @@ class CompanyImage(AjaxUpdateView): """ View for uploading an image for the Company """ model = Company ajax_template_name = 'modal_form.html' - ajax_form_title = 'Update Company Image' + ajax_form_title = _('Update Company Image') form_class = CompanyImageForm def get_data(self): return { - 'success': 'Updated company image', + 'success': _('Updated company image'), } @@ -108,11 +109,11 @@ class CompanyEdit(AjaxUpdateView): form_class = EditCompanyForm context_object_name = 'company' ajax_template_name = 'modal_form.html' - ajax_form_title = 'Edit Company' + ajax_form_title = _('Edit Company') def get_data(self): return { - 'info': 'Edited company information', + 'info': _('Edited company information'), } @@ -122,11 +123,11 @@ class CompanyCreate(AjaxCreateView): context_object_name = 'company' form_class = EditCompanyForm ajax_template_name = 'modal_form.html' - ajax_form_title = "Create new Company" + ajax_form_title = _("Create new Company") def get_data(self): return { - 'success': "Created new company", + 'success': _("Created new company"), } @@ -136,19 +137,19 @@ class CompanyDelete(AjaxDeleteView): model = Company success_url = '/company/' ajax_template_name = 'company/delete.html' - ajax_form_title = 'Delete Company' + ajax_form_title = _('Delete Company') context_object_name = 'company' def get_data(self): return { - 'danger': 'Company was deleted', + 'danger': _('Company was deleted'), } 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() @@ -166,7 +167,7 @@ class SupplierPartEdit(AjaxUpdateView): context_object_name = 'part' form_class = EditSupplierPartForm ajax_template_name = 'modal_form.html' - ajax_form_title = 'Edit Supplier Part' + ajax_form_title = _('Edit Supplier Part') class SupplierPartCreate(AjaxCreateView): @@ -175,7 +176,7 @@ class SupplierPartCreate(AjaxCreateView): model = SupplierPart form_class = EditSupplierPartForm ajax_template_name = 'modal_form.html' - ajax_form_title = 'Create new Supplier Part' + ajax_form_title = _('Create new Supplier Part') context_object_name = 'part' def get_form(self): @@ -232,7 +233,7 @@ class SupplierPartDelete(AjaxDeleteView): success_url = '/supplier/' ajax_template_name = 'company/partdelete.html' - ajax_form_title = 'Delete Supplier Part' + ajax_form_title = _('Delete Supplier Part') parts = [] @@ -302,7 +303,7 @@ class PriceBreakCreate(AjaxCreateView): model = SupplierPriceBreak form_class = EditPriceBreakForm - ajax_form_title = 'Add Price Break' + ajax_form_title = _('Add Price Break') ajax_template_name = 'modal_form.html' def get_data(self): @@ -337,7 +338,7 @@ class PriceBreakEdit(AjaxUpdateView): model = SupplierPriceBreak form_class = EditPriceBreakForm - ajax_form_title = 'Edit Price Break' + ajax_form_title = _('Edit Price Break') ajax_template_name = 'modal_form.html' def get_form(self): @@ -352,5 +353,5 @@ class PriceBreakDelete(AjaxDeleteView): """ View for deleting a supplier price break """ model = SupplierPriceBreak - ajax_form_title = "Delete Price Break" + ajax_form_title = _("Delete Price Break") ajax_template_name = 'modal_delete_form.html' diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po index fc53b0aed0..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-10 11:09+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
+ {% if item.notes %}
{{ item.notes | markdownify }}
+ {% endif %}