Merge branch 'master' into Develop

# Conflicts: # cps/shelf.py
2020-02-09 07:00:04 +01:00
parent 5255085de1 c1e2a98f46
commit 50ba2e329a
40 changed files with 250 additions and 237 deletions
@@ -29,7 +29,7 @@
        {% endfor %}
      </div>
        <button onclick="sendData('{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}')" class="btn btn-default" id="ChangeOrder">{{_('Change order')}}</button>
-        <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Back')}}</a>
+        <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" id="shelf_back" class="btn btn-default">{{_('Back')}}</a>
  </div>
 {% endblock %}