mirror of
https://github.com/inventree/InvenTree.git
synced 2025-10-31 13:15:43 +00:00
06266b48af
* Create new model for storing Part pricing data
Currently this model does not "do" anything but will be used for caching pre-calculated pricing information
* Define function for accessing pricing information for a specific part
* Adds admin site support for new PartPricing model
* Specify role for PartPricing model
* Allow blank values for PartPricing model fields
* Add some TODO entries
* Update migration files to sync with latest master
* Expose API endpoint for viewing part pricing information
* Update migration file
* Improvements:
- Updated model with new fields
- Code for calculating BOM price
- Code for calculating internal price
- Code for calculating supplier price
- Updated unit testing
* Fix (and test) for API serializer
* Including min/max pricing data in part serializer
* Bump API version
* Add pricing overview information in part table
- Adds helper function for formatting currency data
- No longer pre-render "price strings" on the server
* Overhaul of BOM API
- Pricing data no longer calculated "on the fly"
- Remove expensive annotation operations
- Display cached price range information in BOM table
* Filter BOM items by "has pricing"
* Part API endpoint can be filtered by price range
* Updpated API version notes
* Improvements for price caching calculations
- Handle null price values
- Handle case where conversion rates are missing
- Allow manual update via API
* Button to manually refresh pricing
* Improve rendering of price-break table
* Update supplier part pricing table
* Updated js functions
* Adds background task to update assembly pricing whenever a part price cache is changed
* Updates for task offloading
* HTML tweaks
* Implement calculation of historical purchase cost
- take supplier part pack size into account
- improve unit tests
* Improvements for pricing tab rendering
* Refactor of pricing page
- Move javascript functions out into separate files
- Change price-break tables to use bar graphs
- Display part pricing history table and chart
- Remove server-side rendering for price history data
- Fix rendering of supplier pricing table
- Adds extra filtering options to the SupplierPriceBreak API endpoint
* Refactor BOM pricing chart / table
- Display as bar chart with min/max pricing
- Display simplified BOM table
* Update page anchors
* Improvements for BOM pricing table display
* Refactoring sales data tables
- Add extra data and filter options to sales order API endpoints
- Display sales order history table and chart
* Add extra fields to PartPricing model:
- sale_price_min
- sale_price_max
- sale_history_min
- sale_history_max
* Calculate and cache sale price data
* Update part pricing when PurchaseOrder is completed
* Update part pricing when sales order is completed
* Signals for updating part pricing cache
- Whenever an internal price break is created / edited / deleted
- Whenever a sale price break is created / edited / deleted
* Also trigger part pricing update when BomItem is created / edited / deleted
* Update part pricing whenever a supplier price break is updated
* Remove has_complete_bom_pricing method
* Export min/max pricing data in BOM file
* Fix pricing data in BOM export
- Calculate total line cost
- Use more than two digits
* Add pricing information to part export
Also some improvements to part exporting
* Allow download of part category table
* Allow export of stock location data to file
* Improved exporting of StockItem data
* Add cached variant pricing data
- New fields in part pricing model
- Display variant pricing overview in "pricing" tab
* Remove outdated "PART_SHOW_PRICE_HISTORY" setting
* Adds scheduled background task to periodically update part pricing
* Internal prices can optionally override other pricing
* Update js file checks
* Update price breaks to use 6 decimal places
* Fix for InvenTreeMoneySerializer class
- Allow 6 decimal places through the API
* Update for supplier price break table
* javascript linting fix
* Further js fixes
* Unit test updates
* Improve rendering of currency in templates
- Do not artificially limit to 2 decimal places
* Unit test fixes
* Add pricing information to part "details" tab
* Tweak for money formatting
* Enable sort-by-price in BOM table
* More unit test tweaks
* Update BOM exporting
* Fixes for background worker process
- To determine if worker is running, look for *any* successful task, not just heartbeat
- Heartbeat rate increased to 5 minute intervals
- Small adjustments to django_q settings
Ref: https://github.com/inventree/InvenTree/issues/3921
(cherry picked from commit cb26003b92)
* Force background processing of heartbeat task when server is started
- Removes the ~5 minute window in which the server "thinks" that the worker is not actually running
* Adjust strategy for preventing recursion
- Rather than looking for duplicate parts, simply increment a counter
- Add a "scheduled_for_update" flag to prevent multiple updates being scheduled
- Consolidate migration files
* Adds helper function for rendering a range of prices
* Include variant cost in calculations
* Fixes for "has_pricing" API filters
* Ensure part pricing status flags are reset when the server restarts
* Bug fix for BOM API filter
* Include BOM quantity in BOM pricing chart
* Small tweaks to pricing tab
* Prevent caching when looking up settings in background worker
- Caching across mnultiple processes causes issues
- Need to move to something like redis to solve this
- Ref: https://github.com/inventree/InvenTree/issues/3921
* Fixes for /part/pricing/ detail API endpoint
* Update pricing tab
- Consistent naming
* Unit test fixes
* Prevent pricing updates when loading test fixtures
* Fix for Part.pricing
* Updates for "check_missing_pricing"
* Change to pie chart for BOM pricing
* Unit test fix
* Updates
- Sort BOM pie chart correctly
- Simplify PartPricing.is_valid
- Pass "limit" through to check_missing_pricing
- Improved logic for update scheduling
* Add option for changing how many decimals to use when displaying pricing data
* remove old unused setting
* Consolidate settings tabs for pricing and currencies
* Fix CI after changing settings page
* Fix rendering for "Supplier Pricing"
- Take unit pricing / pack size into account
* Extra filtering / ordering options for the SupplierPriceBreak API endpoint
* Fix for purchase price history graph
- Use unit pricing (take pack size into account)
* JS fixes
219 lines
9.2 KiB
HTML
219 lines
9.2 KiB
HTML
{% load static %}
|
|
{% load i18n %}
|
|
{% load inventree_extras %}
|
|
|
|
{% plugins_enabled as plugins_enabled %}
|
|
{% settings_value 'BARCODE_ENABLE' as barcodes %}
|
|
{% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %}
|
|
{% settings_value "REPORT_ENABLE" as report_enabled %}
|
|
{% settings_value "SERVER_RESTART_REQUIRED" as server_restart_required %}
|
|
{% settings_value "LABEL_ENABLE" as labels_enabled %}
|
|
{% inventree_show_about user as show_about %}
|
|
|
|
<!DOCTYPE html>
|
|
<html lang="en">
|
|
<head>
|
|
|
|
<!-- Required meta tags -->
|
|
<meta charset="utf-8">
|
|
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
|
|
|
<!-- Favicon -->
|
|
<link rel="apple-touch-icon" sizes="57x57" href="{% static 'img/favicon/apple-icon-57x57.png' %}">
|
|
<link rel="apple-touch-icon" sizes="60x60" href="{% static 'img/favicon/apple-icon-60x60.png' %}">
|
|
<link rel="apple-touch-icon" sizes="72x72" href="{% static 'img/favicon/apple-icon-72x72.png' %}">
|
|
<link rel="apple-touch-icon" sizes="76x76" href="{% static 'img/favicon/apple-icon-76x76.png' %}">
|
|
<link rel="apple-touch-icon" sizes="114x114" href="{% static 'img/favicon/apple-icon-114x114.png' %}">
|
|
<link rel="apple-touch-icon" sizes="120x120" href="{% static 'img/favicon/apple-icon-120x120.png' %}">
|
|
<link rel="apple-touch-icon" sizes="144x144" href="{% static 'img/favicon/apple-icon-144x144.png' %}">
|
|
<link rel="apple-touch-icon" sizes="152x152" href="{% static 'img/favicon/apple-icon-152x152.png' %}">
|
|
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicon/apple-icon-180x180.png' %}">
|
|
<link rel="icon" type="image/png" sizes="192x192" href="{% static 'img/favicon/android-icon-192x192.png' %}">
|
|
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
|
|
<link rel="icon" type="image/png" sizes="96x96" href="{% static 'img/favicon/favicon-96x96.png' %}">
|
|
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
|
|
<link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
|
|
<meta name="msapplication-TileColor" content="#ffffff">
|
|
<meta name="msapplication-TileImage" content="{% static 'img/favicon/ms-icon-144x144.png' %}">
|
|
<meta name="theme-color" content="#ffffff">
|
|
|
|
<!-- CSS -->
|
|
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'bootstrap-table/bootstrap-table.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'bootstrap-table/extensions/group-by-v2/bootstrap-table-group-by.min.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 'fontawesome/css/brands.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'fontawesome/css/solid.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'select2/css/select2.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'select2/css/select2-bootstrap-5-theme.css' %}">
|
|
<link rel="stylesheet" href="{% static 'fullcalendar/main.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'script/jquery-ui/jquery-ui.min.css' %}">
|
|
<link rel="stylesheet" href="{% static 'easymde/easymde.min.css' %}">
|
|
|
|
<link rel="stylesheet" href="{% static 'css/inventree.css' %}">
|
|
|
|
<link rel="stylesheet" href="{% get_color_theme_css user.get_username %}">
|
|
|
|
<style>
|
|
{% block css %}
|
|
<!-- Custom CSS style goes here -->
|
|
{% endblock %}
|
|
</style>
|
|
{% block head %}
|
|
{% endblock %}
|
|
|
|
<title>
|
|
{% block page_title %}
|
|
{% inventree_title %}
|
|
{% endblock %}
|
|
</title>
|
|
</head>
|
|
|
|
<body>
|
|
|
|
{% include "navbar.html" %}
|
|
|
|
<div class='main body wrapper container-fluid inventree-body'>
|
|
|
|
<div class='row flex-nowrap inventree-body'>
|
|
<div class='col-auto px-1 sidebar-wrapper'>
|
|
<div id='sidebar' class='collapse collapse-horizontal show' style='display: none;'>
|
|
<div id='sidebar-nav' class='list-group text-sm-start'>
|
|
<ul id='sidebar-list-group' class='list-group sidebar-list-group'>
|
|
{% block sidebar %}
|
|
<!-- Sidebar goes here -->
|
|
{% endblock %}
|
|
{% include "plugin/panel_menu.html" %}
|
|
{% include "sidebar_toggle.html" with target='sidebar' %}
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<main class='col ps-md-2 pt-2 pe-2'>
|
|
|
|
{% block alerts %}
|
|
<div class='notification-area' id='alerts'>
|
|
<!-- Div for displayed alerts -->
|
|
{% if server_restart_required %}
|
|
<div id='alert-restart-server' class='alert alert-danger' role='alert'>
|
|
<span class='fas fa-server'></span>
|
|
<strong>{% trans "Server Restart Required" %}</strong>
|
|
<small>
|
|
<br>
|
|
{% trans "A configuration option has been changed which requires a server restart" %}. {% trans "Contact your system administrator for further information" %}
|
|
</small>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
{% endblock %}
|
|
|
|
{% block breadcrumb_list %}
|
|
<div class='container-fluid navigation' id='breadcrumb-div'>
|
|
<nav aria-label='breadcrumb'>
|
|
<ol class='breadcrumb' id='breadcrumb-list'>
|
|
{% block breadcrumbs %}
|
|
{% endblock %}
|
|
</ol>
|
|
</nav>
|
|
|
|
<div id='breadcrumb-tree-collapse' class='collapse collapse-horizontal show border' style='display: none;'>
|
|
{% block breadcrumb_tree %}
|
|
{% endblock %}
|
|
</div>
|
|
</div>
|
|
|
|
{% endblock %}
|
|
|
|
{% block content %}
|
|
<!-- Each view fills in here.. -->
|
|
{% endblock %}
|
|
</main>
|
|
</div>
|
|
|
|
{% include 'modals.html' %}
|
|
{% include "notifications.html" %}
|
|
{% include "search.html" %}
|
|
</div>
|
|
|
|
{% include "third_party_js.html" %}
|
|
|
|
|
|
<!-- general JS -->
|
|
<script defer type='text/javascript' src="{% static 'script/inventree/inventree.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% static 'script/inventree/message.js' %}"></script>
|
|
|
|
<!-- dynamic javascript templates -->
|
|
<script defer type='text/javascript' src="{% url 'calendar.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% url 'nav.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% url 'settings.js' %}"></script>
|
|
|
|
<!-- translated javascript templates-->
|
|
<script defer type='text/javascript' src="{% i18n_static 'api.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'attachment.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'barcode.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'bom.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'build.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'charts.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'company.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'filters.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'forms.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'helpers.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'label.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'modals.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'model_renderers.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'order.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'part.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'report.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'search.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'stock.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'plugin.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'pricing.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'news.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'tables.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'table_filters.js' %}"></script>
|
|
<script defer type='text/javascript' src="{% i18n_static 'notification.js' %}"></script>
|
|
|
|
{% block js_load %}
|
|
{% endblock %}
|
|
|
|
<script defer type='text/javascript'>
|
|
|
|
$(document).ready(function () {
|
|
|
|
{% include "plugin/panel_js.html" %}
|
|
|
|
{% block js_ready %}
|
|
{% endblock %}
|
|
|
|
inventreeDocReady();
|
|
|
|
{% if barcodes %}
|
|
$('#barcode-scan').click(function() {
|
|
barcodeScanDialog();
|
|
});
|
|
{% endif %}
|
|
|
|
moment.locale('{{ request.LANGUAGE_CODE }}');
|
|
|
|
// Account notifications
|
|
{% if messages %}
|
|
{% for message in messages %}
|
|
showMessage(
|
|
'{{ message }}',
|
|
{
|
|
style: 'info',
|
|
}
|
|
);
|
|
{% endfor %}
|
|
{% endif %}
|
|
});
|
|
|
|
</script>
|
|
|
|
{% block js %}
|
|
{% endblock %}
|
|
|
|
</body>
|
|
</html>
|