Commit c51fa922 by François C.

Fix error found during tests (should not occur if odoo database is not rewind)

parent ad361176
Pipeline #1193 passed with stage
in 1 minute 23 seconds
...@@ -285,7 +285,9 @@ function group_action() { ...@@ -285,7 +285,9 @@ function group_action() {
* Remove the grouped orders from the order table to prevent grouping in multiple groups. * Remove the grouped orders from the order table to prevent grouping in multiple groups.
*/ */
function display_grouped_orders() { function display_grouped_orders() {
if (table_orders !== null) { if (table_orders !== null) {
var display_something = true;
$('#groups_items').empty(); $('#groups_items').empty();
let groups_display_content = "<ul>"; let groups_display_content = "<ul>";
...@@ -307,34 +309,39 @@ function display_grouped_orders() { ...@@ -307,34 +309,39 @@ function display_grouped_orders() {
} }
} }
} }
if (group_orders.length > 0) {
// Display group
document.getElementById("container_groups").hidden = false;
let group_row = `<li class="group_line"> Commandes de `;
for (let i in group_orders) {
if (i == group_orders.length-1) { // last element of list
group_row += "<b>" + group_orders[i].partner + "</b> du " + group_orders[i].date_order + " : ";
} else {
group_row += "<b>" + group_orders[i].partner + "</b> du " + group_orders[i].date_order + ", ";
}
}
// Display group if (group_orders[0].reception_status == 'False') {
document.getElementById("container_groups").hidden = false; group_row += "<button class='btn--primary' onClick='group_goto("
let group_row = `<li class="group_line"> Commandes de `; + group_index
+ ")'>Compter les produits</button>";
for (let i in group_orders) {
if (i == group_orders.length-1) { // last element of list
group_row += "<b>" + group_orders[i].partner + "</b> du " + group_orders[i].date_order + " : ";
} else { } else {
group_row += "<b>" + group_orders[i].partner + "</b> du " + group_orders[i].date_order + ", "; group_row += "<button class='btn--success' onClick='group_goto("
+ group_index
+ ")'>Mettre à jour les prix</button>";
} }
}
if (group_orders[0].reception_status == 'False') { group_row += "</li>";
group_row += "<button class='btn--primary' onClick='group_goto(" groups_display_content += group_row;
+ group_index
+ ")'>Compter les produits</button>";
} else { } else {
group_row += "<button class='btn--success' onClick='group_goto(" display_something = false; // occured making test form local django and preprod (couchdb, odoo)
+ group_index
+ ")'>Mettre à jour les prix</button>";
} }
group_row += "</li>";
groups_display_content += group_row;
} }
$('#container_groups').show(); if (display_something === true) {
$('#groups_items').append(groups_display_content); $('#container_groups').show();
$('#groups_items').append(groups_display_content);
}
} }
} }
......
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