From d4ac8e7c197a43493adf042f5d02223c4dc99e1e Mon Sep 17 00:00:00 2001 From: RomainLibert Date: Mon, 2 Jul 2018 12:01:32 +0200 Subject: [PATCH 1/3] [IMP] stock: change demo data for better graph and cohort views --- addons/stock/data/stock_demo2.xml | 133 +++++++++++++++++++++++++++--- 1 file changed, 120 insertions(+), 13 deletions(-) diff --git a/addons/stock/data/stock_demo2.xml b/addons/stock/data/stock_demo2.xml index 7b5044cd4f7..12ed688799d 100644 --- a/addons/stock/data/stock_demo2.xml +++ b/addons/stock/data/stock_demo2.xml @@ -65,10 +65,11 @@ - + outgoing shipment main_warehouse + outgoing shipment - + outgoing shipment your_company warehouse - + your company warehouse + + + + outgoing shipment + + + + + + + + + + outgoing shipment + + + + + + + + + + outgoing shipment + + + + + + + @@ -161,6 +238,7 @@ + - - + + incoming_chicago_warehouse + @@ -243,6 +322,7 @@ + chicago_warehouse - + outgoing_chicago_warehouse - + outgoing_shipment_chicago_warehouse - + chicago_warehouse - + outgoing chicago warehouse + @@ -394,9 +478,32 @@ + obj().env.ref('stock.outgoing_chicago_warehouse1').id, + obj().env.ref('stock.outgoing_chicago_warehouse2').id]"/> + + + + + + + + + + + + + + + + + + + From 76715e7871ba091dbd0a62d42cdf1a0dfda3405a Mon Sep 17 00:00:00 2001 From: RomainLibert Date: Tue, 3 Jul 2018 10:03:49 +0200 Subject: [PATCH 2/3] [IMP] stock_picking_batch: add picking type to pickings demo --- addons/stock_picking_batch/data/stock_picking_batch_demo.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml index 6e19b156389..ddb333c02ac 100644 --- a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml +++ b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml @@ -43,6 +43,7 @@ A first stock move + @@ -52,6 +53,7 @@ A second stock move + @@ -61,6 +63,7 @@ A third stock move + @@ -70,6 +73,7 @@ A fourth stock move + From cf7518f1fe9ed822d0acb055c0a52e0391b2ca5b Mon Sep 17 00:00:00 2001 From: RomainLibert Date: Tue, 24 Jul 2018 13:23:50 +0200 Subject: [PATCH 3/3] [IMP] web: use true and false as values for boolean group by In the graph view, by default the value false was considered to be a non set value (which is the case when dealing with M2O fields). But in the case of boolean fields, we want to display the value false. --- addons/web/static/src/js/views/graph/graph_model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views/graph/graph_model.js b/addons/web/static/src/js/views/graph/graph_model.js index dd7d0efa28f..eb831d5047a 100644 --- a/addons/web/static/src/js/views/graph/graph_model.js +++ b/addons/web/static/src/js/views/graph/graph_model.js @@ -202,7 +202,7 @@ return AbstractModel.extend({ * @returns {string} */ _sanitizeValue: function (value, field) { - if (value === false) return _t("Undefined"); + if (value === false && this.fields[field].type !== 'boolean') return _t("Undefined"); if (value instanceof Array) return value[1]; if (field && this.fields[field] && (this.fields[field].type === 'selection')) { var selected = _.where(this.fields[field].selection, {0: value})[0];