inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 13:05:42 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2279

Browse Source
This commit is contained in:
Matthias Mair
2022-01-12 14:36:04 +01:00
committed by GitHub
parent ee99052d04 7f31e08c56
commit c490574082
31 changed files with 639 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
InvenTree/templates/500.html Normal file
View File

@ -0,0 +1,19 @@
{% extends "base.html" %}
{% load i18n %}
{% block page_title %}
InvenTree | {% trans "Internal Server Error" %}
{% endblock %}
{% block content %}
<div class='container-fluid'>
<h3>{% trans "Internal Server Error" %}</h3>
<div class='alert alert-danger alert-block'>
{% trans "The InvenTree server raised an internal error" %}<br>
{% trans "Refer to the error log in the admin interface for further details" %}
</div>
</div>
{% endblock %}

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

@ -929,6 +929,7 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) {
{
field: 'actions',
title: '',
switchable: false,
formatter: function(value, row) {
if (row.received >= row.quantity) {