Skip to content

T
third-party
Commit 055d4c07 by François C.
Options

Merge branch 'retouches_tickets_supercoop' of… 

Merge branch 'retouches_tickets_supercoop' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into retouches_tickets_supercoop
parents 3cbf6c15 8527a6c4
Pipeline #2568 failed with stage
in 1 minute 52 seconds
Showing with 173 additions and 155 deletions
members_space/views.py
......@@ -61,12 +61,12 @@ def index(request, exception=None):
"""Signaler ici une anomalie du formulaire,
un problème lié à votre souscription""",
'referer': referer,
'mag_place_string': settings.MAG_NAME,
'office_place_string': settings.OFFICE_NAME,
'max_begin_hour': settings.MAX_BEGIN_HOUR,
'payment_meanings': settings.SUBSCRIPTION_PAYMENT_MEANINGS,
'em_url': settings.EM_URL,
'WELCOME_ENTRANCE_MSG': settings.WELCOME_ENTRANCE_MSG,
'mag_place_string': getattr(settings, 'MAG_NAME', ''),
'office_place_string': getattr(settings, 'OFFICE_NAME', ''),
'max_begin_hour': getattr(settings, 'MAX_BEGIN_HOUR', ''),
'payment_meanings': getattr(settings, 'SUBSCRIPTION_PAYMENT_MEANINGS'),
'em_url': getattr(settings, 'EM_URL', ''),
'WELCOME_ENTRANCE_MSG': getattr(settings, 'WELCOME_ENTRANCE_MSG', ''),
'WELCOME_SUBTITLE_ENTRANCE_MSG': getattr(settings, 'WELCOME_SUBTITLE_ENTRANCE_MSG', '')}
if hasattr(settings, 'SUBSCRIPTION_ASK_FOR_SEX'):
context['ask_for_sex'] = settings.SUBSCRIPTION_ASK_FOR_SEX
......
orders/views.py
......@@ -97,6 +97,9 @@ def create_orders(request):
supplier_data["date_planned"],
supplier_data["lines"]
)
if 'error' in res_created:
res["error"] = res_created['error']
return JsonResponse(res, status=500)
res["created"].append(res_created)
except Exception as e:
......
products/models.py
......@@ -536,6 +536,17 @@ class CagetteProducts(models.Model):
result['aliases'][alias_bc] = r['alias']
elif '{' in r['pattern'] or '.' in r['pattern']:
result['patterns'].append(r)
if getattr(settings, 'WITH_MULTI_BARCODE_ODOO_MODULE', False):
multi_barcodes = OdooAPI().search_read('product.multi.barcode', [],['product_id', 'barcode'])
product_ids = []
product_barcodes = {}
for mb in multi_barcodes:
product_ids.append(mb['product_id'][0])
products = OdooAPI().search_read('product.product', [['id', 'in', product_ids]],['barcode'])
for p in products:
product_barcodes[p['id']] = p['barcode']
for mb in multi_barcodes:
result['aliases'][mb['barcode']] = product_barcodes[mb['product_id'][0]]
except Exception as e:
result['error'] = str(e)
coop_logger.error("Get Barcode Rules : %s", str(e))
......
reception/models.py
......@@ -42,7 +42,7 @@ class CagetteReception(models.Model):
orders = api.search_read('purchase.order', c, f)
except Exception as e:
print(str(e))
coop_logger.error("get_orders : %s", str(e))
return orders
def get_order_unprocessable_products(id_po):
......
reception/static/js/reception_produits.js
......@@ -2095,6 +2095,7 @@ function create_orders() {
data: JSON.stringify(orders_data),
success: (result) => {
po_ids = [];
//WARNING : if result.res.created content is rubbishes (as error dump for exemple) couchDB database will be filled with all available orders, with updated quantities equal to original order quantities !!
for (let po of result.res.created) {
po_ids.push(po.id_po);
}
......@@ -2679,7 +2680,6 @@ $(document).ready(function() {
// find order
let order_id = group_ids[i];
let order = result.rows.find(el => el.id == 'order_' + order_id);
order = order.doc;
order.key = parseInt(i) + 1;
orders[order_id] = order;
......
reception/views.py
......@@ -46,7 +46,6 @@ def get_list_orders(request):
poids = [int(i) for i in request.GET.getlist('poids', [])]
get_order_lines = request.GET.get('get_order_lines', False)
get_order_lines = get_order_lines == "true"
ordersOdoo = CagetteReception.get_orders(poids)
orders = []
for order in ordersOdoo:
......
templates/base.html
......@@ -6,11 +6,11 @@
<title>{{title}}</title>
{% load static %}
<link rel="stylesheet" href="{% static "css/knacss.min.css" %}">
<link rel="stylesheet" href="{% static "css/common.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "fontawesome/css/fa-svg-with-js.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/common.css" %}?v=1671550230">
<link rel="stylesheet" href="{% static "fontawesome/css/fa-svg-with-js.css" %}?v=1671550230">
{% if custom_css.all %}
{% for fpath in custom_css.all %}
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=1651853225">
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=1671550230">
{% endfor %}
{% endif %}
......
templates/envelops/index.html
......@@ -2,7 +2,7 @@
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/envelops.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/envelops.css" %}?v=1671550230">
{% endblock %}
{% block additionnal_scripts %}
......@@ -159,6 +159,6 @@
auto_compaction: false
});
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/envelops.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/envelops.js" %}?v=1671550230"></script>
{% endblock %}
templates/inventory/custom_lists.html
......@@ -36,8 +36,8 @@
<script type="text/javascript">
var lists = {{lists|safe}}
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src='{% static "js/custom_lists.js" %}?v=1651853225'></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
<script src='{% static "js/custom_lists.js" %}?v=1671550230'></script>
{% endblock %}
templates/inventory/index.html
......@@ -94,9 +94,9 @@
auto_compaction: false
});
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/products_common.js" %}?v=1651853225"></script>
<script src="{% static "js/inventory.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/products_common.js" %}?v=1671550230"></script>
<script src="{% static "js/inventory.js" %}?v=1671550230"></script>
{% endblock %}
templates/members/admin/index.html
......@@ -6,8 +6,8 @@
{% endblock %}
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'js/admin/bdm_index.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/admin/bdm_index.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -54,5 +54,5 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
{% endblock %}
templates/members/admin/manage_attached.html
......@@ -39,7 +39,7 @@
</div>
</div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/bdm_index.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/bdm_index.js" %}?v=1671550230'></script>
{% endblock %}
\ No newline at end of file
templates/members/admin/manage_attached_create_pair.html
......@@ -109,6 +109,6 @@
</div>
</div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1671550230'></script>
{% endblock %}
templates/members/admin/manage_attached_delete_pair.html
......@@ -73,6 +73,6 @@
</div>
</div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1671550230'></script>
{% endblock %}
templates/members/admin/manage_makeups.html
......@@ -11,7 +11,7 @@
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/datatables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -82,8 +82,8 @@
</div>
</div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_makeups.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/manage_makeups.js" %}?v=1671550230'></script>
<script>
const extension_duration = {{extension_duration}};
</script>
......
templates/members/admin/manage_regular_shifts.html
......@@ -11,7 +11,7 @@
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/datatables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -99,7 +99,7 @@
const committees_shift_name = '{{committees_shift_name}}';
var ASSOCIATE_MEMBER_SHIFT = '{{ASSOCIATE_MEMBER_SHIFT}}';
</script>
<script src='{% static "js/common.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_regular_shifts.js" %}?v=1651853225'></script>
<script src='{% static "js/common.js" %}?v=1671550230'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/manage_regular_shifts.js" %}?v=1671550230'></script>
{% endblock %}
templates/members/admin/manage_shift_registrations.html
......@@ -11,7 +11,7 @@
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/datatables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -54,6 +54,6 @@
<div id="templates" style="display:none;"></div>
</div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_shift_registrations.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/admin/manage_shift_registrations.js" %}?v=1671550230'></script>
{% endblock %}
templates/members/base.html
......@@ -3,7 +3,7 @@
{% block additionnal_css %}
{% if custom_css.members %}
{% for fpath in custom_css.members %}
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=1651853225">
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=1671550230">
{% endfor %}
{% endif %}
<!-- members/base.html -->
......
templates/members/index.html
{% extends "members/base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static 'css/member.css' %}?v=1651853225">
<link rel="stylesheet" href="{% static 'css/member.css' %}?v=1671550230">
{{ block.super }}
{% endblock %}
{% block additionnal_scripts %}
......@@ -27,7 +27,7 @@
</script>
<script src="{% static "js/JsBarcode.all.min.js" %}">
</script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
<script defer src="{% static "fontawesome/js/fontawesome-all.js" %}"></script>
{% endblock %}
......@@ -271,6 +271,6 @@
<div style="display:none;">
<p id="missed_begin_msg">{{ENTRANCE_MISSED_SHIFT_BEGIN_MSG|safe}}</p>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/members.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/members.js" %}?v=1671550230"></script>
{% endblock %}
templates/members/inscriptions.html
{% extends "members/base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=1671550230">
<style>
.shift[data-place="{{mag_place_string}}"], [data-select="{{mag_place_string}}"] {background: #c8deff;}
.shift[data-place="{{office_place_string}}"], [data-select="{{office_place_string}}"] {background: #f9b2ff;}
......@@ -198,8 +198,8 @@
var committees_shift_id = '{{committees_shift_id}}';
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/inscriptions.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
<script src="{% static "js/inscriptions.js" %}?v=1671550230"></script>
{% endblock %}
templates/members/manage_mess.html
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/manage_mess.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/manage_mess.css" %}?v=1671550230">
{% endblock %}
{% block additionnal_scripts %}
<script src="{% static "js/sha1.min.js" %}?v=1651853225"></script>
<script src="{% static "js/sha1.min.js" %}?v=1671550230"></script>
{% endblock %}
{% block content %}
{% include "common/conn_admin.html" %}
......@@ -62,8 +62,8 @@
});
</script>
{% endif %}
<script src="{% static "js/all_common.js" %}"?v=1651853225></script>
<script src="{% static "js/common.js" %}"?v=1651853225></script>
<script src="{% static "js/all_common.js" %}"?v=1671550230></script>
<script src="{% static "js/common.js" %}"?v=1671550230></script>
<script src="{% static "js/manage_mess.js" %}?v=1651853225"></script>
<script src="{% static "js/manage_mess.js" %}?v=1671550230"></script>
{% endblock %}
\ No newline at end of file
templates/members/prepa_odoo.html
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=1671550230">
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=1671550230">
<style>
.shift[data-place="{{mag_place_string}}"], [data-select="{{mag_place_string}}"] {background: #c8deff;}
.shift[data-place="{{office_place_string}}"], [data-select="{{office_place_string}}"] {background: #f9b2ff;}
......@@ -107,8 +107,8 @@
var office_place_string = '{{office_place_string}}'
var max_begin_hour = '{{max_begin_hour}}'
</script>
<script src="{% static "js/all_common.js" %}"?v=1651853225></script>
<script src="{% static "js/common.js" %}"?v=1651853225></script>
<script src="{% static "js/subscription_common.js" %}"?v=1651853225></script>
<script src="{% static "js/prepa_odoo.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}"?v=1671550230></script>
<script src="{% static "js/common.js" %}"?v=1671550230></script>
<script src="{% static "js/subscription_common.js" %}"?v=1671550230></script>
<script src="{% static "js/prepa_odoo.js" %}?v=1671550230"></script>
{% endblock %}
templates/members/validation_coop.html
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=1671550230">
{% endblock %}
{% block additionnal_scripts %}
<script type="text/javascript">
......@@ -54,9 +54,9 @@ Afin d'enregistrer définitivement vos données dans le système du magasin, mer
{% endif %}
<script src="{% static "js/pouchdb.min.js" %}"></script>
<script src="{% static "js/all_common.js" %}"?v=1651853225></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/subscription_common.js" %}?v=1651853225"></script>
<script src="{% static "js/subscription_validation.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}"?v=1671550230></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
<script src="{% static "js/subscription_common.js" %}?v=1671550230"></script>
<script src="{% static "js/subscription_validation.js" %}?v=1671550230"></script>
</div>
{% endblock %}
templates/members_space/index.html
......@@ -5,11 +5,11 @@
<link rel="stylesheet" href="{% static 'css/datatables/jquery.dataTables.css' %}">
<link rel="stylesheet" href="{% static 'css/datatables/responsive.dataTables.min.css' %}">
<link rel="stylesheet" href="{% static 'fullcalendar-5.9.0/lib/main.min.css' %}">
<link rel="stylesheet" href="{% static "css/members-space.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/members-space-my-shifts.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/members-space-faq.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/members-space-my-info.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/members-space-shifts-exchange.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/members-space.css" %}?v=1671550230">
<link rel="stylesheet" href="{% static "css/members-space-my-shifts.css" %}?v=1671550230">
<link rel="stylesheet" href="{% static "css/members-space-faq.css" %}?v=1671550230">
<link rel="stylesheet" href="{% static "css/members-space-my-info.css" %}?v=1671550230">
<link rel="stylesheet" href="{% static "css/members-space-shifts-exchange.css" %}?v=1671550230">
{% endblock %}
{% block additionnal_scripts %}
......@@ -17,7 +17,7 @@
<script type="text/javascript" src="{% static 'js/datatables/dataTables.responsive.min.js' %}"></script>
<script type="text/javascript" src="{% static 'fullcalendar-5.9.0/lib/main.min.js' %}"></script>
<script type="text/javascript" src="{% static 'fullcalendar-5.9.0/lib/locales/fr.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -159,12 +159,12 @@
const canAddShift = {{canAddShift}};
const extension_duration = {{extension_duration}};
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/members-space-home.js" %}?v=1651853225"></script>
<script src="{% static "js/members-space-my-info.js" %}?v=1651853225"></script>
<script src="{% static "js/members-space-my-shifts.js" %}?v=1651853225"></script>
<script src="{% static "js/members-space-faq.js" %}?v=1651853225"></script>
<script src="{% static "js/members-space-shifts-exchange.js" %}?v=1651853225"></script>
<script src="{% static "js/members-space.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
<script src="{% static "js/members-space-home.js" %}?v=1671550230"></script>
<script src="{% static "js/members-space-my-info.js" %}?v=1671550230"></script>
<script src="{% static "js/members-space-my-shifts.js" %}?v=1671550230"></script>
<script src="{% static "js/members-space-faq.js" %}?v=1671550230"></script>
<script src="{% static "js/members-space-shifts-exchange.js" %}?v=1671550230"></script>
<script src="{% static "js/members-space.js" %}?v=1671550230"></script>
{% endblock %}
templates/orders/helper.html
......@@ -9,9 +9,9 @@
{% endblock %}
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'quill/quill.min.js' %}"></script>
{% endblock %}
......@@ -372,6 +372,6 @@
let consumption_average_unit = '{{consumption_average_unit}}';
let open_days_per_week = {{open_days_per_week}};
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/orders_helper.js' %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/orders_helper.js' %}?v=1671550230"></script>
{% endblock %}
templates/outils/config.html
......@@ -40,7 +40,7 @@
<script type="text/javascript">
var module_name = '{{module}}'
</script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/module_config.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/module_config.js" %}?v=1671550230'></script>
{% endblock %}
templates/outils/export_compta.html
......@@ -26,5 +26,5 @@
<input type="submit" value="OK">
</p>
</form>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
{% endblock %}
\ No newline at end of file
templates/outils/export_orders.html
......@@ -16,5 +16,5 @@
<input type="submit" class='btn--primary' value="OK">
</form>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
{% endblock %}
\ No newline at end of file
templates/outils/monitor.html
......@@ -43,8 +43,8 @@
</div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/monitor.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/monitor.js" %}?v=1671550230'></script>
{% endblock %}
templates/products/destocking.html
......@@ -33,8 +33,8 @@
</div>
</div>
<div id="barcode_scanner" style="display:none;"></div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/destocking.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/destocking.js" %}?v=1671550230"></script>
{% endblock %}
templates/products/index.html
......@@ -9,8 +9,8 @@
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script>
<script type="text/javascript" src="{% static 'js/products_index.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/products_index.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -28,6 +28,6 @@
<table id="products_table" class="display" cellspacing="0" ></table>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
templates/products/sales.html
......@@ -46,6 +46,6 @@
console.log(e)
}
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/pos_product_sales.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/pos_product_sales.js" %}?v=1671550230"></script>
{% endblock %}
templates/reception/index.html
......@@ -78,12 +78,12 @@
</div>
<br/>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static 'js/pouchdb.min'|add:POUCHDB_VERSION|add:'.js' %}"></script>
<script type="text/javascript">
var merge_orders_pswd = '{{merge_orders_pswd}}';
var couchdb_dbname = '{{db}}';
var couchdb_server = '{{couchdb_server}}' + couchdb_dbname;
</script>
<script type="text/javascript" src="{% static 'js/reception_index.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/reception_index.js' %}?v=1671550230"></script>
{% endblock %}
templates/reception/reception_produits.html
......@@ -12,7 +12,7 @@
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.pos.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -247,7 +247,7 @@
var update_qty_pswd = "{{update_qty_pswd}}"
var allow_four_digits_in_reception_price = '{{allow_four_digits_in_reception_price}}';
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src='{% static "js/barcodes.js" %}?v=1651853225'></script>
<script type="text/javascript" src="{% static 'js/reception_produits.js' %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src='{% static "js/barcodes.js" %}?v=1671550230'></script>
<script type="text/javascript" src="{% static 'js/reception_produits.js' %}?v=1671550230"></script>
{% endblock %}
templates/sales/index.html
......@@ -4,11 +4,11 @@
{% block additionnal_css %}
<link rel="stylesheet" href="{% static 'css/datatables/jquery.dataTables.css' %}">
<link rel="stylesheet" href="{% static 'jquery-ui-1.12.1/jquery-ui.min.css' %}">
<link rel="stylesheet" href="{% static "css/sales.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/sales.css" %}?v=1671550230">
{% endblock %}
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/datatables.buttons.min.js' %}"></script>
......@@ -50,6 +50,6 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/sales.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/sales.js" %}?v=1671550230"></script>
{% endblock %}
templates/shelfs/admin.html
......@@ -91,9 +91,9 @@
}
</script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/barcodes.js" %}?v=1651853225'></script>
<script src='{% static "js/shelfs_admin.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/barcodes.js" %}?v=1671550230'></script>
<script src='{% static "js/shelfs_admin.js" %}?v=1671550230'></script>
{% endblock %}
templates/shelfs/index.html
......@@ -50,12 +50,12 @@
<script type="text/javascript">
shelfs = {{shelfs|safe}}
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% if SHELFS_SCRIPT %}
<script src="{% static 'js/'|add:SHELFS_SCRIPT|add:'.js' %}?v=1651853225"></script>
<script src="{% static 'js/'|add:SHELFS_SCRIPT|add:'.js' %}?v=1671550230"></script>
{% else %}
<script src="{% static 'js/shelfs_index.js' %}?v=1651853225"></script>
<script src="{% static 'js/shelfs_index.js' %}?v=1671550230"></script>
{% endif %}
{% endblock %}
templates/shelfs/shelf_inventory.html
......@@ -11,7 +11,7 @@
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.pos.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -190,8 +190,8 @@
const ahead_shelfs_ids = {{ahead_shelfs_ids|safe}};
var products = {{products|safe}};
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src='{% static "js/barcodes.js" %}?v=1651853225'></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
<script src='{% static "js/barcodes.js" %}?v=1671550230'></script>
<script type="text/javascript" src="{% static 'js/shelf_inventory.js' %}"></script>
{% endblock %}
templates/shelfs/shelf_view.html
......@@ -46,7 +46,7 @@
<script type="text/javascript">
var shelf_products = {{shelf_products|safe}}
</script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/shelf_view.js' %}"></script>
{% endblock %}
templates/shifts/shift_exchange.html
......@@ -2,7 +2,7 @@
{% load static %}
{% block additionnal_css %}
<link href='{% static "css/fullcalendar.min.css" %}' rel='stylesheet' />
<link href='{% static "css/shift_Cagette.css" %}?v=1651853225' rel='stylesheet' />
<link href='{% static "css/shift_Cagette.css" %}?v=1671550230' rel='stylesheet' />
<link href='{% static "css/fullcalendar.print.min.css" %}' rel='stylesheet' media='print' />
{% endblock %}
......@@ -93,6 +93,6 @@
<div id="templates" style="display:none;">
<div class="extra_info">{{ADDITIONAL_INFO_SHIFT_PAGE|safe}}</div>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/shift_exchange.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/shift_exchange.js" %}?v=1671550230"></script>
{% endblock %}
templates/shifts/shift_states_not_allowed.html
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link href='{% static "css/shift_Cagette.css" %}?v=1651853225' rel='stylesheet' />
<link href='{% static "css/shift_Cagette.css" %}?v=1671550230' rel='stylesheet' />
{% endblock %}
{% block additionnal_scripts %}
......@@ -69,6 +69,6 @@
Vous êtes exempté(e) de service et n'avez donc pas de service à choisir ou échanger.
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/shift_states_not_allowed.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/shift_states_not_allowed.js" %}?v=1671550230"></script>
{% endblock %}
templates/shop/admin.html
......@@ -159,8 +159,8 @@
auto_compaction: false
});
</script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/shop_admin.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/shop_admin.js" %}?v=1671550230'></script>
{% endblock %}
templates/shop/drafts.html
......@@ -141,8 +141,8 @@
auto_compaction: false
});
</script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/shop_drafts.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1671550230'></script>
<script src='{% static "js/shop_drafts.js" %}?v=1671550230'></script>
{% endblock %}
......
templates/shop/index.html
......@@ -505,7 +505,7 @@
{%endif%}
const stock_warning = {{SHOP_STOCK_WARNING|safe}}
</script>
<script src="{% static 'js/all_common.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/shop.js' %}?v=1651853225"></script>
<script src="{% static 'js/all_common.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/shop.js' %}?v=1671550230"></script>
{% endblock %}
templates/stock/stock_breakingArticleSet.html
......@@ -32,6 +32,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
templates/stock/stock_listArticleBreaking.html
......@@ -22,8 +22,8 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
......
templates/stock/stock_movements.html
......@@ -10,8 +10,8 @@
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.pos.js' %}"></script>
<script type="text/javascript" src="{% static 'js/stock_movements.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/stock_movements.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -102,6 +102,6 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src='{% static "js/barcodes.js" %}?v=1651853225'></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src='{% static "js/barcodes.js" %}?v=1671550230'></script>
{% endblock %}
templates/stock/stock_movements_view.html
......@@ -15,8 +15,8 @@
<script type="text/javascript" src="{% static 'js/datatables/jszip.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/pdfmake.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/vfs_fonts.js' %}"></script>
<script type="text/javascript" src="{% static 'js/stock_movements_view.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/stock_movements_view.js' %}?v=1671550230"></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v=1671550230"></script>
{% endblock %}
{% block content %}
......@@ -55,5 +55,5 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
{% endblock %}
templates/stock/stock_order.html
......@@ -44,8 +44,8 @@
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
......
templates/stock/stock_saleWithNotSale.html
......@@ -23,6 +23,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
templates/stock/stock_stockQuantLastSale.html
......@@ -23,6 +23,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
templates/stock/stock_values.html
......@@ -27,6 +27,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
<script src="{% static "js/all_common.js" %}?v=1671550230"></script>
<script src="{% static "js/common.js" %}?v=1671550230"></script>
{% endblock %}
templates/website/personnal_data.html
......@@ -3,7 +3,7 @@
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/knacss.min.css" %}">
<link rel="stylesheet" href="{% static "css/info_perso.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/info_perso.css" %}?v=1671550230">
{% endblock %}
{% block additionnal_scripts %}
......@@ -151,6 +151,6 @@
{% endif %}
</div>
</div>
<script src="{% static 'js/all_common.js' %}?v=1651853225"></script>
<script src="{% static 'js/info_perso.js' %}?v=1651853225"></script>
<script src="{% static 'js/all_common.js' %}?v=1671550230"></script>
<script src="{% static 'js/info_perso.js' %}?v=1671550230"></script>
{% endblock %}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment