mirror of
https://github.com/inventree/InvenTree.git
synced 2025-05-01 21:16:46 +00:00
Peppy fixes
This commit is contained in:
parent
c9cddd2a19
commit
38001b5358
@ -49,4 +49,3 @@ class EditPurchaseOrderLineItemForm(HelperForm):
|
|||||||
'reference',
|
'reference',
|
||||||
'notes',
|
'notes',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -83,7 +83,9 @@ InvenTree | {{ order }}
|
|||||||
<th data-field='received'>Received</th>
|
<th data-field='received'>Received</th>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<th data-field='notes'>Note</th>
|
<th data-field='notes'>Note</th>
|
||||||
|
{% if order.status == OrderStatus.PENDING %}
|
||||||
<th data-field='buttons'></th>
|
<th data-field='buttons'></th>
|
||||||
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
{% for line in order.lines.all %}
|
{% for line in order.lines.all %}
|
||||||
<tr>
|
<tr>
|
||||||
@ -107,6 +109,7 @@ InvenTree | {{ order }}
|
|||||||
<td>
|
<td>
|
||||||
{{ line.notes }}
|
{{ line.notes }}
|
||||||
</td>
|
</td>
|
||||||
|
{% if order.status == OrderStatus.PENDING %}
|
||||||
<td>
|
<td>
|
||||||
<div class='btn-group'>
|
<div class='btn-group'>
|
||||||
<button class='btn btn-default btn-edit' id='edit-line-item-{{ line.id }} title='Edit line item' onclick='editPurchaseOrderLineItem()'>
|
<button class='btn btn-default btn-edit' id='edit-line-item-{{ line.id }} title='Edit line item' onclick='editPurchaseOrderLineItem()'>
|
||||||
@ -117,6 +120,7 @@ InvenTree | {{ order }}
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
@ -190,7 +190,7 @@ class OrderParts(AjaxView):
|
|||||||
except SupplierPart.DoesNotExist:
|
except SupplierPart.DoesNotExist:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not supplier.name in suppliers:
|
if supplier.name not in suppliers:
|
||||||
supplier.order_items = []
|
supplier.order_items = []
|
||||||
supplier.selected_purchase_order = None
|
supplier.selected_purchase_order = None
|
||||||
suppliers[supplier.name] = supplier
|
suppliers[supplier.name] = supplier
|
||||||
@ -387,7 +387,7 @@ class OrderParts(AjaxView):
|
|||||||
|
|
||||||
if form_step == 'select_parts':
|
if form_step == 'select_parts':
|
||||||
# No errors? Proceed to PO selection form
|
# No errors? Proceed to PO selection form
|
||||||
if part_errors == False:
|
if part_errors is False:
|
||||||
self.ajax_template_name = 'order/order_wizard/select_pos.html'
|
self.ajax_template_name = 'order/order_wizard/select_pos.html'
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
@ -3,6 +3,8 @@ ignore =
|
|||||||
# - W293 - blank lines contain whitespace
|
# - W293 - blank lines contain whitespace
|
||||||
W293,
|
W293,
|
||||||
# - E501 - line too long (82 characters)
|
# - E501 - line too long (82 characters)
|
||||||
E501
|
E501,
|
||||||
|
# - C901 - function is too complex
|
||||||
|
C901,
|
||||||
exclude = .git,__pycache__,*/migrations/*
|
exclude = .git,__pycache__,*/migrations/*
|
||||||
max-complexity = 20
|
max-complexity = 20
|
||||||
|
Loading…
x
Reference in New Issue
Block a user