Commit 33a60aed by François C.

Merge branch 'ticket_418' into 'dev_cooperatic'

Ticket 418 - Affichage de la qté commandée dans la colonne qté lors de la réception

See merge request cooperatic-foodcoops/third-party!27
parents cb26c336 d7f39d23
...@@ -291,7 +291,6 @@ function initLists() { ...@@ -291,7 +291,6 @@ function initLists() {
dom: 'lrtip', // Remove the search input from that table dom: 'lrtip', // Remove the search input from that table
language: {url : '/static/js/datatables/french.json'} language: {url : '/static/js/datatables/french.json'}
}); });
// Init table for processed content // Init table for processed content
table_processed = $('#table_processed').DataTable({ table_processed = $('#table_processed').DataTable({
data: list_processed, data: list_processed,
...@@ -327,8 +326,13 @@ function initLists() { ...@@ -327,8 +326,13 @@ function initLists() {
{ {
data:"product_qty", data:"product_qty",
title:"Qté", title:"Qté",
className:"dt-body-center", className:"dt-head-center dt-body-center",
visible: (reception_status == "False") visible: (reception_status == "False"),
render: function (data, type, full) {
let disp = [full.product_qty, (full.old_qty !== undefined)?full.old_qty:full.product_qty].join("/");
return disp;
},
orderable: false
}, },
{ {
data:"price_unit", data:"price_unit",
......
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