inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Merge remote-tracking branch 'inventree/master' into partial-shipment

Browse Source
This commit is contained in:
Oliver 2021-12-03 17:31:27 +11:00
commit d7c87300c6
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/status_codes.py
View File

@ -107,7 +107,7 @@ class PurchaseOrderStatus(StatusCode):
} }
colors = { colors = {
PENDING: 'primary', PENDING: 'secondary',
PLACED: 'primary', PLACED: 'primary',
COMPLETE: 'success', COMPLETE: 'success',
CANCELLED: 'danger', CANCELLED: 'danger',
@ -147,7 +147,7 @@ class SalesOrderStatus(StatusCode):
} }
colors = { colors = {
PENDING: 'primary', PENDING: 'secondary',
SHIPPED: 'success', SHIPPED: 'success',
CANCELLED: 'danger', CANCELLED: 'danger',
LOST: 'warning', LOST: 'warning',

4
InvenTree/templates/base.html
View File

@ -40,8 +40,8 @@
<link rel="stylesheet" href="{% static 'bootstrap-table/extensions/group-by-v2/bootstrap-table-group-by.css' %}"> <link rel="stylesheet" href="{% static 'bootstrap-table/extensions/group-by-v2/bootstrap-table-group-by.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap-table/extensions/filter-control/bootstrap-table-filter-control.css' %}"> <link rel="stylesheet" href="{% static 'bootstrap-table/extensions/filter-control/bootstrap-table-filter-control.css' %}">
<link rel='stylesheet' href='{% static "treegrid/css/jquery.treegrid.css" %}'> <link rel='stylesheet' href='{% static "treegrid/css/jquery.treegrid.css" %}'>
<link rel="stylesheet" href="{% static 'fontawesome/css/brands.css' %}"> <link rel="stylesheet" href="{% static 'fontawesome/css/brands.min.css' %}">
<link rel="stylesheet" href="{% static 'fontawesome/css/solid.css' %}"> <link rel="stylesheet" href="{% static 'fontawesome/css/solid.min.css' %}">
<link rel="stylesheet" href="{% static 'select2/css/select2.css' %}"> <link rel="stylesheet" href="{% static 'select2/css/select2.css' %}">
<link rel="stylesheet" href="{% static 'select2/css/select2-bootstrap-5-theme.css' %}"> <link rel="stylesheet" href="{% static 'select2/css/select2-bootstrap-5-theme.css' %}">
<link rel="stylesheet" href="{% static 'fullcalendar/main.css' %}"> <link rel="stylesheet" href="{% static 'fullcalendar/main.css' %}">

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

@ -153,12 +153,7 @@ function partFields(options={}) {
delete fields['default_expiry']; delete fields['default_expiry'];
} }
// Additional fields when "creating" a new part if (options.create || options.duplicate) {
if (options.create) {
// No supplier parts available yet
delete fields['default_supplier'];
if (global_settings.PART_CREATE_INITIAL) { if (global_settings.PART_CREATE_INITIAL) {
fields.initial_stock = { fields.initial_stock = {
@ -187,6 +182,13 @@ function partFields(options={}) {
group: 'create', group: 'create',
}; };
} }
}
// Additional fields when "creating" a new part
if (options.create) {
// No supplier parts available yet
delete fields['default_supplier'];
fields.copy_category_parameters = { fields.copy_category_parameters = {
type: 'boolean', type: 'boolean',
@ -349,6 +351,10 @@ function duplicatePart(pk, options={}) {
duplicate: pk, duplicate: pk,
}); });
if (fields.initial_stock_location) {
fields.initial_stock_location.value = data.default_location;
}
// Remove "default_supplier" field // Remove "default_supplier" field
delete fields['default_supplier']; delete fields['default_supplier'];