diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css index 0554138c24..da7d38d250 100644 --- a/InvenTree/static/css/inventree.css +++ b/InvenTree/static/css/inventree.css @@ -282,6 +282,13 @@ margin-right: 2px; } +.btn-remove { + padding: 3px; + padding-left: 5px; + padding-right: 5px; + color: #A11; +} + .button-toolbar { padding-left: 0px; } diff --git a/InvenTree/static/script/inventree/stock.js b/InvenTree/static/script/inventree/stock.js index 4788f2c1df..cc2d57098c 100644 --- a/InvenTree/static/script/inventree/stock.js +++ b/InvenTree/static/script/inventree/stock.js @@ -14,6 +14,20 @@ function getStockLocations(filters={}, options={}) { return inventreeGet('/api/stock/location/', filters, options) } +/* Functions for interacting with stock management forms + */ + +function removeStockRow(e) { + // Remove a selected row from a stock modal form + + e = e || window.event; + var src = e.target || e.srcElement; + + var row = $(src).attr('row'); + + $('#' + row).remove(); +} + /* Present user with a dialog to update multiple stock items * Possible actions: diff --git a/InvenTree/stock/forms.py b/InvenTree/stock/forms.py index c6563f1786..10e1aeac0c 100644 --- a/InvenTree/stock/forms.py +++ b/InvenTree/stock/forms.py @@ -69,7 +69,7 @@ class MoveMultipleStockItemsForm(forms.ModelForm): location = forms.ChoiceField(label='Destination', required=True, help_text='Destination stock location') note = forms.CharField(label='Notes', required=True, help_text='Add note (required)') - transaction = forms.BooleanField(required=False, initial=False, label='Create Transaction', help_text='Create a stock transaction for these parts') + # transaction = forms.BooleanField(required=False, initial=False, label='Create Transaction', help_text='Create a stock transaction for these parts') confirm = forms.BooleanField(required=False, initial=False, label='Confirm Stock Movement', help_text='Confirm movement of stock items') def __init__(self, *args, **kwargs): @@ -83,7 +83,7 @@ class MoveMultipleStockItemsForm(forms.ModelForm): fields = [ 'location', 'note', - 'transaction', + # 'transaction', 'confirm', ] diff --git a/InvenTree/stock/templates/stock/stock_move.html b/InvenTree/stock/templates/stock/stock_move.html index 7830f18b10..3bd4a65420 100644 --- a/InvenTree/stock/templates/stock/stock_move.html +++ b/InvenTree/stock/templates/stock/stock_move.html @@ -1,33 +1,32 @@ {% block pre_form_content %} + {% endblock %} +
{% csrf_token %} {% load crispy_forms_tags %} + Stock Items + + + + + + + + {% for item in stock_items %} + + + + + + + {% endfor %} +
ItemLocation{{ stock_action }}
{% include "hover_image.html" with image=item.part.image %} + {{ item.part.full_name }} {{ item.part.description }}{{ item.location.pathstring }} + +
{% crispy form %} - {% block form_data %} - - {% endblock %} - -
- - - - - - - {% for item in stock_items %} - - - - - - {% endfor %} -
ItemLocation{{ stock_action }}
{% include "hover_image.html" with image=item.part.image %} - {{ item.part.full_name }} {{ item.part.description }}{{ item.location.pathstring }} - -
-
\ No newline at end of file