inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 03:55:41 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into pricing-form-updates

Browse Source
This commit is contained in:
Oliver Walters
2023-02-21 22:13:13 +11:00
parent 5b9bfcc930 a2b55314cb
commit 1afe982241
22 changed files with 361 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/InvenTree/api_version.py
View File

@ -2,11 +2,14 @@
# InvenTree API version
INVENTREE_API_VERSION = 96
INVENTREE_API_VERSION = 97
"""
Increment this API version number whenever there is a significant change to the API that any clients need to know about
v97 -> 2023-02-20 : https://github.com/inventree/InvenTree/pull/4377
- Adds "external" attribute to StockLocation model
v96 -> 2023-02-16 : https://github.com/inventree/InvenTree/pull/4345
- Adds stocktake report generation functionality

17
InvenTree/common/models.py
View File

@ -46,6 +46,7 @@ import InvenTree.ready
import InvenTree.tasks
import InvenTree.validators
import order.validators
from plugin import registry
logger = logging.getLogger('inventree')
@ -1628,6 +1629,15 @@ class InvenTreeSetting(BaseInvenTreeSetting):
return False
def label_printer_options():
"""Build a list of available label printer options."""
printers = [('', _('No Printer (Export to PDF)'))]
label_printer_plugins = registry.with_mixin('labels')
if label_printer_plugins:
printers.extend([(p.slug, p.name + ' - ' + p.human_name) for p in label_printer_plugins])
return printers
class InvenTreeUserSetting(BaseInvenTreeSetting):
"""An InvenTreeSetting object with a usercontext."""
@ -1781,6 +1791,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
'validator': bool,
},
"LABEL_DEFAULT_PRINTER": {
'name': _('Default label printer'),
'description': _('Configure which label printer should be selected by default'),
'default': '',
'choices': label_printer_options
},
"REPORT_INLINE": {
'name': _('Inline report display'),
'description': _('Display PDF reports in the browser, instead of downloading as a file'),

25
InvenTree/company/templates/company/supplier_part.html
View File

@ -299,27 +299,12 @@ loadSupplierPriceBreakTable({
});
$('#new-price-break').click(function() {
constructForm(
'{% url "api-part-supplier-price-list" %}',
{
method: 'POST',
fields: {
quantity: {},
part: {
value: {{ part.pk }},
hidden: true,
},
price: {},
price_currency: {
},
},
title: '{% trans "Add Price Break" %}',
onSuccess: function() {
$("#price-break-table").bootstrapTable("refresh");
}
createSupplierPartPriceBreak({{ part.pk }}, {
onSuccess: function() {
$("#price-break-table").bootstrapTable("refresh");
}
);
});
});
loadPurchaseOrderTable($("#purchase-order-table"), {

23
InvenTree/order/templates/order/sales_order_base.html
View File

@ -206,28 +206,7 @@ src="{% static 'img/blank_image.png' %}"
$("#edit-order").click(function() {
constructForm('{% url "api-so-detail" order.pk %}', {
fields: {
reference: {
icon: 'fa-hashtag',
},
{% if order.lines.count == 0 and order.status == SalesOrderStatus.PENDING %}
customer: {
},
{% endif %}
customer_reference: {},
description: {},
target_date: {
icon: 'fa-calendar-alt',
},
link: {
icon: 'fa-link',
},
responsible: {
icon: 'fa-user',
},
},
title: '{% trans "Edit Sales Order" %}',
editSalesOrder({{ order.pk }}, {
reload: true,
});
});

14
InvenTree/part/templates/part/detail.html
View File

@ -793,17 +793,9 @@
constructForm('{% url "api-part-test-template-list" %}', {
method: 'POST',
fields: {
test_name: {},
description: {},
required: {},
requires_value: {},
requires_attachment: {},
part: {
value: {{ part.pk }},
hidden: true,
}
},
fields: partTestTemplateFields({
part: {{ part.pk }}
}),
title: '{% trans "Add Test Result Template" %}',
onSuccess: function() {
$("#test-template-table").bootstrapTable("refresh");

3
InvenTree/stock/api.py
View File

@ -310,7 +310,8 @@ class StockLocationList(APIDownloadMixin, ListCreateAPI):
filterset_fields = [
'name',
'structural'
'structural',
'external',
]
search_fields = [

18
InvenTree/stock/migrations/0095_stocklocation_external.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 3.2.18 on 2023-02-20 12:22
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0094_auto_20230220_0025'),
]
operations = [
migrations.AddField(
model_name='stocklocation',
name='external',
field=models.BooleanField(default=False, help_text='This is an external stock location', verbose_name='External'),
),
]

6
InvenTree/stock/models.py
View File

@ -122,6 +122,12 @@ class StockLocation(InvenTreeBarcodeMixin, MetadataMixin, InvenTreeTree):
'but may be located to child locations.'),
)
external = models.BooleanField(
default=False,
verbose_name=_('External'),
help_text=_('This is an external stock location')
)
def get_location_owner(self):
"""Get the closest "owner" for this location.

1
InvenTree/stock/serializers.py
View File

@ -584,6 +584,7 @@ class LocationSerializer(InvenTree.serializers.InvenTreeModelSerializer):
'owner',
'icon',
'structural',
'external',
]
read_only_fields = [

14
InvenTree/stock/templates/stock/item.html
View File

@ -313,17 +313,9 @@
constructForm('{% url "api-stock-test-result-list" %}', {
method: 'POST',
fields: {
test: {},
result: {},
value: {},
attachment: {},
notes: {},
stock_item: {
value: {{ item.pk }},
hidden: true,
}
},
fields: stockItemTestResultFields({
stock_item: {{ item.pk }},
}),
title: '{% trans "Add Test Result" %}',
onSuccess: reloadTable,
});

4
InvenTree/stock/templates/stock/item_base.html
View File

@ -640,7 +640,9 @@ $("#stock-return-from-customer").click(function() {
value: {{ item.part.default_location.pk }},
{% endif %}
},
notes: {},
notes: {
icon: 'fa-sticky-note',
},
},
method: 'POST',
title: '{% trans "Return to Stock" %}',

1
InvenTree/templates/InvenTree/settings/user_labels.html
View File

@ -15,6 +15,7 @@
<table class='table table-striped table-condensed'>
<tbody>
{% include "InvenTree/settings/setting.html" with key="LABEL_INLINE" icon='fa-tag' user_setting=True %}
{% include "InvenTree/settings/setting.html" with key="LABEL_DEFAULT_PRINTER" icon='fa-tag' user_setting=True %}
</tbody>
</table>
</div>

20
InvenTree/templates/js/translated/attachment.js
View File

@ -25,7 +25,9 @@ function addAttachmentButtonCallbacks(url, fields={}) {
var file_fields = {
attachment: {},
comment: {},
comment: {
icon: 'fa-comment',
},
};
Object.assign(file_fields, fields);
@ -42,8 +44,12 @@ function addAttachmentButtonCallbacks(url, fields={}) {
$('#new-attachment-link').click(function() {
var link_fields = {
link: {},
comment: {},
link: {
icon: 'fa-link',
},
comment: {
icon: 'fa-comment',
},
};
Object.assign(link_fields, fields);
@ -252,8 +258,12 @@ function loadAttachmentTable(url, options) {
constructForm(`${url}${pk}/`, {
fields: {
link: {},
comment: {},
link: {
icon: 'fa-link',
},
comment: {
icon: 'fa-comment',
},
},
processResults: function(data, fields, opts) {
// Remove the "link" field if the attachment is a file!

5
InvenTree/templates/js/translated/bom.js
View File

@ -408,6 +408,7 @@ function bomItemFields() {
hidden: true,
},
sub_part: {
icon: 'fa-shapes',
secondary: {
title: '{% trans "New Part" %}',
fields: function() {
@ -424,7 +425,9 @@ function bomItemFields() {
quantity: {},
reference: {},
overage: {},
note: {},
note: {
icon: 'fa-sticky-note',
},
allow_variants: {},
inherited: {},
consumable: {},

4
InvenTree/templates/js/translated/build.js
View File

@ -536,7 +536,9 @@ function completeBuildOutputs(build_id, outputs, options={}) {
structural: false,
},
},
notes: {},
notes: {
icon: 'fa-sticky-note',
},
accept_incomplete_allocation: {},
},
confirm: true,

47
InvenTree/templates/js/translated/company.js
View File

@ -13,11 +13,13 @@
createCompany,
createManufacturerPart,
createSupplierPart,
createSupplierPartPriceBreak,
deleteManufacturerParts,
deleteManufacturerPartParameters,
deleteSupplierParts,
duplicateSupplierPart,
editCompany,
editSupplierPartPriceBreak,
loadCompanyTable,
loadManufacturerPartTable,
loadManufacturerPartParameterTable,
@ -128,7 +130,7 @@ function supplierPartFields(options={}) {
icon: 'fa-link',
},
note: {
icon: 'fa-pencil-alt',
icon: 'fa-sticky-note',
},
packaging: {
icon: 'fa-box',
@ -321,6 +323,43 @@ function deleteSupplierParts(parts, options={}) {
}
/* Construct set of fields for SupplierPartPriceBreak form */
function supplierPartPriceBreakFields(options={}) {
let fields = {
part: {
hidden: true,
},
quantity: {},
price: {
icon: 'fa-dollar-sign',
},
price_currency: {
icon: 'fa-coins',
},
};
return fields;
}
/* Create a new SupplierPartPriceBreak instance */
function createSupplierPartPriceBreak(part_id, options={}) {
let fields = supplierPartPriceBreakFields(options);
fields.part.value = part_id;
constructForm('{% url "api-part-supplier-price-list" %}', {
fields: fields,
method: 'POST',
fields: fields,
title: '{% trans "Add Price Break" %}',
onSuccess: function(response) {
handleFormSuccess(response, options);
}
});
}
// Returns a default form-set for creating / editing a Company object
function companyFormFields() {
@ -1125,11 +1164,7 @@ function loadSupplierPriceBreakTable(options={}) {
var pk = $(this).attr('pk');
constructForm(`/api/company/price-break/${pk}/`, {
fields: {
quantity: {},
price: {},
price_currency: {},
},
fields: supplierPartPriceBreakFields(),
title: '{% trans "Edit Price Break" %}',
onSuccess: function() {
table.bootstrapTable('refresh');

6
InvenTree/templates/js/translated/label.js
View File

@ -262,7 +262,11 @@ function selectLabel(labels, items, options={}) {
`;
plugins.forEach(function(plugin) {
plugin_selection += `<option value='${plugin.key}' title='${plugin.meta.human_name}'>${plugin.name} - <small>${plugin.meta.human_name}</small></option>`;
var selected = '';
if (user_settings['LABEL_DEFAULT_PRINTER'] == plugin.key) {
selected = ' selected';
}
plugin_selection += `<option value='${plugin.key}' title='${plugin.meta.human_name}'${selected}>${plugin.name} - <small>${plugin.meta.human_name}</small></option>`;
});
plugin_selection += `

171
InvenTree/templates/js/translated/order.js
View File

@ -35,6 +35,7 @@
duplicatePurchaseOrder,
editPurchaseOrder,
editPurchaseOrderLineItem,
editSalesOrder,
exportOrder,
issuePurchaseOrder,
loadPurchaseOrderLineItemTable,
@ -55,6 +56,9 @@
*/
/*
* Form field definitions for a SalesOrderShipment
*/
function salesOrderShipmentFields(options={}) {
var fields = {
order: {},
@ -520,42 +524,55 @@ function createSalesOrderShipment(options={}) {
}
function salesOrderFields(options={}) {
let fields = {
reference: {
icon: 'fa-hashtag',
},
description: {},
customer: {
icon: 'fa-user-tie',
secondary: {
title: '{% trans "Add Customer" %}',
fields: function() {
var fields = companyFormFields();
fields.is_customer.value = true;
return fields;
}
}
},
customer_reference: {},
target_date: {
icon: 'fa-calendar-alt',
},
link: {
icon: 'fa-link',
},
responsible: {
icon: 'fa-user',
}
};
return fields;
}
/*
* Create a new SalesOrder
*/
function createSalesOrder(options={}) {
let fields = salesOrderFields(options);
if (options.customer) {
fields.customer.value = options.customer;
}
constructForm('{% url "api-so-list" %}', {
method: 'POST',
fields: {
reference: {
icon: 'fa-hashtag',
},
customer: {
value: options.customer,
secondary: {
title: '{% trans "Add Customer" %}',
fields: function() {
var fields = companyFormFields();
fields.is_customer.value = true;
return fields;
}
}
},
customer_reference: {},
description: {},
target_date: {
icon: 'fa-calendar-alt',
},
link: {
icon: 'fa-link',
},
responsible: {
icon: 'fa-user',
}
},
fields: fields,
onSuccess: function(data) {
location.href = `/order/sales-order/${data.pk}/`;
},
@ -564,12 +581,27 @@ function createSalesOrder(options={}) {
}
/*
* Edit an existing SalesOrder
*/
function editSalesOrder(order_id, options={}) {
constructForm(`/api/order/so/${order_id}/`, {
fields: salesOrderFields(options),
title: '{% trans "Edit Sales Order" %}',
onSuccess: function(response) {
handleFormSuccess(response, options);
}
});
}
/*
* Launch a modal form to create a new SalesOrderLineItem
*/
function createSalesOrderLineItem(options={}) {
var fields = soLineItemFields(options);
let fields = soLineItemFields(options);
constructForm('{% url "api-so-line-list" %}', {
fields: fields,
@ -591,6 +623,7 @@ function purchaseOrderFields(options={}) {
reference: {
icon: 'fa-hashtag',
},
description: {},
supplier: {
icon: 'fa-building',
secondary: {
@ -604,7 +637,6 @@ function purchaseOrderFields(options={}) {
}
}
},
description: {},
supplier_reference: {},
target_date: {
icon: 'fa-calendar-alt',
@ -762,13 +794,23 @@ function soLineItemFields(options={}) {
order: {
hidden: true,
},
part: {},
part: {
icon: 'fa-shapes',
},
quantity: {},
reference: {},
sale_price: {},
sale_price_currency: {},
target_date: {},
notes: {},
sale_price: {
icon: 'fa-dollar-sign',
},
sale_price_currency: {
icon: 'fa-coins',
},
target_date: {
icon: 'fa-calendar-alt',
},
notes: {
icon: 'fa-sticky-note',
},
};
if (options.order) {
@ -792,9 +834,15 @@ function extraLineFields(options={}) {
},
quantity: {},
reference: {},
price: {},
price_currency: {},
notes: {},
price: {
icon: 'fa-dollar-sign',
},
price_currency: {
icon: 'fa-coins',
},
notes: {
icon: 'fa-sticky-note',
},
};
if (options.order) {
@ -815,6 +863,7 @@ function poLineItemFields(options={}) {
}
},
part: {
icon: 'fa-shapes',
filters: {
part_detail: true,
supplier_detail: true,
@ -911,15 +960,24 @@ function poLineItemFields(options={}) {
},
quantity: {},
reference: {},
purchase_price: {},
purchase_price_currency: {},
target_date: {},
purchase_price: {
icon: 'fa-dollar-sign',
},
purchase_price_currency: {
icon: 'fa-coins',
},
target_date: {
icon: 'fa-calendar-alt',
},
destination: {
icon: 'fa-sitemap',
filters: {
structural: false,
}
},
notes: {},
notes: {
icon: 'fa-sticky-note',
},
};
if (options.order) {
@ -2655,13 +2713,7 @@ function loadPurchaseOrderExtraLineTable(table, options={}) {
var pk = $(this).attr('pk');
constructForm(`/api/order/po-extra-line/${pk}/`, {
fields: {
quantity: {},
reference: {},
price: {},
price_currency: {},
notes: {},
},
fields: extraLineFields(),
title: '{% trans "Edit Line" %}',
onSuccess: reloadTable,
});
@ -4100,7 +4152,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
inventreeGet(`/api/order/so-line/${pk}/`, {}, {
success: function(data) {
var fields = soLineItemFields();
let fields = soLineItemFields();
constructForm('{% url "api-so-line-list" %}', {
method: 'POST',
@ -4120,14 +4172,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
var pk = $(this).attr('pk');
constructForm(`/api/order/so-line/${pk}/`, {
fields: {
quantity: {},
reference: {},
sale_price: {},
sale_price_currency: {},
target_date: {},
notes: {},
},
fields: soLineItemFields(),
title: '{% trans "Edit Line Item" %}',
onSuccess: reloadTable,
});
@ -4438,13 +4483,7 @@ function loadSalesOrderExtraLineTable(table, options={}) {
var pk = $(this).attr('pk');
constructForm(`/api/order/so-extra-line/${pk}/`, {
fields: {
quantity: {},
reference: {},
price: {},
price_currency: {},
notes: {},
},
fields: extraLineFields(),
title: '{% trans "Edit Line" %}',
onSuccess: reloadTable,
});

60
InvenTree/templates/js/translated/part.js
View File

@ -41,6 +41,7 @@
loadSimplePartTable,
partDetail,
partStockLabel,
partTestTemplateFields,
toggleStar,
validateBom,
*/
@ -108,11 +109,13 @@ function partFields(options={}) {
icon: 'fa-link',
},
default_location: {
icon: 'fa-sitemap',
filters: {
structural: false,
}
},
default_supplier: {
icon: 'fa-building',
filters: {
part_detail: true,
supplier_detail: true,
@ -253,6 +256,7 @@ function categoryFields() {
name: {},
description: {},
default_location: {
icon: 'fa-sitemap',
filters: {
structural: false,
}
@ -978,11 +982,21 @@ function loadPartStocktakeTable(partId, options={}) {
fields: {
item_count: {},
quantity: {},
cost_min: {},
cost_min_currency: {},
cost_max: {},
cost_max_currency: {},
note: {},
cost_min: {
icon: 'fa-dollar-sign',
},
cost_min_currency: {
icon: 'fa-coins',
},
cost_max: {
icon: 'fa-dollar-sign',
},
cost_max_currency: {
icon: 'fa-coins',
},
note: {
icon: 'fa-sticky-note',
},
},
title: '{% trans "Edit Stocktake Entry" %}',
onSuccess: function() {
@ -2403,10 +2417,32 @@ function loadPartCategoryTable(table, options) {
});
}
/* Construct a set of fields for the PartTestTemplate model form */
function partTestTemplateFields(options={}) {
let fields = {
test_name: {},
description: {},
required: {},
requires_value: {},
requires_attachment: {},
part: {
hidden: true,
}
};
if (options.part) {
fields.part.value = options.part;
}
return fields;
}
/*
* Load PartTestTemplate table.
*/
function loadPartTestTemplateTable(table, options) {
/*
* Load PartTestTemplate table.
*/
var params = options.params || {};
@ -2505,13 +2541,7 @@ function loadPartTestTemplateTable(table, options) {
var url = `/api/part/test-template/${pk}/`;
constructForm(url, {
fields: {
test_name: {},
description: {},
required: {},
requires_value: {},
requires_attachment: {},
},
fields: partTestTemplateFields(),
title: '{% trans "Edit Test Result Template" %}',
onSuccess: function() {
table.bootstrapTable('refresh');

16
InvenTree/templates/js/translated/pricing.js
View File

@ -652,8 +652,12 @@ function initPriceBreakSet(table, options) {
value: part_id,
},
quantity: {},
price: {},
price_currency: {},
price: {
icon: 'fa-dollar-sign',
},
price_currency: {
icon: 'fa-coins',
},
},
method: 'POST',
title: '{% trans "Add Price Break" %}',
@ -677,8 +681,12 @@ function initPriceBreakSet(table, options) {
constructForm(`${pb_url}${pk}/`, {
fields: {
quantity: {},
price: {},
price_currency: {},
price: {
icon: 'fa-dollar-sign',
},
price_currency: {
icon: 'fa-coins',
},
},
title: '{% trans "Edit Price Break" %}',
onSuccess: reloadPriceBreakTable,

77
InvenTree/templates/js/translated/stock.js
View File

@ -117,6 +117,7 @@ function stockLocationFields(options={}) {
description: {},
owner: {},
structural: {},
external: {},
icon: {
help_text: `{% trans "Icon (optional) - Explore all available icons on" %} <a href="https://fontawesome.com/v5/search?s=solid" target="_blank" rel="noopener noreferrer">Font Awesome</a>.`,
placeholder: 'fas fa-box',
@ -310,18 +311,24 @@ function stockItemFields(options={}) {
icon: 'fa-layer-group',
},
status: {},
expiry_date: {},
expiry_date: {
icon: 'fa-calendar-alt',
},
purchase_price: {
icon: 'fa-dollar-sign',
},
purchase_price_currency: {},
purchase_price_currency: {
icon: 'fa-coins',
},
packaging: {
icon: 'fa-box',
},
link: {
icon: 'fa-link',
},
owner: {},
owner: {
icon: 'fa-user',
},
delete_on_deplete: {},
};
@ -685,7 +692,9 @@ function assignStockToCustomer(items, options={}) {
is_customer: true,
},
},
notes: {},
notes: {
icon: 'fa-sticky-note',
},
},
confirm: true,
confirmMessage: '{% trans "Confirm stock assignment" %}',
@ -854,7 +863,9 @@ function mergeStockItems(items, options={}) {
structural: false,
}
},
notes: {},
notes: {
icon: 'fa-sticky-note',
},
allow_mismatched_suppliers: {},
allow_mismatched_status: {},
},
@ -1298,6 +1309,28 @@ function formatDate(row) {
return html;
}
/* Construct set of default fields for a StockItemTestResult */
function stockItemTestResultFields(options={}) {
let fields = {
test: {},
result: {},
value: {},
attachment: {},
notes: {
icon: 'fa-sticky-note',
},
stock_item: {
hidden: true,
},
};
if (options.stock_item) {
fields.stock_item.value = options.stock_item;
}
return fields;
}
/*
* Load StockItemTestResult table
*/
@ -1563,7 +1596,9 @@ function loadStockTestResultsTable(table, options) {
result: {},
value: {},
attachment: {},
notes: {},
notes: {
icon: 'fa-sticky-note',
},
stock_item: {
value: options.stock_item,
hidden: true,
@ -1583,13 +1618,7 @@ function loadStockTestResultsTable(table, options) {
var url = `/api/stock/test/${pk}/`;
constructForm(url, {
fields: {
test: {},
result: {},
value: {},
attachment: {},
notes: {},
},
fields: stockItemTestResultFields(),
title: '{% trans "Edit Test Result" %}',
onSuccess: reloadTestTable,
});
@ -2491,6 +2520,24 @@ function loadStockLocationTable(table, options) {
title: '{% trans "Stock Items" %}',
switchable: true,
sortable: true,
},
{
field: 'structural',
title: '{% trans "Structural" %}',
switchable: true,
sortable: false,
formatter: function(value) {
return yesNoLabel(value);
}
},
{
field: 'external',
title: '{% trans "External" %}',
switchable: true,
sortable: false,
formatter: function(value) {
return yesNoLabel(value);
}
}
]
});
@ -2841,7 +2888,9 @@ function uninstallStockItem(installed_item_id, options={}) {
structural: false,
}
},
note: {},
note: {
icon: 'fa-sticky-note',
},
},
preFormContent: function(opts) {
var html = '';

4
InvenTree/templates/js/translated/table_filters.js
View File

@ -134,6 +134,10 @@ function getAvailableTableFilters(tableKey) {
type: 'bool',
title: '{% trans "Structural" %}',
},
external: {
type: 'bool',
title: '{% trans "External" %}',
},
};
}