inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 21:45:39 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2181

Browse Source
This commit is contained in:
Matthias Mair
2021-10-29 00:21:11 +02:00
committed by GitHub
parent d97e3cd4e5 5cd9be6845
commit 6e486140c3
11 changed files with 154 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/serializers.py
View File

@ -109,7 +109,6 @@ class PartSalePriceSerializer(InvenTreeModelSerializer):
quantity = serializers.FloatField()
price = InvenTreeMoneySerializer(
max_digits=19, decimal_places=4,
allow_null=True
)
@ -134,7 +133,6 @@ class PartInternalPriceSerializer(InvenTreeModelSerializer):
quantity = serializers.FloatField()
price = InvenTreeMoneySerializer(
max_digits=19, decimal_places=4,
allow_null=True
)

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

@ -128,6 +128,13 @@
</div>
{% endif %}
</div>
<p>
<!-- Details show/hide button -->
<button id="toggle-part-details" class="btn btn-primary" data-toggle="collapse" data-target="#collapsible-part-details" value="show">
<span class="fas fa-chevron-down"></span> {% trans "Show Part Details" %}
</button>
</p>
</div>
</div>
<div class='info-messages'>
@ -208,13 +215,6 @@
</div>
</div>
<p>
<!-- Details show/hide button -->
<button id="toggle-part-details" class="btn btn-primary" data-toggle="collapse" data-target="#collapsible-part-details" value="show">
<span class="fas fa-chevron-down"></span> {% trans "Show Part Details" %}
</button>
</p>
<div class="collapse" id="collapsible-part-details">
<div class="card card-body">
<!-- Details Table -->