Skip to content

T
third-party
Commit 9906d8ca by Damien Moulard
Options

fix merge conflict

parents f8b23369 c1f2b126
Pipeline #2216 passed with stage
in 2 minutes 12 seconds
Showing with 210 additions and 187 deletions
members/admin.py
......@@ -150,7 +150,9 @@ def get_settings(request):
for k, v in default_msettings.items():
if not (k in msettings):
msettings[k] = v
for k,v in msettings.items():
if 'sort_order' not in v:
msettings[k]['sort_order'] = 1
result['settings'] = dict(sorted(msettings.items(), key=lambda k_v: k_v[1]['sort_order']))
# on preprod server, dict order (through JsonResponse ??) is not respected !!
except Exception as e:
......
members/models.py
......@@ -1456,6 +1456,7 @@ class CagetteServices(models.Model):
# Let's start by adding an extra shift to associated member who came together
cond = [['date_begin', '>=', date_24h_before.isoformat()],
['date_begin', '<=', end_date.isoformat()],
['date_closed', '=', False],
['state', '=', 'done'], ['associate_registered', '=', 'both']]
fields = ['state', 'partner_id', 'date_begin']
res = api.search_read('shift.registration', cond, fields)
......@@ -1495,7 +1496,8 @@ class CagetteServices(models.Model):
(_h, _m, _s) = h.split(':')
if int(_h) < 21:
ids.append(int(r['id']))
f = {'state': absence_status}
# coop_logger.info("Traitement absences shift_registration ids %s", ids)
f = {'state': absence_status, 'date_closed': now.isoformat()}
update_shift_reg_result = {'update': api.update('shift.registration', ids, f), 'reg_shift': res}
if update_shift_reg_result['update'] is True:
update_shift_reg_result['process_status_res'] = api.execute('res.partner','run_process_target_status', [])
......
shelfs/static/js/shelf_inventory.js
......@@ -111,15 +111,23 @@ function barcode_analyzer(chars) {
}
}
function reset_previous_value() {
if (editing_item !== null) {
if (typeof editing_item.added_qties !== "undefined") {
editing_item.qty -= editing_item.added_qties.pop();
}
$('#edition_input').val(editing_item.qty);
$("#reset_to_previous_qty").hide();
}
}
/**
* Option to display an icon next to edition input to cancel last value.
* Disabled for now. Look for #reset_to_previous_qty to restore.
*
* WARNING: if you restore this functionality, update validateEdition() so
* canceling last value is ignored if edition_cancel is pressed.
*/
// function reset_previous_value() {
// if (editing_item !== null) {
// if (typeof editing_item.added_qties !== "undefined") {
// editing_item.qty -= editing_item.added_qties.pop();
// }
// $('#edition_input').val(editing_item.qty);
// $("#reset_to_previous_qty").hide();
// }
// }
function refresh() {
location.reload();
}
......@@ -300,12 +308,38 @@ function clearLineEdition() {
$('#product_name').text('');
$('#edition_input').val('');
$('#search_input').focus();
$("#reset_to_previous_qty").hide();
// $("#reset_to_previous_qty").hide();
}
// Validate product edition
/**
* Validate product edition.
* Keep track of every qty change.
*/
function validateEdition() {
if (editing_item != null) {
const current_val = $("#edition_input").val();
// Let's verify if quantity have been changed
if (current_val != editing_item.qty) {
if (typeof editing_item.added_qties !== "undefined") {
// total may have been affected by manual typing
const total = get_added_qties_sum(editing_item);
if (current_val != total) {
// add difference in added_qties array
editing_item.added_qties.push(current_val - total);
}
} else {
// Init added_qties to take change into account
editing_item.added_qties = [
editing_item.qty,
current_val - editing_item.qty
];
}
}
editing_item.qty = current_val;
if (editProductInfo(editing_item)) {
clearLineEdition();
}
......@@ -1141,45 +1175,27 @@ function init() {
$(document.documentElement).scrollTop(scrollTo);
*/
});
if ($(this).val().length > 0) {
let reset_icon = $("#reset_to_previous_qty");
reset_icon.show();
reset_icon.off();
reset_icon.on("click", reset_previous_value);
} else {
$("#reset_to_previous_qty").hide();
}
// if ($(this).val().length > 0) {
// let reset_icon = $("#reset_to_previous_qty");
// reset_icon.show();
// reset_icon.off();
// reset_icon.on("click", reset_previous_value);
// } else {
// $("#reset_to_previous_qty").hide();
// }
})
.on('blur', function () {
const current_val = $(this).val();
$(this).off('wheel.disableScroll');
if (editing_item !== null) {
//Let's verify if quantity have be changed
if (current_val != editing_item.qty) {
if (typeof editing_item.added_qties !== "undefined") {
// total may have been affected by manual typing
const total = get_added_qties_sum(editing_item);
if (current_val != total) {
// add difference in added_qties array
editing_item.added_qties.push(current_val - total);
}
} else {
// Init added_qties to take change into account
editing_item.added_qties = [
editing_item.qty,
current_val - editing_item.qty
];
}
}
editing_item.qty = current_val;
}
});
$("#edition_input").keypress(function(event) {
// Force validation when enter pressed in edition
if (event.keyCode == 13 || event.which == 13) {
validateEdition();
}
});
// client-side validation of numeric inputs, optionally replacing separator sign(s).
$("input.number").on("keydown", function (e) {
// allow function keys and decimal separators
......@@ -1235,7 +1251,6 @@ function init() {
}
});
$(document).pos();
$(document).on('scan.pos.barcode', function(event) {
//access `event.code` - barcode data
......
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=">
<link rel="stylesheet" href="{% static "fontawesome/css/fa-svg-with-js.css" %}?v=">
<link rel="stylesheet" href="{% static "css/common.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "fontawesome/css/fa-svg-with-js.css" %}?v=1651853225">
{% if custom_css.all %}
{% for fpath in custom_css.all %}
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=">
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=1651853225">
{% endfor %}
{% endif %}
......
templates/envelops/index.html
......@@ -2,7 +2,7 @@
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/envelops.css" %}?v=">
<link rel="stylesheet" href="{% static "css/envelops.css" %}?v=1651853225">
{% endblock %}
{% block additionnal_scripts %}
......@@ -159,6 +159,6 @@
auto_compaction: false
});
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/envelops.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/envelops.js" %}?v=1651853225"></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="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src='{% static "js/custom_lists.js" %}?v='></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>
{% endblock %}
templates/inventory/index.html
......@@ -94,9 +94,9 @@
auto_compaction: false
});
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/products_common.js" %}?v="></script>
<script src="{% static "js/inventory.js" %}?v="></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>
{% 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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v="></script>
<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>
{% endblock %}
{% block content %}
......@@ -46,5 +46,5 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
{% endblock %}
templates/members/admin/manage_attached.html
......@@ -39,7 +39,7 @@
</div>
</div>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/admin/manage_attached.js" %}?v='></script>
<script src='{% static "js/admin/bdm_index.js" %}?v='></script>
<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>
{% 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='></script>
<script src='{% static "js/admin/manage_attached.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1651853225'></script>
{% endblock %}
templates/members/admin/manage_attached_delete_pair.html
......@@ -73,6 +73,6 @@
</div>
</div>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/admin/manage_attached.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_attached.js" %}?v=1651853225'></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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
{% endblock %}
{% block content %}
......@@ -59,6 +59,6 @@
<div id="templates" style="display:none;"></div>
</div>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/admin/manage_makeups.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_makeups.js" %}?v=1651853225'></script>
{% endblock %}
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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
{% endblock %}
{% block content %}
......@@ -97,7 +97,7 @@
var couchdb_server = '{{couchdb_server}}' + couchdb_dbname;
var ASSOCIATE_MEMBER_SHIFT = '{{ASSOCIATE_MEMBER_SHIFT}}';
</script>
<script src='{% static "js/common.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/admin/manage_regular_shifts.js" %}?v='></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>
{% 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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
{% endblock %}
{% block content %}
......@@ -54,6 +54,6 @@
<div id="templates" style="display:none;"></div>
</div>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/admin/manage_shift_registrations.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/admin/manage_shift_registrations.js" %}?v=1651853225'></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=">
<link rel="stylesheet" href="{% static ''|add:fpath %}?v=1651853225">
{% 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=">
<link rel="stylesheet" href="{% static 'css/member.css' %}?v=1651853225">
{{ block.super }}
{% endblock %}
{% block additionnal_scripts %}
......@@ -26,7 +26,7 @@
</script>
<script src="{% static "js/JsBarcode.all.min.js" %}">
</script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script defer src="{% static "fontawesome/js/fontawesome-all.js" %}"></script>
{% endblock %}
......@@ -268,6 +268,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="></script>
<script src="{% static "js/members.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/members.js" %}?v=1651853225"></script>
{% endblock %}
templates/members/inscriptions.html
{% extends "members/base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=">
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=1651853225">
<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;}
......@@ -184,8 +184,8 @@
var committees_shift_id = '{{committees_shift_id}}';
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/inscriptions.js" %}?v="></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>
{% endblock %}
templates/members/manage_mess.html
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/manage_mess.css" %}?v=">
<link rel="stylesheet" href="{% static "css/manage_mess.css" %}?v=1651853225">
{% endblock %}
{% block additionnal_scripts %}
<script src="{% static "js/sha1.min.js" %}?v="></script>
<script src="{% static "js/sha1.min.js" %}?v=1651853225"></script>
{% endblock %}
{% block content %}
{% include "common/conn_admin.html" %}
......@@ -62,8 +62,8 @@
});
</script>
{% endif %}
<script src="{% static "js/all_common.js" %}"?v=></script>
<script src="{% static "js/common.js" %}"?v=></script>
<script src="{% static "js/all_common.js" %}"?v=1651853225></script>
<script src="{% static "js/common.js" %}"?v=1651853225></script>
<script src="{% static "js/manage_mess.js" %}?v="></script>
<script src="{% static "js/manage_mess.js" %}?v=1651853225"></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=">
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=">
<link rel="stylesheet" href="{% static "css/inscriptions.css" %}?v=1651853225">
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=1651853225">
<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=></script>
<script src="{% static "js/common.js" %}"?v=></script>
<script src="{% static "js/subscription_common.js" %}"?v=></script>
<script src="{% static "js/prepa_odoo.js" %}?v="></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>
{% endblock %}
templates/members/validation_coop.html
{% extends "base.html" %}
{% load static %}
{% block additionnal_css %}
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=">
<link rel="stylesheet" href="{% static "css/prepa_odoo.css" %}?v=1651853225">
{% 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=></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/subscription_common.js" %}?v="></script>
<script src="{% static "js/subscription_validation.js" %}?v="></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>
</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=">
<link rel="stylesheet" href="{% static "css/members-space-my-shifts.css" %}?v=">
<link rel="stylesheet" href="{% static "css/members-space-faq.css" %}?v=">
<link rel="stylesheet" href="{% static "css/members-space-my-info.css" %}?v=">
<link rel="stylesheet" href="{% static "css/members-space-shifts-exchange.css" %}?v=">
<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">
{% endblock %}
{% block additionnal_scripts %}
......@@ -154,11 +154,11 @@
};
var block_actions_for_attached_people = '{{block_actions_for_attached_people}}';
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/members-space-home.js" %}?v="></script>
<script src="{% static "js/members-space-my-info.js" %}?v="></script>
<script src="{% static "js/members-space-my-shifts.js" %}?v="></script>
<script src="{% static "js/members-space-faq.js" %}?v="></script>
<script src="{% static "js/members-space-shifts-exchange.js" %}?v="></script>
<script src="{% static "js/members-space.js" %}?v="></script>
<script src="{% static "js/all_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>
{% 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="></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/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'quill/quill.min.js' %}"></script>
{% endblock %}
......@@ -370,6 +370,6 @@
var odoo_server = '{{odoo_server}}';
var metabase_url = '{{metabase_url}}';
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script type="text/javascript" src="{% static 'js/orders_helper.js' %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/orders_helper.js' %}?v=1651853225"></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='></script>
<script src='{% static "js/module_config.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/module_config.js" %}?v=1651853225'></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="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></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='></script>
<script src='{% static "js/monitor.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/monitor.js" %}?v=1651853225'></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="></script>
<script src="{% static "js/destocking.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/destocking.js" %}?v=1651853225"></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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v="></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>
{% 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="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
{% endblock %}
templates/products/sales.html
......@@ -46,6 +46,6 @@
console.log(e)
}
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/pos_product_sales.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/pos_product_sales.js" %}?v=1651853225"></script>
{% endblock %}
templates/reception/index.html
......@@ -64,12 +64,12 @@
</div>
<br/>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></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="></script>
<script type="text/javascript" src="{% static 'js/reception_index.js' %}?v=1651853225"></script>
{% endblock %}
templates/reception/reception_produits.html
......@@ -199,7 +199,7 @@
var add_all_left_is_good_qties = "{{ADD_ALL_LEFT_IS_GOOD_QTIES}}"
var add_all_left_is_good_prices = "{{ADD_ALL_LEFT_IS_GOOD_PRICES}}"
</script>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src='{% static "js/barcodes.js" %}?v='></script>
<script type="text/javascript" src="{% static 'js/reception_produits.js' %}?v="></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>
{% 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=">
<link rel="stylesheet" href="{% static "css/sales.css" %}?v=1651853225">
{% endblock %}
{% block additionnal_scripts %}
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v="></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/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="></script>
<script src="{% static "js/sales.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/sales.js" %}?v=1651853225"></script>
{% endblock %}
templates/shelfs/admin.html
......@@ -86,9 +86,9 @@
}
</script>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/barcodes.js" %}?v='></script>
<script src='{% static "js/shelfs_admin.js" %}?v='></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>
{% 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="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
{% if SHELFS_SCRIPT %}
<script src="{% static 'js/'|add:SHELFS_SCRIPT|add:'.js' %}?v="></script>
<script src="{% static 'js/'|add:SHELFS_SCRIPT|add:'.js' %}?v=1651853225"></script>
{% else %}
<script src="{% static 'js/shelfs_index.js' %}?v="></script>
<script src="{% static 'js/shelfs_index.js' %}?v=1651853225"></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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v=1651853225"></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="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src='{% static "js/barcodes.js" %}?v='></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 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="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></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=' rel='stylesheet' />
<link href='{% static "css/shift_Cagette.css" %}?v=1651853225' 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="></script>
<script src="{% static "js/shift_exchange.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/shift_exchange.js" %}?v=1651853225"></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=' rel='stylesheet' />
<link href='{% static "css/shift_Cagette.css" %}?v=1651853225' 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="></script>
<script src="{% static "js/shift_states_not_allowed.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/shift_states_not_allowed.js" %}?v=1651853225"></script>
{% endblock %}
templates/shop/admin.html
......@@ -159,8 +159,8 @@
auto_compaction: false
});
</script>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/shop_admin.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/shop_admin.js" %}?v=1651853225'></script>
{% endblock %}
templates/shop/drafts.html
......@@ -141,8 +141,8 @@
auto_compaction: false
});
</script>
<script src='{% static "js/all_common.js" %}?v='></script>
<script src='{% static "js/shop_drafts.js" %}?v='></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script>
<script src='{% static "js/shop_drafts.js" %}?v=1651853225'></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="></script>
<script type="text/javascript" src="{% static 'js/shop.js' %}?v="></script>
<script src="{% static 'js/all_common.js' %}?v=1651853225"></script>
<script type="text/javascript" src="{% static 'js/shop.js' %}?v=1651853225"></script>
{% endblock %}
templates/stock/stock_breakingArticleSet.html
......@@ -32,6 +32,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
{% endblock %}
templates/stock/stock_listArticleBreaking.html
......@@ -22,8 +22,8 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></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="></script>
<script type="text/javascript" src="{% static 'js/notify.min.js' %}?v="></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>
{% endblock %}
{% block content %}
......@@ -100,6 +100,6 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src='{% static "js/barcodes.js" %}?v='></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src='{% static "js/barcodes.js" %}?v=1651853225'></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="></script>
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v="></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>
{% endblock %}
{% block content %}
......@@ -53,5 +53,5 @@
</div>
</div>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
{% endblock %}
templates/stock/stock_order.html
......@@ -44,8 +44,8 @@
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
{% endblock %}
......
templates/stock/stock_saleWithNotSale.html
......@@ -23,6 +23,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></script>
{% endblock %}
templates/stock/stock_stockQuantLastSale.html
......@@ -23,6 +23,6 @@
<br/>
<br/>
<script src="{% static "js/all_common.js" %}?v="></script>
<script src="{% static "js/common.js" %}?v="></script>
<script src="{% static "js/all_common.js" %}?v=1651853225"></script>
<script src="{% static "js/common.js" %}?v=1651853225"></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=">
<link rel="stylesheet" href="{% static "css/info_perso.css" %}?v=1651853225">
{% endblock %}
{% block additionnal_scripts %}
......@@ -151,6 +151,6 @@
{% endif %}
</div>
</div>
<script src="{% static 'js/all_common.js' %}?v="></script>
<script src="{% static 'js/info_perso.js' %}?v="></script>
<script src="{% static 'js/all_common.js' %}?v=1651853225"></script>
<script src="{% static 'js/info_perso.js' %}?v=1651853225"></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