From 5f7030fc446c30f7996b32c9ffed006882a31d42 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Aug 2017 14:37:50 +0200
Subject: [PATCH 001/119] [FIX] stock: move name length

- Create a stockable product with a long description (> 3000
  characters)
- Validate the SO

An error is raised because the stock move name is too long.

The stock move name is taken from the procurement name, which is itself
taken from the SO line description. However, the stock move name is an
indexed field and therefore its length is limited (to 2712 characters by
default).

We truncate the move name to 2000 characters. Actually, there is no real
point to so many characters, nor its indexing.

opw-767040
---
 addons/stock/models/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py
index c1ea59f239a..4d3e78aa75c 100644
--- a/addons/stock/models/procurement.py
+++ b/addons/stock/models/procurement.py
@@ -151,7 +151,7 @@ class ProcurementOrder(models.Model):
         qty_done = sum(self.move_ids.filtered(lambda move: move.state == 'done').mapped('product_uom_qty'))
         qty_left = max(self.product_qty - qty_done, 0)
         return {
-            'name': self.name,
+            'name': self.name[:2000],
             'company_id': self.rule_id.company_id.id or self.rule_id.location_src_id.company_id.id or self.rule_id.location_id.company_id.id or self.company_id.id,
             'product_id': self.product_id.id,
             'product_uom': self.product_uom.id,

From 388e258ce8c2a4fbd5e2ec5ec746bb91ca48d97f Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 21 Dec 2016 16:35:09 +0100
Subject: [PATCH 002/119] [FIX] web: rotate graph label

When there are too many labels to display on the x-axis, they overlap
and it simply becomes unreadable. By slightly rotating them, this can be
avoided in most cases.

opw-697625
opw-697626
---
 addons/web/static/src/js/views/graph_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index db6418fd15a..2aa98965329 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -166,7 +166,7 @@ return Widget.extend({
         var chart = nv.models.multiBarChart();
         var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
-          margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length},
+          margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length, bottom: 60},
           delay: 250,
           transition: 10,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
@@ -175,7 +175,7 @@ return Widget.extend({
           rightAlignYAxis: false,
           stacked: this.stacked,
           reduceXTicks: false,
-          // rotateLabels: 40,
+          rotateLabels: -20,
           showControls: (this.groupbys.length > 1)
         });
         chart.yAxis.tickFormat(function(d) { return formats.format_value(d, { type : 'float' });});

From ffd43386393f493cd098339c9cb3f812dea1dd5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Wed, 23 Aug 2017 10:56:57 +0200
Subject: [PATCH 003/119] [FIX] web_kanban: allow special chaaracters in kanban
 tooltip

---
 addons/web_kanban/static/src/js/kanban_column.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban_column.js b/addons/web_kanban/static/src/js/kanban_column.js
index f848c266944..b4fa2e8d010 100644
--- a/addons/web_kanban/static/src/js/kanban_column.js
+++ b/addons/web_kanban/static/src/js/kanban_column.js
@@ -65,9 +65,10 @@ var KanbanColumn = Widget.extend({
         });
 
         var self = this;
-        if (group_data.options && group_data.options.group_by_tooltip) {
-            this.tooltip_info = _.map(group_data.options.group_by_tooltip, function (key, value, list) {
-                return (self.values && self.values[value] && "<div>" +key + "<br>" + self.values[value] + "</div>") || '';
+        if (group_data.options && group_data.options.group_by_tooltip && this.values) {
+            this.tooltip_info = _.map(group_data.options.group_by_tooltip, function (key, value) {
+                if (!self.values[value]) { return ''; }
+                return $('<div>').text(key + '<br>' + self.values[value]).text();
             }).join('');
         } else {
             this.tooltip_info = "";

From 6797d6a7c639c22f9987207481accee9b9b5b486 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Tue, 22 Aug 2017 13:41:12 +0200
Subject: [PATCH 004/119] [FIX] web: don't save empty required x2manys

Before this commit, the same function was called at the rendering and at the writing of a field.
It caused a field that should be displayed all the time (field is never false) to ignore its required attribute, in particular with one2many's.

After this commit, we differentiate between the rendering function and the validate to write function, making a type of field both requirable and always displayed even if empty

OPW 766002

Closes odoo/enterprise#1306

Cherry-pick odoo/enterprise@be8e5709918b42e6c60fe0327329f855a29f5a99
---
 addons/web/static/src/js/views/form_common.js       | 13 ++++++++++++-
 .../static/src/js/views/form_relational_widgets.js  | 12 ++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js
index 6752885f372..3ed2e77e695 100644
--- a/addons/web/static/src/js/views/form_common.js
+++ b/addons/web/static/src/js/views/form_common.js
@@ -716,7 +716,7 @@ var AbstractField = FormWidget.extend(FieldInterface, {
         }
     },
     _toggle_label: function() {
-        var empty = this.get('effective_readonly') && this.is_false();
+        var empty = this.get('effective_readonly') && !this.is_set();
         this.$label.toggleClass('o_form_label_empty', empty).toggleClass('o_form_label_false', this.get('effective_readonly') && this.get('value') === false);
         this.$el.toggleClass('o_form_field_empty', empty);
     },
@@ -755,10 +755,21 @@ var AbstractField = FormWidget.extend(FieldInterface, {
     /**
      * Method useful to implement to ease validity testing. Must return true if the current
      * value is similar to false in OpenERP.
+     * Used at write time, in particular when the field is required
      */
     is_false: function() {
         return this.get('value') === false;
     },
+
+    /**
+     *  Method called at rendering time to determine if the field should be
+     *  displayed (non-empty) or not (empty)
+     *  We test the same thing as is_false but with different semantics
+     */
+    is_set: function() {
+        return !this.is_false();
+    },
+
     _check_css_flags: function() {
         var show_translate = (!this.get('effective_readonly') && this.field_manager.get('actual_mode') !== "create");
         this.$translate.toggleClass('o_translate_active', !!show_translate);
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 9a24eef6ae5..722ef2f4932 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -345,8 +345,8 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com
         if (!this.get("effective_readonly")) {
             this.$input.val(noValue ? "" : (str.split("\n")[0].trim() || $(data.noDisplayContent).text()));
             this.current_display = this.$input.val();
-            this.$follow_button.toggle(!this.is_false());
-            this.$el.toggleClass('o_with_button', !!this.$follow_button && this.$follow_button.length > 0 && !this.is_false());
+            this.$follow_button.toggle(this.is_set());
+            this.$el.toggleClass('o_with_button', !!this.$follow_button && this.$follow_button.length > 0 && this.is_set());
         } else {
             this.$el.html(noValue ? "" : (_.escape(str.trim()).split("\n").join("<br/>") || data.noDisplayContent));
             // Define callback to perform when clicking on the field
@@ -871,6 +871,10 @@ var FieldX2Many = AbstractManyField.extend({
     is_false: function () {
         return _(this.dataset.ids).isEmpty();
     },
+    is_set: function() {
+        // always consider that field is "set" hence displayed
+        return true;
+    },
 });
 
 var X2ManyDataSet = data.BufferedDataSet.extend({
@@ -1697,6 +1701,10 @@ var FieldMany2ManyCheckBoxes = AbstractManyField.extend(common.ReinitializeField
     is_false: function() {
         return false;
     },
+    is_set: function() {
+        // always consider that field is "set" hence displayed
+        return true;
+    },
 });
 
 core.form_widget_registry

From 9214d7815267d6bdad954f7e94a4bf187cea35bc Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 23 Aug 2017 17:59:04 +0200
Subject: [PATCH 005/119] [FIX] board: height of graph

When a graph is added to the dashboard, it doesn't have a minimum
height set, so only the label and the axis are displayed, not the
content.

opw-766454
---
 addons/board/static/src/less/dashboard.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/board/static/src/less/dashboard.less b/addons/board/static/src/less/dashboard.less
index 36f0727c0ac..855da1d2acc 100644
--- a/addons/board/static/src/less/dashboard.less
+++ b/addons/board/static/src/less/dashboard.less
@@ -114,6 +114,11 @@
             .o_kanban_view .o_kanban_record .oe_kanban_list_many2many .o_form_field_many2manytags {
                 border: none;
             }
+
+            // Override height of graph. min-height doesn't do the trick
+            .o_graph {
+                height: 500px;
+            }
         }
     }
 }

From acb9d60d944f21606ee4a9decb752a7a24c65d9d Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 22 Aug 2017 08:45:52 +0200
Subject: [PATCH 006/119] [FIX] web: Pivot: handle __count__ measure

The former implementation of the Pivot view used __count__ as
magic field to display the number of records in groups. However,
in filters defined in xml, __count is used instead of __count__,
so it crashed when such filters were activated.

With the new views, we made those filters work by using __count.
However, if a user saved filters using __count__ at that time as
favorite, activating them in the new views produces a crash as
well.

This rev. adds a compatibility layer to ensure that the pivot
view handles both __count__ and __count measures uniformly.
---
 .../static/src/js/views/pivot/pivot_model.js  | 13 ++++++++-
 addons/web/static/tests/views/pivot_tests.js  | 29 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index d74af7fee22..13275926c02 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -222,6 +222,17 @@ var PivotModel = AbstractModel.extend({
      * @returns {Deferred}
      */
     load: function (params) {
+        // In the preview implementation of the pivot view (a.k.a. version 2),
+        // the virtual field used to display the number of records was named
+        // __count__, whereas __count is actually the one used in xml. So
+        // basically, activating a filter specifying __count as measures crashed.
+        // Unfortunately, as __count__ was used in the JS, all filters saved as
+        // favorite at that time were saved with __count__, and not __count.
+        // So in order the make them still work with the new implementation, we
+        // simply rename __count__ into __count at this unique entry point.
+        var measures = _.map(params.measures, function (measure) {
+            return measure === '__count__' ? '__count' : measure;
+        });
         this.initialDomain = params.domain;
         this.initialRowGroupBys = params.rowGroupBys;
         this.fields = params.fields;
@@ -231,7 +242,7 @@ var PivotModel = AbstractModel.extend({
             context: _.extend({}, session.user_context, params.context),
             groupedBy: params.groupedBy,
             colGroupBys: params.colGroupBys,
-            measures: params.measures,
+            measures: measures,
             sorted_column: {},
         };
         this.defaultGroupedBy = params.groupedBy;
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index 267437845b0..eb2b18f7d71 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -859,4 +859,33 @@ QUnit.module('Views', {
         pivot.destroy();
     });
 
+    QUnit.test('pivot still handles __count__ measure', function (assert) {
+        // for retro-compatibility reasons, the pivot view still handles
+        // '__count__' measure.
+        assert.expect(2);
+
+        var pivot = createView({
+            View: PivotView,
+            model: "partner",
+            data: this.data,
+            arch: '<pivot></pivot>',
+            mockRPC: function (route, args) {
+                if (args.method === 'read_group') {
+                    assert.deepEqual(args.kwargs.fields, ['__count'],
+                        "should make a read_group with field __count");
+                }
+                return this._super(route, args);
+            },
+            viewOptions: {
+                context: {
+                    pivot_measures: ['__count__'],
+                },
+            },
+        });
+
+        var $countMeasure = pivot.$buttons.find('li[data-field=__count]');
+        assert.ok($countMeasure.hasClass('selected'), "The count measure should be activated");
+
+        pivot.destroy();
+    });
 });});

From 42f22a21614ee7967b900736001b8e68b8ad756e Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 22 Aug 2017 14:33:25 +0200
Subject: [PATCH 007/119] [FIX] web: read context when reloading Graph or Pivot
 views

Before this rev., keys like pivot_measures, graph_mode..., were
correctly took into account at first load of Pivot or Graph view,
but not at reload.

Those keys are particularily useful when a user saves a research
to its favorites. When such a favorite is selected, the view is
reloaded and the interesting information is in the context.
---
 .../src/js/views/graph/graph_controller.js    | 10 ++++
 .../static/src/js/views/graph/graph_model.js  | 15 ++++--
 .../static/src/js/views/graph/graph_view.js   |  8 ++--
 .../static/src/js/views/pivot/pivot_model.js  | 48 +++++++++++++------
 .../static/src/js/views/pivot/pivot_view.js   |  6 +--
 addons/web/static/tests/views/graph_tests.js  | 46 ++++++++++++++++++
 addons/web/static/tests/views/pivot_tests.js  | 47 ++++++++++++++++++
 7 files changed, 154 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/views/graph/graph_controller.js b/addons/web/static/src/js/views/graph/graph_controller.js
index d68808bac1d..77e3f1e7a40 100644
--- a/addons/web/static/src/js/views/graph/graph_controller.js
+++ b/addons/web/static/src/js/views/graph/graph_controller.js
@@ -101,11 +101,21 @@ var GraphController = AbstractController.extend({
             self._updateButtons();
         });
     },
+    /**
+     * @private
+     */
+    _update: function () {
+        this._updateButtons();
+        return this._super.apply(this, arguments);
+    },
     /**
      * makes sure that the buttons in the control panel matches the current
      * state (so, correct active buttons and stuff like that)
      */
     _updateButtons: function () {
+        if (!this.$buttons) {
+            return;
+        }
         var state = this.model.get();
         this.$buttons.find('.o_graph_button').removeClass('active');
         this.$buttons
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 50e9f224697..a6d2b057d0e 100644
--- a/addons/web/static/src/js/views/graph/graph_model.js
+++ b/addons/web/static/src/js/views/graph/graph_model.js
@@ -55,14 +55,15 @@ return AbstractModel.extend({
      *   to keep track of various entities.
      */
     load: function (params) {
-        this.initialGroupBys = params.groupBys;
+        var groupBys = params.context.graph_groupbys || params.groupBys;
+        this.initialGroupBys = groupBys;
         this.fields = params.fields;
         this.modelName = params.modelName;
         this.chart = {
             data: [],
-            groupedBy: params.groupedBy.length ? params.groupedBy : params.groupBys,
-            measure: params.measure,
-            mode: params.mode,
+            groupedBy: params.groupedBy.length ? params.groupedBy : groupBys,
+            measure: params.context.graph_measure || params.measure,
+            mode: params.context.graph_mode || params.mode,
             domain: params.domain,
             context: params.context,
         };
@@ -85,6 +86,12 @@ return AbstractModel.extend({
      * @returns {Deferred}
      */
     reload: function (handle, params) {
+        if ('context' in params) {
+            this.chart.context = params.context;
+            this.chart.groupedBy = params.context.graph_groupbys || this.chart.groupedBy;
+            this.chart.measure = params.context.graph_measure || this.chart.measure;
+            this.chart.mode = params.context.graph_mode || this.chart.mode;
+        }
         if ('domain' in params) {
             this.chart.domain = params.domain;
         }
diff --git a/addons/web/static/src/js/views/graph/graph_view.js b/addons/web/static/src/js/views/graph/graph_view.js
index 08b5ce1968f..423d52ca64c 100644
--- a/addons/web/static/src/js/views/graph/graph_view.js
+++ b/addons/web/static/src/js/views/graph/graph_view.js
@@ -27,7 +27,7 @@ var GraphView = AbstractView.extend({
     /**
      * @override
      */
-    init: function (viewInfo, params) {
+    init: function (viewInfo) {
         this._super.apply(this, arguments);
 
         var measure;
@@ -57,9 +57,9 @@ var GraphView = AbstractView.extend({
         this.controllerParams.measures = measures;
         this.rendererParams.stacked = viewInfo.arch.attrs.stacked !== "False";
 
-        this.loadParams.mode = params.context.graph_mode || viewInfo.arch.attrs.type || 'bar';
-        this.loadParams.measure = params.context.graph_measure || measure || '__count__';
-        this.loadParams.groupBys = params.context.graph_groupbys || groupBys || [];
+        this.loadParams.mode = viewInfo.arch.attrs.type || 'bar';
+        this.loadParams.measure = measure || '__count__';
+        this.loadParams.groupBys = groupBys || [];
         this.loadParams.fields = viewInfo.fields;
     },
 });
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 13275926c02..7eb2ba4bc6b 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -222,27 +222,16 @@ var PivotModel = AbstractModel.extend({
      * @returns {Deferred}
      */
     load: function (params) {
-        // In the preview implementation of the pivot view (a.k.a. version 2),
-        // the virtual field used to display the number of records was named
-        // __count__, whereas __count is actually the one used in xml. So
-        // basically, activating a filter specifying __count as measures crashed.
-        // Unfortunately, as __count__ was used in the JS, all filters saved as
-        // favorite at that time were saved with __count__, and not __count.
-        // So in order the make them still work with the new implementation, we
-        // simply rename __count__ into __count at this unique entry point.
-        var measures = _.map(params.measures, function (measure) {
-            return measure === '__count__' ? '__count' : measure;
-        });
         this.initialDomain = params.domain;
-        this.initialRowGroupBys = params.rowGroupBys;
+        this.initialRowGroupBys = params.context.pivot_row_groupby || params.rowGroupBys;
         this.fields = params.fields;
         this.modelName = params.modelName;
         this.data = {
             domain: params.domain,
             context: _.extend({}, session.user_context, params.context),
             groupedBy: params.groupedBy,
-            colGroupBys: params.colGroupBys,
-            measures: measures,
+            colGroupBys: params.context.pivot_column_groupby || params.colGroupBys,
+            measures: this._processMeasures(params.context.pivot_measures) || params.measures,
             sorted_column: {},
         };
         this.defaultGroupedBy = params.groupedBy;
@@ -256,6 +245,12 @@ var PivotModel = AbstractModel.extend({
      */
     reload: function (handle, params) {
         var self = this;
+        if ('context' in params) {
+            this.data.context = params.context;
+            this.data.colGroupBys = params.context.pivot_column_groupby || this.data.colGroupBys;
+            this.data.groupedBy = params.context.pivot_row_groupby || this.data.groupedBy;
+            this.data.measures = this._processMeasures(params.context.pivot_measures) || this.data.measures;
+        }
         if ('domain' in params) {
             this.data.domain = params.domain;
         } else {
@@ -272,7 +267,7 @@ var PivotModel = AbstractModel.extend({
         var old_col_root = this.data.main_col.root;
         return this._loadData().then(function () {
             var new_groupby_length;
-            if (!('groupBy' in params)) {
+            if (!('groupBy' in params) && !('pivot_row_groupby' in (params.context || {}))) {
                 // we only update the row groupbys according to the old groupbys
                 // if we don't have the key 'groupBy' in params.  In that case,
                 // we want to have the full open state for the groupbys.
@@ -659,6 +654,29 @@ var PivotModel = AbstractModel.extend({
         this.data.main_row.root = main_row_header;
         this.data.main_col.root = main_col_header;
     },
+    /**
+     * In the preview implementation of the pivot view (a.k.a. version 2),
+     * the virtual field used to display the number of records was named
+     * __count__, whereas __count is actually the one used in xml. So
+     * basically, activating a filter specifying __count as measures crashed.
+     * Unfortunately, as __count__ was used in the JS, all filters saved as
+     * favorite at that time were saved with __count__, and not __count.
+     * So in order the make them still work with the new implementation, we
+     * handle both __count__ and __count.
+     *
+     * This function replaces in the given array of measures occurences of
+     * '__count__' by '__count'.
+     *
+     * @param {Array[string] || undefined} measures
+     * @return {Array[string] || undefined}
+     */
+    _processMeasures: function (measures) {
+        if (measures) {
+            return _.map(measures, function (measure) {
+                return measure === '__count__' ? '__count' : measure;
+            });
+        }
+    },
     /**
      * Format a value to a usable string, for the renderer to display.
      *
diff --git a/addons/web/static/src/js/views/pivot/pivot_view.js b/addons/web/static/src/js/views/pivot/pivot_view.js
index 356672081d9..7e4dddc4a52 100644
--- a/addons/web/static/src/js/views/pivot/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot/pivot_view.js
@@ -87,9 +87,9 @@ var PivotView = AbstractView.extend({
             activeMeasures.push('__count');
         }
 
-        this.loadParams.measures = params.context.pivot_measures || activeMeasures;
-        this.loadParams.colGroupBys = params.context.pivot_column_groupby || colGroupBys;
-        this.loadParams.rowGroupBys = params.context.pivot_row_groupby || rowGroupBys;
+        this.loadParams.measures = activeMeasures;
+        this.loadParams.colGroupBys = colGroupBys;
+        this.loadParams.rowGroupBys = rowGroupBys;
         this.loadParams.fields = fields;
 
         this.controllerParams.title = params.title || arch.attrs.string || _t("Untitled");
diff --git a/addons/web/static/tests/views/graph_tests.js b/addons/web/static/tests/views/graph_tests.js
index c7d69b194ff..07f7d060347 100644
--- a/addons/web/static/tests/views/graph_tests.js
+++ b/addons/web/static/tests/views/graph_tests.js
@@ -372,6 +372,52 @@ QUnit.module('Views', {
         });
     });
 
+    QUnit.test('correctly uses graph_ keys from the context (at reload)', function (assert) {
+        var done = assert.async();
+        assert.expect(8);
+
+        var graph = createView({
+            View: GraphView,
+            model: "foo",
+            data: this.data,
+            arch: '<graph><field name="product_id"/></graph>',
+        });
+
+        assert.strictEqual(graph.renderer.state.mode, "bar", "should be in bar chart mode");
+        assert.ok(graph.$buttons.find('button[data-mode="bar"]').hasClass('active'),
+            'bar chart button should be active');
+
+        var reloadParams = {
+            context: {
+                graph_measure: 'foo',
+                graph_mode: 'line',
+                graph_groupbys: ['color_id'],
+            },
+        };
+        graph.reload(reloadParams);
+        return concurrency.delay(0).then(function () {
+            // check measure
+            assert.strictEqual(graph.$('text.nv-legend-text:contains(Foo)').length, 1,
+                "should now use the 'foo' measure");
+
+            // check mode
+            assert.strictEqual(graph.renderer.state.mode, "line", "should be in line chart mode");
+            assert.notOk(graph.$buttons.find('button[data-mode="bar"]').hasClass('active'),
+                'bar chart button should not be active');
+            assert.ok(graph.$buttons.find('button[data-mode="line"]').hasClass('active'),
+                'line chart button should be active');
+
+            // check groupbys
+            assert.strictEqual(graph.$('text:contains(xphone)').length, 0,
+                        "should not contain a text element with product in legend");
+            assert.strictEqual(graph.$('text:contains(red)').length, 1,
+                        "should contain a text element with color in legend");
+
+            graph.destroy();
+            done();
+        });
+    });
+
     QUnit.test('reload graph with correct fields', function (assert) {
         assert.expect(2);
 
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index eb2b18f7d71..fe8c4c5b3f9 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -825,6 +825,53 @@ QUnit.module('Views', {
         pivot.destroy();
     });
 
+    QUnit.test('correctly uses pivot_ keys from the context (at reload)', function (assert) {
+        assert.expect(8);
+
+        this.data.partner.fields.amount = {string: "Amount", type: "float"};
+
+        var pivot = createView({
+            View: PivotView,
+            model: "partner",
+            data: this.data,
+            arch: '<pivot>' +
+                        '<field name="date" interval="day" type="col"/>' +
+                        '<field name="amount" type="measure"/>' +
+                '</pivot>',
+        });
+
+        assert.strictEqual(pivot.$('tbody tr:first td.o_pivot_cell_value:last').text(), '0.00',
+            "the active measure should be amount");
+
+        var reloadParams = {
+            context: {
+                pivot_measures: ['foo'],
+                pivot_column_groupby: ['customer'],
+                pivot_row_groupby: ['product_id'],
+            },
+        };
+        pivot.reload(reloadParams);
+
+        assert.strictEqual(pivot.$('thead .o_pivot_header_cell_opened').length, 1,
+            "column: should have one opened header");
+        assert.strictEqual(pivot.$('thead .o_pivot_header_cell_closed:contains(First)').length, 1,
+            "column: should display one closed header with 'First'");
+        assert.strictEqual(pivot.$('thead .o_pivot_header_cell_closed:contains(Second)').length, 1,
+            "column: should display one closed header with 'Second'");
+
+        assert.strictEqual(pivot.$('tbody .o_pivot_header_cell_opened').length, 1,
+            "row: should have one opened header");
+        assert.strictEqual(pivot.$('tbody .o_pivot_header_cell_closed:contains(xphone)').length, 1,
+            "row: should display one closed header with 'xphone'");
+        assert.strictEqual(pivot.$('tbody .o_pivot_header_cell_closed:contains(xpad)').length, 1,
+            "row: should display one closed header with 'xpad'");
+
+        assert.strictEqual(pivot.$('tbody tr:first td:nth(3)').text(), '32',
+            "selected measure should be foo, with total 32");
+
+        pivot.destroy();
+    });
+
     QUnit.test('correctly use group_by key from the context', function (assert) {
         assert.expect(7);
 

From 6e4b59cc9cf2ede2ff54579d0cb672210f2b80ab Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 23 Aug 2017 16:10:44 +0200
Subject: [PATCH 008/119] [FIX] web: Form: display button box in create mode

Before this rev., the button box wasn't displayed on new (not saved
yet) records. This wasn't the case before the new views.

This is a problem in lunch, as the lunch.order form view is opened
in create mode, and the balance is displayed in the button box.
---
 addons/web/static/src/js/views/form/form_renderer.js | 4 ----
 addons/web/static/tests/views/form_tests.js          | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index 2ef0f077e09..999006e54c2 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -246,10 +246,6 @@ var FormRenderer = BasicRenderer.extend({
     _renderButtonBox: function (node) {
         var self = this;
         var $result = $('<' + node.tag + '>', { 'class': 'o_not_full' });
-        // Avoid to show buttons if we are in create mode (edit mode without res_id)
-        if (this.mode === 'edit' && !this.state.res_id) {
-            return $result;
-        }
         var buttons = _.map(node.children, function (child) {
             if (child.tag === 'button') {
                 return self._renderStatButton(child);
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index ada05e5ed28..3ceb2046756 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -2642,7 +2642,7 @@ QUnit.module('Views', {
         form.destroy();
     });
 
-    QUnit.test('button box is not rendered in create mode', function (assert) {
+    QUnit.test('button box is rendered in create mode', function (assert) {
         assert.expect(3);
 
         var form = createView({
@@ -2672,8 +2672,8 @@ QUnit.module('Views', {
         // create mode (leave edition first!)
         form.$buttons.find('.o_form_button_cancel').click();
         form.$buttons.find('.o_form_button_create').click();
-        assert.strictEqual(form.$('.oe_stat_button').length, 0,
-            "button box should not be displayed when creating a new record");
+        assert.strictEqual(form.$('.oe_stat_button').length, 1,
+            "button box should be displayed when creating a new record as well");
 
         form.destroy();
     });

From d8c897de6452114533ffe7447ff394fcaf080032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Wed, 23 Aug 2017 16:56:13 +0200
Subject: [PATCH 009/119] [FIX] sale_timesheet: uncomment forgotten code when
 testing previous fix

---
 addons/sale_timesheet/models/account.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale_timesheet/models/account.py b/addons/sale_timesheet/models/account.py
index eec7637be31..7e6e70c50b8 100644
--- a/addons/sale_timesheet/models/account.py
+++ b/addons/sale_timesheet/models/account.py
@@ -27,9 +27,9 @@ class AccountAnalyticLine(models.Model):
     @api.multi
     def write(self, values):
         # prevent to update invoiced timesheets
-        #if self.filtered(lambda timesheet: timesheet.timesheet_invoice_id):
-        #    if any([field_name in values for field_name in ['unit_amount', 'employee_id', 'task_id', 'timesheet_revenue', 'so_line', 'amount', 'date']]):
-        #        raise UserError(_('You can not modify already invoiced timesheets.'))
+        if self.filtered(lambda timesheet: timesheet.timesheet_invoice_id):
+            if any([field_name in values for field_name in ['unit_amount', 'employee_id', 'task_id', 'timesheet_revenue', 'so_line', 'amount', 'date']]):
+                raise UserError(_('You can not modify already invoiced timesheets.'))
 
         so_lines = self.mapped('so_line')
         if values.get('task_id'):

From 32aa7dc9a0e4a987aff13f93627faa7036798df3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Wed, 23 Aug 2017 14:54:26 +0200
Subject: [PATCH 010/119] [FIX] models: implement `change_default` behavior for
 fields

The behavior is no longer implemented by the web client.  Implement it
server-side as part of the onchange mechanism, simply by defining onchange
methods for the fields that have the flag.
---
 odoo/addons/test_new_api/models.py            |  2 +-
 .../test_new_api/tests/test_onchange.py       | 22 +++++++++++++++++++
 odoo/models.py                                | 12 ++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/odoo/addons/test_new_api/models.py b/odoo/addons/test_new_api/models.py
index c84827d47ce..02609521ae0 100644
--- a/odoo/addons/test_new_api/models.py
+++ b/odoo/addons/test_new_api/models.py
@@ -286,7 +286,7 @@ class Foo(models.Model):
     _name = 'test_new_api.foo'
 
     name = fields.Char()
-    value1 = fields.Integer()
+    value1 = fields.Integer(change_default=True)
     value2 = fields.Integer()
 
 
diff --git a/odoo/addons/test_new_api/tests/test_onchange.py b/odoo/addons/test_new_api/tests/test_onchange.py
index a6e2bff1b35..43c36b5b1d1 100644
--- a/odoo/addons/test_new_api/tests/test_onchange.py
+++ b/odoo/addons/test_new_api/tests/test_onchange.py
@@ -231,6 +231,28 @@ class TestOnChange(common.TransactionCase):
                       for user in discussion.participants + demo],
         )
 
+    def test_onchange_default(self):
+        """ test the effect of a conditional user-default on a field """
+        Foo = self.env['test_new_api.foo']
+        field_onchange = Foo._onchange_spec()
+        self.assertTrue(Foo._fields['value1'].change_default)
+        self.assertEqual(field_onchange.get('value1'), '1')
+
+        # create a user-defined default based on 'value1'
+        self.env['ir.values'].set_default('test_new_api.foo', 'value2', 666, condition='value1=42')
+
+        # setting 'value1' to 42 should trigger the change of 'value2'
+        self.env.invalidate_all()
+        values = {'name': 'X', 'value1': 42, 'value2': False}
+        result = Foo.onchange(values, 'value1', field_onchange)
+        self.assertEqual(result['value'], {'value2': 666})
+
+        # setting 'value1' to 24 should not trigger the change of 'value2'
+        self.env.invalidate_all()
+        values = {'name': 'X', 'value1': 24, 'value2': False}
+        result = Foo.onchange(values, 'value1', field_onchange)
+        self.assertEqual(result['value'], {})
+
     def test_onchange_one2many_value(self):
         """ test the value of the one2many field inside the onchange """
         discussion = self.env.ref('test_new_api.discussion_0')
diff --git a/odoo/models.py b/odoo/models.py
index d5540341b4b..f6139aa3a36 100644
--- a/odoo/models.py
+++ b/odoo/models.py
@@ -573,6 +573,7 @@ class BaseModel(object):
         def is_onchange(func):
             return callable(func) and hasattr(func, '_onchange')
 
+        # collect onchange methods on the model's class
         cls = type(self)
         methods = defaultdict(list)
         for attr, func in getmembers(cls, is_onchange):
@@ -581,6 +582,17 @@ class BaseModel(object):
                     _logger.warning("@onchange%r parameters must be field names", func._onchange)
                 methods[name].append(func)
 
+        # add onchange methods to implement "change_default" on fields
+        def onchange_default(field, self):
+            value = field.convert_to_write(self[field.name], self)
+            condition = "%s=%s" % (field.name, value)
+            defaults = self.env['ir.values'].get_defaults_dict(self._name, condition)
+            self.update(defaults)
+
+        for name, field in cls._fields.items():
+            if field.change_default:
+                methods[name].append(functools.partial(onchange_default, field))
+
         # optimization: memoize result on cls, it will not be recomputed
         cls._onchange_methods = methods
         return methods

From 04470b811231eabab9ed4a7ed147882b16585e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 24 Aug 2017 10:57:15 +0200
Subject: [PATCH 011/119] [FIX] web: increase timeout for JS unit tests

Some runbot servers are quite slow in the midday, and they fail the unit
tests because the 3min timeout is reached.
---
 addons/web/tests/test_js.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py
index 2253b1b73fc..c2f29ba0d0d 100644
--- a/addons/web/tests/test_js.py
+++ b/addons/web/tests/test_js.py
@@ -10,4 +10,4 @@ class WebSuite(odoo.tests.HttpCase):
     at_install = False
 
     def test_01_js(self):
-        self.phantom_js('/web/tests?mod=web', "", "", login='admin', timeout=180)
+        self.phantom_js('/web/tests?mod=web', "", "", login='admin', timeout=240)

From c0247e6a8d6057710908be941dec6a846c31cd28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 24 Aug 2017 09:57:02 +0200
Subject: [PATCH 012/119] [FIX] web: correct evaluation for x2many fields in
 onchanges

Before this commit, it could happen that a x2many field was considered
invalid, which prevent triggering onchanges, even though each of its
required fields are properly set.  Here is such a scenario:

We have a one2many field something_ids in a form view, with an inline
tree view, which contains a field X.  The field X is required on the
model, but marked required="0" in the inline view.

In that case, we incorrectly evaluated the required modifiers: since the
attrs did not contain the required attribute, we fell back on the
field_get value, which is true in this case.  But this is not correct,
the fieldviewget already computed the actual modifiers and took into
account the fact that it was overridden.  We need to only look at the
modifiers.
---
 .../static/src/js/views/basic/basic_model.js  |  3 +-
 .../tests/fields/relational_fields_tests.js   | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 0d95c292070..d54f609f002 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -2738,8 +2738,7 @@ var BasicModel = AbstractModel.extend({
                 var fieldInfo = element.fieldsInfo[element.viewType][fieldName];
                 var rawModifiers = JSON.parse(fieldInfo.modifiers || "{}");
                 var modifiers = self._evalModifiers(record, rawModifiers);
-                var required = 'required' in modifiers ? modifiers.required : field.required;
-                if (required && !self._isFieldSet(recordData[fieldName], field.type)) {
+                if (modifiers.required && !self._isFieldSet(recordData[fieldName], field.type)) {
                     isValid = false;
                 }
             });
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 89f4601efc4..a2504af38bb 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -5352,6 +5352,43 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
+    QUnit.test('onchange and required fields with override in arch', function (assert) {
+        assert.expect(4);
+
+        this.data.partner.onchanges = {
+            turtles: function (obj) {}
+        };
+        this.data.turtle.fields.turtle_foo.required = true;
+        this.data.partner.records[0].turtles = [];
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch:'<form string="Partners">' +
+                    '<field name="turtles">' +
+                        '<tree editable="bottom">' +
+                            '<field name="turtle_int"/>' +
+                            '<field name="turtle_foo" required="0"/>' +
+                        '</tree>' +
+                    '</field>' +
+                '</form>',
+            res_id: 1,
+            mockRPC: function (route, args) {
+                assert.step(args.method);
+                return this._super.apply(this, arguments);
+            },
+        });
+        form.$buttons.find('.o_form_button_edit').click();
+
+        // triggers an onchange on partner, because the new record is valid
+        form.$('.o_field_x2many_list_row_add a').click();
+
+        assert.verifySteps(['read', 'default_get', 'onchange']);
+        form.destroy();
+    });
+
+
 
     QUnit.module('FieldMany2Many');
 

From 2eac9788f6de93a9017541e877322f90f082c3cd Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 23 Aug 2017 13:43:45 +0200
Subject: [PATCH 013/119] [FIX] l10n_multilang: Getting translations of
 templates from records

Bug:

Before the the fix, when trying to get all the translations of templates from a
specific model:
-All the translations for the templates of this model were catched first -> TT
-All the records of this model for a specific company were catched afterwards -> RC

Then, the linked between the translations(TT) and the records(RC) were made in function
process_translations.

But in some cases, a few records were removed and then it raised an error because the number
of translations was different than the number of records.

Fix:

Thanks to the function create_record_with_xmlid in addons/account/models/chart_template.py, all the records
created from a template have an xml_id in ir.model.data with str(company.id)+'_'+template_xmlid.name

So with this way, it is possible to catch only the records created from a template.

opw:767095
---
 addons/l10n_multilang/models/l10n_multilang.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_multilang/models/l10n_multilang.py b/addons/l10n_multilang/models/l10n_multilang.py
index de0ef064bcd..bee06394b7d 100644
--- a/addons/l10n_multilang/models/l10n_multilang.py
+++ b/addons/l10n_multilang/models/l10n_multilang.py
@@ -73,22 +73,26 @@ class AccountChartTemplate(models.Model):
 
     @api.multi
     def _process_accounts_translations(self, company_id, langs, field):
-        in_ids = self.env['account.account.template'].search([('chart_template_id', '=', self.id)], order='id')
-        out_ids = self.env['account.account'].search([('company_id', '=', company_id)], order='id')
+        in_ids, out_ids = self._get_template_from_model(company_id, 'account.account')
         return self.process_translations(langs, field, in_ids, out_ids)
 
     @api.multi
     def _process_taxes_translations(self, company_id, langs, field):
-        in_ids = self.env['account.tax.template'].search([('chart_template_id', '=', self.id)], order='id')
-        out_ids = self.env['account.tax'].search([('company_id', '=', company_id)], order='id')
+        in_ids, out_ids = self._get_template_from_model(company_id, 'account.tax')
         return self.process_translations(langs, field, in_ids, out_ids)
 
     @api.multi
     def _process_fiscal_pos_translations(self, company_id, langs, field):
-        in_ids = self.env['account.fiscal.position.template'].search([('chart_template_id', '=', self.id)], order='id')
-        out_ids = self.env['account.fiscal.position'].search([('company_id', '=', company_id)], order='id')
+        in_ids, out_ids = self._get_template_from_model(company_id, 'account.fiscal.position')
         return self.process_translations(langs, field, in_ids, out_ids)
 
+    def _get_template_from_model(self, company_id, model):
+        out_data = self.env['ir.model.data'].search([('model', '=', model), ('name', '=like', str(company_id)+'\_%')])
+        out_ids = self.env[model].search([('id', 'in', out_data.mapped('res_id'))], order='id')
+        in_xml_id_names = [xml_id.partition(str(company_id) + '_')[-1] for xml_id in out_data.mapped('name')]
+        in_xml_ids = self.env['ir.model.data'].search([('model', '=', model+'.template'), ('name', 'in', in_xml_id_names)])
+        in_ids = self.env[model+'.template'].search([('id', 'in', in_xml_ids.mapped('res_id'))], order='id')
+        return (in_ids, out_ids)
 
 class BaseLanguageInstall(models.TransientModel):
     """ Install Language"""

From 7ec4f2d6f5e5974f9e16b60fde305477668a39d3 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 24 Aug 2017 11:15:13 +0200
Subject: [PATCH 014/119] [FIX] project: # Days to Close

Take into account the End Date for task analysis.

opw-767245
---
 addons/project/report/project_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 00d739ec9c4..cddd6722ba5 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -58,7 +58,7 @@ class ReportProjectTaskUser(models.Model):
                     t.partner_id,
                     t.stage_id as stage_id,
                     t.kanban_state as state,
-                    (extract('epoch' from (t.write_date-t.create_date)))/(3600*24)  as closing_days,
+                    (extract('epoch' from (NULLIF(t.date_end, t.write_date)-t.create_date)))/(3600*24)  as closing_days,
                     (extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
                     (extract('epoch' from (t.date_deadline-(now() at time zone 'UTC'))))/(3600*24)  as delay_endings_days
         """

From 11c523f69357b850cabf6c238d9d4f40d43b3d77 Mon Sep 17 00:00:00 2001
From: Do Vuong Tien <tiendv@trobz.com>
Date: Thu, 24 Aug 2017 12:28:03 +0700
Subject: [PATCH 015/119] [CLA] Signature for vuongtien2411

Done at #19025
---
 doc/cla/individual/vuongtien2411.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/cla/individual/vuongtien2411.md

diff --git a/doc/cla/individual/vuongtien2411.md b/doc/cla/individual/vuongtien2411.md
new file mode 100644
index 00000000000..821a9881a43
--- /dev/null
+++ b/doc/cla/individual/vuongtien2411.md
@@ -0,0 +1,11 @@
+Vietnam, 2017-08-24
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Do Vuong Tien  tiendv@trobz.com https://github.com/vuongtien2411

From dedff1842b7ea3ae3f2b0935ab0684201cc4aac0 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 2 Dec 2016 14:19:30 +0100
Subject: [PATCH 016/119] [FIX] account: account domain in reconciliation

In the reconciliation widget, create a counterpart line. No domain is
applied on the "Account" field regarding the company, meaning that we
can select an account from any company.

opw-694149
---
 addons/account/models/account_journal_dashboard.py          | 4 ++--
 .../account/static/src/js/account_reconciliation_widgets.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index 505442c36dd..edb2e5a01ff 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -264,11 +264,11 @@ class account_journal(models.Model):
             return {
                 'type': 'ir.actions.client',
                 'tag': 'bank_statement_reconciliation_view',
-                'context': {'statement_ids': bank_stmt.ids},
+                'context': {'statement_ids': bank_stmt.ids, 'company_ids': self.mapped('company_id').ids},
             }
         else:
             # Open reconciliation view for customers/suppliers
-            action_context = {'show_mode_selector': False}
+            action_context = {'show_mode_selector': False, 'company_ids': self.mapped('company_id').ids}
             if self.type == 'sale':
                 action_context.update({'mode': 'customers'})
             elif self.type == 'purchase':
diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js
index dbbb55bddb1..6aacbb24c68 100644
--- a/addons/account/static/src/js/account_reconciliation_widgets.js
+++ b/addons/account/static/src/js/account_reconciliation_widgets.js
@@ -91,6 +91,10 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, {
         // NB : for presets to work correctly, a field id must be the same string as a preset field
         this.presets = {};
         // Description of the fields to initialize in the "create new line" form
+        var domain_account_id = [['deprecated', '=', false]];
+        if (context && context.context && context.context.company_ids) {
+            domain_account_id.push(['company_id', 'in', context.context.company_ids]);
+        }
         this.create_form_fields = {
             account_id: {
                 id: "account_id",
@@ -103,7 +107,7 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, {
                     relation: "account.account",
                     string: _t("Account"),
                     type: "many2one",
-                    domain: [['deprecated', '=', false]],
+                    domain: domain_account_id,
                 },
             },
             label: {

From f4270a244ee9cd3d283b38f52f08b909edb73da0 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 24 Aug 2017 16:00:01 +0200
Subject: [PATCH 017/119] [FIX] hr_payroll: missing field in view

opw-767431
---
 addons/hr_payroll/views/hr_payroll_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_payroll/views/hr_payroll_views.xml b/addons/hr_payroll/views/hr_payroll_views.xml
index ac8006a26ab..114a57a8b38 100644
--- a/addons/hr_payroll/views/hr_payroll_views.xml
+++ b/addons/hr_payroll/views/hr_payroll_views.xml
@@ -507,6 +507,7 @@
                 <form string="Contribution">
                     <group>
                         <field name="name"/>
+                        <field name="partner_id"/>
                         <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" class="oe_inline"/>
                     </group>
                     <newline/>

From ea60ec029d48daf3453bac5ed5752cf5ca3b37ee Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 24 Aug 2017 16:20:29 +0200
Subject: [PATCH 018/119] [FIX] account: traceback in reconciliation widget

If a user reconcile an active line, when he active an other line, the
widget can't close the removed line because it no longer exists.

bug introduce by https://github.com/odoo/odoo/commit/1de418aa7afb986eeb2b98f12dee0c5661902737
---
 .../static/src/js/reconciliation/reconciliation_action.js    | 5 ++++-
 addons/account/static/tests/reconciliation_tests.js          | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account/static/src/js/reconciliation/reconciliation_action.js b/addons/account/static/src/js/reconciliation/reconciliation_action.js
index 8763d5acaa1..fabfee1ad00 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_action.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_action.js
@@ -201,7 +201,10 @@ var StatementAction = Widget.extend(ControlPanelMixin, {
                 _.each(self.model.lines, function (line, _handle) {
                     if (line.mode !== 'inactive' && _handle !== handle) {
                         self.model.changeMode(_handle, 'inactive');
-                        self._getWidget(_handle).update(line);
+                        var widget = self._getWidget(_handle);
+                        if (widget) {
+                            widget.update(line);
+                        }
                     }
                 });
             }
diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js
index 511656906d9..d90ceb08d4c 100644
--- a/addons/account/static/tests/reconciliation_tests.js
+++ b/addons/account/static/tests/reconciliation_tests.js
@@ -1005,7 +1005,6 @@ QUnit.module('account', {
         clientAction.destroy();
     });
 
-
     QUnit.test('Reconciliation pager', function (assert) {
         assert.expect(6);
 
@@ -1219,9 +1218,11 @@ QUnit.module('account', {
 
         assert.strictEqual(clientAction.$('.o_reconciliation_line').length, 10, "should display 10 lines");
         assert.strictEqual(clientAction.$('.js_load_more:visible').length, 1, "should display the load more button");
+        clientAction.$('.accounting_view:has(.o_reconcile:visible) thead .cell_action').click();
         clientAction.$('.o_reconcile:visible').click();
         assert.strictEqual(clientAction.$('.o_reconcile:visible').length, 0, "should remove the reconciled line");
         assert.strictEqual(clientAction.$('.o_reconciliation_line').length, 10, "should load one line to complete the 10");
+        clientAction.$('thead .cell_action:eq(1)').click();
         clientAction.$('.js_load_more').click();
         assert.strictEqual(clientAction.$('.o_reconciliation_line').length, 11, "should load the last record");
         assert.strictEqual(clientAction.$('.js_load_more:visible').length, 0, "should hide the load more button");

From 6e22e8b027ae8237b9c0ad9165eae695b7d875d6 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 24 Aug 2017 18:13:54 +0200
Subject: [PATCH 019/119] [FIX] web: use 'o_input' class on kanban progressbar
 <input/>

Since the new views, the 'o_input' class has to be set explicitely on
<input/>, <select/> and <textarea/> elements to have the proper styling.
---
 addons/web/static/src/js/fields/basic_fields.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index c69ca8bd2e8..6343fb7e80e 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -1689,7 +1689,7 @@ var FieldProgressBar = AbstractField.extend({
             } else {
                 this.$el.on('click', function () {
                     if (!self.write_mode) {
-                        var $input = $('<input>', {type: 'text', class: 'o_progressbar_value'});
+                        var $input = $('<input>', {type: 'text', class: 'o_progressbar_value o_input'});
                         $input.on('blur', _.bind(self.on_change_input, self));
                         self.$('.o_progressbar_value').replaceWith($input);
                         self.write_mode = true;

From 9f1a77f152861cecbbf3dbea0ca9c84d2fbef110 Mon Sep 17 00:00:00 2001
From: Kirti Choudhary <kic@odoo.com>
Date: Tue, 8 Aug 2017 14:32:28 +0530
Subject: [PATCH 020/119] [REF] stock_picking_wave: renamed string picking
 waves -> batch picking.

This commit only rename every string from picking wave to batch picking.
Model rename will only be pushed on master(saas-18) once the forward port
will be done.
---
 addons/procurement/models/procurement.py      |  2 +-
 addons/stock/models/stock_config_settings.py  |  2 +-
 addons/stock_picking_wave/__manifest__.py     |  6 +++---
 .../data/stock_picking_wave_data.xml          |  6 +++---
 .../data/stock_picking_wave_demo.xml          |  2 +-
 .../models/stock_picking_wave.py              | 18 ++++++++---------
 .../views/stock_picking_wave_views.xml        | 20 +++++++++----------
 .../wizard/stock_picking_to_wave.py           |  6 +++---
 .../wizard/stock_picking_to_wave_views.xml    | 14 ++++++-------
 9 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/procurement/models/procurement.py b/addons/procurement/models/procurement.py
index e0dc2e97889..840fb86f94b 100644
--- a/addons/procurement/models/procurement.py
+++ b/addons/procurement/models/procurement.py
@@ -21,7 +21,7 @@ class ProcurementGroup(models.Model):
     having the moves grouped into pickings that represent the sales order.
 
     Used in: sales order (to group delivery order lines like the so), pull/push
-    rules (to pack like the delivery order), on orderpoints (e.g. for wave picking
+    rules (to pack like the delivery order), on orderpoints (e.g. for batch picking
     all the similar products together).
 
     Grouping is made only if the source and the destination is the same.
diff --git a/addons/stock/models/stock_config_settings.py b/addons/stock/models/stock_config_settings.py
index 531047ec3ec..a1dbc055ef1 100644
--- a/addons/stock/models/stock_config_settings.py
+++ b/addons/stock/models/stock_config_settings.py
@@ -35,7 +35,7 @@ class StockConfigSettings(models.TransientModel):
         string="No Rescheduling Propagation",
         oldname='default_new_propagation_minimum_delta',
         help="Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n This option allows to not propagate the rescheduling if the change is not critical.")
-    module_stock_picking_wave = fields.Boolean("Picking Waves")
+    module_stock_picking_wave = fields.Boolean("Batch Pickings")
     module_stock_calendar = fields.Boolean("Vendor Calendar for Reordering",
         help='Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).\nBy default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules.')
     module_stock_barcode = fields.Boolean("Barcode Scanner")
diff --git a/addons/stock_picking_wave/__manifest__.py b/addons/stock_picking_wave/__manifest__.py
index 4401f5dc6d6..c5a98ddf5ed 100644
--- a/addons/stock_picking_wave/__manifest__.py
+++ b/addons/stock_picking_wave/__manifest__.py
@@ -2,12 +2,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'Warehouse Management: Waves',
+    'name': 'Warehouse Management: Batch Picking',
     'version': '1.0',
     'category': 'Warehouse',
     'description': """
-This module adds the picking wave option in warehouse management
-================================================================
+This module adds the batch picking option in warehouse management
+=================================================================
     """,
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['stock'],
diff --git a/addons/stock_picking_wave/data/stock_picking_wave_data.xml b/addons/stock_picking_wave/data/stock_picking_wave_data.xml
index bfc677faff6..54cc489db76 100644
--- a/addons/stock_picking_wave/data/stock_picking_wave_data.xml
+++ b/addons/stock_picking_wave/data/stock_picking_wave_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Picking Wave related subtypes for messaging / Chatter -->
+    <!-- Batch Picking related subtypes for messaging / Chatter -->
     <record id="mt_wave_state" model="mail.message.subtype">
         <field name="name">Stage Changed</field>
         <field name="res_model">stock.picking.wave</field>
@@ -9,9 +9,9 @@
     </record>
 
     <record id="seq_picking_wave" model="ir.sequence">
-        <field name="name">Picking Wave</field>
+        <field name="name">Batch Picking</field>
         <field name="code">picking.wave</field>
-        <field name="prefix">Wave/</field>
+        <field name="prefix">Batch/</field>
         <field name="padding">5</field>
         <field name="company_id" eval="False"/>
     </record>
diff --git a/addons/stock_picking_wave/data/stock_picking_wave_demo.xml b/addons/stock_picking_wave/data/stock_picking_wave_demo.xml
index 2d074370200..38970d7d550 100644
--- a/addons/stock_picking_wave/data/stock_picking_wave_demo.xml
+++ b/addons/stock_picking_wave/data/stock_picking_wave_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 			<!--
-	            Add picking wave   
+	            Add batch picking
 	        -->
 		<record id="stock_picking_wave_dry_1" model="stock.picking.wave">
 	        <field name="name">Picking Dry for John</field>
diff --git a/addons/stock_picking_wave/models/stock_picking_wave.py b/addons/stock_picking_wave/models/stock_picking_wave.py
index 8c70e7663bc..3932c4e6a1c 100644
--- a/addons/stock_picking_wave/models/stock_picking_wave.py
+++ b/addons/stock_picking_wave/models/stock_picking_wave.py
@@ -8,19 +8,19 @@ from odoo.exceptions import UserError
 class StockPickingWave(models.Model):
     _inherit = ['mail.thread']
     _name = "stock.picking.wave"
-    _description = "Picking Wave"
+    _description = "Batch Picking"
     _order = "name desc"
 
     name = fields.Char(
-        string='Picking Wave Name', default='/',
+        string='Batch Picking Name', default='/',
         copy=False, required=True,
-        help='Name of the picking wave')
+        help='Name of the batch picking')
     user_id = fields.Many2one(
         'res.users', string='Responsible', track_visibility='onchange',
-        help='Person responsible for this wave')
+        help='Person responsible for this batch picking')
     picking_ids = fields.One2many(
         'stock.picking', 'wave_id', string='Pickings',
-        help='List of picking associated to this wave')
+        help='List of picking associated to this batch')
     state = fields.Selection([
         ('draft', 'Draft'),
         ('in_progress', 'Running'),
@@ -56,12 +56,12 @@ class StockPickingWave(models.Model):
     def done(self):
         pickings = self.mapped('picking_ids').filtered(lambda picking: picking.state not in ('cancel', 'done'))
         if any(picking.state != 'assigned' for picking in pickings):
-            raise UserError(_('Some pickings are still waiting for goods. Please check or force their availability before setting this wave to done.'))
+            raise UserError(_('Some pickings are still waiting for goods. Please check or force their availability before setting this batch to done.'))
         for picking in pickings:
             picking.message_post(
                 body="<b>%s:</b> %s <a href=#id=%s&view_type=form&model=stock.picking.wave>%s</a>" % (
                     _("Transferred by"),
-                    _("Picking Wave"),
+                    _("Batch Picking"),
                     picking.wave_id.id,
                     picking.wave_id.name))
         if pickings:
@@ -78,6 +78,6 @@ class StockPicking(models.Model):
     _inherit = "stock.picking"
 
     wave_id = fields.Many2one(
-        'stock.picking.wave', string='Picking Wave',
+        'stock.picking.wave', string='Batch Picking',
         states={'done': [('readonly', True)], 'cancel': [('readonly', True)]},
-        help='Picking wave associated to this picking')
+        help='Batch associated to this picking')
diff --git a/addons/stock_picking_wave/views/stock_picking_wave_views.xml b/addons/stock_picking_wave/views/stock_picking_wave_views.xml
index f31857ac07a..0cd30865ffa 100644
--- a/addons/stock_picking_wave/views/stock_picking_wave_views.xml
+++ b/addons/stock_picking_wave/views/stock_picking_wave_views.xml
@@ -4,7 +4,7 @@
             <field name="name">picking.wave.form</field>
             <field name="model">stock.picking.wave</field>
             <field name="arch" type="xml">
-                <form string="Stock Picking Waves">
+                <form string="Stock Batch Picking">
                     <header>
                         <button name="confirm_picking" states="draft" string="Confirm" type="object" class="oe_highlight"/>
                         <button name="print_picking" string="Print" type="object" class="oe_highlight"/>
@@ -49,7 +49,7 @@
             <field name="name">picking.wave.tree</field>
             <field name="model">stock.picking.wave</field>
             <field name="arch" type="xml">
-                <tree string="Stock Picking Waves" decoration-muted="state=='cancel'">
+                <tree string="Stock Batch Picking" decoration-muted="state=='cancel'">
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="state"/>
@@ -90,9 +90,9 @@
             <field name="name">picking.wave.filter</field>
             <field name="model">stock.picking.wave</field>
             <field name="arch" type="xml">
-                <search string="Search Picking Waves">
-                    <field name="name" string="Picking Wave"/>
-                    <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Picking Waves not finished"/>
+                <search string="Search Batch Picking">
+                    <field name="name" string="Batch Picking"/>
+                    <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Batch Picking not finished"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By">
                         <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
@@ -103,7 +103,7 @@
         </record>
 
         <record id="action_picking_wave" model="ir.actions.act_window">
-            <field name="name">Picking Waves</field>
+            <field name="name">Batch Picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.picking.wave</field>
             <field name="view_type">form</field>
@@ -112,11 +112,11 @@
             <field name="search_view_id" ref="view_picking_wave_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a Picking Wave. 
+                Click to create a Batch Picking.
               </p><p>
-                The goal of the picking waves is to group operations that may
+                The goal of the Batch Picking is to group operations that may
                 (needs to) be done together in order to increase their efficiency.
-                It may also be useful to assign jobs (one person = one wave) or
+                It may also be useful to assign jobs (one person = one batch) or
                 help the timing management of operations (tasks to be done at 1pm).
               </p>
             </field>
@@ -149,7 +149,7 @@
         <field name="inherit_id" ref="stock.view_picking_internal_search"/>
         <field name="arch" type="xml">
             <xpath expr="//filter[@name='picking_type']" position="after">
-                <filter string="Wave" domain="[]" context="{'group_by':'wave_id'}"/>
+                <filter string="Batch" domain="[]" context="{'group_by':'wave_id'}"/>
             </xpath>
             <xpath expr="//field[@name='picking_type_id']" position="after">
                     <field name="wave_id"/>
diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
index 69b53578018..cd02ca984e8 100644
--- a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
+++ b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
@@ -6,13 +6,13 @@ from odoo import api, fields, models
 
 class StockPickingToWave(models.TransientModel):
     _name = 'stock.picking.to.wave'
-    _description = 'Add pickings to a picking wave'
+    _description = 'Add pickings to a batch picking'
 
-    wave_id = fields.Many2one('stock.picking.wave', string='Picking Wave', required=True)
+    wave_id = fields.Many2one('stock.picking.wave', string='Batch Picking', required=True)
 
     @api.multi
     def attach_pickings(self):
-        # use active_ids to add picking line to the selected wave
+        # use active_ids to add picking line to the selected batch
         self.ensure_one()
         picking_ids = self.env.context.get('active_ids')
         return self.env['stock.picking'].browse(picking_ids).write({'wave_id': self.wave_id.id})
diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml b/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
index a8ed7dd8bdf..78662f6942a 100644
--- a/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
+++ b/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-        <!-- add picking to wave  -->
+        <!-- add picking to batch -->
         <record model="ir.ui.view" id="picking_to_wave_form">
             <field name="name">stock.picking.to.wave.form</field>
             <field name="model">stock.picking.to.wave</field>
             <field name="arch" type="xml">
-                <form string="Add pickings to wave">
-                    <separator string="Select a wave"/>
+                <form string="Add pickings to batch">
+                    <separator string="Select a batch"/>
                     <field name="wave_id" class="oe_inline"/>
                     <footer>
-                        <button name="attach_pickings" type="object" string="Add to Wave" class="btn-primary"/>
+                        <button name="attach_pickings" type="object" string="Add to Batch" class="btn-primary"/>
                         <button string="Cancel" class="btn-default" special="cancel"/>
                     </footer>
                 </form>
             </field>
         </record>
 
-        <!--  add picking to wave action -->
+        <!--  add picking to batch action -->
         <record model="ir.actions.act_window" id="picking_to_wave_act">
-            <field name="name">Add to Wave</field>
+            <field name="name">Add to Batch</field>
             <field name="res_model">stock.picking.to.wave</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -29,7 +29,7 @@
 
         <act_window id="action_picking_to_wave"
             multi="True"
-            key2="client_action_multi" name="Add to Wave"
+            key2="client_action_multi" name="Add to Batch"
             res_model="stock.picking.to.wave" src_model="stock.picking"
             view_mode="form" target="new" view_type="form"
             />

From dace2241f6418087050c451abdf2e2d0cd0b5910 Mon Sep 17 00:00:00 2001
From: Kirti Choudhary <kic@odoo.com>
Date: Thu, 17 Aug 2017 12:45:39 +0530
Subject: [PATCH 021/119] [IMP] stock_picking_wave: rename to
 stock_picking_batch

Also rename it's files and replace old references with new one
---
 .../__init__.py                                           | 0
 .../__manifest__.py                                       | 8 ++++----
 .../data/stock_picking_batch_data.xml}                    | 0
 .../data/stock_picking_batch_demo.xml}                    | 0
 .../i18n/af.po                                            | 0
 .../i18n/am.po                                            | 0
 .../i18n/ar.po                                            | 0
 .../i18n/bg.po                                            | 0
 .../i18n/bs.po                                            | 0
 .../i18n/ca.po                                            | 0
 .../i18n/cs.po                                            | 0
 .../i18n/da.po                                            | 0
 .../i18n/de.po                                            | 0
 .../i18n/el.po                                            | 0
 .../i18n/en_AU.po                                         | 0
 .../i18n/en_GB.po                                         | 0
 .../i18n/es.po                                            | 0
 .../i18n/es_AR.po                                         | 0
 .../i18n/es_BO.po                                         | 0
 .../i18n/es_CL.po                                         | 0
 .../i18n/es_CO.po                                         | 0
 .../i18n/es_CR.po                                         | 0
 .../i18n/es_DO.po                                         | 0
 .../i18n/es_EC.po                                         | 0
 .../i18n/es_PE.po                                         | 0
 .../i18n/es_PY.po                                         | 0
 .../i18n/es_VE.po                                         | 0
 .../i18n/et.po                                            | 0
 .../i18n/eu.po                                            | 0
 .../i18n/fa.po                                            | 0
 .../i18n/fi.po                                            | 0
 .../i18n/fo.po                                            | 0
 .../i18n/fr.po                                            | 0
 .../i18n/fr_BE.po                                         | 0
 .../i18n/fr_CA.po                                         | 0
 .../i18n/gl.po                                            | 0
 .../i18n/gu.po                                            | 0
 .../i18n/he.po                                            | 0
 .../i18n/hi.po                                            | 0
 .../i18n/hr.po                                            | 0
 .../i18n/hu.po                                            | 0
 .../i18n/id.po                                            | 0
 .../i18n/it.po                                            | 0
 .../i18n/ja.po                                            | 0
 .../i18n/ka.po                                            | 0
 .../i18n/kab.po                                           | 0
 .../i18n/ko.po                                            | 0
 .../i18n/lo.po                                            | 0
 .../i18n/lt.po                                            | 0
 .../i18n/lv.po                                            | 0
 .../i18n/mk.po                                            | 0
 .../i18n/mn.po                                            | 0
 .../i18n/nb.po                                            | 0
 .../i18n/nl.po                                            | 0
 .../i18n/nl_BE.po                                         | 0
 .../i18n/pl.po                                            | 0
 .../i18n/pt.po                                            | 0
 .../i18n/pt_BR.po                                         | 0
 .../i18n/ro.po                                            | 0
 .../i18n/ru.po                                            | 0
 .../i18n/sk.po                                            | 0
 .../i18n/sl.po                                            | 0
 .../i18n/sq.po                                            | 0
 .../i18n/sr.po                                            | 0
 .../i18n/sr@latin.po                                      | 0
 .../i18n/stock_picking_batch.pot}                         | 0
 .../i18n/sv.po                                            | 0
 .../i18n/ta.po                                            | 0
 .../i18n/th.po                                            | 0
 .../i18n/tr.po                                            | 0
 .../i18n/uk.po                                            | 0
 .../i18n/vi.po                                            | 0
 .../i18n/zh_CN.po                                         | 0
 .../i18n/zh_TW.po                                         | 0
 .../models/__init__.py                                    | 2 +-
 .../models/stock_picking_batch.py}                        | 2 +-
 .../security/ir.model.access.csv                          | 0
 .../views/stock_picking_batch_views.xml}                  | 0
 .../wizard/__init__.py                                    | 2 +-
 .../wizard/stock_picking_to_batch.py}                     | 0
 .../wizard/stock_picking_to_batch_views.xml}              | 0
 81 files changed, 7 insertions(+), 7 deletions(-)
 rename addons/{stock_picking_wave => stock_picking_batch}/__init__.py (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/__manifest__.py (74%)
 rename addons/{stock_picking_wave/data/stock_picking_wave_data.xml => stock_picking_batch/data/stock_picking_batch_data.xml} (100%)
 rename addons/{stock_picking_wave/data/stock_picking_wave_demo.xml => stock_picking_batch/data/stock_picking_batch_demo.xml} (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/af.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/am.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ar.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/bg.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/bs.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ca.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/cs.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/da.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/de.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/el.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/en_AU.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/en_GB.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_AR.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_BO.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_CL.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_CO.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_CR.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_DO.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_EC.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_PE.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_PY.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/es_VE.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/et.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/eu.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/fa.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/fi.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/fo.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/fr.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/fr_BE.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/fr_CA.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/gl.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/gu.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/he.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/hi.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/hr.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/hu.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/id.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/it.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ja.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ka.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/kab.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ko.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/lo.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/lt.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/lv.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/mk.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/mn.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/nb.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/nl.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/nl_BE.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/pl.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/pt.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/pt_BR.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ro.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ru.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/sk.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/sl.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/sq.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/sr.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/sr@latin.po (100%)
 rename addons/{stock_picking_wave/i18n/stock_picking_wave.pot => stock_picking_batch/i18n/stock_picking_batch.pot} (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/sv.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/ta.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/th.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/tr.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/uk.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/vi.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/zh_CN.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/i18n/zh_TW.po (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/models/__init__.py (74%)
 rename addons/{stock_picking_wave/models/stock_picking_wave.py => stock_picking_batch/models/stock_picking_batch.py} (98%)
 rename addons/{stock_picking_wave => stock_picking_batch}/security/ir.model.access.csv (100%)
 rename addons/{stock_picking_wave/views/stock_picking_wave_views.xml => stock_picking_batch/views/stock_picking_batch_views.xml} (100%)
 rename addons/{stock_picking_wave => stock_picking_batch}/wizard/__init__.py (72%)
 rename addons/{stock_picking_wave/wizard/stock_picking_to_wave.py => stock_picking_batch/wizard/stock_picking_to_batch.py} (100%)
 rename addons/{stock_picking_wave/wizard/stock_picking_to_wave_views.xml => stock_picking_batch/wizard/stock_picking_to_batch_views.xml} (100%)

diff --git a/addons/stock_picking_wave/__init__.py b/addons/stock_picking_batch/__init__.py
similarity index 100%
rename from addons/stock_picking_wave/__init__.py
rename to addons/stock_picking_batch/__init__.py
diff --git a/addons/stock_picking_wave/__manifest__.py b/addons/stock_picking_batch/__manifest__.py
similarity index 74%
rename from addons/stock_picking_wave/__manifest__.py
rename to addons/stock_picking_batch/__manifest__.py
index c5a98ddf5ed..498ea901fdc 100644
--- a/addons/stock_picking_wave/__manifest__.py
+++ b/addons/stock_picking_batch/__manifest__.py
@@ -13,12 +13,12 @@ This module adds the batch picking option in warehouse management
     'depends': ['stock'],
     'data': [
         'security/ir.model.access.csv',
-        'views/stock_picking_wave_views.xml',
-        'data/stock_picking_wave_data.xml',
-        'wizard/stock_picking_to_wave_views.xml',
+        'views/stock_picking_batch_views.xml',
+        'data/stock_picking_batch_data.xml',
+        'wizard/stock_picking_to_batch_views.xml',
     ],
     'demo': [
-        'data/stock_picking_wave_demo.xml',
+        'data/stock_picking_batch_demo.xml',
     ],
     'installable': True,
 }
diff --git a/addons/stock_picking_wave/data/stock_picking_wave_data.xml b/addons/stock_picking_batch/data/stock_picking_batch_data.xml
similarity index 100%
rename from addons/stock_picking_wave/data/stock_picking_wave_data.xml
rename to addons/stock_picking_batch/data/stock_picking_batch_data.xml
diff --git a/addons/stock_picking_wave/data/stock_picking_wave_demo.xml b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml
similarity index 100%
rename from addons/stock_picking_wave/data/stock_picking_wave_demo.xml
rename to addons/stock_picking_batch/data/stock_picking_batch_demo.xml
diff --git a/addons/stock_picking_wave/i18n/af.po b/addons/stock_picking_batch/i18n/af.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/af.po
rename to addons/stock_picking_batch/i18n/af.po
diff --git a/addons/stock_picking_wave/i18n/am.po b/addons/stock_picking_batch/i18n/am.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/am.po
rename to addons/stock_picking_batch/i18n/am.po
diff --git a/addons/stock_picking_wave/i18n/ar.po b/addons/stock_picking_batch/i18n/ar.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ar.po
rename to addons/stock_picking_batch/i18n/ar.po
diff --git a/addons/stock_picking_wave/i18n/bg.po b/addons/stock_picking_batch/i18n/bg.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/bg.po
rename to addons/stock_picking_batch/i18n/bg.po
diff --git a/addons/stock_picking_wave/i18n/bs.po b/addons/stock_picking_batch/i18n/bs.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/bs.po
rename to addons/stock_picking_batch/i18n/bs.po
diff --git a/addons/stock_picking_wave/i18n/ca.po b/addons/stock_picking_batch/i18n/ca.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ca.po
rename to addons/stock_picking_batch/i18n/ca.po
diff --git a/addons/stock_picking_wave/i18n/cs.po b/addons/stock_picking_batch/i18n/cs.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/cs.po
rename to addons/stock_picking_batch/i18n/cs.po
diff --git a/addons/stock_picking_wave/i18n/da.po b/addons/stock_picking_batch/i18n/da.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/da.po
rename to addons/stock_picking_batch/i18n/da.po
diff --git a/addons/stock_picking_wave/i18n/de.po b/addons/stock_picking_batch/i18n/de.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/de.po
rename to addons/stock_picking_batch/i18n/de.po
diff --git a/addons/stock_picking_wave/i18n/el.po b/addons/stock_picking_batch/i18n/el.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/el.po
rename to addons/stock_picking_batch/i18n/el.po
diff --git a/addons/stock_picking_wave/i18n/en_AU.po b/addons/stock_picking_batch/i18n/en_AU.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/en_AU.po
rename to addons/stock_picking_batch/i18n/en_AU.po
diff --git a/addons/stock_picking_wave/i18n/en_GB.po b/addons/stock_picking_batch/i18n/en_GB.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/en_GB.po
rename to addons/stock_picking_batch/i18n/en_GB.po
diff --git a/addons/stock_picking_wave/i18n/es.po b/addons/stock_picking_batch/i18n/es.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es.po
rename to addons/stock_picking_batch/i18n/es.po
diff --git a/addons/stock_picking_wave/i18n/es_AR.po b/addons/stock_picking_batch/i18n/es_AR.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_AR.po
rename to addons/stock_picking_batch/i18n/es_AR.po
diff --git a/addons/stock_picking_wave/i18n/es_BO.po b/addons/stock_picking_batch/i18n/es_BO.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_BO.po
rename to addons/stock_picking_batch/i18n/es_BO.po
diff --git a/addons/stock_picking_wave/i18n/es_CL.po b/addons/stock_picking_batch/i18n/es_CL.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_CL.po
rename to addons/stock_picking_batch/i18n/es_CL.po
diff --git a/addons/stock_picking_wave/i18n/es_CO.po b/addons/stock_picking_batch/i18n/es_CO.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_CO.po
rename to addons/stock_picking_batch/i18n/es_CO.po
diff --git a/addons/stock_picking_wave/i18n/es_CR.po b/addons/stock_picking_batch/i18n/es_CR.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_CR.po
rename to addons/stock_picking_batch/i18n/es_CR.po
diff --git a/addons/stock_picking_wave/i18n/es_DO.po b/addons/stock_picking_batch/i18n/es_DO.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_DO.po
rename to addons/stock_picking_batch/i18n/es_DO.po
diff --git a/addons/stock_picking_wave/i18n/es_EC.po b/addons/stock_picking_batch/i18n/es_EC.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_EC.po
rename to addons/stock_picking_batch/i18n/es_EC.po
diff --git a/addons/stock_picking_wave/i18n/es_PE.po b/addons/stock_picking_batch/i18n/es_PE.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_PE.po
rename to addons/stock_picking_batch/i18n/es_PE.po
diff --git a/addons/stock_picking_wave/i18n/es_PY.po b/addons/stock_picking_batch/i18n/es_PY.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_PY.po
rename to addons/stock_picking_batch/i18n/es_PY.po
diff --git a/addons/stock_picking_wave/i18n/es_VE.po b/addons/stock_picking_batch/i18n/es_VE.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/es_VE.po
rename to addons/stock_picking_batch/i18n/es_VE.po
diff --git a/addons/stock_picking_wave/i18n/et.po b/addons/stock_picking_batch/i18n/et.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/et.po
rename to addons/stock_picking_batch/i18n/et.po
diff --git a/addons/stock_picking_wave/i18n/eu.po b/addons/stock_picking_batch/i18n/eu.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/eu.po
rename to addons/stock_picking_batch/i18n/eu.po
diff --git a/addons/stock_picking_wave/i18n/fa.po b/addons/stock_picking_batch/i18n/fa.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/fa.po
rename to addons/stock_picking_batch/i18n/fa.po
diff --git a/addons/stock_picking_wave/i18n/fi.po b/addons/stock_picking_batch/i18n/fi.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/fi.po
rename to addons/stock_picking_batch/i18n/fi.po
diff --git a/addons/stock_picking_wave/i18n/fo.po b/addons/stock_picking_batch/i18n/fo.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/fo.po
rename to addons/stock_picking_batch/i18n/fo.po
diff --git a/addons/stock_picking_wave/i18n/fr.po b/addons/stock_picking_batch/i18n/fr.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/fr.po
rename to addons/stock_picking_batch/i18n/fr.po
diff --git a/addons/stock_picking_wave/i18n/fr_BE.po b/addons/stock_picking_batch/i18n/fr_BE.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/fr_BE.po
rename to addons/stock_picking_batch/i18n/fr_BE.po
diff --git a/addons/stock_picking_wave/i18n/fr_CA.po b/addons/stock_picking_batch/i18n/fr_CA.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/fr_CA.po
rename to addons/stock_picking_batch/i18n/fr_CA.po
diff --git a/addons/stock_picking_wave/i18n/gl.po b/addons/stock_picking_batch/i18n/gl.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/gl.po
rename to addons/stock_picking_batch/i18n/gl.po
diff --git a/addons/stock_picking_wave/i18n/gu.po b/addons/stock_picking_batch/i18n/gu.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/gu.po
rename to addons/stock_picking_batch/i18n/gu.po
diff --git a/addons/stock_picking_wave/i18n/he.po b/addons/stock_picking_batch/i18n/he.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/he.po
rename to addons/stock_picking_batch/i18n/he.po
diff --git a/addons/stock_picking_wave/i18n/hi.po b/addons/stock_picking_batch/i18n/hi.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/hi.po
rename to addons/stock_picking_batch/i18n/hi.po
diff --git a/addons/stock_picking_wave/i18n/hr.po b/addons/stock_picking_batch/i18n/hr.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/hr.po
rename to addons/stock_picking_batch/i18n/hr.po
diff --git a/addons/stock_picking_wave/i18n/hu.po b/addons/stock_picking_batch/i18n/hu.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/hu.po
rename to addons/stock_picking_batch/i18n/hu.po
diff --git a/addons/stock_picking_wave/i18n/id.po b/addons/stock_picking_batch/i18n/id.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/id.po
rename to addons/stock_picking_batch/i18n/id.po
diff --git a/addons/stock_picking_wave/i18n/it.po b/addons/stock_picking_batch/i18n/it.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/it.po
rename to addons/stock_picking_batch/i18n/it.po
diff --git a/addons/stock_picking_wave/i18n/ja.po b/addons/stock_picking_batch/i18n/ja.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ja.po
rename to addons/stock_picking_batch/i18n/ja.po
diff --git a/addons/stock_picking_wave/i18n/ka.po b/addons/stock_picking_batch/i18n/ka.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ka.po
rename to addons/stock_picking_batch/i18n/ka.po
diff --git a/addons/stock_picking_wave/i18n/kab.po b/addons/stock_picking_batch/i18n/kab.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/kab.po
rename to addons/stock_picking_batch/i18n/kab.po
diff --git a/addons/stock_picking_wave/i18n/ko.po b/addons/stock_picking_batch/i18n/ko.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ko.po
rename to addons/stock_picking_batch/i18n/ko.po
diff --git a/addons/stock_picking_wave/i18n/lo.po b/addons/stock_picking_batch/i18n/lo.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/lo.po
rename to addons/stock_picking_batch/i18n/lo.po
diff --git a/addons/stock_picking_wave/i18n/lt.po b/addons/stock_picking_batch/i18n/lt.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/lt.po
rename to addons/stock_picking_batch/i18n/lt.po
diff --git a/addons/stock_picking_wave/i18n/lv.po b/addons/stock_picking_batch/i18n/lv.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/lv.po
rename to addons/stock_picking_batch/i18n/lv.po
diff --git a/addons/stock_picking_wave/i18n/mk.po b/addons/stock_picking_batch/i18n/mk.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/mk.po
rename to addons/stock_picking_batch/i18n/mk.po
diff --git a/addons/stock_picking_wave/i18n/mn.po b/addons/stock_picking_batch/i18n/mn.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/mn.po
rename to addons/stock_picking_batch/i18n/mn.po
diff --git a/addons/stock_picking_wave/i18n/nb.po b/addons/stock_picking_batch/i18n/nb.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/nb.po
rename to addons/stock_picking_batch/i18n/nb.po
diff --git a/addons/stock_picking_wave/i18n/nl.po b/addons/stock_picking_batch/i18n/nl.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/nl.po
rename to addons/stock_picking_batch/i18n/nl.po
diff --git a/addons/stock_picking_wave/i18n/nl_BE.po b/addons/stock_picking_batch/i18n/nl_BE.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/nl_BE.po
rename to addons/stock_picking_batch/i18n/nl_BE.po
diff --git a/addons/stock_picking_wave/i18n/pl.po b/addons/stock_picking_batch/i18n/pl.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/pl.po
rename to addons/stock_picking_batch/i18n/pl.po
diff --git a/addons/stock_picking_wave/i18n/pt.po b/addons/stock_picking_batch/i18n/pt.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/pt.po
rename to addons/stock_picking_batch/i18n/pt.po
diff --git a/addons/stock_picking_wave/i18n/pt_BR.po b/addons/stock_picking_batch/i18n/pt_BR.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/pt_BR.po
rename to addons/stock_picking_batch/i18n/pt_BR.po
diff --git a/addons/stock_picking_wave/i18n/ro.po b/addons/stock_picking_batch/i18n/ro.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ro.po
rename to addons/stock_picking_batch/i18n/ro.po
diff --git a/addons/stock_picking_wave/i18n/ru.po b/addons/stock_picking_batch/i18n/ru.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ru.po
rename to addons/stock_picking_batch/i18n/ru.po
diff --git a/addons/stock_picking_wave/i18n/sk.po b/addons/stock_picking_batch/i18n/sk.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/sk.po
rename to addons/stock_picking_batch/i18n/sk.po
diff --git a/addons/stock_picking_wave/i18n/sl.po b/addons/stock_picking_batch/i18n/sl.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/sl.po
rename to addons/stock_picking_batch/i18n/sl.po
diff --git a/addons/stock_picking_wave/i18n/sq.po b/addons/stock_picking_batch/i18n/sq.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/sq.po
rename to addons/stock_picking_batch/i18n/sq.po
diff --git a/addons/stock_picking_wave/i18n/sr.po b/addons/stock_picking_batch/i18n/sr.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/sr.po
rename to addons/stock_picking_batch/i18n/sr.po
diff --git a/addons/stock_picking_wave/i18n/sr@latin.po b/addons/stock_picking_batch/i18n/sr@latin.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/sr@latin.po
rename to addons/stock_picking_batch/i18n/sr@latin.po
diff --git a/addons/stock_picking_wave/i18n/stock_picking_wave.pot b/addons/stock_picking_batch/i18n/stock_picking_batch.pot
similarity index 100%
rename from addons/stock_picking_wave/i18n/stock_picking_wave.pot
rename to addons/stock_picking_batch/i18n/stock_picking_batch.pot
diff --git a/addons/stock_picking_wave/i18n/sv.po b/addons/stock_picking_batch/i18n/sv.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/sv.po
rename to addons/stock_picking_batch/i18n/sv.po
diff --git a/addons/stock_picking_wave/i18n/ta.po b/addons/stock_picking_batch/i18n/ta.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/ta.po
rename to addons/stock_picking_batch/i18n/ta.po
diff --git a/addons/stock_picking_wave/i18n/th.po b/addons/stock_picking_batch/i18n/th.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/th.po
rename to addons/stock_picking_batch/i18n/th.po
diff --git a/addons/stock_picking_wave/i18n/tr.po b/addons/stock_picking_batch/i18n/tr.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/tr.po
rename to addons/stock_picking_batch/i18n/tr.po
diff --git a/addons/stock_picking_wave/i18n/uk.po b/addons/stock_picking_batch/i18n/uk.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/uk.po
rename to addons/stock_picking_batch/i18n/uk.po
diff --git a/addons/stock_picking_wave/i18n/vi.po b/addons/stock_picking_batch/i18n/vi.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/vi.po
rename to addons/stock_picking_batch/i18n/vi.po
diff --git a/addons/stock_picking_wave/i18n/zh_CN.po b/addons/stock_picking_batch/i18n/zh_CN.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/zh_CN.po
rename to addons/stock_picking_batch/i18n/zh_CN.po
diff --git a/addons/stock_picking_wave/i18n/zh_TW.po b/addons/stock_picking_batch/i18n/zh_TW.po
similarity index 100%
rename from addons/stock_picking_wave/i18n/zh_TW.po
rename to addons/stock_picking_batch/i18n/zh_TW.po
diff --git a/addons/stock_picking_wave/models/__init__.py b/addons/stock_picking_batch/models/__init__.py
similarity index 74%
rename from addons/stock_picking_wave/models/__init__.py
rename to addons/stock_picking_batch/models/__init__.py
index cfd8cec597b..6f4ec3d8036 100644
--- a/addons/stock_picking_wave/models/__init__.py
+++ b/addons/stock_picking_batch/models/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import stock_picking_wave
+from . import stock_picking_batch
diff --git a/addons/stock_picking_wave/models/stock_picking_wave.py b/addons/stock_picking_batch/models/stock_picking_batch.py
similarity index 98%
rename from addons/stock_picking_wave/models/stock_picking_wave.py
rename to addons/stock_picking_batch/models/stock_picking_batch.py
index 3932c4e6a1c..6de6e88b0fc 100644
--- a/addons/stock_picking_wave/models/stock_picking_wave.py
+++ b/addons/stock_picking_batch/models/stock_picking_batch.py
@@ -70,7 +70,7 @@ class StockPickingWave(models.Model):
 
     def _track_subtype(self, init_values):
         if 'state' in init_values:
-            return 'stock_picking_wave.mt_wave_state'
+            return 'stock_picking_batch.mt_wave_state'
         return super(StockPickingWave, self)._track_subtype(init_values)
 
 
diff --git a/addons/stock_picking_wave/security/ir.model.access.csv b/addons/stock_picking_batch/security/ir.model.access.csv
similarity index 100%
rename from addons/stock_picking_wave/security/ir.model.access.csv
rename to addons/stock_picking_batch/security/ir.model.access.csv
diff --git a/addons/stock_picking_wave/views/stock_picking_wave_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
similarity index 100%
rename from addons/stock_picking_wave/views/stock_picking_wave_views.xml
rename to addons/stock_picking_batch/views/stock_picking_batch_views.xml
diff --git a/addons/stock_picking_wave/wizard/__init__.py b/addons/stock_picking_batch/wizard/__init__.py
similarity index 72%
rename from addons/stock_picking_wave/wizard/__init__.py
rename to addons/stock_picking_batch/wizard/__init__.py
index afd96c47267..063ece3795c 100644
--- a/addons/stock_picking_wave/wizard/__init__.py
+++ b/addons/stock_picking_batch/wizard/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import stock_picking_to_wave
+from . import stock_picking_to_batch
diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py b/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
similarity index 100%
rename from addons/stock_picking_wave/wizard/stock_picking_to_wave.py
rename to addons/stock_picking_batch/wizard/stock_picking_to_batch.py
diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
similarity index 100%
rename from addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
rename to addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml

From af846c354e969d5668be4385fa117729e20bfbaa Mon Sep 17 00:00:00 2001
From: Kirti Choudhary <kic@odoo.com>
Date: Mon, 21 Aug 2017 18:08:06 +0530
Subject: [PATCH 022/119] [IMP] stock_picking_batch: few improvements,

- model renamed: stock.picking.wave -> stock.picking.batch
- Class renamed: StockPickingWave -> StockPickingBatch
- .xml files: changed XML IDs according to module guidelines, reindented code and removed commented code
---
 addons/stock/models/stock_config_settings.py  |   2 +-
 .../views/stock_config_settings_views.xml     |   4 +-
 .../data/stock_picking_batch_data.xml         |  11 +-
 .../data/stock_picking_batch_demo.xml         | 231 ++++++++--------
 .../models/stock_picking_batch.py             |  24 +-
 .../security/ir.model.access.csv              |   2 +-
 .../views/stock_picking_batch_views.xml       | 258 ++++++++----------
 .../wizard/stock_picking_to_batch.py          |   8 +-
 .../wizard/stock_picking_to_batch_views.xml   |  60 ++--
 9 files changed, 287 insertions(+), 313 deletions(-)

diff --git a/addons/stock/models/stock_config_settings.py b/addons/stock/models/stock_config_settings.py
index a1dbc055ef1..45ff22c6ede 100644
--- a/addons/stock/models/stock_config_settings.py
+++ b/addons/stock/models/stock_config_settings.py
@@ -35,7 +35,7 @@ class StockConfigSettings(models.TransientModel):
         string="No Rescheduling Propagation",
         oldname='default_new_propagation_minimum_delta',
         help="Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n This option allows to not propagate the rescheduling if the change is not critical.")
-    module_stock_picking_wave = fields.Boolean("Batch Pickings")
+    module_stock_picking_batch = fields.Boolean("Batch Pickings", oldname="module_stock_picking_wave")
     module_stock_calendar = fields.Boolean("Vendor Calendar for Reordering",
         help='Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).\nBy default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules.')
     module_stock_barcode = fields.Boolean("Barcode Scanner")
diff --git a/addons/stock/views/stock_config_settings_views.xml b/addons/stock/views/stock_config_settings_views.xml
index 3719c4ab3f3..df827a73bde 100644
--- a/addons/stock/views/stock_config_settings_views.xml
+++ b/addons/stock/views/stock_config_settings_views.xml
@@ -43,10 +43,10 @@
                             </div>
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
-                                    <field name="module_stock_picking_wave"/>
+                                    <field name="module_stock_picking_batch"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label for="module_stock_picking_wave"/>
+                                    <label for="module_stock_picking_batch"/>
                                     <div class="text-muted">
                                         Process picking in batch per worker
                                     </div>
diff --git a/addons/stock_picking_batch/data/stock_picking_batch_data.xml b/addons/stock_picking_batch/data/stock_picking_batch_data.xml
index 54cc489db76..1ce28f17aca 100644
--- a/addons/stock_picking_batch/data/stock_picking_batch_data.xml
+++ b/addons/stock_picking_batch/data/stock_picking_batch_data.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Batch Picking related subtypes for messaging / Chatter -->
-    <record id="mt_wave_state" model="mail.message.subtype">
+
+    <!-- Batch picking related subtypes for messaging / Chatter -->
+    <record id="mt_batch_state" model="mail.message.subtype">
         <field name="name">Stage Changed</field>
-        <field name="res_model">stock.picking.wave</field>
+        <field name="res_model">stock.picking.batch</field>
         <field name="default" eval="False"/>
         <field name="description">Stage Changed</field>
     </record>
 
-    <record id="seq_picking_wave" model="ir.sequence">
+    <record id="seq_picking_batch" model="ir.sequence">
         <field name="name">Batch Picking</field>
-        <field name="code">picking.wave</field>
+        <field name="code">picking.batch</field>
         <field name="prefix">Batch/</field>
         <field name="padding">5</field>
         <field name="company_id" eval="False"/>
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 38970d7d550..8262a81c58f 100644
--- a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml
+++ b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml
@@ -1,125 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-			<!--
-	            Add batch picking
-	        -->
-		<record id="stock_picking_wave_dry_1" model="stock.picking.wave">
-	        <field name="name">Picking Dry for John</field>
-			<field name="state">in_progress</field>   
-	    </record>
-	        
-		<record id="stock_picking_wave_freeze_1" model="stock.picking.wave">
-	        <field name="name">Picking Freeze for Mickael</field>
-			<field name="state">in_progress</field>
-	    </record>
-	
-			<!--
-	            Add picking   
-	        -->
-	
-		<record id="Picking_A" model="stock.picking">
-			<field name="name">Picking #1</field>
-			<field name="move_type">one</field>
-			<field name="priority">2</field>	
-			<field name="picking_type_id" ref="stock.picking_type_internal"/>
-			<field name="wave_id" ref="stock_picking_wave_freeze_1"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>
-		</record>
-		<record id="Picking_B" model="stock.picking">
-			<field name="name">Picking #2</field>
-			<field name="move_type">one</field>		
-			<field name="state">assigned</field>
-			<field name="priority">1</field>		
-			<field name="picking_type_id" ref="stock.picking_type_internal"/>
-			<field name="wave_id" ref="stock_picking_wave_dry_1"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>
-		</record>	
-		<record id="Picking_C" model="stock.picking">
-			<field name="name">Picking #3</field>
-			<field name="move_type">one</field>		
-			<field name="state">assigned</field>
-			<field name="priority">1</field>		
-			<field name="picking_type_id" ref="stock.picking_type_internal"/>	
-			<field name="wave_id" ref="stock_picking_wave_freeze_1"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>
-		</record>	
-	
-			<!-- add Product -->
-			
-		<record id="product_product_ice_cream_choco" model="product.product">
-	            <field name="name">Ice Cream Chocolate</field>
-	            <field name="default_code">IC-CHOCO</field>
-	            <field name="categ_id" ref="product.product_category_all"/>
-	            <field name="list_price">450.0</field>
-	            <field name="standard_price">300.0</field>
-	            <field name="type">consu</field>
-	            <field name="uom_id" ref="product.product_uom_unit"/>
-	            <field name="uom_po_id" ref="product.product_uom_unit"/>
-	            <field name="description_sale">Ice Cream Chocolate with sticks</field>
-	    </record>
-	    <record id="product_product_ice_cream_vani" model="product.product">
-	            <field name="name">Ice Cream Vanilla</field>
-	            <field name="default_code">IC-VANI</field>
-	            <field name="categ_id" ref="product.product_category_all"/>
-	            <field name="list_price">450.0</field>
-	            <field name="standard_price">300.0</field>
-	            <field name="type">consu</field>
-	            <field name="uom_id" ref="product.product_uom_unit"/>
-	            <field name="uom_po_id" ref="product.product_uom_unit"/>
-	            <field name="description_sale">Ice Cream Vanilla</field>
-	    </record>    
-		<record id="product_product_dry_specu" model="product.product">
-	            <field name="name">Speculoos</field>
-	            <field name="default_code">DRY-SPEC</field>
-	            <field name="categ_id" ref="product.product_category_all"/>
-	            <field name="list_price">150.0</field>
-	            <field name="standard_price">100.0</field>
-	            <field name="type">consu</field>
-	            <field name="uom_id" ref="product.product_uom_unit"/>
-	            <field name="uom_po_id" ref="product.product_uom_unit"/>
-	            <field name="description_sale">Speculoos - A belgian speciality</field>
-	    </record>	
-			
-		
-			<!--
-	            Add stock move   
-	        -->
-	
-		<record id="stock_move1" model="stock.move">
-			<field name="name">A first stock move</field>		
-			<field name="picking_id" ref="Picking_A"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>		
-			<field name="product_uom" ref="product.product_uom_unit" />
-			<field name="product_id" ref="product_product_ice_cream_choco"/>
-		</record>
-		<record id="stock_move2" model="stock.move">
-			<field name="name">A second stock move</field>		
-			<field name="picking_id" ref="Picking_A"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>		
-			<field name="product_uom" ref="product.product_uom_unit" />
-			<field name="product_id" ref="product_product_ice_cream_vani"/>
-		</record>
-		<record id="stock_move3" model="stock.move">
-			<field name="name">A third stock move</field>		
-			<field name="picking_id" ref="Picking_B"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>		
-			<field name="product_uom" ref="product.product_uom_unit" />
-			<!--<field name="product_id" ref="product.product_product_10"/>-->
-			<field name="product_id" ref="product_product_dry_specu"/>		
-		</record>
-		<record id="stock_move4" model="stock.move">
-			<field name="name">A fourth stock move</field>		
-			<field name="picking_id" ref="Picking_C"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
-			<field name="location_dest_id" ref="stock.stock_location_output"/>		
-			<field name="product_uom" ref="product.product_uom_unit" />		
-			<field name="product_id" ref="product_product_ice_cream_vani"/>		
-		</record>
+
+    <!-- Add batch picking -->
+    <record id="stock_picking_batch_dry_1" model="stock.picking.batch">
+        <field name="name">Picking Dry for John</field>
+        <field name="state">in_progress</field>
+    </record>
+    <record id="stock_picking_batch_freeze_1" model="stock.picking.batch">
+        <field name="name">Picking Freeze for Mickael</field>
+        <field name="state">in_progress</field>
+    </record>
+
+    <!-- Add picking -->
+    <record id="Picking_A" model="stock.picking">
+        <field name="name">Picking #1</field>
+        <field name="move_type">one</field>
+        <field name="priority">2</field>
+        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="batch_id" ref="stock_picking_batch_freeze_1"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+    </record>
+    <record id="Picking_B" model="stock.picking">
+        <field name="name">Picking #2</field>
+        <field name="move_type">one</field>
+        <field name="state">assigned</field>
+        <field name="priority">1</field>
+        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="batch_id" ref="stock_picking_batch_dry_1"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+    </record>
+    <record id="Picking_C" model="stock.picking">
+        <field name="name">Picking #3</field>
+        <field name="move_type">one</field>
+        <field name="state">assigned</field>
+        <field name="priority">1</field>
+        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="batch_id" ref="stock_picking_batch_freeze_1"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+    </record>
+
+    <!-- add Product -->
+    <record id="product_product_ice_cream_choco" model="product.product">
+        <field name="name">Ice Cream Chocolate</field>
+        <field name="default_code">IC-CHOCO</field>
+        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="list_price">450.0</field>
+        <field name="standard_price">300.0</field>
+        <field name="type">consu</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="description_sale">Ice Cream Chocolate with sticks</field>
+    </record>
+    <record id="product_product_ice_cream_vani" model="product.product">
+        <field name="name">Ice Cream Vanilla</field>
+        <field name="default_code">IC-VANI</field>
+        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="list_price">450.0</field>
+        <field name="standard_price">300.0</field>
+        <field name="type">consu</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="description_sale">Ice Cream Vanilla</field>
+    </record>
+    <record id="product_product_dry_specu" model="product.product">
+        <field name="name">Speculoos</field>
+        <field name="default_code">DRY-SPEC</field>
+        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="list_price">150.0</field>
+        <field name="standard_price">100.0</field>
+        <field name="type">consu</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="description_sale">Speculoos - A belgian speciality</field>
+    </record>
+
+    <!-- Add stock move -->
+    <record id="stock_move1" model="stock.move">
+        <field name="name">A first stock move</field>
+        <field name="picking_id" ref="Picking_A"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="product_uom" ref="product.product_uom_unit" />
+        <field name="product_id" ref="product_product_ice_cream_choco"/>
+    </record>
+    <record id="stock_move2" model="stock.move">
+        <field name="name">A second stock move</field>
+        <field name="picking_id" ref="Picking_A"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="product_uom" ref="product.product_uom_unit" />
+        <field name="product_id" ref="product_product_ice_cream_vani"/>
+    </record>
+    <record id="stock_move3" model="stock.move">
+        <field name="name">A third stock move</field>
+        <field name="picking_id" ref="Picking_B"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="product_uom" ref="product.product_uom_unit" />
+        <field name="product_id" ref="product_product_dry_specu"/>
+    </record>
+    <record id="stock_move4" model="stock.move">
+        <field name="name">A fourth stock move</field>
+        <field name="picking_id" ref="Picking_C"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="product_uom" ref="product.product_uom_unit" />
+        <field name="product_id" ref="product_product_ice_cream_vani"/>
+    </record>
 
 </odoo>
diff --git a/addons/stock_picking_batch/models/stock_picking_batch.py b/addons/stock_picking_batch/models/stock_picking_batch.py
index 6de6e88b0fc..17528be6c98 100644
--- a/addons/stock_picking_batch/models/stock_picking_batch.py
+++ b/addons/stock_picking_batch/models/stock_picking_batch.py
@@ -5,9 +5,9 @@ from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 
 
-class StockPickingWave(models.Model):
+class StockPickingBatch(models.Model):
     _inherit = ['mail.thread']
-    _name = "stock.picking.wave"
+    _name = "stock.picking.batch"
     _description = "Batch Picking"
     _order = "name desc"
 
@@ -19,7 +19,7 @@ class StockPickingWave(models.Model):
         'res.users', string='Responsible', track_visibility='onchange',
         help='Person responsible for this batch picking')
     picking_ids = fields.One2many(
-        'stock.picking', 'wave_id', string='Pickings',
+        'stock.picking', 'batch_id', string='Pickings',
         help='List of picking associated to this batch')
     state = fields.Selection([
         ('draft', 'Draft'),
@@ -31,8 +31,8 @@ class StockPickingWave(models.Model):
     @api.model
     def create(self, vals):
         if vals.get('name', '/') == '/':
-            vals['name'] = self.env['ir.sequence'].next_by_code('picking.wave') or '/'
-        return super(StockPickingWave, self).create(vals)
+            vals['name'] = self.env['ir.sequence'].next_by_code('batch.picking') or '/'
+        return super(StockPickingBatch, self).create(vals)
 
     @api.multi
     def confirm_picking(self):
@@ -59,25 +59,25 @@ class StockPickingWave(models.Model):
             raise UserError(_('Some pickings are still waiting for goods. Please check or force their availability before setting this batch to done.'))
         for picking in pickings:
             picking.message_post(
-                body="<b>%s:</b> %s <a href=#id=%s&view_type=form&model=stock.picking.wave>%s</a>" % (
+                body="<b>%s:</b> %s <a href=#id=%s&view_type=form&model=stock.picking.batch>%s</a>" % (
                     _("Transferred by"),
                     _("Batch Picking"),
-                    picking.wave_id.id,
-                    picking.wave_id.name))
+                    picking.batch_id.id,
+                    picking.batch_id.name))
         if pickings:
             pickings.action_done()
         return self.write({'state': 'done'})
 
     def _track_subtype(self, init_values):
         if 'state' in init_values:
-            return 'stock_picking_batch.mt_wave_state'
-        return super(StockPickingWave, self)._track_subtype(init_values)
+            return 'stock_picking_batch.mt_batch_state'
+        return super(StockPickingBatch, self)._track_subtype(init_values)
 
 
 class StockPicking(models.Model):
     _inherit = "stock.picking"
 
-    wave_id = fields.Many2one(
-        'stock.picking.wave', string='Batch Picking',
+    batch_id = fields.Many2one(
+        'stock.picking.batch', string='Batch Picking', oldname="wave_id",
         states={'done': [('readonly', True)], 'cancel': [('readonly', True)]},
         help='Batch associated to this picking')
diff --git a/addons/stock_picking_batch/security/ir.model.access.csv b/addons/stock_picking_batch/security/ir.model.access.csv
index 40168055609..615ed649f59 100644
--- a/addons/stock_picking_batch/security/ir.model.access.csv
+++ b/addons/stock_picking_batch/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_picking_wave,stock.picking.wave stock users,model_stock_picking_wave,stock.group_stock_user,1,1,1,1
\ No newline at end of file
+access_stock_picking_batch,stock.picking.batch stock users,model_stock_picking_batch,stock.group_stock_user,1,1,1,1
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 0cd30865ffa..dd7650890f2 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -1,160 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="view_picking_wave_form" model="ir.ui.view">
-            <field name="name">picking.wave.form</field>
-            <field name="model">stock.picking.wave</field>
-            <field name="arch" type="xml">
-                <form string="Stock Batch Picking">
-                    <header>
-                        <button name="confirm_picking" states="draft" string="Confirm" type="object" class="oe_highlight"/>
-                        <button name="print_picking" string="Print" type="object" class="oe_highlight"/>
-                        <button name="done" states="in_progress" string="Done" type="object" class="oe_highlight"/>
-                        <button name="cancel_picking" string="Cancel" type="object" states="in_progress"/>
-                        <field name="state" widget="statusbar" statusbar_visible="in_progress,done"/>
-                    </header>
-                    <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <field name="name" class="oe_inline" readonly="1"/>
-                            </h1>
-                        </div>
-                        <group>
-                            <field name="user_id"/>
-                        </group>
-                        <separator string="Pickings"/>
-                        <field name="picking_ids" widget="many2many" domain="[('state', 'not in', ('done', 'cancel'))]" options="{'not_delete': True}">
-                            <tree>
-                                <field name="name"/>
-                                <field name="backorder_id"/>
-                                <field name="origin"/>
-                                <field name="date"/>
-                                <field name="min_date"/>
-                                <field name="state"/>
-                                <button name="action_assign" string="Confirm picking" type="object" icon="fa-check text-success" attrs="{'invisible': [('state', 'in', ('done', 'cancel', 'confirmed', 'assigned'))]}"/>
-                                <button name="force_assign" string="Force availability" type="object" icon="fa-arrow-right text-success" attrs="{'invisible': [('state', 'in', ('done', 'cancel', 'draft', 'assigned'))]}" groups="stock.group_stock_manager"/>
-                                <button name="action_cancel" string="Cancel picking" type="object" icon="fa-times-circle text-danger" attrs="{'invisible': [('state', 'in', ('done', 'cancel'))]}"/>
-                            </tree>
-                        </field>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
-                        <field name="message_ids" widget="mail_thread"/>
+
+    <record id="stock_picking_batch_form" model="ir.ui.view">
+        <field name="name">stock.picking.batch.form</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="arch" type="xml">
+            <form string="Stock Batch Picking">
+                <header>
+                    <button name="confirm_picking" states="draft" string="Confirm" type="object" class="oe_highlight"/>
+                    <button name="print_picking" string="Print" type="object" class="oe_highlight"/>
+                    <button name="done" states="in_progress" string="Done" type="object" class="oe_highlight"/>
+                    <button name="cancel_picking" string="Cancel" type="object" states="in_progress"/>
+                    <field name="state" widget="statusbar" statusbar_visible="in_progress,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1><field name="name" class="oe_inline" readonly="1"/></h1>
                     </div>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="view_picking_wave_tree" model="ir.ui.view">
-            <field name="name">picking.wave.tree</field>
-            <field name="model">stock.picking.wave</field>
-            <field name="arch" type="xml">
-                <tree string="Stock Batch Picking" decoration-muted="state=='cancel'">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_stock_picking_wave_kanban" model="ir.ui.view">
-            <field name="name">stock.picking.wave.kanban</field>
-            <field name="model">stock.picking.wave</field>
-            <field name="arch" type="xml">
-                <kanban class="o_kanban_mobile">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="state"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_global_click">
-                                <div class="row mb4">
-                                    <div class="col-xs-6">
-                                        <strong><field name="name"/></strong>
-                                    </div>
-                                    <div class="col-xs-6 text-right">
-                                        <field name="state" widget="kanban_label_selection"/>
-                                    </div>
+                    <group>
+                        <field name="user_id"/>
+                    </group>
+                    <separator string="Pickings"/>
+                    <field name="picking_ids" widget="many2many" domain="[('state', 'not in', ('done', 'cancel'))]" options="{'not_delete': True}">
+                        <tree>
+                            <field name="name"/>
+                            <field name="backorder_id"/>
+                            <field name="origin"/>
+                            <field name="date"/>
+                            <field name="scheduled_date"/>
+                            <field name="state"/>
+                            <button name="action_assign" string="Confirm picking" type="object" icon="fa-check text-success" attrs="{'invisible': [('state', 'in', ('done', 'cancel', 'confirmed', 'assigned'))]}"/>
+                            <button name="force_assign" string="Force availability" type="object" icon="fa-arrow-right text-success" attrs="{'invisible': [('state', 'in', ('done', 'cancel', 'draft', 'assigned'))]}" groups="stock.group_stock_manager"/>
+                            <button name="action_cancel" string="Cancel picking" type="object" icon="fa-times-circle text-danger" attrs="{'invisible': [('state', 'in', ('done', 'cancel'))]}"/>
+                        </tree>
+                    </field>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+    <record id="stock_picking_batch_tree" model="ir.ui.view">
+        <field name="name">stock.picking.batch.tree</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="arch" type="xml">
+            <tree string="Stock Batch Picking" decoration-muted="state=='cancel'">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record id="stock_picking_batch_kanban" model="ir.ui.view">
+        <field name="name">stock.picking.batch.kanban</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_mobile">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="state"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_global_click">
+                            <div class="row mb4">
+                                <div class="col-xs-6">
+                                    <strong><field name="name"/></strong>
                                 </div>
-                                <div class="pull-right">
-                                    <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
+                                <div class="col-xs-6 text-right">
+                                    <field name="state" widget="kanban_label_selection"/>
                                 </div>
                             </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="view_picking_wave_filter" model="ir.ui.view">
-            <field name="name">picking.wave.filter</field>
-            <field name="model">stock.picking.wave</field>
-            <field name="arch" type="xml">
-                <search string="Search Batch Picking">
-                    <field name="name" string="Batch Picking"/>
-                    <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Batch Picking not finished"/>
-                    <field name="user_id"/>
-                    <group expand="0" string="Group By">
-                        <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="State" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
-               </search>
-            </field>
-        </record>
-
-        <record id="action_picking_wave" model="ir.actions.act_window">
-            <field name="name">Batch Picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.picking.wave</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,kanban,form</field>
-            <field name="context">{"search_default_in_progress" : True,}</field>
-            <field name="search_view_id" ref="view_picking_wave_filter"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a Batch Picking.
-              </p><p>
-                The goal of the Batch Picking is to group operations that may
-                (needs to) be done together in order to increase their efficiency.
-                It may also be useful to assign jobs (one person = one batch) or
-                help the timing management of operations (tasks to be done at 1pm).
-              </p>
-            </field>
-        </record>
-        <menuitem action="action_picking_wave" id="menu_action_picking_wave" parent="stock.menu_stock_warehouse_mgmt" sequence="30"/>
-
-        <!-- <record model="ir.ui.view" id="view_stock_picking_wave_inherit">
-        <field name="name">stock.picking.wave.inherit.form</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='picking_type_id']" position="after">
-                <field name="wave_id" domain="[('state', 'not in', ('done', 'cancel'))]"/>
-            </xpath>
+                            <div class="pull-right">
+                                <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
         </field>
-        </record>-->
-        <record model="ir.ui.view" id="view_stock_picking_wave_tree_inherit">
-        <field name="name">stock.picking.wave.inherit.tree</field>
+    </record>
+    <record id="stock_picking_batch_filter" model="ir.ui.view">
+        <field name="name">stock.picking.batch.filter</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="arch" type="xml">
+            <search string="Search Batch Picking">
+                <field name="name" string="Batch Picking"/>
+                <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Batch Pickings not finished"/>
+                <field name="user_id"/>
+                <group expand="0" string="Group By">
+                    <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="State" domain="[]" context="{'group_by':'state'}"/>
+                </group>
+           </search>
+        </field>
+    </record>
+    <record id="stock_picking_batch_action" model="ir.actions.act_window">
+        <field name="name">Batch Picking</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">stock.picking.batch</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="context">{"search_default_in_progress" : True,}</field>
+        <field name="search_view_id" ref="stock_picking_batch_filter"/>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to create a Batch Picking.
+          </p><p>
+            The goal of the batch picking is to group operations that may
+            (needs to) be done together in order to increase their efficiency.
+            It may also be useful to assign jobs (one person = one batch) or
+            help the timing management of operations (tasks to be done at 1pm).
+          </p>
+        </field>
+    </record>
+    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.menu_stock_warehouse_mgmt" sequence="30"/>
+
+    <record id="vpicktree_inherit_stock_picking_batch" model="ir.ui.view">
+        <field name="name">stock.picking.tree</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.vpicktree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='picking_type_id']" position="after">
-                <field name="wave_id"/>
+                <field name="batch_id"/>
             </xpath>
         </field>
-        </record>
-        <record model="ir.ui.view" id="view_stock_picking_wave_search_inherit">
-        <field name="name">stock.picking.wave.inherit.search</field>
+    </record>
+    <record id="view_picking_internal_search_inherit_stock_picking_batch" model="ir.ui.view">
+        <field name="name">stock.picking.search</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_internal_search"/>
         <field name="arch" type="xml">
             <xpath expr="//filter[@name='picking_type']" position="after">
-                <filter string="Batch" domain="[]" context="{'group_by':'wave_id'}"/>
+                <filter string="Batch" domain="[]" context="{'group_by':'batch_id'}"/>
             </xpath>
             <xpath expr="//field[@name='picking_type_id']" position="after">
-                    <field name="wave_id"/>
+                <field name="batch_id"/>
             </xpath>
         </field>
-        </record>
+    </record>
 
 </odoo>
diff --git a/addons/stock_picking_batch/wizard/stock_picking_to_batch.py b/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
index cd02ca984e8..c25b97bcad9 100644
--- a/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
+++ b/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
@@ -4,15 +4,15 @@
 from odoo import api, fields, models
 
 
-class StockPickingToWave(models.TransientModel):
-    _name = 'stock.picking.to.wave'
+class StockPickingToBatch(models.TransientModel):
+    _name = 'stock.picking.to.batch'
     _description = 'Add pickings to a batch picking'
 
-    wave_id = fields.Many2one('stock.picking.wave', string='Batch Picking', required=True)
+    batch_id = fields.Many2one('stock.picking.batch', string='Batch Picking', required=True, oldname="wave_id")
 
     @api.multi
     def attach_pickings(self):
         # use active_ids to add picking line to the selected batch
         self.ensure_one()
         picking_ids = self.env.context.get('active_ids')
-        return self.env['stock.picking'].browse(picking_ids).write({'wave_id': self.wave_id.id})
+        return self.env['stock.picking'].browse(picking_ids).write({'batch_id': self.batch_id.id})
diff --git a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
index 78662f6942a..9f994be520b 100644
--- a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
+++ b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-        <!-- add picking to batch -->
-        <record model="ir.ui.view" id="picking_to_wave_form">
-            <field name="name">stock.picking.to.wave.form</field>
-            <field name="model">stock.picking.to.wave</field>
-            <field name="arch" type="xml">
-                <form string="Add pickings to batch">
-                    <separator string="Select a batch"/>
-                    <field name="wave_id" class="oe_inline"/>
-                    <footer>
-                        <button name="attach_pickings" type="object" string="Add to Batch" class="btn-primary"/>
-                        <button string="Cancel" class="btn-default" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
+    <!-- add picking to batch  -->
+    <record id="stock_picking_to_batch_form" model="ir.ui.view">
+        <field name="name">stock.picking.to.batch.form</field>
+        <field name="model">stock.picking.to.batch</field>
+        <field name="arch" type="xml">
+            <form string="Add pickings to batch">
+                <separator string="Select a batch"/>
+                <field name="batch_id" class="oe_inline"/>
+                <footer>
+                    <button name="attach_pickings" type="object" string="Add to Batch" class="btn-primary"/>
+                    <button string="Cancel" class="btn-default" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
 
-        <!--  add picking to batch action -->
-        <record model="ir.actions.act_window" id="picking_to_wave_act">
-            <field name="name">Add to Batch</field>
-            <field name="res_model">stock.picking.to.wave</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="picking_to_wave_form"/>
-            <field name="target">new</field>
-        </record>
+    <!--  add picking to batch action -->
+    <record id="stock_picking_to_batch_action" model="ir.actions.act_window">
+        <field name="name">Add to Batch</field>
+        <field name="res_model">stock.picking.to.batch</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="stock_picking_to_batch_form"/>
+        <field name="target">new</field>
+    </record>
 
-        <act_window id="action_picking_to_wave"
-            multi="True"
-            key2="client_action_multi" name="Add to Batch"
-            res_model="stock.picking.to.wave" src_model="stock.picking"
-            view_mode="form" target="new" view_type="form"
-            />
+    <act_window id="stock_picking_to_batch_action_stock_picking"
+        multi="True"
+        key2="client_action_multi" name="Add to Batch"
+        res_model="stock.picking.to.batch" src_model="stock.picking"
+        view_mode="form" target="new" view_type="form"
+    />
 
 </odoo>

From 04b81d37ac6050c4a87e78a7fec5e17bb27f1468 Mon Sep 17 00:00:00 2001
From: Kirti Choudhary <kic@odoo.com>
Date: Fri, 18 Aug 2017 14:43:23 +0530
Subject: [PATCH 023/119] [IMP] .tx: module stock_picking_wave renamed to
 stock_picking_batch

Adapt tx to module rename hence it's entry in config file
---
 .tx/config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.tx/config b/.tx/config
index b09a0702e25..09ff9f60894 100644
--- a/.tx/config
+++ b/.tx/config
@@ -697,9 +697,9 @@ file_filter = addons/stock_landed_costs/i18n/<lang>.po
 source_file = addons/stock_landed_costs/i18n/stock_landed_costs.pot
 source_lang = en
 
-[odoo-master.stock_picking_wave]
-file_filter = addons/stock_picking_wave/i18n/<lang>.po
-source_file = addons/stock_picking_wave/i18n/stock_picking_wave.pot
+[odoo-master.stock_picking_batch]
+file_filter = addons/stock_picking_batch/i18n/<lang>.po
+source_file = addons/stock_picking_batch/i18n/stock_picking_batch.pot
 source_lang = en
 
 [odoo-master.survey]

From 0ec73fa9c56cf3579901baca2d2ed9837588d67d Mon Sep 17 00:00:00 2001
From: amoyaux <arm@odoo.com>
Date: Fri, 25 Aug 2017 15:32:14 +0200
Subject: [PATCH 024/119] [FIX] stock_picking_batch: scheduled_date field

Stock picking batch was introduced in saas-17 instead of
master as planned. However I missed one field that has been renamed on
stock picking called scheduled_date inseatd of min_date.

This commit make the inverse change in order to be compatible with saas-17
---
 addons/stock_picking_batch/views/stock_picking_batch_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index dd7650890f2..cb2a782ce94 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -27,7 +27,7 @@
                             <field name="backorder_id"/>
                             <field name="origin"/>
                             <field name="date"/>
-                            <field name="scheduled_date"/>
+                            <field name="min_date"/>
                             <field name="state"/>
                             <button name="action_assign" string="Confirm picking" type="object" icon="fa-check text-success" attrs="{'invisible': [('state', 'in', ('done', 'cancel', 'confirmed', 'assigned'))]}"/>
                             <button name="force_assign" string="Force availability" type="object" icon="fa-arrow-right text-success" attrs="{'invisible': [('state', 'in', ('done', 'cancel', 'draft', 'assigned'))]}" groups="stock.group_stock_manager"/>

From 193707632dd5cf068ccf5819014be4cfac821e61 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 25 Aug 2017 14:10:57 +0200
Subject: [PATCH 025/119] [FIX] sale_timesheet: apply correct discount in
 revenue computation

Related to https://github.com/odoo/odoo/commit/aec6248bb379c1ece02f5d4f718566c770fc2c6f
---
 addons/sale_timesheet/models/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_timesheet/models/account.py b/addons/sale_timesheet/models/account.py
index 7e6e70c50b8..1f1737e86ef 100644
--- a/addons/sale_timesheet/models/account.py
+++ b/addons/sale_timesheet/models/account.py
@@ -134,7 +134,7 @@ class AccountAnalyticLine(models.Model):
                 total_revenue_invoiced = sum(analytic_lines.mapped('timesheet_revenue'))
                 # compute (new) revenue of current timesheet line
                 revenue = min(
-                    analytic_account.currency_id.round(unit_amount * so_line.currency_id.compute(so_line.price_unit, analytic_account.currency_id) * (1-so_line.discount)),
+                    analytic_account.currency_id.round(unit_amount * so_line.currency_id.compute(so_line.price_unit, analytic_account.currency_id) * (1-(so_line.discount/100))),
                     total_revenue_so - total_revenue_invoiced
                 )
                 billable_type = 'billable_fixed'

From 71bb9a09ffa00a8186edea3eb47478fffe70ad5a Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 25 Aug 2017 14:13:11 +0200
Subject: [PATCH 026/119] [FIX] sale_timesheet: don't block th edition of
 timesheet if prepaid.

In case where the product is of invoice_type 'order' and not 'delivery',
we allow the user to edit the anlaytics lines / timesheet.

Previously, an employee was unable to edit an timesheet line once saved.
When you work on prepaid pack / long task, it is frequent to edit
existing timesheet line.
---
 addons/sale_timesheet/models/account.py               |  4 ++--
 addons/sale_timesheet/tests/test_timesheet_revenue.py | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/sale_timesheet/models/account.py b/addons/sale_timesheet/models/account.py
index 1f1737e86ef..07c70419b89 100644
--- a/addons/sale_timesheet/models/account.py
+++ b/addons/sale_timesheet/models/account.py
@@ -26,8 +26,8 @@ class AccountAnalyticLine(models.Model):
 
     @api.multi
     def write(self, values):
-        # prevent to update invoiced timesheets
-        if self.filtered(lambda timesheet: timesheet.timesheet_invoice_id):
+        # prevent to update invoiced timesheets if product_id is not of type order
+        if self.so_line.product_id.invoice_policy != "order" and self.filtered(lambda timesheet: timesheet.timesheet_invoice_id):
             if any([field_name in values for field_name in ['unit_amount', 'employee_id', 'task_id', 'timesheet_revenue', 'so_line', 'amount', 'date']]):
                 raise UserError(_('You can not modify already invoiced timesheets.'))
 
diff --git a/addons/sale_timesheet/tests/test_timesheet_revenue.py b/addons/sale_timesheet/tests/test_timesheet_revenue.py
index c1f13ee9b51..1fa0b40fcd2 100644
--- a/addons/sale_timesheet/tests/test_timesheet_revenue.py
+++ b/addons/sale_timesheet/tests/test_timesheet_revenue.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.addons.sale.tests.test_sale_common import TestSale
+from odoo.exceptions import UserError
 from odoo.tools import float_compare, float_repr
 
 
@@ -185,6 +186,16 @@ class TestSaleTimesheet(TestSale):
         self.assertEquals(timesheet2.timesheet_invoice_id, invoice)
         self.assertEquals(timesheet3.timesheet_invoice_id, invoice)
 
+        # check that analytic line for product 'ordered' can be altered
+        with self.assertRaises(UserError):
+            timesheet1.write(dict(unit_amount=10))
+        self.assertNotEquals(timesheet1.unit_amount, 10)
+
+        # check that analytic line for product 'delivered' cannot be altered
+        timesheet3.write(dict(unit_amount=10))
+        self.assertEquals(timesheet3.unit_amount, 10)
+
+
     def test_revenue_multi_currency(self):
         """ Create a SO with 2 lines : one for a delivered service, one for a ordered service. Confirm
             and invoice it. For this, we use a partner having a DIFFERENT currency from the current company.

From 7095c32f1cd17a86606e4137ece8baa3034fe74a Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 25 Aug 2017 12:12:42 +0200
Subject: [PATCH 027/119] [FIX] web: tests: correctly destroy view

---
 addons/web/static/tests/fields/basic_fields_tests.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 1f9e416223c..f851ad60115 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -1241,6 +1241,8 @@ QUnit.module('basic_fields', {
         // Copying from a div tag with white-space:pre-wrap doesn't work in Firefox
         assert.strictEqual(form.$('[name="txt"]').prop("tagName").toLowerCase(), 'span',
             "the field contents should be surrounded by a span tag");
+
+        form.destroy();
     });
 
     QUnit.module('FieldBinary');

From b131e9b0ef458e8cc00b0a2eb6c1b4d8dfe889a0 Mon Sep 17 00:00:00 2001
From: Akash Bhavsar <abh@odoo.com>
Date: Mon, 26 Jun 2017 17:24:01 +0530
Subject: [PATCH 028/119] [FIX] barcodes: fix several issues when scanning
 barcodes

Since the new views, most of the barcodes feature was
broken. This commit re-enables the support of commands like
'edit', 'save', 'cancel', 'previous' and 'next'.

Also changed javascript event handler to jquery event handler to
make barcodes testable in phantomjs.
---
 .../barcodes/static/src/js/barcode_events.js  |  22 ++--
 .../barcodes/static/src/js/barcode_field.js   |   2 +-
 .../static/src/js/barcode_form_view.js        |  55 ++++++--
 addons/barcodes/static/tests/barcode_tests.js | 121 ++++++++++++++++++
 addons/barcodes/views/barcodes_templates.xml  |   6 +
 addons/web/static/tests/helpers/test_utils.js |  15 +++
 6 files changed, 197 insertions(+), 24 deletions(-)
 create mode 100644 addons/barcodes/static/tests/barcode_tests.js

diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js
index 04c03a41308..0f13c59fe66 100644
--- a/addons/barcodes/static/src/js/barcode_events.js
+++ b/addons/barcodes/static/src/js/barcode_events.js
@@ -77,13 +77,7 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
                     'bubbles': old_event.bubbles,
                     'cancelable': old_event.cancelable,
                 };
-                try {
-                    new_event = new Event("keypress", params);
-                } catch(error) {
-                    // For IE >= 9, use new CustomEvent(), instead of new Event()
-                    new_event = new CustomEvent("keypress", params);
-                }
-
+                new_event = $.Event('keypress', params);
                 new_event.viewArg = old_event.viewArg;
                 new_event.ctrl = old_event.ctrl;
                 new_event.alt = old_event.alt;
@@ -96,7 +90,7 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
                 new_event.which = old_event.which;
                 new_event.dispatched_by_barcode_reader = true;
 
-                old_event.target.dispatchEvent(new_event);
+                $(old_event.target).trigger(new_event);
             }
         }
     },
@@ -173,17 +167,17 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
     },
 
     start: function(prevent_key_repeat){
-        document.body.addEventListener('keypress', this.__handler, true);
+        $('body').bind("keypress", this.__handler);
         if (prevent_key_repeat === true) {
-            document.body.addEventListener('keydown', this.__keydown_handler, true);
-            document.body.addEventListener('keyup', this.__keyup_handler, true);
+            $('body').bind("keydown", this.__keydown_handler);
+            $('body').bind('keyup', this.__keyup_handler);
         }
     },
 
     stop: function(){
-        document.body.removeEventListener('keypress', this.__handler, true);
-        document.body.removeEventListener('keydown', this.__keydown_handler, true);
-        document.body.removeEventListener('keyup', this.__keyup_handler, true);
+        $('body').unbind("keypress", this.__handler);
+        $('body').unbind("keydown", this.__keydown_handler);
+        $('body').unbind('keyup', this.__keyup_handler);
     },
 });
 
diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js
index aa31b4d8261..9b0f2391e3a 100644
--- a/addons/barcodes/static/src/js/barcode_field.js
+++ b/addons/barcodes/static/src/js/barcode_field.js
@@ -40,7 +40,7 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
      */
     _onKeypress: function (e) {
         /* only simulate a keypress if it has been previously prevented */
-        if (e.originalEvent.dispatched_by_barcode_reader !== true) {
+        if (e.dispatched_by_barcode_reader !== true) {
             e.preventDefault();
             this.$input.blur();
             return;
diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 69a59fdaafa..37fa34dcf95 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -26,19 +26,21 @@ FormController.include({
         this.activeBarcode = {
             form_view: {
                 commands: {
-                    'O-CMD.NEW': 'createRecord',
-                    'O-CMD.EDIT': 'toEditMode',
-                    'O-CMD.CANCEL': 'discardChange',
-                    'O-CMD.SAVE': function () { return this.saveRecord({reload: true}); },
-                    // 'O-CMD.PAGER-PREV':
-                    // 'O-CMD.PAGER-NEXT':
-                }
-            }
+                    'O-CMD.EDIT': this._onEdit.bind(this),
+                    'O-CMD.CANCEL': this._onDiscard.bind(this),
+                    'O-CMD.SAVE': this._onCommandSave.bind(this),
+                    'O-CMD.PAGER-PREV': this._onCommandPrevious.bind(this),
+                    'O-CMD.PAGER-NEXT': this._onCommandNext.bind(this),
+                },
+            },
         };
 
         this.barcodeMutex = new concurrency.Mutex();
         this._barcodeStartListening();
     },
+    /**
+     * @override
+     */
     destroy: function () {
         this._barcodeStopListening();
         this._super();
@@ -70,6 +72,8 @@ FormController.include({
         }
     },
     /**
+     * Returns true iff the given barcode matches the given record (candidate).
+     *
      * @private
      * @param {Object} candidate: record in the x2m
      * @param {string} barcode sent by the scanner (string generate from keypress series)
@@ -128,7 +132,7 @@ FormController.include({
      */
     _getBarCodeRecord: function (record, barcode, activeBarcode) {
         var self = this;
-        if (!activeBarcode.fieldName) {
+        if (!activeBarcode.fieldName || !record.data[activeBarcode.fieldName]) {
             return;
         }
         return _.find(record.data[activeBarcode.fieldName].data, function (record) {
@@ -237,6 +241,24 @@ FormController.include({
             });
         });
     },
+    /**
+     * @private
+     */
+    _onCommandNext: function () {
+        return this.mutex.exec(function () {}).then(this.pager.next.bind(this.pager));
+    },
+    /**
+     * @private
+     */
+    _onCommandPrevious: function () {
+        return this.mutex.exec(function () {}).then(this.pager.previous.bind(this.pager));
+    },
+    /**
+     * @private
+     */
+    _onCommandSave: function () {
+        return this.saveRecord();
+    },
     /**
      * @private
      * @param {KeyEvent} event
@@ -359,6 +381,21 @@ FormRenderer.include({
         }
         return $button;
     },
+    /**
+     * Add barcode event handler
+     *
+     * @override
+     * @private
+     * @param {Object} node
+     * @returns {jQueryElement}
+     */
+    _renderTagButton: function (node) {
+        var $button = this._super.apply(this, arguments);
+        if (node.attrs.barcode_trigger) {
+            this._barcodeButtonHandler($button, node);
+        }
+        return $button;
+    }
 });
 
 BarcodeEvents.ReservedBarcodePrefixes.push('O-BTN');
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
new file mode 100644
index 00000000000..09daebcd976
--- /dev/null
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -0,0 +1,121 @@
+odoo.define('barcodes.tests', function (require) {
+"use strict";
+
+var testUtils = require('web.test_utils');
+var FormView = require('web.FormView');
+
+var createView = testUtils.createView;
+var triggerKeypressEvent = testUtils.triggerKeypressEvent;
+
+QUnit.module('Barcodes', {
+    beforeEach: function () {
+        this.data = {
+            product: {
+                fields: {
+                    name: {string : "Product name", type: "char"},
+                },
+                records: [
+                    {id: 1, name: "iPad Mini"},
+                    {id: 2, name: "Mouse, Optical"},
+                ],
+            },
+        };
+    }
+});
+
+QUnit.test('Button with barcode_trigger', function (assert) {
+    assert.expect(1);
+
+    var form = createView({
+        View: FormView,
+        model: 'product',
+        data: this.data,
+        arch: '<form>' +
+                '<header>' +
+                    '<button name="do_something" string="Validate" type="object" barcode_trigger="doit"/>' +
+                '</header>' +
+            '</form>',
+        res_id: 2,
+        intercepts: {
+            execute_action: function (event) {
+                assert.strictEqual(event.data.action_data.name, 'do_something',
+                    "do_something method call verified");
+            },
+        },
+    });
+
+    // O-BTN.doit
+    _.each(['O','-','B','T','N','.','d','o','i','t','Enter'], triggerKeypressEvent);
+
+    form.destroy();
+});
+
+QUnit.test('edit, save and cancel buttons', function (assert) {
+    assert.expect(6);
+
+    var form = createView({
+        View: FormView,
+        model: 'product',
+        data: this.data,
+        arch: '<form><field name="display_name"/></form>',
+        mockRPC: function (route, args) {
+            if (args.method === 'write') {
+                assert.step('save');
+            }
+            return this._super.apply(this, arguments);
+        },
+        res_id: 1,
+    });
+
+    // O-CMD.EDIT
+    _.each(["O","-","C","M","D",".","E","D","I","T","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$(".o_form_editable").length, 1,
+        "should have switched to 'edit' mode");
+    // dummy change to check that it actually saves
+    form.$('.o_field_widget').val('test').trigger('input');
+    // O-CMD.SAVE
+    _.each(["O","-","C","M","D",".","S","A","V","E","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$(".o_form_readonly").length, 1,
+        "should have switched to 'readonly' mode");
+    assert.verifySteps(['save'], 'should have saved');
+
+    // O-CMD.EDIT
+    _.each(["O","-","C","M","D",".","E","D","I","T","Enter"], triggerKeypressEvent);
+    // dummy change to check that it correctly discards
+    form.$('.o_field_widget').val('test').trigger('input');
+    // O-CMD.CANCEL
+    _.each(["O","-","C","M","D",".","C","A","N","C","E","L","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$(".o_form_readonly").length, 1,
+        "should have switched to 'readonly' mode");
+    assert.verifySteps(['save'], 'should not have saved');
+
+    form.destroy();
+});
+
+QUnit.test('pager buttons', function (assert) {
+    assert.expect(3);
+
+    var form = createView({
+        View: FormView,
+        model: 'product',
+        data: this.data,
+        arch: '<form><field name="display_name"/></form>',
+        res_id: 1,
+        viewOptions: {
+            ids: [1, 2],
+            index: 0,
+        },
+    });
+
+    assert.strictEqual(form.$('.o_field_widget').text(), 'iPad Mini');
+    // O-CMD.PAGER-NEXT
+    _.each(["O","-","C","M","D",".","P","A","G","E","R","-","N","E","X","T","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_field_widget').text(), 'Mouse, Optical');
+    // O-CMD.PAGER-PREV
+    _.each(["O","-","C","M","D",".","P","A","G","E","R","-","P","R","E","V","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_field_widget').text(), 'iPad Mini');
+
+    form.destroy();
+});
+
+});
diff --git a/addons/barcodes/views/barcodes_templates.xml b/addons/barcodes/views/barcodes_templates.xml
index 420a069a491..cb16a40c178 100644
--- a/addons/barcodes/views/barcodes_templates.xml
+++ b/addons/barcodes/views/barcodes_templates.xml
@@ -10,4 +10,10 @@
             </xpath>
         </template>
 
+        <template id="qunit_suite" name="barcode_tests" inherit_id="web.qunit_suite">
+            <xpath expr="//t[@t-set='head']" position="inside">
+                <script type="text/javascript" src="/barcodes/static/tests/barcode_tests.js"/>
+            </xpath>
+        </template>
+
 </odoo>
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index 0115dfc9152..f7003faaf5c 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -457,6 +457,20 @@ function triggerPositionalMouseEvent(x, y, type){
     return el;
 }
 
+/**
+ * simulate a keypress event for a given character
+ * @param {string} the character
+ */
+function triggerKeypressEvent(char) {
+    var keycode;
+    if (char === "Enter") {
+        keycode = $.ui.keyCode.ENTER;
+    } else {
+        keycode = char.charCodeAt(0);
+    }
+    return $('body').trigger($.Event('keypress', {which: keycode, keyCode: keycode}));
+}
+
 /**
  * Removes the src attribute on images and iframes to prevent not found errors,
  * and optionally triggers an rpc with the src url as route on a widget.
@@ -498,6 +512,7 @@ return session.is_bound.then(function () {
         dragAndDrop: dragAndDrop,
         triggerMouseEvent: triggerMouseEvent,
         triggerPositionalMouseEvent: triggerPositionalMouseEvent,
+        triggerKeypressEvent: triggerKeypressEvent,
         removeSrcAttribute: removeSrcAttribute,
     };
 });

From 5b968ad37108015805cfebd6b1ab0ea97e595361 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Wed, 2 Aug 2017 17:24:46 +0200
Subject: [PATCH 029/119] [FIX] web, barcodes: restore `disableAutofocus`
 option

This option has been removed with the new views but was used in barcode.

The form renderer was also dealing with some part of the autofocus
but this should only be handled by the controller.

The logic is now only in the controller and a test case has been added.
---
 .../static/src/js/barcode_form_view.js        |  4 +++
 .../src/js/views/form/form_controller.js      |  7 +++--
 .../static/src/js/views/form/form_renderer.js |  3 ---
 .../web/static/src/js/views/form/form_view.js |  1 +
 addons/web/static/tests/views/form_tests.js   | 26 +++++++++++++++++++
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 37fa34dcf95..7b82e68405c 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -171,6 +171,10 @@ FormController.include({
             candidate: this.activeBarcode[name] && this.activeBarcode[name].handle === this.handle ?
                 this.activeBarcode[name].candidate : null,
         };
+
+        // we want to disable autofocus when activating the barcode to avoid
+        // putting the scanned value in the focused field
+        this.disableAutofocus = true;
     },
     /**
      * @private
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index 7ddd3d16587..611847ac3f4 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -28,6 +28,7 @@ var FormController = BasicController.extend({
         this._super.apply(this, arguments);
 
         this.actionButtons = params.actionButtons;
+        this.disableAutofocus = params.disableAutofocus;
         this.footerToButtons = params.footerToButtons;
         this.defaultButtons = params.defaultButtons;
         this.hasSidebar = params.hasSidebar;
@@ -42,7 +43,9 @@ var FormController = BasicController.extend({
      * Calls autofocus on the renderer
      */
     autofocus: function () {
-        this.renderer.autofocus();
+        if (!this.disableAutofocus) {
+            this.renderer.autofocus();
+        }
     },
     /**
      * This method switches the form view in edit mode, with a new record.
@@ -305,7 +308,7 @@ var FormController = BasicController.extend({
         this.set('title', title);
         this._updateButtons();
         this._updateSidebar();
-        return this._super.apply(this, arguments);
+        return this._super.apply(this, arguments).then(this.autofocus.bind(this));
     },
     /**
      * @private
diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index 999006e54c2..ac53168df6e 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -815,9 +815,6 @@ var FormRenderer = BasicRenderer.extend({
                 self._addFieldTooltip(widget, $label);
             }
         });
-
-        // Focus the default field (in edit mode)
-        self.autofocus();
     },
     /**
      * Sets id attribute of given widget to idForLabel
diff --git a/addons/web/static/src/js/views/form/form_view.js b/addons/web/static/src/js/views/form/form_view.js
index f0264b67307..b48a5488848 100644
--- a/addons/web/static/src/js/views/form/form_view.js
+++ b/addons/web/static/src/js/views/form/form_view.js
@@ -29,6 +29,7 @@ var FormView = BasicView.extend({
         this.loadParams.type = 'record';
         this.loadParams.parentID = params.parentID;
 
+        this.controllerParams.disableAutofocus = params.disable_autofocus;
         this.controllerParams.hasSidebar = params.sidebar;
         this.controllerParams.toolbarActions = viewInfo.toolbar;
         this.controllerParams.footerToButtons = params.footer_to_buttons;
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 3ceb2046756..15147c22d1d 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -4197,6 +4197,32 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('no autofocus with disable_autofocus option [REQUIRE FOCUS]', function (assert) {
+        assert.expect(2);
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                        '<field name="int_field"/>' +
+                        '<field name="foo"/>' +
+                '</form>',
+            viewOptions: {
+                disable_autofocus: true,
+            },
+        });
+        assert.notStrictEqual(document.activeElement, form.$('input[name="int_field"]')[0],
+            "int_field field should not have focus");
+
+        form.update({});
+
+        assert.notStrictEqual(document.activeElement, form.$('input[name="int_field"]')[0],
+            "int_field field should not have focus");
+
+        form.destroy();
+    });
+
     QUnit.test('open one2many form containing many2many_tags', function (assert) {
             assert.expect(4);
 

From ebcf35b66c689ab80de888b16e8fef5567553cc0 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Wed, 2 Aug 2017 17:30:07 +0200
Subject: [PATCH 030/119] [FIX] web: restore `form_view_initial_mode` support

The key `form_view_initial_mode` can be set in the action context, to
open the action in edit mode, mainly.

This key wasn't supported since the new view refactoring so this commit
restores its support.
---
 addons/web/static/src/js/chrome/view_manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome/view_manager.js b/addons/web/static/src/js/chrome/view_manager.js
index 30ad6ad008a..2e92ce004a9 100644
--- a/addons/web/static/src/js/chrome/view_manager.js
+++ b/addons/web/static/src/js/chrome/view_manager.js
@@ -363,7 +363,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
         var View = this.registry.get(arch.attrs.js_class || view_descr.type);
         var params = _.extend({}, view_options, {userContext: this.getSession().user_context});
         if (view_descr.type === "form" && ((this.action.target === 'new' || this.action.target === 'inline') ||
-            (view_options && view_options.mode === 'edit'))) {
+            (view_options && (view_options.mode === 'edit' || view_options.context.form_view_initial_mode)))) {
             params.mode = params.initial_mode || 'edit';
         }
         view_descr.searchview_hidden = View.prototype.searchview_hidden;

From b2e1b1356b897a2a057ae6938b41446f5363804c Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Fri, 4 Aug 2017 13:38:07 +0200
Subject: [PATCH 031/119] [FIX] stock: correctly save the operation in picking

When creating a new picking and adding a new product operation, the operation was
disappearing. As the field `product_id` is readonly in some conditions, its value
wasn't sent by the client on the picking write rpc.

This behaviour of not sending readonly fields in x2many has been correctly
implemented with the new views but some views (like this one) was basing their
behaviour on this breach.

See rev. https://github.com/odoo/odoo/commit/3b3f6f04af79d7dcc4461262e14e05096d76180b for more details.
---
 addons/stock/views/stock_picking_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index ff42bf3095a..03ac9c57545 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -252,7 +252,7 @@
                             <field name="pack_operation_product_ids" options="{'reload_on_button': True}" context="{'default_picking_id': id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}" mode="tree,kanban">
                                 <tree editable="bottom" decoration-muted="result_package_id" decoration-danger="qty_done&gt;product_qty" decoration-success="qty_done==product_qty and state!='done' and not result_package_id">
                                     <field name="package_id" groups="stock.group_tracking_lot" invisible="1"/>
-                                    <field name="product_id" required="1" attrs="{'readonly': [('fresh_record', '=', False)]}"/>
+                                    <field name="product_id" required="1" attrs="{'readonly': [('fresh_record', '=', False)]}" force_save="1"/>
                                     <field name="fresh_record" invisible="1"/>
                                     <field name="product_uom_id" attrs="{'readonly': [('fresh_record', '=', False)]}" groups="product.group_uom"/>
                                     <field name="lots_visible" invisible="1"/>

From 3d5b2836754ff4a63315990e4f455c51a1e11177 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 8 Aug 2017 11:52:11 +0200
Subject: [PATCH 032/119] [FIX] barcodes: don't trigger onchange at each
 keypress

When a keypress event is triggered in a 'field_float_scannable'
widget, the event is first catched by the barcodes mechanism, and
then manually re-triggered. However, the way it was done implied
that the environment was notified of each keypress event, so if
there was an onchange on that particular field, an onchange RPC
was done at each keypress.

Moreover, the focus was lost at each keypress as well.
---
 .../barcodes/static/src/js/barcode_field.js   | 19 +----
 addons/barcodes/static/tests/barcode_tests.js | 73 +++++++++++++++++++
 2 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js
index 9b0f2391e3a..3248ef4f1a1 100644
--- a/addons/barcodes/static/src/js/barcode_field.js
+++ b/addons/barcodes/static/src/js/barcode_field.js
@@ -8,12 +8,12 @@ var fieldRegistry = require('web.field_registry');
 // Field in which the user can both type normally and scan barcodes
 
 var FieldFloatScannable = basicFields.FieldFloat.extend({
-    events: {
+    events: _.extend({}, basicFields.FieldFloat.prototype.events, {
         // The barcode_events component intercepts keypresses and releases them when it
         // appears they are not part of a barcode. But since released keypresses don't
         // trigger native behaviour (like characters input), we must simulate it.
         'keypress': '_onKeypress',
-    },
+    }),
 
     //--------------------------------------------------------------------------
     // Private
@@ -42,7 +42,6 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
         /* only simulate a keypress if it has been previously prevented */
         if (e.dispatched_by_barcode_reader !== true) {
             e.preventDefault();
-            this.$input.blur();
             return;
         }
         var character = String.fromCharCode(e.which);
@@ -52,18 +51,8 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
         e.target.value = str_before_carret + character + str_after_carret;
         var new_carret_index = str_before_carret.length + character.length;
         e.target.setSelectionRange(new_carret_index, new_carret_index);
-        // Note: FieldChar (that FieldFloat extends) calls store_dom_value upon change
-        // event, which is triggered when the input loses focus and its internal dirty
-        // flag is set. But here, we directly modify the value property of the input,
-        // which doesn't set the dirty flag. So we could call store_dom_value upon blur.
-        // But we also want the DOM value to be stored when a barcode_event occurs and
-        // triggers an onchange. We could listen to barcode_event in order to call
-        // store_dom_value, but that would have to happen before the onchange is triggered.
-        // So the safest method is still to store the value each time it changes.
-        // This long explanation is here to avoid having to do the thinking all over agan
-        // in case this strategy doesn't work / breaks.
-        // TL;DR Safest way not to lose the value when a barcode scan triggers an onchange.
-        this._setValue(e.target.value);
+        // trigger an 'input' event to notify the widget that it's value changed
+        $(e.target).trigger('input');
     },
 });
 
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index 09daebcd976..5489d0d7fb6 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -1,6 +1,8 @@
 odoo.define('barcodes.tests', function (require) {
 "use strict";
 
+var barcodeEvents = require('barcodes.BarcodeEvents');
+
 var testUtils = require('web.test_utils');
 var FormView = require('web.FormView');
 
@@ -13,6 +15,7 @@ QUnit.module('Barcodes', {
             product: {
                 fields: {
                     name: {string : "Product name", type: "char"},
+                    int_field: {string : "Integer", type: "integer"},
                 },
                 records: [
                     {id: 1, name: "iPad Mini"},
@@ -118,4 +121,74 @@ QUnit.test('pager buttons', function (assert) {
     form.destroy();
 });
 
+QUnit.test('widget field_float_scannable', function (assert) {
+    var done = assert.async();
+    assert.expect(11);
+
+    var delay = barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms;
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = 0;
+
+    this.data.product.records[0].int_field = 4;
+    this.data.product.onchanges = {
+        int_field: function () {},
+    };
+
+    var form = createView({
+        View: FormView,
+        model: 'product',
+        data: this.data,
+        arch: '<form>' +
+                    '<field name="display_name"/>' +
+                    '<field name="int_field" widget="field_float_scannable"/>' +
+                '</form>',
+        mockRPC: function (route, args) {
+            if (args.method === 'onchange') {
+                assert.step('onchange');
+                assert.strictEqual(args.args[1].int_field, 426,
+                    "should send correct value for int_field");
+            }
+            return this._super.apply(this, arguments);
+        },
+        fieldDebounce: 1000,
+        res_id: 1,
+    });
+
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').text(), '4',
+        "should display the correct value in readonly");
+
+    form.$buttons.find('.o_form_button_edit').click();
+
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').val(), '4',
+        "should display the correct value in edit");
+
+    // simulates keypress events in the input to replace 0.00 by 26 (should not trigger onchanges)
+    form.$('.o_field_widget[name=int_field]').focus();
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').get(0), document.activeElement,
+        "int field should be focused");
+    form.$('.o_field_widget[name=int_field]').trigger({type: 'keypress', which: 50, keyCode: 50}); // 2
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').get(0), document.activeElement,
+        "int field should still be focused");
+    form.$('.o_field_widget[name=int_field]').trigger({type: 'keypress', which: 54, keyCode: 54}); // 6
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').get(0), document.activeElement,
+        "int field should still be focused");
+
+    setTimeout(function () {
+        assert.strictEqual(form.$('.o_field_widget[name=int_field]').val(), '426',
+            "should display the correct value in edit");
+        assert.strictEqual(form.$('.o_field_widget[name=int_field]').get(0), document.activeElement,
+        "int field should still be focused");
+
+        assert.verifySteps([], 'should not have done any onchange RPC');
+
+        form.$('.o_field_widget[name=int_field]').trigger('change'); // should trigger the onchange
+
+        assert.verifySteps(['onchange'], 'should have done the onchange RPC');
+
+        form.destroy();
+        barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
+        done();
+    });
+
+});
+
 });

From dec1bdb44d2ee2bf1874f0a5051bdd7720cbb4d7 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 24 Aug 2017 08:40:10 +0200
Subject: [PATCH 033/119] [FIX] barcodes: don't redraw form twice

When scanning a command barcode, the view shouldn't be redrawn
after the operation corresponding to the command is executed,
for two reasons: first, it is useless as the view has already
been reloaded, and second, it may cause issues if it has been
destroyed meanwhile.

For example, when scanning barcode O-CMD.MAIN-MENU from a
picking form view: a do_action is performed to go back to the
main barcode client action (so the current form view is destroyed),
but an handler tried to redrawn the destroyed form view, which
produced a crash because the session was required by Date fields,
and it couldn't be provided (there were no more parent listening
to provide it).
---
 .../static/src/js/barcode_form_view.js        |  9 +++-
 addons/barcodes/static/tests/barcode_tests.js | 51 +++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 7b82e68405c..08872f8084a 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -240,8 +240,13 @@ FormController.include({
             if (prefixed && !hasCommand) {
                 self.do_warn(_t('Error : Barcode command is undefined'), barcode);
             }
-            return $.when.apply($, defs).then(function () {
-                self.update({}, {reload: false});
+            return self.alive($.when.apply($, defs)).then(function () {
+                if (!prefixed) {
+                    // redraw the view if we scanned a real barcode (required if
+                    // we manually apply the change in JS, e.g. incrementing the
+                    // quantity)
+                    self.update({}, {reload: false});
+                }
             });
         });
     },
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index 5489d0d7fb6..ac9ff367d45 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -4,6 +4,7 @@ odoo.define('barcodes.tests', function (require) {
 var barcodeEvents = require('barcodes.BarcodeEvents');
 
 var testUtils = require('web.test_utils');
+var FormController = require('web.FormController');
 var FormView = require('web.FormView');
 
 var createView = testUtils.createView;
@@ -121,6 +122,56 @@ QUnit.test('pager buttons', function (assert) {
     form.destroy();
 });
 
+QUnit.test('do no update form twice after a command barcode scanned', function (assert) {
+    assert.expect(7);
+
+    var delay = barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms;
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = 0;
+    var formUpdate = FormController.prototype.update;
+    FormController.prototype.update = function () {
+        assert.step('update');
+        return formUpdate.apply(this, arguments);
+    };
+
+    var form = createView({
+        View: FormView,
+        model: 'product',
+        data: this.data,
+        arch: '<form>' +
+                    '<field name="display_name"/>' +
+                    '<field name="int_field" widget="field_float_scannable"/>' +
+                '</form>',
+        mockRPC: function (route, args) {
+            if (args.method === 'read') {
+                assert.step('read');
+            }
+            return this._super.apply(this, arguments);
+        },
+        res_id: 1,
+        viewOptions: {
+            ids: [1, 2],
+            index: 0,
+        },
+    });
+
+    assert.verifySteps(['read'], "update should not have been called yet");
+
+    // switch to next record
+    _.each(["O","-","C","M","D",".","P","A","G","E","R","-","N","E","X","T","Enter"], triggerKeypressEvent);
+    // a first update is done to reload the data (thus followed by a read), but
+    // update shouldn't be called afterwards
+    assert.verifySteps(['read', 'update', 'read']);
+
+    _.each(['5','4','3','9','8','2','6','7','1','2','5','2','Enter'], triggerKeypressEvent);
+    // a real barcode has been scanned -> an update should be requested (with
+    // option reload='false', so it isn't followed by a read)
+    assert.verifySteps(['read', 'update', 'read', 'update']);
+
+    form.destroy();
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
+    FormController.prototype.update = formUpdate;
+});
+
 QUnit.test('widget field_float_scannable', function (assert) {
     var done = assert.async();
     assert.expect(11);

From c73233d2489e3d074d4d13d1c782a97734e29e32 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 24 Aug 2017 14:37:13 +0200
Subject: [PATCH 034/119] [FIX] barcodes: don't warn if action unavailable

Before this rev. a warning was displayed when a barcode mapping an
invisible button was scanned. It shouldn't, for the following
reason. In the stock.picking form view, two buttons with
barcode_trigger='validate' are in the page ('Start Inventory' and
'Validate'), and there is always at least one of them that is
invisible. So when scanning the 'validate' barcode, we don't want
a warning to be displayed, as there is potentially another button
that is able to handle the request.
---
 addons/barcodes/static/src/js/barcode_form_view.js |  2 --
 addons/barcodes/static/tests/barcode_tests.js      | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 08872f8084a..c238df4da59 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -350,8 +350,6 @@ FormRenderer.include({
         commands['O-BTN.' + node.attrs.barcode_trigger] = function () {
             if (!$button.hasClass('o_invisible_modifier')) {
                 $button.click();
-            } else {
-                this.do_warn(_t('Action currently unavailable'));
             }
             return $.when();
         };
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index ac9ff367d45..e6c87cdaaad 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -28,7 +28,7 @@ QUnit.module('Barcodes', {
 });
 
 QUnit.test('Button with barcode_trigger', function (assert) {
-    assert.expect(1);
+    assert.expect(2);
 
     var form = createView({
         View: FormView,
@@ -37,6 +37,7 @@ QUnit.test('Button with barcode_trigger', function (assert) {
         arch: '<form>' +
                 '<header>' +
                     '<button name="do_something" string="Validate" type="object" barcode_trigger="doit"/>' +
+                    '<button name="do_something_else" string="Validate" type="object" invisible="1" barcode_trigger="dothat"/>' +
                 '</header>' +
             '</form>',
         res_id: 2,
@@ -45,11 +46,18 @@ QUnit.test('Button with barcode_trigger', function (assert) {
                 assert.strictEqual(event.data.action_data.name, 'do_something',
                     "do_something method call verified");
             },
+            warning: function () {
+                assert.step('warn');
+            },
         },
     });
 
     // O-BTN.doit
     _.each(['O','-','B','T','N','.','d','o','i','t','Enter'], triggerKeypressEvent);
+    // O-BTN.dothat (should not call execute_action as the button isn't visible)
+    _.each(['O','-','B','T','N','.','d','o','t','h','a','t','Enter'], triggerKeypressEvent);
+
+    assert.verifySteps([], "no warning should be displayed");
 
     form.destroy();
 });

From 5f40f21adcbbd47409831a32e19777387a740c12 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 25 Aug 2017 10:08:19 +0200
Subject: [PATCH 035/119] [FIX] barcodes: barcode_handler widget should be
 generic

When a barcode field with widget="barcode_handler" is in a form
view, an onchange RPC should be done each time a barcode is
scanned.

Before this rev., it worked by chance because the views using it
don't define a 'pack_operation_product_ids' field.

Anyway, this widget is meant to be generic, so it shouldn't
hardcode a fieldname.
---
 .../barcodes/static/src/js/barcode_field.js   |  3 --
 addons/barcodes/static/tests/barcode_tests.js | 48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js
index 3248ef4f1a1..7b9b29aa4c8 100644
--- a/addons/barcodes/static/src/js/barcode_field.js
+++ b/addons/barcodes/static/src/js/barcode_field.js
@@ -57,7 +57,6 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
 });
 
 // Field to use scan barcodes
-
 var FormViewBarcodeHandler = AbstractField.extend({
     /**
      * @override
@@ -67,8 +66,6 @@ var FormViewBarcodeHandler = AbstractField.extend({
 
         this.trigger_up('activeBarcode', {
             name: this.name,
-            fieldName: 'pack_operation_product_ids',
-            quantity: 'qty_done',
             commands: {
                 barcode: '_barcodeAddX2MQuantity',
             }
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index e6c87cdaaad..cb999cee168 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -247,7 +247,55 @@ QUnit.test('widget field_float_scannable', function (assert) {
         barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
         done();
     });
+});
 
+QUnit.test('widget barcode_handler', function (assert) {
+    assert.expect(4);
+
+    var delay = barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms;
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = 0;
+
+    this.data.product.fields.barcode_scanned = {string : "Scanned barcode", type: "char"};
+    this.data.product.onchanges = {
+        barcode_scanned: function (obj) {
+            // simulate an onchange that increment the int_field value
+            // at each barcode scanned
+            obj.int_field = obj.int_field + 1;
+        },
+    };
+
+    var form = createView({
+        View: FormView,
+        model: 'product',
+        data: this.data,
+        arch: '<form>' +
+                    '<field name="display_name"/>' +
+                    '<field name="int_field"/>' +
+                    '<field name="barcode_scanned" widget="barcode_handler" invisible="1"/>' +
+                '</form>',
+        mockRPC: function (route, args) {
+            if (args.method === 'onchange') {
+                assert.step('onchange');
+            }
+            return this._super.apply(this, arguments);
+        },
+        res_id: 1,
+        viewOptions: {
+            mode: 'edit',
+        },
+    });
+
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').val(), '0',
+        "initial value should be correct");
+
+    _.each(['5','4','3','9','8','2','6','7','1','2','5','2','Enter'], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_field_widget[name=int_field]').val(), '1',
+        "value should have been incremented");
+
+    assert.verifySteps(['onchange'], "an onchange should have been done");
+
+    form.destroy();
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
 });
 
 });

From 8019eacb4716befcc0affa4f8c9d554be2ec6655 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 24 Aug 2017 14:36:53 +0200
Subject: [PATCH 036/119] [FIX] barcodes: generate correct update command

The barcode mechanism is optimized to (in certain conditions),
directly increment the quantity of a numerical field inside an
x2many, without performing any RPC, and then re-rendering the
x2many to display the new value.

Before this rev., it seemed to work fine, but when the view was
saved, those changes of quantity were lost. This was because the
changes weren't correctly notified to the model (the quantity
field being inside an x2many, the correct update command for the
x2many should be generated).
---
 .../static/src/js/barcode_form_view.js        |  10 +-
 addons/barcodes/static/tests/barcode_tests.js | 106 +++++++++++++++++-
 2 files changed, 111 insertions(+), 5 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index c238df4da59..8f6a3b0a3e2 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -93,8 +93,14 @@ FormController.include({
      */
     _barcodeSelectedCandidate: function (candidate, record, barcode, activeBarcode) {
         var changes = {};
-        changes[activeBarcode.quantity] = candidate.data[activeBarcode.quantity] + 1;
-        return this.model.notifyChanges(candidate.id, changes);
+        var candidateChanges = {};
+        candidateChanges[activeBarcode.quantity] = candidate.data[activeBarcode.quantity] + 1;
+        changes[activeBarcode.fieldName] = {
+            operation: 'UPDATE',
+            id: candidate.id,
+            data: candidateChanges,
+        };
+        return this.model.notifyChanges(this.handle, changes);
     },
     /**
      * @private
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index cb999cee168..5f8af60911b 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -3,9 +3,11 @@ odoo.define('barcodes.tests', function (require) {
 
 var barcodeEvents = require('barcodes.BarcodeEvents');
 
-var testUtils = require('web.test_utils');
+var AbstractField = require('web.AbstractField');
+var fieldRegistry = require('web.field_registry');
 var FormController = require('web.FormController');
 var FormView = require('web.FormView');
+var testUtils = require('web.test_utils');
 
 var createView = testUtils.createView;
 var triggerKeypressEvent = testUtils.triggerKeypressEvent;
@@ -13,14 +15,35 @@ var triggerKeypressEvent = testUtils.triggerKeypressEvent;
 QUnit.module('Barcodes', {
     beforeEach: function () {
         this.data = {
+            order: {
+                fields: {
+                    _barcode_scanned: {string: 'Barcode scanned', type: 'char'},
+                    line_ids: {string: 'Order lines', type: 'one2many', relation: 'order_line'},
+                },
+                records: [
+                    {id: 1, line_ids: [1, 2]},
+                ],
+            },
+            order_line: {
+                fields: {
+                    product_id: {string: 'Product', type: 'many2one', relation: 'product'},
+                    product_barcode: {string: 'Product Barcode', type: 'char'},
+                    quantity: {string: 'Quantity', type: 'integer'},
+                },
+                records: [
+                    {id: 1, product_id: 1, quantity: 0, product_barcode: '1234567890'},
+                    {id: 2, product_id: 2, quantity: 0, product_barcode: '0987654321'},
+                ],
+            },
             product: {
                 fields: {
                     name: {string : "Product name", type: "char"},
                     int_field: {string : "Integer", type: "integer"},
+                    barcode: {string: "Barcode", type: "char"},
                 },
                 records: [
-                    {id: 1, name: "iPad Mini"},
-                    {id: 2, name: "Mouse, Optical"},
+                    {id: 1, name: "iPad Mini", barcode: '1234567890'},
+                    {id: 2, name: "Mouse, Optical", barcode: '0987654321'},
                 ],
             },
         };
@@ -298,4 +321,81 @@ QUnit.test('widget barcode_handler', function (assert) {
     barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
 });
 
+QUnit.test('specification of widget barcode_handler', function (assert) {
+    assert.expect(5);
+
+    var delay = barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms;
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = 0;
+
+    // Define a specific barcode_handler widget for this test case
+    var TestBarcodeHandler = AbstractField.extend({
+        init: function () {
+            this._super.apply(this, arguments);
+
+            this.trigger_up('activeBarcode', {
+                name: 'test',
+                fieldName: 'line_ids',
+                quantity: 'quantity',
+                commands: {
+                    barcode: '_barcodeAddX2MQuantity',
+                }
+            });
+        },
+    });
+    var previousField = fieldRegistry.get('test_barcode_handler');
+    fieldRegistry.add('test_barcode_handler', TestBarcodeHandler);
+
+    var form = createView({
+        View: FormView,
+        model: 'order',
+        data: this.data,
+        arch: '<form>' +
+                    '<field name="_barcode_scanned" widget="test_barcode_handler"/>' +
+                    '<field name="line_ids">' +
+                        '<tree>' +
+                            '<field name="product_id"/>' +
+                            '<field name="product_barcode" invisible="1"/>' +
+                            '<field name="quantity"/>' +
+                        '</tree>' +
+                    '</field>' +
+                '</form>',
+        mockRPC: function (route, args) {
+            if (args.method === 'onchange') {
+                assert.notOK(true, "should not do any onchange RPC");
+            }
+            if (args.method === 'write') {
+                assert.deepEqual(args.args[1].line_ids, [
+                    [1, 1, {quantity: 2}], [1, 2, {quantity: 1}],
+                ], "should have generated the correct commands");
+            }
+            return this._super.apply(this, arguments);
+        },
+        res_id: 1,
+        viewOptions: {
+            mode: 'edit',
+        },
+    });
+
+    assert.strictEqual(form.$('.o_data_row').length, 2,
+        "one2many should contain 2 rows");
+
+    // scan twice product 1
+    _.each(['1','2','3','4','5','6','7','8','9','0','Enter'], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_data_row:first .o_data_cell:nth(1)').text(), '1',
+        "quantity of line one should have been incremented");
+    _.each(['1','2','3','4','5','6','7','8','9','0','Enter'], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_data_row:first .o_data_cell:nth(1)').text(), '2',
+        "quantity of line one should have been incremented");
+
+    // scan once product 2
+    _.each(['0','9','8','7','6','5','4','3','2','1','Enter'], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_data_row:nth(1) .o_data_cell:nth(1)').text(), '1',
+        "quantity of line one should have been incremented");
+
+    form.$buttons.find('.o_form_button_save').click();
+
+    form.destroy();
+    barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
+    fieldRegistry.add('test_barcode_handler', previousField);
+});
 });

From 802dde31f3b58b8f26d6f6c584e5e4f8f392a482 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 25 Aug 2017 14:29:11 +0200
Subject: [PATCH 037/119] [FIX] web,barcodes: pager: FIRST and LAST actions

The barcode mechanism is supposed to handle commands PAGER-FIRST
(go to first record referenced in the pager) and PAGER-LAST (go
to last record). Before this rev., it wasn't the case.

We needed to add an option 'notifyChange' to the updateState
function of the pager, to ensure that the form is correctly
reloaded when the pager cursor is manually set (by the barcode
handler) on the first or last element.
---
 .../static/src/js/barcode_form_view.js        | 25 +++++++++++++++++++
 addons/barcodes/static/tests/barcode_tests.js |  8 +++++-
 addons/web/static/src/js/chrome/pager.js      |  8 +++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 8f6a3b0a3e2..5b042999bf6 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -31,6 +31,8 @@ FormController.include({
                     'O-CMD.SAVE': this._onCommandSave.bind(this),
                     'O-CMD.PAGER-PREV': this._onCommandPrevious.bind(this),
                     'O-CMD.PAGER-NEXT': this._onCommandNext.bind(this),
+                    'O-CMD.PAGER-FIRST': this._onCommandFirst.bind(this),
+                    'O-CMD.PAGER-LAST': this._onCommandLast.bind(this),
                 },
             },
         };
@@ -256,6 +258,29 @@ FormController.include({
             });
         });
     },
+    /**
+     * @private
+     */
+    _onCommandFirst: function () {
+        var self = this;
+        return this.mutex.exec(function () {}).then(function () {
+            self.pager.updateState({
+                current_min: 1,
+            }, {notifyChange: true});
+        });
+    },
+    /**
+     * @private
+     */
+    _onCommandLast: function () {
+        var self = this;
+        return this.mutex.exec(function () {}).then(function () {
+            var state = self.model.get(self.handle, {raw: true});
+            self.pager.updateState({
+                current_min: state.count,
+            }, {notifyChange: true});
+        });
+    },
     /**
      * @private
      */
diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index 5f8af60911b..add55ed4d5d 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -128,7 +128,7 @@ QUnit.test('edit, save and cancel buttons', function (assert) {
 });
 
 QUnit.test('pager buttons', function (assert) {
-    assert.expect(3);
+    assert.expect(5);
 
     var form = createView({
         View: FormView,
@@ -149,6 +149,12 @@ QUnit.test('pager buttons', function (assert) {
     // O-CMD.PAGER-PREV
     _.each(["O","-","C","M","D",".","P","A","G","E","R","-","P","R","E","V","Enter"], triggerKeypressEvent);
     assert.strictEqual(form.$('.o_field_widget').text(), 'iPad Mini');
+    // O-CMD.PAGER-LAST
+    _.each(["O","-","C","M","D",".","P","A","G","E","R","-","L","A","S","T","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_field_widget').text(), 'Mouse, Optical');
+    // O-CMD.PAGER-FIRST
+    _.each(["O","-","C","M","D",".","P","A","G","E","R","-","F","I","R","S","T","Enter"], triggerKeypressEvent);
+    assert.strictEqual(form.$('.o_field_widget').text(), 'iPad Mini');
 
     form.destroy();
 });
diff --git a/addons/web/static/src/js/chrome/pager.js b/addons/web/static/src/js/chrome/pager.js
index bbe69c6d86a..c7f22a6f2c9 100644
--- a/addons/web/static/src/js/chrome/pager.js
+++ b/addons/web/static/src/js/chrome/pager.js
@@ -97,10 +97,16 @@ var Pager = Widget.extend({
     /**
      * Sets the state of the pager and renders it
      * @param {Object} [state] the values to update (size, current_min and limit)
+     * @param {Object} [options]
+     * @param {boolean} [options.notifyChange] set to true to make the pager
+     *   notify the environment that its state changed
      */
-    updateState: function (state) {
+    updateState: function (state, options) {
         _.extend(this.state, state);
         this._render();
+        if (options && options.notifyChange) {
+            this.trigger('pager_changed', _.clone(this.state));
+        }
     },
 
     //--------------------------------------------------------------------------

From 72ff51f565f17d2420d1d574b7cde3be915ad42d Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 9 Aug 2017 14:52:39 +0200
Subject: [PATCH 038/119] [REF] stock: product: _compute_quantities

This method is used to set `qty_available`, `virtual_available`,
`incoming_qty` and `outgoing_qty`.

We change the depends because only looking on stock.move is enough (all
changes on quants are made through stock moves, and we de not support to
edit directly quants anyway).

This method will call `_get_domain_locations` and we make sure that,
when the `company_owned` key is present in the context, we also return
domains to find products that are in a location that belongs to the
current user's company. This is done in order to include transit
location.

Also, remove the comment from tde. As these fields are displayed in
view, only using the context could alter the behavior.
---
 addons/stock/models/product.py  | 10 +++++++--
 addons/stock/tests/test_move.py | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index 693f5c0119e..391542c829f 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -76,7 +76,7 @@ class Product(models.Model):
     reordering_min_qty = fields.Float(compute='_compute_nbr_reordering_rules')
     reordering_max_qty = fields.Float(compute='_compute_nbr_reordering_rules')
 
-    @api.depends('stock_quant_ids', 'stock_move_ids')
+    @api.depends('stock_move_ids.product_qty', 'stock_move_ids.state')
     def _compute_quantities(self):
         res = self._compute_quantities_dict(self._context.get('lot_id'), self._context.get('owner_id'), self._context.get('package_id'), self._context.get('from_date'), self._context.get('to_date'))
         for product in self:
@@ -154,9 +154,15 @@ class Product(models.Model):
         It will return all stock locations when no parameters are given
         Possible parameters are shop, warehouse, location, force_company, compute_child
         '''
-        # TDE FIXME: clean that brol, context seems overused
         Warehouse = self.env['stock.warehouse']
 
+        if self.env.context.get('company_owned', False):
+            company_id = self.env.user.company_id.id
+            return (
+                [('location_id.company_id', '=', company_id)],
+                [('location_id.company_id', '=', False), ('location_dest_id.company_id', '=', company_id)],
+                [('location_id.company_id', '=', company_id), ('location_dest_id.company_id', '=', False),
+            ])
         location_ids = []
         if self.env.context.get('location', False):
             if isinstance(self.env.context['location'], pycompat.integer_types):
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index 22ae95448e4..2fc3d884045 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -12,6 +12,10 @@ class StockMove(TransactionCase):
         self.customer_location = self.env.ref('stock.stock_location_customers')
         self.supplier_location = self.env.ref('stock.stock_location_suppliers')
         self.pack_location = self.env.ref('stock.location_pack_zone')
+        self.transit_location = self.env['stock.location'].search([
+            ('company_id', '=', self.env.user.company_id.id),
+            ('usage', '=', 'transit'),
+        ], limit=1)
         self.uom_unit = self.env.ref('product.product_uom_unit')
         self.product1 = self.env['product.product'].create({
             'name': 'Product A',
@@ -2632,3 +2636,39 @@ class StockMove(TransactionCase):
                 self.assertEqual(quant.in_date, Datetime.to_string(initial_in_date_lot1))
             elif quant.lot_id == lot2:
                 self.assertEqual(quant.in_date, initial_in_date_lot2)
+
+    def test_transit_1(self):
+        """ Receive some products, send some to transit, check the product's `available_qty`
+        computed field with or without the "company_owned" key in the context.
+        """
+        move1 = self.env['stock.move'].create({
+            'name': 'test_transit_1',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'picking_type_id': self.env.ref('stock.picking_type_in').id,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 10
+        move1.action_done()
+
+        self.assertEqual(self.product1.qty_available, 10.0)
+
+        move2 = self.env['stock.move'].create({
+            'name': 'test_transit_1',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.transit_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 5.0,
+        })
+        move2.action_confirm()
+        move2.action_assign()
+        move2.move_line_ids.qty_done = 5
+        move2.action_done()
+
+        self.assertEqual(self.product1.qty_available, 5.0)
+        self.assertEqual(self.product1.with_context(company_owned=True).qty_available, 10.0)

From acce1d115a8f311ae55b352035b4f5e850a0810a Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 9 Aug 2017 18:02:29 +0200
Subject: [PATCH 039/119] [FIX] stock_account: do not consider transit moves as
 out moves

We expose a serie of functions that return domains to find in and out
moves and, as opposed as before, the transit locations who have a
company id set (i.e. the inter warehouse transit) do not impact the
valuation of a company.

We rename the `not_move` argument of `_get_latest_cumulated_value` to
`exclude_move`, which is more explicit.
---
 addons/stock_account/models/product.py        | 32 +++------
 addons/stock_account/models/stock.py          | 72 +++++++++++++++++--
 .../tests/test_stockvaluation.py              | 59 +++++++++++++++
 3 files changed, 132 insertions(+), 31 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 289c53d8e56..bbb6f28a0cc 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -166,15 +166,11 @@ class ProductProduct(models.Model):
         self.write({'standard_price': new_price})
         return True
 
-    def _get_latest_cumulated_value(self, not_move=False):
+    def _get_latest_cumulated_value(self, exclude_move=False):
         self.ensure_one()
-        # TODO: only filter on IN and OUT stock.move
-        domain = [
-            ('product_id', '=', self.id),
-            ('state', '=', 'done'),
-            ]
-        if not_move:
-            domain += [('id', '!=', not_move.id)]
+        domain = [('product_id', '=', self.id)] + self.env['stock.move']._get_all_base_domain()
+        if exclude_move:
+            domain += [('id', '!=', exclude_move.id)]
         latest = self.env['stock.move'].search(domain, order='date desc, id desc', limit=1)
         if not latest:
             return 0.0
@@ -182,26 +178,14 @@ class ProductProduct(models.Model):
 
     def _get_candidates_out_move(self):
         self.ensure_one()
-        # TODO: filter at start of period
-        candidates = self.env['stock.move'].search([
-            ('product_id', '=', self.id),
-            ('location_dest_id.usage', 'not in', ('transit', 'internal')),
-            ('location_id.usage', 'in', ('transit', 'internal')),
-            ('remaining_qty', '>', 0),
-            ('state', '=', 'done')
-        ], order='date, id') #TODO: case
+        domain = [('product_id', '=', self.id), ('remaining_qty', '>', 0.0)] + self.env['stock.move']._get_out_base_domain()
+        candidates = self.env['stock.move'].search(domain, order='date, id')
         return candidates
 
     def _get_candidates_move(self):
         self.ensure_one()
-        # TODO: filter at start of period
-        candidates = self.env['stock.move'].search([
-            ('product_id', '=', self.id),
-            ('location_dest_id.usage', 'in', ('transit', 'internal')),
-            ('location_id.usage', 'not in', ('transit', 'internal')),
-            ('remaining_qty', '>', 0),
-            ('state', '=', 'done')
-        ], order='date, id') #TODO: case where 
+        domain = [('product_id', '=', self.id), ('remaining_qty', '>', 0.0)] + self.env['stock.move']._get_in_base_domain()
+        candidates = self.env['stock.move'].search(domain, order='date, id')
         return candidates
 
     @api.multi
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index d9504d7bc9e..d1c0197c07e 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -100,6 +100,64 @@ class StockMove(models.Model):
         for move in moves:
             move.value += value
 
+    @ api.model
+    def _get_in_base_domain(self, company_id=False):
+        domain = [
+            ('state', '=', 'done'),
+            ('location_id.company_id', '=', False),
+            ('location_dest_id.company_id', '=', company_id or self.env.user.company_id.id)
+        ]
+        return domain
+
+    @ api.model
+    def _get_out_base_domain(self, company_id=False):
+        domain = [
+            ('state', '=', 'done'),
+            ('location_id.company_id', '=', company_id or self.env.user.company_id.id),
+            ('location_dest_id.company_id', '=', False)
+        ]
+        return domain
+
+    @ api.model
+    def _get_all_base_domain(self, company_id=False):
+        domain = [
+            ('state', '=', 'done'),
+            '|',
+                '&',
+                    ('location_id.company_id', '=', False),
+                    ('location_dest_id.company_id', '=', company_id or self.env.user.company_id.id),
+                '&',
+                    ('location_id.company_id', '=', company_id or self.env.user.company_id.id),
+                    ('location_dest_id.company_id', '=', False)
+        ]
+        return domain
+
+    def _get_in_domain(self):
+        return [('product_id', '=', self.product_id.id)] + self._get_in_base_domain(company_id=self.company_id.id)
+
+    def _get_out_domain(self):
+        return [('product_id', '=', self.product_id.id)] + self._get_out_base_domain(company_id=self.company_id.id)
+
+    def _get_all_domain(self):
+        return [('product_id', '=', self.product_id.id)] + self._get_all_base_domain(company_id=self.company_id.id)
+
+    def _is_in(self):
+        """ Check if the move should be considered as entering the company so that the cost method
+        will be able to apply the correct logic.
+
+        :return: True if the move is entering the company else False
+        """
+        return not self.location_id.company_id and self.location_dest_id.company_id.id == self.company_id.id
+
+    def _is_out(self):
+        """ Check if the move should be considered as leaving the company so that the cost method
+        will be able to apply the correct logic.
+
+        :return: True if the move is leaving the company else False
+        """
+        return self.location_id.company_id.id == self.company_id.id and not self.location_dest_id.company_id
+
+
 #     def change_move_value_in_the_past(self, value):
 #         self.ensure_one()
 #         if self.product_id.cost_method == 'fifo':
@@ -154,15 +212,15 @@ class StockMove(models.Model):
         for move in self:
             #Should write move.price_unit here maybe, certainly on incoming
             if move.product_id.cost_method == 'average':
-                qty_available[move.product_id.id] = move.product_id.qty_available
+                qty_available[move.product_id.id] = move.product_id.with_context(company_owned=True).qty_available
         res = super(StockMove, self).action_done()
         for move in res:
-            if move.location_id.usage not in ('internal', 'transit') and move.location_dest_id.usage in ('internal', 'transit'):
+            if move._is_in():
                 if move.product_id.cost_method in ['fifo', 'average']:
                     if not move.price_unit:
                         move.price_unit = move._get_price_unit()
                     move.value = move.price_unit * move.product_qty
-                    move.cumulated_value = move.product_id._get_latest_cumulated_value(not_move=move) + move.value
+                    move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
                     move.remaining_qty = move.product_qty
                     if move.product_id.cost_method == 'fifo':
                         # If you find an out with qty_remaining (because of negative stock), you can change it over there
@@ -184,7 +242,7 @@ class StockMove(models.Model):
                 else:
                     move.price_unit = move.product_id.standard_price
                     move.value = move.price_unit * move.product_qty
-            elif move.location_id.usage in ('internal', 'transit') and move.location_dest_id.usage not in ('internal', 'transit'):
+            elif move._is_out():
                 if move.product_id.cost_method == 'fifo':
                     qty_to_take = move.product_qty
                     tmp_value = 0
@@ -207,14 +265,14 @@ class StockMove(models.Model):
                     if qty_to_take > 0:
                         move.remaining_qty = qty_to_take # In case there are no candidates to match, put standard price on it
                     move.value = -tmp_value
-                    move.cumulated_value = move.product_id._get_latest_cumulated_value(not_move=move) + move.value
+                    move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
                     move.last_done_qty = move.product_id.qty_available
                 elif move.product_id.cost_method == 'average':
                     curr_rounding = move.company_id.currency_id.rounding
-                    avg_price_unit = float_round(move.product_id._get_latest_cumulated_value(not_move=move) / qty_available[move.product_id.id], precision_rounding=curr_rounding)
+                    avg_price_unit = float_round(move.product_id._get_latest_cumulated_value(exclude_move=move) / qty_available[move.product_id.id], precision_rounding=curr_rounding)
                     move.value = float_round(-avg_price_unit * move.product_qty, precision_rounding=curr_rounding)
                     move.remaining_qty = 0
-                    move.cumulated_value = move.product_id._get_latest_cumulated_value(not_move=move) + move.value
+                    move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
                     move.last_done_qty = move.product_id.qty_available
                 elif move.product_id.cost_method == 'standard':
                     move.value = - move.product_id.standard_price * move.product_qty
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 7cb07ada7f1..3328b1f3d96 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -187,6 +187,65 @@ class TestStockValuation(TransactionCase):
         self.assertEqual(move6.remaining_qty, 0.0)  # unused in out moves
         self.assertEqual(move7.remaining_qty, 0.0)  # unused in out moves
 
+        # send 10 units in our transit location, the valorisation should not be impacted
+        transit_location = self.env['stock.location'].search([
+            ('company_id', '=', self.env.user.company_id.id),
+            ('usage', '=', 'transit'),
+        ], limit=1)
+        move8 = self.env['stock.move'].create({
+            'name': 'Send 10 units in transit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': transit_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move8.action_confirm()
+        move8.action_assign()
+        move8.move_line_ids.qty_done = 10.0
+        move8.action_done()
+
+        self.assertEqual(move8.value, 0.0)
+        self.assertEqual(move8.cumulated_value, 0.0)
+
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move2.remaining_qty, 0)
+        self.assertEqual(move3.remaining_qty, 0.0)  # unused in out moves
+        self.assertEqual(move4.remaining_qty, 0.0)
+        self.assertEqual(move5.remaining_qty, 54.0)
+        self.assertEqual(move6.remaining_qty, 0.0)  # unused in out moves
+        self.assertEqual(move7.remaining_qty, 0.0)  # unused in out moves
+        self.assertEqual(move8.remaining_qty, 0.0)  # unused in internal moves
+
+        # Sale 10 units @ 16.5 per unit
+        move9 = self.env['stock.move'].create({
+            'name': 'Sale 10 units @ 16.5 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move9.action_confirm()
+        move9.action_assign()
+        move9.move_line_ids.qty_done = 10.0
+        move9.action_done()
+
+        # note: it' ll have to get 10 units from move5 so its value should
+        # be -(10*16.50) = -165
+        self.assertEqual(move9.value, -165.0)
+        self.assertEqual(move9.cumulated_value, 726.0)
+
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move2.remaining_qty, 0)
+        self.assertEqual(move3.remaining_qty, 0.0)  # unused in out moves
+        self.assertEqual(move4.remaining_qty, 0.0)
+        self.assertEqual(move5.remaining_qty, 44.0)
+        self.assertEqual(move6.remaining_qty, 0.0)  # unused in out moves
+        self.assertEqual(move7.remaining_qty, 0.0)  # unused in out moves
+        self.assertEqual(move8.remaining_qty, 0.0)  # unused in internal moves
+        self.assertEqual(move9.remaining_qty, 0.0)  # unused in out moves
+
     def test_fifo_perpetual_2(self):
         # https://docs.google.com/spreadsheets/d/1NI0u9N1gFByXxYHfdiXuxQCrycXXOh76TpPQ3CWeyDw/edit?ts=58da749b#gid=0
         self.product1.cost_method = 'fifo'

From 91d69578495c078a985e7eb4b2deb1caf117e126 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 10 Aug 2017 16:24:10 +0200
Subject: [PATCH 040/119] [FIX] stock_account: fifo and negative stock

rename `_get_candidates_out_move` to `_get_fifo_candidates_out_move`
and `_get_candidates_move` to `_get_fifo_candidates_in_move` as it's
more explicit that they're only used in FIFO costing.

Fix `_update_future_cumulated_value` to filter only on internal moves
and to remove the value added in the past (self is always an out move to
which we added some value) and rename into
`update_fifo_future_cumulated_value`.

In `action_done`, rename `qty_taken_for_candidate` to
`qty_taken_for_candidate` as it's the qty we take to compensate the
candidate and not a quantity we take on the candidate (in this case,
some old out moves that we could not valuate in time because the stock
was negative). We fix the write on the value and cumulated value to
decrease the qty_taken_for_candidate*move.price_unit, because an out
move has always a negative value and we actually substract the value of
`move` which is always an in move and has always a positive value.

We fix the purchase test where negative out moves were valued positively
and add `test_fifo_negative_1` that tests the sending of goods we do not
have and the receipt encoded afterwards.
---
 addons/purchase/test/fifo_price.yml           |  4 +-
 addons/stock_account/models/product.py        | 10 ++-
 addons/stock_account/models/stock.py          | 44 ++++++----
 .../tests/test_stockvaluation.py              | 80 +++++++++++++++++++
 4 files changed, 117 insertions(+), 21 deletions(-)

diff --git a/addons/purchase/test/fifo_price.yml b/addons/purchase/test/fifo_price.yml
index a8ad4e24240..598e41844e8 100644
--- a/addons/purchase/test/fifo_price.yml
+++ b/addons/purchase/test/fifo_price.yml
@@ -343,7 +343,7 @@
     self.env['stock.immediate.transfer'].create({'pick_id': picking.id}).process()
     original_out_move = self.env['stock.picking'].browse(ref('outgoing_fifo_shipment_neg')).move_lines[0]
     assert original_out_move.remaining_qty == 50.0, 'On the out move of 100, 50 still needs to be matched'
-    assert original_out_move.value == 2500, 'Value of the move should be 2500'
+    assert original_out_move.value == -2500, 'Value of the move should be -2500'
 - 
   Receive purchase order with 600 kg FIFO Ice Cream at 80 euro/kg
 - 
@@ -368,6 +368,6 @@
     picking = self.picking_ids[0]
     self.env['stock.immediate.transfer'].create({'pick_id': picking.id}).process()
     original_out_move = self.env['stock.picking'].browse(ref('outgoing_fifo_shipment_neg')).move_lines[0]
-    assert original_out_move.value == 6500.0, 'First original out move should have 6500 as value'
+    assert original_out_move.value == -6500.0, 'First original out move should have -6500 as value'
     assert original_out_move.product_id.stock_value == 12000.0, 'Stock Value should be 12000'
     assert original_out_move.product_id.qty_available == 150.0, 'Qty available should be 150'
\ No newline at end of file
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index bbb6f28a0cc..f7ba6e6f805 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -176,13 +176,17 @@ class ProductProduct(models.Model):
             return 0.0
         return latest.cumulated_value
 
-    def _get_candidates_out_move(self):
+    def _get_fifo_candidates_out_move(self):
+        """ Find OUT moves that were not valued in time because of negative stock.
+        """
         self.ensure_one()
         domain = [('product_id', '=', self.id), ('remaining_qty', '>', 0.0)] + self.env['stock.move']._get_out_base_domain()
         candidates = self.env['stock.move'].search(domain, order='date, id')
         return candidates
 
-    def _get_candidates_move(self):
+    def _get_fifo_candidates_in_move(self):
+        """ Find IN moves that can be used to value OUT moves.
+        """
         self.ensure_one()
         domain = [('product_id', '=', self.id), ('remaining_qty', '>', 0.0)] + self.env['stock.move']._get_in_base_domain()
         candidates = self.env['stock.move'].search(domain, order='date, id')
@@ -205,7 +209,7 @@ class ProductProduct(models.Model):
             elif product.cost_method == 'average':
                 product.stock_value = product._get_latest_cumulated_value()
             elif product.cost_method == 'fifo': #Could also do same as for average, but it would lead to more rounding errors
-                moves = product._get_candidates_move()
+                moves = product._get_fifo_candidates_in_move()
                 value = 0
                 for move in moves:
                     value += move.remaining_qty * move.price_unit
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index d1c0197c07e..f314446d777 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -92,13 +92,23 @@ class StockMove(models.Model):
                 return move.price_unit or self.product_id.standard_price
         return self.product_id.standard_price
 
-    def _update_future_cumulated_value(self, value):
+    def _update_fifo_future_cumulated_value(self, value):
+        """ This method is intended to be called on an OUT move that was not valued in time because
+        of negative stock with `value` argument representing its new value.
+        """
         self.ensure_one()
-        moves = self.search([('state', '=', 'done'), 
-                     ('date', '>',  self.date), 
-                     ('product_id', '=', self.product_id.id)])
+        domain = self._get_all_domain()
+        domain += [
+            '|',
+                ('date', '>', self.date),
+                '&',
+                    ('date', '=', self.date),
+                    ('id', '>', self.id)
+        ]
+        moves = self.search(domain, order='date, id')
         for move in moves:
-            move.value += value
+            # As `self` is always an out move, we decrease its value on the future moves.
+            move.cumulated_value -= value
 
     @ api.model
     def _get_in_base_domain(self, company_id=False):
@@ -223,20 +233,22 @@ class StockMove(models.Model):
                     move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
                     move.remaining_qty = move.product_qty
                     if move.product_id.cost_method == 'fifo':
-                        # If you find an out with qty_remaining (because of negative stock), you can change it over there
-                        candidates_out = move.product_id._get_candidates_out_move()
+                        # If there are some OUT moves that we could not value in time, find them
+                        # and value them now with this new IN move. After that, update the cumulated
+                        # value along the moves done after the newly valued move.
+                        candidates_out = move.product_id._get_fifo_candidates_out_move()
                         qty_to_take = move.product_qty
                         for candidate in candidates_out:
                             if candidate.remaining_qty < qty_to_take:
-                                qty_taken_on_candidate = candidate.remaining_qty
+                                qty_taken_for_candidate = candidate.remaining_qty
                             else:
-                                qty_taken_on_candidate = qty_to_take
-                            candidate.remaining_qty -= qty_taken_on_candidate
-                            move.remaining_qty -= qty_taken_on_candidate
-                            qty_to_take -= qty_taken_on_candidate
-                            candidate.value += move.price_unit * qty_taken_on_candidate
-                            candidate.cumulated_value += move.price_unit * qty_taken_on_candidate
-                            candidate._update_future_cumulated_value(move.price_unit * qty_taken_on_candidate)
+                                qty_taken_for_candidate = qty_to_take
+                            candidate.remaining_qty -= qty_taken_for_candidate
+                            move.remaining_qty -= qty_taken_for_candidate
+                            qty_to_take -= qty_taken_for_candidate
+                            candidate.value -= move.price_unit * qty_taken_for_candidate
+                            candidate.cumulated_value -= move.price_unit * qty_taken_for_candidate
+                            candidate._update_fifo_future_cumulated_value(move.price_unit * qty_taken_for_candidate)
                             candidate.price_unit = candidate.value / candidate.product_qty
                     move.last_done_qty = move.product_id.qty_available
                 else:
@@ -246,7 +258,7 @@ class StockMove(models.Model):
                 if move.product_id.cost_method == 'fifo':
                     qty_to_take = move.product_qty
                     tmp_value = 0
-                    candidates = move.product_id._get_candidates_move()
+                    candidates = move.product_id._get_fifo_candidates_in_move()
                     last_candidate = False
                     for candidate in candidates:
                         if candidate.remaining_qty <= qty_to_take:
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 3328b1f3d96..965801c6eed 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -462,3 +462,83 @@ class TestStockValuation(TransactionCase):
         self.assertEqual(move5.cumulated_value, 795.9)  # fuck you, rounding
         # self.assertEqual(move5.cumulated_value, 796)
 
+    def test_fifo_negative_1(self):
+        self.product1.product_tmpl_id.cost_method = 'fifo'
+        move1 = self.env['stock.move'].create({
+            'name': '50 out',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 50.0,
+            'price_unit': 0,
+            'move_line_ids': [(0, 0, {
+                'product_id': self.product1.id,
+                'location_id': self.stock_location.id,
+                'location_dest_id': self.customer_location.id,
+                'product_uom_id': self.uom_unit.id,
+                'qty_done': 50.0,
+            })]
+        })
+        move1.action_confirm()
+        move1.action_done()
+
+        self.assertEqual(move1.value, 0.0)
+        self.assertEqual(move1.cumulated_value, 0.0)
+        # normally unused in out moves, but as it moved negative stock we mark it
+        self.assertEqual(move1.remaining_qty, 50.0)
+
+        move2 = self.env['stock.move'].create({
+            'name': '40 in @15',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 40.0,
+            'price_unit': 15.0,
+            'move_line_ids': [(0, 0, {
+                'product_id': self.product1.id,
+                'location_id': self.supplier_location.id,
+                'location_dest_id': self.stock_location.id,
+                'product_uom_id': self.uom_unit.id,
+                'qty_done': 40.0,
+            })]
+        })
+        move2.action_confirm()
+        move2.with_context(debug=True).action_done()
+
+        self.assertEqual(move1.value, -600.0)
+        self.assertEqual(move1.cumulated_value, -600.0)
+        self.assertEqual(move1.remaining_qty, 10.0)
+        self.assertEqual(move2.value, 600.0)
+        self.assertEqual(move2.remaining_qty, 0.0)
+        self.assertEqual(move2.cumulated_value, 0.0)
+
+        move3 = self.env['stock.move'].create({
+            'name': '20 in @25',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 20.0,
+            'price_unit': 25.0,
+            'move_line_ids': [(0, 0, {
+                'product_id': self.product1.id,
+                'location_id': self.supplier_location.id,
+                'location_dest_id': self.stock_location.id,
+                'product_uom_id': self.uom_unit.id,
+                'qty_done': 20.0
+            })]
+        })
+        move3.action_confirm()
+        move3.action_done()
+
+        self.assertEqual(move1.value, -850.0)
+        self.assertEqual(move1.cumulated_value, -850.0)
+        self.assertEqual(move1.remaining_qty, 0.0)
+        self.assertEqual(move2.value, 600.0)
+        self.assertEqual(move2.remaining_qty, 0.0)
+        self.assertEqual(move2.cumulated_value, -250.0)
+        self.assertEqual(move3.value, 500.0)
+        self.assertEqual(move3.remaining_qty, 10.0)
+        self.assertEqual(move3.cumulated_value, 250.0)

From 57e85e88b985a39ce5fde3fec9bea4842d54891e Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 10 Aug 2017 18:24:21 +0200
Subject: [PATCH 041/119] [REM] stock_account: unused onchanges

---
 addons/stock_account/models/product.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index f7ba6e6f805..b3ecdc62dc7 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -73,11 +73,6 @@ class ProductTemplate(models.Model):
     def _set_cost_method(self):
         return self.write({'property_cost_method': self.cost_method})
 
-    @api.onchange('type')
-    def onchange_type_valuation(self):
-        # TO REMOVE IN MASTER
-        pass
-
     @api.multi
     def _get_product_accounts(self):
         """ Add the stock accounts related to product to the result of super()
@@ -114,11 +109,6 @@ class ProductProduct(models.Model):
     stock_value = fields.Float(
         'Value', compute='_compute_stock_value')
 
-    @api.onchange('type')
-    def onchange_type_valuation(self):
-        # TO REMOVE IN MASTER
-        pass
-
     @api.multi
     def do_change_standard_price(self, new_price, account_id):
         """ Changes the Standard Price of Product and creates an account move accordingly."""

From afff55e80913cfc38030fcc8b397c1a2d6aa1ff2 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 10 Aug 2017 18:45:16 +0200
Subject: [PATCH 042/119] [FIX] stock_account: average and negative stock

Do not inline the average price calculation in `action_done`, as there's
a computed field that handle correctly the negative stock (does not
trigger division by 0). Also, complete this compute method by also
looking on transit locations and implement two fallbacks if the quantity
in stock is null: return the latest cost, if not found return the
standard price.

Also, make sure that `remaining_qty` is only set on fifo moves.
---
 addons/stock_account/models/product.py        | 18 +++-
 addons/stock_account/models/stock.py          | 15 +--
 .../tests/test_stockvaluation.py              | 98 ++++++++++++++++++-
 3 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index b3ecdc62dc7..20c39f6f367 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -3,7 +3,7 @@
 
 from odoo import api, fields, models, tools, _
 from odoo.exceptions import UserError
-from odoo.tools import float_is_zero
+from odoo.tools import float_is_zero, pycompat
 from odoo.addons import decimal_precision as dp
 
 
@@ -183,14 +183,22 @@ class ProductProduct(models.Model):
         return candidates
 
     @api.multi
+    @api.depends('stock_move_ids.product_qty', 'stock_move_ids.state')
     def _compute_average_price(self):
-        for product in self:
+        """ Compute the average price of a product.product according to the latest cumulated value
+        and the quantity that is in stock (for all the company owned locations, i.e. including the
+        warehouses transit ones). If nothing is in stick, we fallback first on the latest average
+        price on an out move used for this product then on the standard price.
+        """
+        for p_set, product in pycompat.izip(self, self.with_context(company_owned=True)):
             if product.qty_available > 0:
                 last_cumulated_value = product._get_latest_cumulated_value()
-                product.average_price = last_cumulated_value / product.qty_available
+                p_set.average_price = last_cumulated_value / product.qty_available
             else:
-                product.average_price = 0
-    
+                domain = [('product_id', '=', product.id), ('last_done_qty', '>', 0.0)] + self.env['stock.move']._get_all_base_domain()
+                move = self.env['stock.move'].search(domain, order='date desc, id desc', limit=1)
+                p_set.average_price = move and move.cumulated_value / move.last_done_qty or product.standard_price
+
     @api.multi
     def _compute_stock_value(self):
         for product in self:
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index f314446d777..10da8ee47e7 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -218,11 +218,11 @@ class StockMove(models.Model):
 
     @api.multi
     def action_done(self):
-        qty_available = {}
-        for move in self:
-            #Should write move.price_unit here maybe, certainly on incoming
-            if move.product_id.cost_method == 'average':
-                qty_available[move.product_id.id] = move.product_id.with_context(company_owned=True).qty_available
+        average_price = {}
+        for move in self.filtered(lambda m: m.product_id.cost_method == 'average'):
+            # For the average costing method, the value depends of the quantity in stock at the
+            # moment of the transfer, so fetch the value before calling super.
+            average_price[move.product_id.id] = move.product_id.average_price
         res = super(StockMove, self).action_done()
         for move in res:
             if move._is_in():
@@ -231,8 +231,9 @@ class StockMove(models.Model):
                         move.price_unit = move._get_price_unit()
                     move.value = move.price_unit * move.product_qty
                     move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
-                    move.remaining_qty = move.product_qty
                     if move.product_id.cost_method == 'fifo':
+                        move.remaining_qty = move.product_qty
+
                         # If there are some OUT moves that we could not value in time, find them
                         # and value them now with this new IN move. After that, update the cumulated
                         # value along the moves done after the newly valued move.
@@ -281,7 +282,7 @@ class StockMove(models.Model):
                     move.last_done_qty = move.product_id.qty_available
                 elif move.product_id.cost_method == 'average':
                     curr_rounding = move.company_id.currency_id.rounding
-                    avg_price_unit = float_round(move.product_id._get_latest_cumulated_value(exclude_move=move) / qty_available[move.product_id.id], precision_rounding=curr_rounding)
+                    avg_price_unit = average_price[move.product_id.id]
                     move.value = float_round(-avg_price_unit * move.product_qty, precision_rounding=curr_rounding)
                     move.remaining_qty = 0
                     move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 965801c6eed..d5178fd7ca9 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -386,8 +386,7 @@ class TestStockValuation(TransactionCase):
 
         self.assertEqual(move1.value, 900.0)
         self.assertEqual(move1.cumulated_value, 900.0)
-
-        self.assertEqual(move1.remaining_qty, 60.0)
+        self.assertEqual(move1.remaining_qty, 0.0)  # unusedin average move
 
         # Purchase 140 units @ 15.50 per unit
         move2 = self.env['stock.move'].create({
@@ -407,7 +406,7 @@ class TestStockValuation(TransactionCase):
         self.assertEqual(move2.value, 2170.0)
         self.assertEqual(move2.cumulated_value, 3070.0)
 
-        # Sale 190 units @ 15.00 per unit
+        # Sale 190 units @ 15.35 per unit
         move3 = self.env['stock.move'].create({
             'name': 'Sale 190 units @ 19.00 per unit',
             'location_id': self.stock_location.id,
@@ -456,7 +455,7 @@ class TestStockValuation(TransactionCase):
         move5.action_confirm()
         move5.action_assign()
         move5.move_line_ids.qty_done = 30.0
-        move5.action_done()
+        move5.with_context(debug=True).action_done()
 
         self.assertEqual(move5.value, -477.6)
         self.assertEqual(move5.cumulated_value, 795.9)  # fuck you, rounding
@@ -505,7 +504,7 @@ class TestStockValuation(TransactionCase):
             })]
         })
         move2.action_confirm()
-        move2.with_context(debug=True).action_done()
+        move2.action_done()
 
         self.assertEqual(move1.value, -600.0)
         self.assertEqual(move1.cumulated_value, -600.0)
@@ -542,3 +541,92 @@ class TestStockValuation(TransactionCase):
         self.assertEqual(move3.value, 500.0)
         self.assertEqual(move3.remaining_qty, 10.0)
         self.assertEqual(move3.cumulated_value, 250.0)
+
+    def test_average_negative_1(self):
+        """ Send goods that you don't have in stock and never received any unit.
+        """
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        # set a standard price
+        self.product1.standard_price = 99
+
+        # send 10 units that we do not have
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.stock_location), 0)
+        move1 = self.env['stock.move'].create({
+            'name': 'test_average_negative_1',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move1.action_confirm()
+        move1.force_assign()
+        move1.quantity_done = 10.0
+        move1.action_done()
+        self.assertEqual(move1.value, -990.0)  # as no move out were done for this product, fallback on the standard price
+        self.assertEqual(move1.cumulated_value, -990.0)
+        self.assertEqual(move1.remaining_qty, 0.0)  # unused in average move
+
+    def test_average_negative_2(self):
+        """ Send goods that you don't have in stock but received and send some units before.
+        """
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        # set a standard price
+        self.product1.standard_price = 99
+
+        # Receives 10 produts at 10
+        move1 = self.env['stock.move'].create({
+            'name': '68 units @ 15.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 10.0
+        move1.action_done()
+
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(move1.cumulated_value, 100.0)
+        self.assertEqual(move1.remaining_qty, 0.0)  # unused in average move
+
+        # send 10 products
+        move2 = self.env['stock.move'].create({
+            'name': 'Sale 94 units @ 19.00 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move2.action_confirm()
+        move2.action_assign()
+        move2.move_line_ids.qty_done = 10.0
+        move2.action_done()
+
+        self.assertEqual(move2.value, -100.0)
+        self.assertEqual(move2.cumulated_value, 0.0)
+        self.assertEqual(move2.remaining_qty, 0.0)  # unused in average move
+
+        # send 10 products again
+        move3 = self.env['stock.move'].create({
+            'name': 'Sale 94 units @ 19.00 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move3.action_confirm()
+        move3.force_assign()
+        move3.quantity_done = 10.0
+        move3.action_done()
+
+        self.assertEqual(move3.value, -100.0)  # as no move out were done for this product, fallback on latest cost
+        self.assertEqual(move3.cumulated_value, -100.0)
+        self.assertEqual(move3.remaining_qty, 0.0)  # unused in average move

From 9439f6aa557be4deff566462c3900910bb43bc63 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 14 Aug 2017 12:00:37 +0200
Subject: [PATCH 043/119] [REF] stock_account: move away from the replay
 everything strategy

The approach we tried with the current implementation lead to a replay
of all the next moves since a move had to be corrected, and posting an
account entry with the valuation difference.

This proved to be slow and complicated, and moreover the resulting
account entry could be very difficult to understand and justify.

So we moved away from this strategy and implemented the following points:

For FIFO
* If a move goes into negative (sent more than availabale, we do not
  counterpart directly at the next in move: we valued it at the last
  fifo price and only when running `_fifo_vacuum` (which is called at
  every openning of the valuation report), we use some units currently
  in stock and post an account entry with the difference between the
  fake value and the real one used.
* When editing a done move and increasing its quantity, the new quantity
  is available now and will be used at the next move out. We do not try
  to replay the history to make the new values go away directly.
* When editing a done move and decreasing its quantity, it acts as a
  return to the supplier at the price unit of the move.

On average price:
* Don't replay anything, if we fall under the negative stock usecase,
  value at the last average price.
We restore the previous code that set the average price on the standard
price and we slightly patch it to continue to update the average price
if quantity in stock is negative.

We also add a link between stock moves and account moves. A stat button
on the stock move's form redirect directly to them. It's therefore a
little easier to understand what happened.

We remove the separate fifo and average price fields that were added in
saas17, we keep the single standard price (that should be renamed
cost_price for consistency). In the same idea, remove the cumulated
value that was stored on the move. If we need it, just recompute it
(it's not a frequent operation). We remove last_done_move_id,
last_done_remaining_qty and last_done_qty that were added in saas17 to
help in the replay method, as we just got rid of it. We also remove the
code that compensate the negative stock directy at the next in.

What the fifo vacuum does is essentially the same thing as what an out
move do: find a candidate and take units from it. In this case, the
candidates are newer than its concerned stock move. We stored on the
concerned stock move the value at which we sent it (remaining_value) and
post the difference with the real value on a real product.
---
 addons/stock/views/stock_move_views.xml       |    2 +
 addons/stock_account/models/__init__.py       |    1 +
 addons/stock_account/models/account_move.py   |   10 +
 addons/stock_account/models/product.py        |   54 -
 addons/stock_account/models/stock.py          |  344 ++---
 .../tests/test_stockvaluation.py              | 1132 +++++++++++++++--
 addons/stock_account/views/product_views.xml  |    5 +-
 .../views/stock_account_views.xml             |   11 +
 8 files changed, 1211 insertions(+), 348 deletions(-)
 create mode 100644 addons/stock_account/models/account_move.py

diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 6c9e5230575..fa4bcf3c348 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -231,6 +231,8 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" />
                 </header>
                 <sheet>
+                    <div class="oe_button_box" name="button_box">
+                    </div>
                     <group>
                         <group name="main_grp" colspan="2">
                             <group name="main_grp_col1">
diff --git a/addons/stock_account/models/__init__.py b/addons/stock_account/models/__init__.py
index 21bf84ae9b2..7ba53628062 100644
--- a/addons/stock_account/models/__init__.py
+++ b/addons/stock_account/models/__init__.py
@@ -3,6 +3,7 @@
 
 from . import account_chart_template
 from . import account_invoice
+from . import account_move
 from . import product
 from . import stock
 from . import stock_config_settings
diff --git a/addons/stock_account/models/account_move.py b/addons/stock_account/models/account_move.py
new file mode 100644
index 00000000000..7919da15090
--- /dev/null
+++ b/addons/stock_account/models/account_move.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    stock_move_id = fields.Many2one('stock.move', string='Stock Move')
+
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 20c39f6f367..d98bc8f2533 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -38,19 +38,6 @@ class ProductTemplate(models.Model):
         company_dependent=True, domain=[('deprecated', '=', False)],
         help="When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless "
              "there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used.")
-    average_price = fields.Float(
-        'Average Cost', compute='_compute_average_price',
-        digits=dp.get_precision('Product Price'), groups="base.group_user",
-        help="Average cost of the product, in the default unit of measure of the product.")
-
-    @api.multi
-    def _compute_average_price(self):
-        unique_variants = self.filtered(lambda template: len(template.product_variant_ids) == 1)
-        for template in unique_variants:
-            template.average_price = template.product_variant_ids.average_price
-        for template in (self - unique_variants):
-            template.average_price = 0.0
-
 
     @api.one
     @api.depends('property_valuation', 'categ_id.property_valuation')
@@ -100,12 +87,6 @@ class ProductTemplate(models.Model):
 class ProductProduct(models.Model):
     _inherit = 'product.product'
 
-    average_price = fields.Float(
-        'Average Cost', 
-        digits=dp.get_precision('Product Price'),
-        groups="base.group_user",
-        compute='_compute_average_price',
-        help="Calculated average cost")
     stock_value = fields.Float(
         'Value', compute='_compute_stock_value')
 
@@ -156,24 +137,6 @@ class ProductProduct(models.Model):
         self.write({'standard_price': new_price})
         return True
 
-    def _get_latest_cumulated_value(self, exclude_move=False):
-        self.ensure_one()
-        domain = [('product_id', '=', self.id)] + self.env['stock.move']._get_all_base_domain()
-        if exclude_move:
-            domain += [('id', '!=', exclude_move.id)]
-        latest = self.env['stock.move'].search(domain, order='date desc, id desc', limit=1)
-        if not latest:
-            return 0.0
-        return latest.cumulated_value
-
-    def _get_fifo_candidates_out_move(self):
-        """ Find OUT moves that were not valued in time because of negative stock.
-        """
-        self.ensure_one()
-        domain = [('product_id', '=', self.id), ('remaining_qty', '>', 0.0)] + self.env['stock.move']._get_out_base_domain()
-        candidates = self.env['stock.move'].search(domain, order='date, id')
-        return candidates
-
     def _get_fifo_candidates_in_move(self):
         """ Find IN moves that can be used to value OUT moves.
         """
@@ -182,23 +145,6 @@ class ProductProduct(models.Model):
         candidates = self.env['stock.move'].search(domain, order='date, id')
         return candidates
 
-    @api.multi
-    @api.depends('stock_move_ids.product_qty', 'stock_move_ids.state')
-    def _compute_average_price(self):
-        """ Compute the average price of a product.product according to the latest cumulated value
-        and the quantity that is in stock (for all the company owned locations, i.e. including the
-        warehouses transit ones). If nothing is in stick, we fallback first on the latest average
-        price on an out move used for this product then on the standard price.
-        """
-        for p_set, product in pycompat.izip(self, self.with_context(company_owned=True)):
-            if product.qty_available > 0:
-                last_cumulated_value = product._get_latest_cumulated_value()
-                p_set.average_price = last_cumulated_value / product.qty_available
-            else:
-                domain = [('product_id', '=', product.id), ('last_done_qty', '>', 0.0)] + self.env['stock.move']._get_all_base_domain()
-                move = self.env['stock.move'].search(domain, order='date desc, id desc', limit=1)
-                p_set.average_price = move and move.cumulated_value / move.last_done_qty or product.standard_price
-
     @api.multi
     def _compute_stock_value(self):
         for product in self:
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index 10da8ee47e7..d4564d97959 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -55,11 +55,25 @@ class StockMoveLine(models.Model):
     
     @api.multi
     def write(self, vals):
-        super(StockMoveLine, self).write(vals)
         if 'qty_done' in vals:
-            for move in self.mapped('move_id').filtered(lambda m: m.state == 'done'):
-                move.value = move.quantity_done * move.price_unit
-                move.replay()
+            # We need to update the `value`, `remaining_value` and `remaining_qty` on the linked
+            # stock move.
+            moves_to_update = {}
+            for move_line in self.filtered(lambda ml: ml.state == 'done'):
+                moves_to_update[move_line.move_id] = vals['qty_done'] - move_line.qty_done
+
+            for move_id, qty_difference in moves_to_update.items():
+                # more/less units are available, update `value`, `remaining_value` and
+                # `remaining_qty` on the linked stock move.
+                move_vals = {
+                    'value': move_id.value + qty_difference * move_id.price_unit,
+                    'remaining_value': move_id.remaining_value + qty_difference * move_id.price_unit,
+                    'remaining_qty': move_id.remaining_qty + qty_difference,
+                }
+                move_id.write(move_vals)
+                if move_id.product_id.valuation == 'real_time':
+                    move_id.with_context(force_valuation_amount=qty_difference*move_id.price_unit)._account_entry_move()
+        return super(StockMoveLine, self).write(vals)
 
 
 class StockMove(models.Model):
@@ -67,50 +81,26 @@ class StockMove(models.Model):
 
     to_refund = fields.Boolean(string="To Refund (update SO/PO)",
                                help='Trigger a decrease of the delivered/received quantity in the associated Sale Order/Purchase Order')
-
     value = fields.Float()
-    cumulated_value = fields.Float()
     remaining_qty = fields.Float()
-    last_done_move_id = fields.Many2one('stock.move')
-    last_done_remaining_qty = fields.Float()
-    last_done_qty = fields.Float()
-
-    # TODO: add constraints remaining_qty > 0
-    # TODO: add constrain price_unit = 0 on done move?
+    remaining_value = fields.Float()
+    account_move_ids = fields.One2many('account.move', 'stock_move_id')
 
     @api.multi
-    def _get_price_unit(self):
+    def action_get_account_moves(self):
         self.ensure_one()
-        if self.product_id.cost_method == 'average':
-            return self.product_id.average_price or self.product_id.standard_price
-        if self.product_id.cost_method == 'fifo':
-            move = self.search([('product_id', '=', self.product_id.id),
-                         ('state', '=', 'done'), 
-                         ('location_id.usage', '=', 'internal'), 
-                         ('location_dest_id.usage', '!=', 'internal')], order='date desc', limit=1)
-            if move:
-                return move.price_unit or self.product_id.standard_price
-        return self.product_id.standard_price
+        action_ref = self.env.ref('account.action_move_journal_line')
+        if not action_ref:
+            return False
+        action_data = action_ref.read()[0]
+        action_data['domain'] = [('id', 'in', self.account_move_ids.ids)]
+        return action_data
 
-    def _update_fifo_future_cumulated_value(self, value):
-        """ This method is intended to be called on an OUT move that was not valued in time because
-        of negative stock with `value` argument representing its new value.
-        """
-        self.ensure_one()
-        domain = self._get_all_domain()
-        domain += [
-            '|',
-                ('date', '>', self.date),
-                '&',
-                    ('date', '=', self.date),
-                    ('id', '>', self.id)
-        ]
-        moves = self.search(domain, order='date, id')
-        for move in moves:
-            # As `self` is always an out move, we decrease its value on the future moves.
-            move.cumulated_value -= value
+    def get_price_unit(self):
+        """ Returns the unit price to store on the quant """
+        return self.price_unit or self.product_id.standard_price
 
-    @ api.model
+    @api.model
     def _get_in_base_domain(self, company_id=False):
         domain = [
             ('state', '=', 'done'),
@@ -119,16 +109,7 @@ class StockMove(models.Model):
         ]
         return domain
 
-    @ api.model
-    def _get_out_base_domain(self, company_id=False):
-        domain = [
-            ('state', '=', 'done'),
-            ('location_id.company_id', '=', company_id or self.env.user.company_id.id),
-            ('location_dest_id.company_id', '=', False)
-        ]
-        return domain
-
-    @ api.model
+    @api.model
     def _get_all_base_domain(self, company_id=False):
         domain = [
             ('state', '=', 'done'),
@@ -145,9 +126,6 @@ class StockMove(models.Model):
     def _get_in_domain(self):
         return [('product_id', '=', self.product_id.id)] + self._get_in_base_domain(company_id=self.company_id.id)
 
-    def _get_out_domain(self):
-        return [('product_id', '=', self.product_id.id)] + self._get_out_base_domain(company_id=self.company_id.id)
-
     def _get_all_domain(self):
         return [('product_id', '=', self.product_id.id)] + self._get_all_base_domain(company_id=self.company_id.id)
 
@@ -167,133 +145,171 @@ class StockMove(models.Model):
         """
         return self.location_id.company_id.id == self.company_id.id and not self.location_dest_id.company_id
 
-
-#     def change_move_value_in_the_past(self, value):
-#         self.ensure_one()
-#         if self.product_id.cost_method == 'fifo':
-#             moves = self.search([('state', '=', 'done'),
-#                          ('date', '>',  self.date), 
-#                          ('product_id', '=', self.product_id.id)])
-#             if self.location_id.usage not in ('internal', 'transit'):
-#                 if move.last_done_move_id and move.last_done_remaining_qty:
-
-    @api.multi
-    def replay(self):
-        # Easy scenario: avergae /done
-        # search last move before this one
-        start_move = self.search([('product_id', '=', self.product_id.id), 
-                     ('state', '=', 'done'), 
-                     ('date', '<', self.date)], limit=1, order='date desc') #filter on outgoing/incoming moves
-        next_moves = self.search([('product_id', '=', self.product_id.id), 
-                     ('state', '=', 'done'), 
-                     ('date', '>', start_move.date)], order='date') # filter on outgoing/incoming moves
-        if start_move:
-            last_cumulated_value = start_move.cumulated_value
-            last_done_qty_available = start_move.last_done_qty
-        else:
-            last_cumulated_value = 0.0
-            last_done_qty_available = 0.0
-        if self.product_id.cost_method == 'average':
-            for move in next_moves:
-                if move.location_id.usage in ('internal', 'transit') and move.location_dest_id.usage not in ('internal', 'transit'):
-                    if last_done_qty_available:
-                        move.value = - ((last_cumulated_value / last_done_qty_available) * move.product_qty)
-                    last_done_qty_available -= move.product_qty
-                else:
-                    last_done_qty_available += move.product_qty
-                move.cumulated_value = last_cumulated_value + move.value
-                last_cumulated_value = move.cumulated_value
-                move.last_done_qty = last_done_qty_available
-        
-        
-        # FIFO: needs dict with qty_remaining to replay algorithm
-        
-        
-        # update cumulated_value according to value
-        
-        # update outs according to values
-        
-        # update 
-
-
     @api.multi
     def action_done(self):
-        average_price = {}
-        for move in self.filtered(lambda m: m.product_id.cost_method == 'average'):
-            # For the average costing method, the value depends of the quantity in stock at the
-            # moment of the transfer, so fetch the value before calling super.
-            average_price[move.product_id.id] = move.product_id.average_price
+        self.product_price_update_before_done()
         res = super(StockMove, self).action_done()
         for move in res:
             if move._is_in():
                 if move.product_id.cost_method in ['fifo', 'average']:
-                    if not move.price_unit:
-                        move.price_unit = move._get_price_unit()
-                    move.value = move.price_unit * move.product_qty
-                    move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
+                    price_unit = move.price_unit or move.get_price_unit()
+                    value = price_unit * move.product_qty
+                    vals = {
+                        'price_unit': price_unit,
+                        'value': value,
+                        'remaining_value': value,
+                    }
                     if move.product_id.cost_method == 'fifo':
-                        move.remaining_qty = move.product_qty
-
-                        # If there are some OUT moves that we could not value in time, find them
-                        # and value them now with this new IN move. After that, update the cumulated
-                        # value along the moves done after the newly valued move.
-                        candidates_out = move.product_id._get_fifo_candidates_out_move()
-                        qty_to_take = move.product_qty
-                        for candidate in candidates_out:
-                            if candidate.remaining_qty < qty_to_take:
-                                qty_taken_for_candidate = candidate.remaining_qty
-                            else:
-                                qty_taken_for_candidate = qty_to_take
-                            candidate.remaining_qty -= qty_taken_for_candidate
-                            move.remaining_qty -= qty_taken_for_candidate
-                            qty_to_take -= qty_taken_for_candidate
-                            candidate.value -= move.price_unit * qty_taken_for_candidate
-                            candidate.cumulated_value -= move.price_unit * qty_taken_for_candidate
-                            candidate._update_fifo_future_cumulated_value(move.price_unit * qty_taken_for_candidate)
-                            candidate.price_unit = candidate.value / candidate.product_qty
-                    move.last_done_qty = move.product_id.qty_available
-                else:
-                    move.price_unit = move.product_id.standard_price
-                    move.value = move.price_unit * move.product_qty
+                        vals['remaining_qty'] = move.product_qty
+                    move.write(vals)
+                else:  # standard
+                    move.write({
+                        'price_unit': move.product_id.standard_price,
+                        'value': move.product_id.standard_price * move.product_qty,
+                    })
             elif move._is_out():
                 if move.product_id.cost_method == 'fifo':
-                    qty_to_take = move.product_qty
-                    tmp_value = 0
+                    # Find back incoming stock moves (called candidates here) to value this move.
+                    qty_to_take_on_candidates = move.product_qty
                     candidates = move.product_id._get_fifo_candidates_in_move()
-                    last_candidate = False
+                    new_standard_price = 0
+                    tmp_value = 0  # to accumulate the value taken on the candidates
                     for candidate in candidates:
-                        if candidate.remaining_qty <= qty_to_take:
+                        new_standard_price = candidate.price_unit
+                        if candidate.remaining_qty <= qty_to_take_on_candidates:
                             qty_taken_on_candidate = candidate.remaining_qty
                         else:
-                            qty_taken_on_candidate = qty_to_take
-                        tmp_value += qty_taken_on_candidate * candidate.price_unit
-                        candidate.remaining_qty -= qty_taken_on_candidate
-                        qty_to_take -= qty_taken_on_candidate
-                        if qty_to_take == 0:
+                            qty_taken_on_candidate = qty_to_take_on_candidates
+
+                        value_taken_on_candidate = qty_taken_on_candidate * candidate.price_unit
+                        candidate_vals = {
+                            'remaining_qty': candidate.remaining_qty - qty_taken_on_candidate,
+                            'remaining_value': candidate.remaining_value - value_taken_on_candidate,
+                        }
+                        candidate.write(candidate_vals)
+
+                        qty_to_take_on_candidates -= qty_taken_on_candidate
+                        tmp_value += value_taken_on_candidate
+                        if qty_to_take_on_candidates == 0:
                             break
-                        last_candidate = candidate
-                    if last_candidate:
-                        move.last_done_move_id = last_candidate.id
-                        move.last_done_remaining_qty = last_candidate.remaining_qty
-                    if qty_to_take > 0:
-                        move.remaining_qty = qty_to_take # In case there are no candidates to match, put standard price on it
-                    move.value = -tmp_value
-                    move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
-                    move.last_done_qty = move.product_id.qty_available
-                elif move.product_id.cost_method == 'average':
+
+                    # Update the standard price with the price of the last used candidate, if any.
+                    if new_standard_price:
+                        move.product_id.standard_price = new_standard_price
+
+                    # If there's still quantity to value but we're out of candidates, we fall in the
+                    # negative stock use case. We chose to value the out move at the price of the
+                    # last out and a correction entry will be made once `_fifo_vacuum` is called.
+                    if qty_to_take_on_candidates == 0:
+                        move.write({
+                            'value': -tmp_value,  # outgoing move are valued negatively
+                            'price_unit': -tmp_value / move.product_qty,
+                        })
+                    elif qty_to_take_on_candidates > 0:
+                        last_fifo_price = new_standard_price or move.product_id.standard_price
+                        negative_stock_value = last_fifo_price * -qty_to_take_on_candidates
+                        vals = {
+                            'remaining_qty': -qty_to_take_on_candidates,
+                            'remaining_value': negative_stock_value,
+                            'value': -tmp_value + negative_stock_value,
+                            'price_unit': (-tmp_value + negative_stock_value) / move.product_qty,
+                        }
+                        move.write(vals)
+                elif move.product_id.cost_method in ['standard', 'average']:
                     curr_rounding = move.company_id.currency_id.rounding
-                    avg_price_unit = average_price[move.product_id.id]
-                    move.value = float_round(-avg_price_unit * move.product_qty, precision_rounding=curr_rounding)
-                    move.remaining_qty = 0
-                    move.cumulated_value = move.product_id._get_latest_cumulated_value(exclude_move=move) + move.value
-                    move.last_done_qty = move.product_id.qty_available
-                elif move.product_id.cost_method == 'standard':
-                    move.value = - move.product_id.standard_price * move.product_qty
-                
+                    value = -float_round(move.product_id.standard_price * move.product_qty, precision_rounding=curr_rounding)
+                    move.write({
+                        'value': value,
+                        'price_unit': value / move.product_qty,
+                    })
         for move in res.filtered(lambda m: m.product_id.valuation == 'real_time'):
             move._account_entry_move()
         return res
 
+    @api.multi
+    def product_price_update_before_done(self):
+        tmpl_dict = defaultdict(lambda: 0.0)
+        # adapt standard price on incomming moves if the product cost_method is 'average'
+        std_price_update = {}
+        for move in self.filtered(lambda move: move.location_id.usage in ('supplier', 'production') and move.product_id.cost_method == 'average'):
+            product_tot_qty_available = move.product_id.qty_available + tmpl_dict[move.product_id.id]
+
+            if product_tot_qty_available == 0:
+                new_std_price = move.get_price_unit()
+            else:
+                # Get the standard price
+                amount_unit = std_price_update.get((move.company_id.id, move.product_id.id)) or move.product_id.standard_price
+                new_std_price = ((amount_unit * product_tot_qty_available) + (move.get_price_unit() * move.product_qty)) / (product_tot_qty_available + move.product_qty)
+
+            tmpl_dict[move.product_id.id] += move.product_qty
+            # Write the standard price, as SUPERUSER_ID because a warehouse manager may not have the right to write on products
+            move.product_id.with_context(force_company=move.company_id.id).sudo().write({'standard_price': new_std_price})
+            std_price_update[move.company_id.id, move.product_id.id] = new_std_price
+
+    @api.model
+    def _fifo_vacuum(self):
+        """ Every moves that need to be fixed are identifiable by having a negative `remaining_qty`.
+        """
+        # FIXME: sort by date (does filtered lose the order?)
+        for move in self.filtered(lambda m: (m._is_in() or m._is_out()) and m.remaining_qty < 0):
+            domain = [
+                '|',
+                    ('date', '>', move.date),
+                    '&',
+                        ('date', '=', move.date),
+                        ('id', '>', move.id)
+            ]
+            domain += self._get_in_domain()
+            candidates = self.search(domain, order='date, id')
+            if not candidates:
+                return
+            qty_to_take_on_candidates = abs(move.remaining_qty)
+            tmp_value = 0
+            for candidate in candidates:
+                if candidate.remaining_qty <= qty_to_take_on_candidates:
+                    qty_taken_on_candidate = candidate.remaining_qty
+                else:
+                    qty_taken_on_candidate = qty_to_take_on_candidates
+
+                value_taken_on_candidate = qty_taken_on_candidate * candidate.price_unit
+                candidate_vals = {
+                    'remaining_qty': candidate.remaining_qty - qty_taken_on_candidate,
+                    'remaining_value': candidate.remaining_value - value_taken_on_candidate,
+                }
+                candidate.write(candidate_vals)
+
+                qty_to_take_on_candidates -= qty_taken_on_candidate
+                tmp_value += value_taken_on_candidate
+                if qty_to_take_on_candidates == 0:
+                    break
+
+            corrected_value = move.remaining_value + tmp_value
+            if move.product_id.valuation == 'real_time':
+                if move._is_in():
+                    # If we just compensated an IN move that has a negative remaining
+                    # quantity, it means the move has returned more items than it received.
+                    # The correction should behave as a return too. As `_account_entry_move`
+                    # will post the natural values for an IN move (credit IN account, debit
+                    # OUT one), we inverse the sign to create the correct entries.
+                    move.with_context(force_valuation_amount=-corrected_value)._account_entry_move()
+                else:
+                    move.with_context(force_valuation_amount=corrected_value)._account_entry_move()
+
+            if qty_to_take_on_candidates == 0:
+                move.write({
+                    'value': move.value - corrected_value,
+                    'remaining_value': 0,
+                    'remaining_qty': 0,
+                })
+            elif qty_to_take_on_candidates > 0:
+                # It's possible that `remaining_value` is equals to 0 even if the move needs to be
+                # compensated (negative stock for the first ever out in FIFO).
+                move.write({
+                    'value': move.value - corrected_value,
+                    'remaining_value': 0 if not move.remaining_value else move.remaining_value + corrected_value,
+                    'remaining_qty': -qty_to_take_on_candidates,
+                })
+
     @api.multi
     def _get_accounting_data_for_valuation(self):
         """ Return the accounts and journal to use to post Journal Entries for
@@ -415,7 +431,9 @@ class StockMove(models.Model):
                 'journal_id': journal_id,
                 'line_ids': move_lines,
                 'date': date,
-                'ref': self.picking_id.name})
+                'ref': self.picking_id.name,
+                'stock_move_id': self.id,
+            })
             new_account_move.post()
 
     def _account_entry_move(self):
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index d5178fd7ca9..fd50a6aef98 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -17,7 +17,657 @@ class TestStockValuation(TransactionCase):
             'categ_id': self.env.ref('product.product_category_all').id,
         })
 
+        self.product1.product_tmpl_id.valuation = 'real_time'
+        Account = self.env['account.account']
+        self.stock_input_account = Account.create({
+            'name': 'Stock Input',
+            'code': 'StockIn',
+            'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+        })
+        self.stock_output_account = Account.create({
+            'name': 'Stock Output',
+            'code': 'StockOut',
+            'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+        })
+        self.stock_valuation_account = Account.create({
+            'name': 'Stock Valuation',
+            'code': 'Stock Valuation',
+            'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+        })
+        self.stock_journal = self.env['account.journal'].create({
+            'name': 'Stock Journal',
+            'code': 'STJTEST',
+            'type': 'general',
+        })
+        self.product1.categ_id.write({
+            'property_stock_account_input_categ_id': self.stock_input_account.id,
+            'property_stock_account_output_categ_id': self.stock_output_account.id,
+            'property_stock_valuation_account_id': self.stock_valuation_account.id,
+            'property_stock_journal': self.stock_journal.id,
+        })
+        self.product1.categ_id.write({
+            'property_stock_account_input_categ_id': self.stock_input_account.id,
+            'property_stock_account_output_categ_id': self.stock_output_account.id,
+            'property_stock_valuation_account_id': self.stock_valuation_account.id,
+            'property_stock_journal': self.stock_journal.id,
+        })
+
+    def _get_stock_input_move_lines(self):
+        return self.env['account.move.line'].search([
+            ('product_id', '=', self.product1.id),
+            ('account_id', '=', self.stock_input_account.id),
+        ], order='date, id')
+
+    def _get_stock_output_move_lines(self):
+        return self.env['account.move.line'].search([
+            ('product_id', '=', self.product1.id),
+            ('account_id', '=', self.stock_output_account.id),
+        ], order='date, id')
+
+    def _get_stock_valuation_move_lines(self):
+        return self.env['account.move.line'].search([
+            ('product_id', '=', self.product1.id),
+            ('account_id', '=', self.stock_valuation_account.id),
+        ], order='date, id')
+
     def test_fifo_perpetual_1(self):
+        self.product1.product_tmpl_id.cost_method = 'fifo'
+
+        # ---------------------------------------------------------------------
+        # receive 10 units @ 10.00 per unit
+        # ---------------------------------------------------------------------
+        move1 = self.env['stock.move'].create({
+            'name': 'IN 10 units @ 10.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10.0,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 10.0
+        move1.action_done()
+
+        # stock_account values for move1
+        self.assertEqual(move1.product_uom_qty, 10.0)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 10.0)
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(move1.remaining_value, 100.0)
+
+        # account values for move1
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 1)
+        move1_input_aml = input_aml[-1]
+        self.assertEqual(move1_input_aml.debit, 0)
+        self.assertEqual(move1_input_aml.credit, 100)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move1_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 1)
+        self.assertEqual(move1_valuation_aml.debit, 100)
+        self.assertEqual(move1_valuation_aml.credit, 0)
+
+        output_aml = self._get_stock_output_move_lines()
+        self.assertEqual(len(output_aml), 0)
+
+        # link between stock move and account move
+        self.assertEqual(len(move1.account_move_ids), 1)
+        self.assertTrue(set(move1.account_move_ids.line_ids.ids) == {move1_valuation_aml.id, move1_input_aml.id})
+
+        # ---------------------------------------------------------------------
+        # receive 10 units @ 8.00 per unit
+        # ---------------------------------------------------------------------
+        move2 = self.env['stock.move'].create({
+            'name': 'IN 10 units @ 8.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 8.0,
+        })
+        move2.action_confirm()
+        move2.action_assign()
+        move2.move_line_ids.qty_done = 10.0
+        move2.action_done()
+
+        # stock_account values for move2
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 10.0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 80.0)
+
+        # account values for move2
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 2)
+        move2_input_aml = input_aml[-1]
+        self.assertEqual(move2_input_aml.debit, 0)
+        self.assertEqual(move2_input_aml.credit, 80)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move2_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 2)
+        self.assertEqual(move2_valuation_aml.debit, 80)
+        self.assertEqual(move2_valuation_aml.credit, 0)
+
+        output_aml = self._get_stock_output_move_lines()
+        self.assertEqual(len(output_aml), 0)
+
+        # link between stock move and account move
+        self.assertEqual(len(move2.account_move_ids), 1)
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+
+        # older moves
+        self.assertEqual(move1.product_uom_qty, 10.0)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 10.0)
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(move1.remaining_value, 100.0)
+        self.assertEqual(len(move1.account_move_ids), 1)
+        self.assertTrue(set(move1.account_move_ids.line_ids.ids) == {move1_valuation_aml.id, move1_input_aml.id})
+
+        # ---------------------------------------------------------------------
+        # sale 3 units
+        # ---------------------------------------------------------------------
+        move3 = self.env['stock.move'].create({
+            'name': 'Sale 3 units',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 3.0,
+        })
+        move3.action_confirm()
+        move3.action_assign()
+        move3.move_line_ids.qty_done = 3.0
+        move3.action_done()
+
+        # stock_account values for move3
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)  # unused in out move
+        self.assertEqual(move3.value, -30.0)  # took 3 items from move 1 @ 10.00 per unit
+        self.assertEqual(move3.remaining_value, 0.0)  # took 3 items from move 1 @ 10.00 per unit
+
+        # account values for move3
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 2)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move3_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 3)
+        self.assertEqual(move3_valuation_aml.debit, 0)
+        self.assertEqual(move3_valuation_aml.credit, 30)
+
+        output_aml = self._get_stock_output_move_lines()
+        move3_output_aml = output_aml[-1]
+        self.assertEqual(len(output_aml), 1)
+        self.assertEqual(move3_output_aml.debit, 30)
+        self.assertEqual(move3_output_aml.credit, 0)
+
+        # link between stock move and account move
+        self.assertEqual(len(move3.account_move_ids), 1)
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+
+        # older moves
+        self.assertEqual(move1.product_uom_qty, 10.0)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 7)
+        self.assertEqual(move1.remaining_value, 70)
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 10.0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 80.0)
+        self.assertTrue(set(move1.account_move_ids.line_ids.ids) == {move1_valuation_aml.id, move1_input_aml.id})
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+
+        # ---------------------------------------------------------------------
+        # Increase received quantity of move1 from 10 to 12, it should updates
+        # the remaining quantity, the value and remaining value on this move
+        # without impacting any of the next ones.
+        # ---------------------------------------------------------------------
+        move1.quantity_done = 12
+
+        # stock_account values for move3
+        self.assertEqual(move1.product_uom_qty, 12.0)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 9.0)
+        self.assertEqual(move1.value, 120.0)
+        self.assertEqual(move1.remaining_value, 90.0)
+
+        # account values for move1
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 3)
+        move1_correction_input_aml = input_aml[-1]
+        self.assertEqual(move1_correction_input_aml.debit, 0)
+        self.assertEqual(move1_correction_input_aml.credit, 20)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move1_correction_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 4)
+        self.assertEqual(move1_correction_valuation_aml.debit, 20)
+        self.assertEqual(move1_correction_valuation_aml.credit, 0)
+
+        output_aml = self._get_stock_output_move_lines()
+        self.assertEqual(len(output_aml), 1)
+
+        # link between stock move and account move
+        self.assertEqual(len(move1.account_move_ids), 2)
+        self.assertTrue(set(move1.account_move_ids.mapped('line_ids').ids) == {move1_input_aml.id, move1_valuation_aml.id, move1_correction_input_aml.id, move1_correction_valuation_aml.id})
+
+        # older moves
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 10.0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 80.0)
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)
+        self.assertEqual(move3.value, -30.0)
+        self.assertEqual(move3.remaining_value, 0.0)
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+
+        # ---------------------------------------------------------------------
+        # Sale 9 units, the units available from the previous increase are sent
+        # immediately.
+        # ---------------------------------------------------------------------
+        move4 = self.env['stock.move'].create({
+            'name': 'Sale 9 units',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 9.0,
+        })
+        move4.action_confirm()
+        move4.action_assign()
+        move4.move_line_ids.qty_done = 9.0
+        move4.action_done()
+
+        # stock_account values for move4
+        self.assertEqual(move4.product_uom_qty, 9.0)
+        self.assertEqual(move4.remaining_qty, 0.0)  # unused in out move
+        self.assertEqual(move4.value, -90.0)  # took 9 items from move 1 @ 10.00 per unit
+        self.assertEqual(move4.remaining_value, 0.0)  # took 3 items from move 1 @ 10.00 per unit
+
+        # account values for move4
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 3)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move4_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 5)
+        self.assertEqual(move4_valuation_aml.debit, 0)
+        self.assertEqual(move4_valuation_aml.credit, 90)
+
+        output_aml = self._get_stock_output_move_lines()
+        move4_output_aml = output_aml[-1]
+        self.assertEqual(len(output_aml), 2)
+        self.assertEqual(move4_output_aml.debit, 90)
+        self.assertEqual(move4_output_aml.credit, 0)
+
+        # link between stock move and account move
+        self.assertEqual(len(move4.account_move_ids), 1)
+        self.assertTrue(set(move4.account_move_ids.line_ids.ids) == {move4_valuation_aml.id, move4_output_aml.id})
+
+        # older moves
+        self.assertEqual(move1.product_uom_qty, 12)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move1.value, 120)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 10.0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 80.0)
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)
+        self.assertEqual(move3.value, -30.0)
+        self.assertEqual(move3.remaining_value, 0.0)
+        self.assertTrue(set(move1.account_move_ids.mapped('line_ids').ids) == {move1_input_aml.id, move1_valuation_aml.id, move1_correction_input_aml.id, move1_correction_valuation_aml.id})
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+
+        # ---------------------------------------------------------------------
+        # Sale 20 units, we fall in negative stock for 10 units. Theses are
+        # valued at the last FIFO cost and the total is negative.
+        # ---------------------------------------------------------------------
+        move5 = self.env['stock.move'].create({
+            'name': 'Sale 20 units',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 20.0,
+        })
+        move5.action_confirm()
+        move5.action_assign()
+        move5.move_line_ids.qty_done = 20.0
+        move5.action_done()
+
+        # stock_account values for move5
+        self.assertEqual(move5.product_uom_qty, 20.0)
+        self.assertEqual(move5.remaining_qty, -10.0)
+        self.assertEqual(move5.value, -160.0)
+        self.assertEqual(move5.remaining_value, -80.0)
+
+        # account values for move5
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 3)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move5_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 6)
+        self.assertEqual(move5_valuation_aml.debit, 0)
+        self.assertEqual(move5_valuation_aml.credit, 160)
+
+        output_aml = self._get_stock_output_move_lines()
+        move5_output_aml = output_aml[-1]
+        self.assertEqual(len(output_aml), 3)
+        self.assertEqual(move5_output_aml.debit, 160)
+        self.assertEqual(move5_output_aml.credit, 0)
+
+        # link between stock move and account move
+        self.assertEqual(len(move5.account_move_ids), 1)
+        self.assertTrue(set(move5.account_move_ids.line_ids.ids) == {move5_valuation_aml.id, move5_output_aml.id})
+
+        # older moves
+        self.assertEqual(move1.product_uom_qty, 12)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move1.value, 120)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 0)
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)
+        self.assertEqual(move3.value, -30.0)
+        self.assertEqual(move3.remaining_value, 0.0)
+        self.assertEqual(move4.product_uom_qty, 9.0)
+        self.assertEqual(move4.remaining_qty, 0.0)
+        self.assertEqual(move4.value, -90.0)
+        self.assertEqual(move4.remaining_value, 0)
+        self.assertTrue(set(move1.account_move_ids.mapped('line_ids').ids) == {move1_input_aml.id, move1_valuation_aml.id, move1_correction_input_aml.id, move1_correction_valuation_aml.id})
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+        self.assertTrue(set(move4.account_move_ids.line_ids.ids) == {move4_valuation_aml.id, move4_output_aml.id})
+
+        # ---------------------------------------------------------------------
+        # Receive 10 units @ 12.00 to counterbalance the negative, we do not do
+        # the operation right now.
+        # ---------------------------------------------------------------------
+        move6 = self.env['stock.move'].create({
+            'name': 'IN 10 units @ 12.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 12.0,
+        })
+        move6.action_confirm()
+        move6.action_assign()
+        move6.move_line_ids.qty_done = 10.0
+        move6.action_done()
+
+        # stock_account values for move6
+        self.assertEqual(move6.product_uom_qty, 10)
+        self.assertEqual(move6.price_unit, 12.0)
+        self.assertEqual(move6.remaining_qty, 10.0)
+        self.assertEqual(move6.value, 120)
+        self.assertEqual(move6.remaining_value, 120)
+
+        # account values for move6
+        input_aml = self._get_stock_input_move_lines()
+        move6_input_aml = input_aml[-1]
+        self.assertEqual(len(input_aml), 4)
+        self.assertEqual(move6_input_aml.debit, 0)
+        self.assertEqual(move6_input_aml.credit, 120)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move6_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 7)
+        self.assertEqual(move6_valuation_aml.debit, 120)
+        self.assertEqual(move6_valuation_aml.credit, 0)
+
+        output_aml = self._get_stock_output_move_lines()
+        self.assertEqual(len(output_aml), 3)
+
+        # link between stock move and account move
+        self.assertEqual(len(move6.account_move_ids), 1)
+        self.assertTrue(set(move6.account_move_ids.line_ids.ids) == {move6_valuation_aml.id, move6_input_aml.id})
+
+        # older moves
+        self.assertEqual(move1.product_uom_qty, 12)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move1.value, 120)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 0)
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)
+        self.assertEqual(move3.value, -30.0)
+        self.assertEqual(move3.remaining_value, 0.0)
+        self.assertEqual(move4.product_uom_qty, 9.0)
+        self.assertEqual(move4.remaining_qty, 0.0)
+        self.assertEqual(move4.value, -90.0)
+        self.assertEqual(move4.remaining_value, 0)
+        self.assertEqual(move5.product_uom_qty, 20.0)
+        self.assertEqual(move5.remaining_qty, -10.0)
+        self.assertEqual(move5.value, -160.0)
+        self.assertEqual(move5.remaining_value, -80.0)
+        self.assertTrue(set(move1.account_move_ids.mapped('line_ids').ids) == {move1_input_aml.id, move1_valuation_aml.id, move1_correction_input_aml.id, move1_correction_valuation_aml.id})
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+        self.assertTrue(set(move4.account_move_ids.line_ids.ids) == {move4_valuation_aml.id, move4_output_aml.id})
+        self.assertTrue(set(move5.account_move_ids.line_ids.ids) == {move5_valuation_aml.id, move5_output_aml.id})
+
+        # ---------------------------------------------------------------------
+        # Vacuum is called, we cleanup the negatives.
+        # ---------------------------------------------------------------------
+        move5._fifo_vacuum()
+
+        # account values after vacuum
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 4)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        vacuum_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 8)
+        self.assertEqual(vacuum_valuation_aml.balance, -40)
+
+        output_aml = self._get_stock_output_move_lines()
+        vacuum_output_aml = output_aml[-1]
+        self.assertEqual(len(output_aml), 4)
+        self.assertEqual(vacuum_output_aml.balance, 40)
+
+        # stock_account values
+        self.assertEqual(move1.product_uom_qty, 12)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move1.value, 120)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 0)
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)
+        self.assertEqual(move3.value, -30.0)
+        self.assertEqual(move3.remaining_value, 0.0)
+        self.assertEqual(move4.product_uom_qty, 9.0)
+        self.assertEqual(move4.remaining_qty, 0.0)
+        self.assertEqual(move4.value, -90.0)
+        self.assertEqual(move4.remaining_value, 0)
+        self.assertEqual(move5.product_uom_qty, 20.0)
+        self.assertEqual(move5.remaining_qty, 0.0)
+        self.assertEqual(move5.value, -200.0)
+        self.assertEqual(move5.remaining_value, 0.0)
+        self.assertEqual(move6.product_uom_qty, 10)
+        self.assertEqual(move6.price_unit, 12.0)
+        self.assertEqual(move6.remaining_qty, 0.0)
+        self.assertEqual(move6.value, 120)
+        self.assertEqual(move6.remaining_value, 0)
+        self.assertTrue(set(move1.account_move_ids.mapped('line_ids').ids) == {move1_input_aml.id, move1_valuation_aml.id, move1_correction_input_aml.id, move1_correction_valuation_aml.id})
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+        self.assertTrue(set(move4.account_move_ids.line_ids.ids) == {move4_valuation_aml.id, move4_output_aml.id})
+        # a new account move was created  for move 5, to compensate the negative stock we had
+        move5_correction_account_move = self.env['account.move'].browse(max(move5.account_move_ids.ids))
+        move5_correction_output_aml = move5_correction_account_move.line_ids.filtered(lambda ml: ml.account_id == self.stock_output_account)
+        self.assertEqual(move5_correction_output_aml.debit, 40)
+        self.assertEqual(move5_correction_output_aml.credit, 0)
+        move5_correction_valuation_aml = move5_correction_account_move.line_ids.filtered(lambda ml: ml.account_id == self.stock_valuation_account)
+        self.assertEqual(move5_correction_valuation_aml.debit, 0)
+        self.assertEqual(move5_correction_valuation_aml.credit, 40)
+        self.assertTrue(set(move5.account_move_ids.mapped('line_ids').ids) == {move5_valuation_aml.id, move5_output_aml.id, move5_correction_output_aml.id, move5_correction_valuation_aml.id})
+        self.assertTrue(set(move6.account_move_ids.line_ids.ids) == {move6_valuation_aml.id, move6_input_aml.id})
+
+        # ---------------------------------------------------------------------
+        # Edit move6, receive less
+        # ---------------------------------------------------------------------
+        move6.quantity_done = 8
+
+        # stock_account values for move6
+        self.assertEqual(move6.product_uom_qty, 8)
+        self.assertEqual(move6.price_unit, 12)
+        self.assertEqual(move6.remaining_qty, -2)
+        self.assertEqual(move6.value, 96)
+        self.assertEqual(move6.remaining_value, -24)
+
+        # account values for move1
+        input_aml = self._get_stock_input_move_lines()
+        move6_correction_input_aml = input_aml[-1]
+        self.assertEqual(move6_correction_input_aml.debit, 24)
+        self.assertEqual(move6_correction_input_aml.credit, 0)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move6_correction_valuation_aml = valuation_aml[-1]
+        self.assertEqual(move6_correction_valuation_aml.debit, 0)
+        self.assertEqual(move6_correction_valuation_aml.credit, 24)
+
+        # link between stock move and account move
+        self.assertEqual(len(move6.account_move_ids), 2)
+        self.assertTrue(set(move6.account_move_ids.mapped('line_ids').ids) == {move6_input_aml.id, move6_valuation_aml.id, move6_correction_input_aml.id, move6_correction_valuation_aml.id})
+
+        # -----------------------------------------------------------
+        # receive 4, do not counterbalance now
+        # -----------------------------------------------------------
+        move7 = self.env['stock.move'].create({
+            'name': 'IN 4 units @ 15.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 4.0,
+            'price_unit': 15.0,
+        })
+        move7.action_confirm()
+        move7.action_assign()
+        move7.move_line_ids.qty_done = 4.0
+        move7.action_done()
+
+        # stock_account values for move1
+        self.assertEqual(move7.product_uom_qty, 4.0)
+        self.assertEqual(move7.price_unit, 15.0)
+        self.assertEqual(move7.remaining_qty, 4.0)
+        self.assertEqual(move7.value, 60.0)
+        self.assertEqual(move7.remaining_value, 60.0)
+
+        # account values for move7
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 6)
+        move7_input_aml = input_aml[-1]
+        self.assertEqual(move7_input_aml.debit, 0)
+        self.assertEqual(move7_input_aml.credit, 60)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move7_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 10)
+        self.assertEqual(move7_valuation_aml.debit, 60)
+        self.assertEqual(move7_valuation_aml.credit, 0)
+
+        # link between stock move and account move
+        self.assertEqual(len(move7.account_move_ids), 1)
+        self.assertTrue(set(move7.account_move_ids.line_ids.ids) == {move7_valuation_aml.id, move7_input_aml.id})
+
+        # -----------------------------------------------------------
+        # vacuum, compensate in
+        # -----------------------------------------------------------
+        move6._fifo_vacuum()
+
+        # account values after vacuum
+        input_aml = self._get_stock_input_move_lines()
+        self.assertEqual(len(input_aml), 7)
+        move6_correction2_input_aml = input_aml[-1]
+        self.assertEqual(move6_correction2_input_aml.debit, 6)
+        self.assertEqual(move6_correction2_input_aml.credit, 0)
+
+        valuation_aml = self._get_stock_valuation_move_lines()
+        move6_correction2_valuation_aml = valuation_aml[-1]
+        self.assertEqual(len(valuation_aml), 11)
+        self.assertEqual(move6_correction2_valuation_aml.debit, 0)
+        self.assertEqual(move6_correction2_valuation_aml.credit, 6)
+
+        # stock_account values
+        self.assertEqual(move1.product_uom_qty, 12)
+        self.assertEqual(move1.price_unit, 10.0)
+        self.assertEqual(move1.remaining_qty, 0)
+        self.assertEqual(move1.value, 120)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.product_uom_qty, 10.0)
+        self.assertEqual(move2.price_unit, 8.0)
+        self.assertEqual(move2.remaining_qty, 0)
+        self.assertEqual(move2.value, 80.0)
+        self.assertEqual(move2.remaining_value, 0)
+        self.assertEqual(move3.product_uom_qty, 3.0)
+        self.assertEqual(move3.remaining_qty, 0.0)
+        self.assertEqual(move3.value, -30.0)
+        self.assertEqual(move3.remaining_value, 0.0)
+        self.assertEqual(move4.product_uom_qty, 9.0)
+        self.assertEqual(move4.remaining_qty, 0.0)
+        self.assertEqual(move4.value, -90.0)
+        self.assertEqual(move4.remaining_value, 0)
+        self.assertEqual(move5.product_uom_qty, 20.0)
+        self.assertEqual(move5.remaining_qty, 0.0)
+        self.assertEqual(move5.value, -200.0)
+        self.assertEqual(move5.remaining_value, 0.0)
+        self.assertEqual(move6.product_uom_qty, 8)
+        self.assertEqual(move6.price_unit, 12.0)
+        self.assertEqual(move6.remaining_qty, 0.0)
+        self.assertEqual(move6.value, 90)
+        self.assertEqual(move6.remaining_value, 0)
+        self.assertTrue(set(move1.account_move_ids.mapped('line_ids').ids) == {move1_input_aml.id, move1_valuation_aml.id, move1_correction_input_aml.id, move1_correction_valuation_aml.id})
+        self.assertTrue(set(move2.account_move_ids.line_ids.ids) == {move2_valuation_aml.id, move2_input_aml.id})
+        self.assertTrue(set(move3.account_move_ids.line_ids.ids) == {move3_valuation_aml.id, move3_output_aml.id})
+        self.assertTrue(set(move4.account_move_ids.line_ids.ids) == {move4_valuation_aml.id, move4_output_aml.id})
+        # a new account move was created  for move 5, to compensate the negative stock we had
+        move5_correction_account_move = self.env['account.move'].browse(max(move5.account_move_ids.ids))
+        move5_correction_output_aml = move5_correction_account_move.line_ids.filtered(lambda ml: ml.account_id == self.stock_output_account)
+        self.assertEqual(move5_correction_output_aml.debit, 40)
+        self.assertEqual(move5_correction_output_aml.credit, 0)
+        move5_correction_valuation_aml = move5_correction_account_move.line_ids.filtered(lambda ml: ml.account_id == self.stock_valuation_account)
+        self.assertEqual(move5_correction_valuation_aml.debit, 0)
+        self.assertEqual(move5_correction_valuation_aml.credit, 40)
+        self.assertTrue(set(move5.account_move_ids.mapped('line_ids').ids) == {move5_valuation_aml.id, move5_output_aml.id, move5_correction_output_aml.id, move5_correction_valuation_aml.id})
+        self.assertTrue(set(move6.account_move_ids.mapped('line_ids').ids) == {move6_valuation_aml.id, move6_input_aml.id, move6_correction_input_aml.id, move6_correction_valuation_aml.id, move6_correction2_input_aml.id, move6_correction2_valuation_aml.id})
+
+    def test_fifo_perpetual_2(self):
         # http://accountingexplained.com/financial/inventories/fifo-method
         self.product1.product_tmpl_id.cost_method = 'fifo'
 
@@ -37,7 +687,6 @@ class TestStockValuation(TransactionCase):
         move1.action_done()
 
         self.assertEqual(move1.value, 1020.0)
-        self.assertEqual(move1.cumulated_value, 1020.0)
 
         self.assertEqual(move1.remaining_qty, 68.0)
 
@@ -57,7 +706,6 @@ class TestStockValuation(TransactionCase):
         move2.action_done()
 
         self.assertEqual(move2.value, 2170.0)
-        self.assertEqual(move2.cumulated_value, 3190.0)
 
         self.assertEqual(move1.remaining_qty, 68.0)
         self.assertEqual(move2.remaining_qty, 140.0)
@@ -76,12 +724,10 @@ class TestStockValuation(TransactionCase):
         move3.move_line_ids.qty_done = 94.0
         move3.action_done()
 
-        self.assertEqual(move3.price_unit, 0.0)  # unused in out moves
 
         # note: it' ll have to get 68 units from the first batch and 26 from the second one
         # so its value should be -((68*15) + (26*15.5)) = -1423
         self.assertEqual(move3.value, -1423.0)
-        self.assertEqual(move3.cumulated_value, 1767.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 114)
@@ -103,7 +749,6 @@ class TestStockValuation(TransactionCase):
         move4.action_done()
 
         self.assertEqual(move4.value, 640.0)
-        self.assertEqual(move4.cumulated_value, 2407.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 114)
@@ -126,7 +771,6 @@ class TestStockValuation(TransactionCase):
         move5.action_done()
 
         self.assertEqual(move5.value, 1287.0)
-        self.assertEqual(move5.cumulated_value, 3694.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 114)
@@ -151,7 +795,6 @@ class TestStockValuation(TransactionCase):
         # note: it' ll have to get 114 units from the move2 and 2 from move4
         # so its value should be -((114*15.5) + (2*16)) = 1735
         self.assertEqual(move6.value, -1799.0)
-        self.assertEqual(move6.cumulated_value, 1895.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 0)
@@ -177,7 +820,6 @@ class TestStockValuation(TransactionCase):
         # note: it' ll have to get 38 units from the move4 and 24 from move5
         # so its value should be -((38*16) + (24*16.5)) = 608 + 396
         self.assertEqual(move7.value, -1004.0)
-        self.assertEqual(move7.cumulated_value, 891.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 0)
@@ -206,7 +848,6 @@ class TestStockValuation(TransactionCase):
         move8.action_done()
 
         self.assertEqual(move8.value, 0.0)
-        self.assertEqual(move8.cumulated_value, 0.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 0)
@@ -234,7 +875,6 @@ class TestStockValuation(TransactionCase):
         # note: it' ll have to get 10 units from move5 so its value should
         # be -(10*16.50) = -165
         self.assertEqual(move9.value, -165.0)
-        self.assertEqual(move9.cumulated_value, 726.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 0)
@@ -246,8 +886,7 @@ class TestStockValuation(TransactionCase):
         self.assertEqual(move8.remaining_qty, 0.0)  # unused in internal moves
         self.assertEqual(move9.remaining_qty, 0.0)  # unused in out moves
 
-    def test_fifo_perpetual_2(self):
-        # https://docs.google.com/spreadsheets/d/1NI0u9N1gFByXxYHfdiXuxQCrycXXOh76TpPQ3CWeyDw/edit?ts=58da749b#gid=0
+    def test_fifo_perpetual_3(self):
         self.product1.cost_method = 'fifo'
 
         # in 10 @ 100
@@ -266,7 +905,6 @@ class TestStockValuation(TransactionCase):
         move1.action_done()
 
         self.assertEqual(move1.value, 1000.0)
-        self.assertEqual(move1.cumulated_value, 1000.0)
 
         self.assertEqual(move1.remaining_qty, 10.0)
 
@@ -286,7 +924,6 @@ class TestStockValuation(TransactionCase):
         move2.action_done()
 
         self.assertEqual(move2.value, 800.0)
-        self.assertEqual(move2.cumulated_value, 1800.0)
 
         self.assertEqual(move1.remaining_qty, 10.0)
         self.assertEqual(move2.remaining_qty, 10.0)
@@ -305,12 +942,10 @@ class TestStockValuation(TransactionCase):
         move3.move_line_ids.qty_done = 15.0
         move3.action_done()
 
-        self.assertEqual(move3.price_unit, 0.0)  # unused in out moves
 
         # note: it' ll have to get 10 units from move1 and 5 from move2
         # so its value should be -((10*100) + (5*80)) = -1423
         self.assertEqual(move3.value, -1400.0)
-        self.assertEqual(move3.cumulated_value, 400.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 5)
@@ -332,7 +967,6 @@ class TestStockValuation(TransactionCase):
         move4.action_done()
 
         self.assertEqual(move4.value, 300.0)
-        self.assertEqual(move4.cumulated_value, 700.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 5)
@@ -356,7 +990,6 @@ class TestStockValuation(TransactionCase):
         # note: it' ll have to get 5 units from the move2 and 2 from move4
         # so its value should be -((5*80) + (2*60)) = 520
         self.assertEqual(move5.value, -520.0)
-        self.assertEqual(move5.cumulated_value, 180.0)
 
         self.assertEqual(move1.remaining_qty, 0)
         self.assertEqual(move2.remaining_qty, 0)
@@ -364,103 +997,6 @@ class TestStockValuation(TransactionCase):
         self.assertEqual(move4.remaining_qty, 3.0)
         self.assertEqual(move5.remaining_qty, 0.0)  # unused in out moves
 
-    def test_average_perpetual_1(self):
-        # http://accountingexplained.com/financial/inventories/avco-method
-
-        self.product1.product_tmpl_id.cost_method = 'average'
-
-        # Beginning Inventory: 60 units @ 15.00 per unit
-        move1 = self.env['stock.move'].create({
-            'name': '60 units @ 15.00 per unit',
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 60.0,
-            'price_unit': 15,
-        })
-        move1.action_confirm()
-        move1.action_assign()
-        move1.move_line_ids.qty_done = 60.0
-        move1.action_done()
-
-        self.assertEqual(move1.value, 900.0)
-        self.assertEqual(move1.cumulated_value, 900.0)
-        self.assertEqual(move1.remaining_qty, 0.0)  # unusedin average move
-
-        # Purchase 140 units @ 15.50 per unit
-        move2 = self.env['stock.move'].create({
-            'name': '140 units @ 15.50 per unit',
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 140.0,
-            'price_unit': 15.50,
-        })
-        move2.action_confirm()
-        move2.action_assign()
-        move2.move_line_ids.qty_done = 140.0
-        move2.action_done()
-
-        self.assertEqual(move2.value, 2170.0)
-        self.assertEqual(move2.cumulated_value, 3070.0)
-
-        # Sale 190 units @ 15.35 per unit
-        move3 = self.env['stock.move'].create({
-            'name': 'Sale 190 units @ 19.00 per unit',
-            'location_id': self.stock_location.id,
-            'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 190.0,
-        })
-        move3.action_confirm()
-        move3.action_assign()
-        move3.move_line_ids.qty_done = 190.0
-        move3.action_done()
-
-        self.assertEqual(move3.price_unit, 0.0)  # unused in out moves
-
-        self.assertEqual(move3.value, -2916.5)
-        self.assertEqual(move3.cumulated_value, 153.5)
-
-        # Purchase 70 units @ $16.00 per unit
-        move4 = self.env['stock.move'].create({
-            'name': '70 units @ $16.00 per unit',
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 70.0,
-            'price_unit': 16.00,
-        })
-        move4.action_confirm()
-        move4.action_assign()
-        move4.move_line_ids.qty_done = 70.0
-        move4.action_done()
-
-        self.assertEqual(move4.value, 1120.0)
-        self.assertEqual(move4.cumulated_value, 1273.5)
-
-        # Sale 30 units @ $19.50 per unit
-        move5 = self.env['stock.move'].create({
-            'name': '30 units @ $19.50 per unit',
-            'location_id': self.stock_location.id,
-            'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 30.0,
-        })
-        move5.action_confirm()
-        move5.action_assign()
-        move5.move_line_ids.qty_done = 30.0
-        move5.with_context(debug=True).action_done()
-
-        self.assertEqual(move5.value, -477.6)
-        self.assertEqual(move5.cumulated_value, 795.9)  # fuck you, rounding
-        # self.assertEqual(move5.cumulated_value, 796)
-
     def test_fifo_negative_1(self):
         self.product1.product_tmpl_id.cost_method = 'fifo'
         move1 = self.env['stock.move'].create({
@@ -483,9 +1019,8 @@ class TestStockValuation(TransactionCase):
         move1.action_done()
 
         self.assertEqual(move1.value, 0.0)
-        self.assertEqual(move1.cumulated_value, 0.0)
         # normally unused in out moves, but as it moved negative stock we mark it
-        self.assertEqual(move1.remaining_qty, 50.0)
+        self.assertEqual(move1.remaining_qty, -50.0)
 
         move2 = self.env['stock.move'].create({
             'name': '40 in @15',
@@ -506,12 +1041,12 @@ class TestStockValuation(TransactionCase):
         move2.action_confirm()
         move2.action_done()
 
+        move1._fifo_vacuum()
+
         self.assertEqual(move1.value, -600.0)
-        self.assertEqual(move1.cumulated_value, -600.0)
-        self.assertEqual(move1.remaining_qty, 10.0)
+        self.assertEqual(move1.remaining_qty, -10.0)
         self.assertEqual(move2.value, 600.0)
         self.assertEqual(move2.remaining_qty, 0.0)
-        self.assertEqual(move2.cumulated_value, 0.0)
 
         move3 = self.env['stock.move'].create({
             'name': '20 in @25',
@@ -532,15 +1067,150 @@ class TestStockValuation(TransactionCase):
         move3.action_confirm()
         move3.action_done()
 
+        move1._fifo_vacuum()
+
         self.assertEqual(move1.value, -850.0)
-        self.assertEqual(move1.cumulated_value, -850.0)
         self.assertEqual(move1.remaining_qty, 0.0)
         self.assertEqual(move2.value, 600.0)
         self.assertEqual(move2.remaining_qty, 0.0)
-        self.assertEqual(move2.cumulated_value, -250.0)
         self.assertEqual(move3.value, 500.0)
         self.assertEqual(move3.remaining_qty, 10.0)
-        self.assertEqual(move3.cumulated_value, 250.0)
+
+    def test_fifo_negative_2(self):
+        """ Receives 10 units, send more, the extra quantity should be valued at the last fifo
+        price, running the vacuum should not do anything.
+        """
+        self.product1.product_tmpl_id.cost_method = 'fifo'
+
+        move1 = self.env['stock.move'].create({
+            'name': '10 in',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10,
+            'move_line_ids': [(0, 0, {
+                'product_id': self.product1.id,
+                'location_id': self.stock_location.id,
+                'location_dest_id': self.customer_location.id,
+                'product_uom_id': self.uom_unit.id,
+                'qty_done': 10.0,
+            })]
+        })
+        move1.action_confirm()
+        move1.action_done()
+
+        move2 = self.env['stock.move'].create({
+            'name': '10 in',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 12.0,
+            'price_unit': 0,
+            'move_line_ids': [(0, 0, {
+                'product_id': self.product1.id,
+                'location_id': self.stock_location.id,
+                'location_dest_id': self.customer_location.id,
+                'product_uom_id': self.uom_unit.id,
+                'qty_done': 12.0,
+            })]
+        })
+        move2.action_confirm()
+        move2.action_done()
+
+        move2._fifo_vacuum()
+        self.assertEqual(len(move2.account_move_ids), 1)
+
+    def test_average_perpetual_1(self):
+        # http://accountingexplained.com/financial/inventories/avco-method
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        # Beginning Inventory: 60 units @ 15.00 per unit
+        move1 = self.env['stock.move'].create({
+            'name': '60 units @ 15.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 60.0,
+            'price_unit': 15,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 60.0
+        move1.action_done()
+
+        self.assertEqual(move1.value, 900.0)
+        self.assertEqual(move1.remaining_qty, 0.0)  # unusedin average move
+
+        # Purchase 140 units @ 15.50 per unit
+        move2 = self.env['stock.move'].create({
+            'name': '140 units @ 15.50 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 140.0,
+            'price_unit': 15.50,
+        })
+        move2.action_confirm()
+        move2.action_assign()
+        move2.move_line_ids.qty_done = 140.0
+        move2.action_done()
+
+        self.assertEqual(move2.value, 2170.0)
+
+        # Sale 190 units @ 15.35 per unit
+        move3 = self.env['stock.move'].create({
+            'name': 'Sale 190 units @ 19.00 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 190.0,
+        })
+        move3.action_confirm()
+        move3.action_assign()
+        move3.move_line_ids.qty_done = 190.0
+        move3.action_done()
+
+
+        self.assertEqual(move3.value, -2916.5)
+
+        # Purchase 70 units @ $16.00 per unit
+        move4 = self.env['stock.move'].create({
+            'name': '70 units @ $16.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 70.0,
+            'price_unit': 16.00,
+        })
+        move4.action_confirm()
+        move4.action_assign()
+        move4.move_line_ids.qty_done = 70.0
+        move4.action_done()
+
+        self.assertEqual(move4.value, 1120.0)
+
+        # Sale 30 units @ $19.50 per unit
+        move5 = self.env['stock.move'].create({
+            'name': '30 units @ $19.50 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 30.0,
+        })
+        move5.action_confirm()
+        move5.action_assign()
+        move5.move_line_ids.qty_done = 30.0
+        move5.action_done()
+
+        self.assertEqual(move5.value, -477.6)
 
     def test_average_negative_1(self):
         """ Send goods that you don't have in stock and never received any unit.
@@ -565,7 +1235,6 @@ class TestStockValuation(TransactionCase):
         move1.quantity_done = 10.0
         move1.action_done()
         self.assertEqual(move1.value, -990.0)  # as no move out were done for this product, fallback on the standard price
-        self.assertEqual(move1.cumulated_value, -990.0)
         self.assertEqual(move1.remaining_qty, 0.0)  # unused in average move
 
     def test_average_negative_2(self):
@@ -592,7 +1261,6 @@ class TestStockValuation(TransactionCase):
         move1.action_done()
 
         self.assertEqual(move1.value, 100.0)
-        self.assertEqual(move1.cumulated_value, 100.0)
         self.assertEqual(move1.remaining_qty, 0.0)  # unused in average move
 
         # send 10 products
@@ -610,7 +1278,6 @@ class TestStockValuation(TransactionCase):
         move2.action_done()
 
         self.assertEqual(move2.value, -100.0)
-        self.assertEqual(move2.cumulated_value, 0.0)
         self.assertEqual(move2.remaining_qty, 0.0)  # unused in average move
 
         # send 10 products again
@@ -628,5 +1295,216 @@ class TestStockValuation(TransactionCase):
         move3.action_done()
 
         self.assertEqual(move3.value, -100.0)  # as no move out were done for this product, fallback on latest cost
-        self.assertEqual(move3.cumulated_value, -100.0)
         self.assertEqual(move3.remaining_qty, 0.0)  # unused in average move
+
+    def test_average_negative_3(self):
+        """ Send goods that you don't have in stock but received and send some units before.
+        """
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        # set a standard price
+        self.product1.standard_price = 99
+
+        # Receives 10 produts at 10
+        move1 = self.env['stock.move'].create({
+            'name': '68 units @ 15.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 10.0
+        move1.action_done()
+
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(move1.remaining_qty, 0.0)  # unused in average move
+
+        # send 10 products
+        move2 = self.env['stock.move'].create({
+            'name': 'Sale 94 units @ 19.00 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move2.action_confirm()
+        move2.action_assign()
+        move2.move_line_ids.qty_done = 10.0
+        move2.action_done()
+
+        self.assertEqual(move2.value, -100.0)
+        self.assertEqual(move2.remaining_qty, 0.0)  # unused in average move
+
+        # send 10 products again
+        move3 = self.env['stock.move'].create({
+            'name': 'Sale 94 units @ 19.00 per unit',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+        })
+        move3.action_confirm()
+        move3.force_assign()
+        move3.quantity_done = 10.0
+        move3.action_done()
+
+        self.assertEqual(move3.value, -100.0)  # as no move out were done for this product, fallback on latest cost
+        self.assertEqual(move3.remaining_qty, 0.0)  # unused in average move
+
+    def test_average_negative_4(self):
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        # set a standard price
+        self.product1.standard_price = 99
+
+        # Receives 10 produts at 10
+        move1 = self.env['stock.move'].create({
+            'name': '68 units @ 15.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 10.0
+        move1.action_done()
+
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(move1.remaining_qty, 0.0)  # unused in average move
+
+    def test_average_negative_5(self):
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        # in 10 @ 10
+        move1 = self.env['stock.move'].create({
+            'name': '10 units @ 10.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10,
+        })
+        move1.action_confirm()
+        move1.action_assign()
+        move1.move_line_ids.qty_done = 10.0
+        move1.action_done()
+
+        self.assertEqual(move1.value, 100.0)
+        self.assertEqual(self.product1.standard_price, 10)
+
+        # in 10 @ 20
+        move2 = self.env['stock.move'].create({
+            'name': '10 units @ 20.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 20,
+        })
+        move2.action_confirm()
+        move2.action_assign()
+        move2.move_line_ids.qty_done = 10.0
+        move2.action_done()
+
+        self.assertEqual(move2.value, 200.0)
+        self.assertEqual(self.product1.standard_price, 15)
+
+        # send 5
+        move3 = self.env['stock.move'].create({
+            'name': 'Sale 5 units',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 5.0,
+        })
+        move3.action_confirm()
+        move3.force_assign()
+        move3.quantity_done = 5.0
+        move3.action_done()
+
+        self.assertEqual(move3.value, -75.0)
+        self.assertEqual(self.product1.standard_price, 15)
+
+        # send 30
+        move4 = self.env['stock.move'].create({
+            'name': 'Sale 5 units',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 30.0,
+        })
+        move4.action_confirm()
+        move4.force_assign()
+        move4.quantity_done = 30.0
+        move4.action_done()
+
+        self.assertEqual(move4.value, -450.0)
+        self.assertEqual(self.product1.standard_price, 15)
+
+        # in 20 @ 20
+        move5 = self.env['stock.move'].create({
+            'name': '20 units @ 20.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 20.0,
+            'price_unit': 20,
+        })
+        move5.action_confirm()
+        move5.action_assign()
+        move5.move_line_ids.qty_done = 20.0
+        move5.action_done()
+
+        self.assertEqual(move5.value, 400.0)
+        self.assertEqual(self.product1.standard_price, 35)
+
+        self.assertEqual(self.product1.qty_available, 5)
+
+        # send 5 products to empty the inventory, the average price should not go to 0
+        move6 = self.env['stock.move'].create({
+            'name': 'Sale 5 units',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 5.0,
+        })
+        move6.action_confirm()
+        move6.force_assign()
+        move6.quantity_done = 5.0
+        move6.action_done()
+
+        self.assertEqual(move6.value, -175.0)
+        self.assertEqual(self.product1.standard_price, 35)
+
+        # in 10 @ 10, the new average price should be 10
+        move7 = self.env['stock.move'].create({
+            'name': '10 units @ 10.00 per unit',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 10.0,
+            'price_unit': 10,
+        })
+        move7.action_confirm()
+        move7.action_assign()
+        move7.move_line_ids.qty_done = 10.0
+        move7.action_done()
+
+        self.assertEqual(move7.value, 100.0)
+        self.assertEqual(self.product1.standard_price, 10)
diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 654514d05c5..33c686fdba0 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -39,11 +39,8 @@
                     </field>
                     <field name="standard_price" position="replace">
                         <field name="standard_price"
-                            attrs="{'readonly': [('valuation','=','real_time')]}"
-                            widget='monetary' options="{'currency_field': 'currency_id'}"/>
-                        <field name="average_price" readonly="1" 
-                            attrs="{'invisible': [('cost_method','!=', 'average')]}"
                             widget='monetary' options="{'currency_field': 'currency_id'}"/>
+
                     </field>
                     <div name="standard_price_uom" position="after">
                         <button string="Update Cost" type="action"
diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index fa14fc21e6b..edbf1c5e3e7 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -2,6 +2,17 @@
 <odoo>
     <data>
 
+        <record id="view_move_form_inherit" model="ir.ui.view">
+            <field name="name">stock.move.form.inherit</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="action_get_account_moves" icon="fa-arrows" class="oe_stat_button" string="Account Moves" type="object"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_inventory_form_inherit" model="ir.ui.view">
             <field name="name">stock.inventory.form.inherit</field>
             <field name="model">stock.inventory</field>

From 9e861febd573aa443bfc130e5abcb01564a4c067 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 23 Aug 2017 22:19:08 +0200
Subject: [PATCH 044/119] [FIX] stock_account: valuation wizard

The invisible attrs was not working anymore since the new view, where 0
is different than False.
---
 addons/stock_account/wizard/wizard_valuation_history_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_account/wizard/wizard_valuation_history_views.xml b/addons/stock_account/wizard/wizard_valuation_history_views.xml
index a1400983319..2413dc88537 100644
--- a/addons/stock_account/wizard/wizard_valuation_history_views.xml
+++ b/addons/stock_account/wizard/wizard_valuation_history_views.xml
@@ -8,7 +8,7 @@
                 <group>
                     <group>
                         <field name="compute_at_date" widget="radio"/>
-                        <field name="date" attrs="{'invisible': [('compute_at_date', '=', False)]}"/>
+                        <field name="date" attrs="{'invisible': [('compute_at_date', '=', 0)]}"/>
                     </group>
                 </group>
                 <footer>

From 7208af72ddc0bbdb0c2c12d5222906363bb1ddfb Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 23 Aug 2017 22:35:00 +0200
Subject: [PATCH 045/119] [REF] stock_account: valuation wizard: at date list

Organize the displayed fields to help users understand more what's going
on behind the scenes, especially with the remaining_qty and
remaining_value things.
---
 addons/stock_account/views/stock_account_views.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index edbf1c5e3e7..7579cea5b45 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -61,14 +61,16 @@
                     <field name="picking_type_id" invisible="1"/>
                     <field name="create_date" invisible="1" groups="base.group_no_one"/>
                     <field name="product_id"/>
-                    <field name="price_unit"/>
-                    <field name="product_uom_qty"/>
-                    <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                     <field name="location_id" groups="stock.group_stock_multi_locations"/>
                     <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
                     <field name="date" groups="base.group_no_one"/>
                     <field name="state" invisible="1"/>
+                    <field name="product_uom_qty" string="Qty"/>
+                    <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="price_unit"/>
+                    <field name="remaining_qty"/>
                     <field name="value" sum="Stock Valuation"/>
+                    <field name="remaining_value" sum="Stock Valuation"/>
                 </tree>
             </field>
         </record>

From 12934f1b0c8ac53ec6438d1b2c9dd2a55078f127 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 23 Aug 2017 23:08:08 +0200
Subject: [PATCH 046/119] [FIX] stock_account: valuation wizard:
 _compute_stock_value

Adapt to latest changes, and find all valued stock moves in fifo to
display even a negative total value if present.
---
 addons/stock_account/models/product.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index d98bc8f2533..75baea62cb2 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -148,16 +148,13 @@ class ProductProduct(models.Model):
     @api.multi
     def _compute_stock_value(self):
         for product in self:
-            if product.cost_method == 'standard':
-                product.stock_value = product.standard_price * product.qty_available
-            elif product.cost_method == 'average':
-                product.stock_value = product._get_latest_cumulated_value()
-            elif product.cost_method == 'fifo': #Could also do same as for average, but it would lead to more rounding errors
-                moves = product._get_fifo_candidates_in_move()
-                value = 0
-                for move in moves:
-                    value += move.remaining_qty * move.price_unit
-                product.stock_value = value
+            if product.cost_method in ['standard', 'average']:
+                product.stock_value = product.standard_price * product.with_context(company_owned=True).qty_available
+            elif product.cost_method == 'fifo':
+                StockMove = self.env['stock.move']
+                domain = [('product_id', '=', product.id)] + StockMove._get_all_base_domain()
+                moves = StockMove.search(domain)
+                product.stock_value = sum(moves.mapped('value'))
 
 
 class ProductCategory(models.Model):

From af43b0c3fc9298c3bfabd53ead1270ce99afb39a Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 23 Aug 2017 23:27:24 +0200
Subject: [PATCH 047/119] [REF] stock_account: valuation wizard: run
 _fifo_vacuum if needed

---
 .../wizard/wizard_valuation_history.py              | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/stock_account/wizard/wizard_valuation_history.py b/addons/stock_account/wizard/wizard_valuation_history.py
index 3f4d87f5d31..0836b516fff 100644
--- a/addons/stock_account/wizard/wizard_valuation_history.py
+++ b/addons/stock_account/wizard/wizard_valuation_history.py
@@ -17,8 +17,19 @@ class WizardValuationHistory(models.TransientModel):
     @api.multi
     def open_table(self):
         self.ensure_one()
-        if self.compute_at_date and self.date:
 
+        # Call `_fifo_vacuum` on concerned moves
+        fifo_valued_products = self.env['product.product']
+        fifo_valued_products |= self.env['product.template'].search([('property_cost_method', '=', 'fifo')]).mapped('product_variant_ids')
+        fifo_valued_categories = self.env['product.category'].search([('property_cost_method', '=', 'fifo')])
+        fifo_valued_products |= self.env['product.product'].search([('categ_id', 'child_of', fifo_valued_categories.ids)])
+        moves_to_vacuum = self.env['stock.move']
+        Move = self.env['stock.move']
+        for product in fifo_valued_products:
+            moves_to_vacuum |= Move.search([('product_id', '=', product.id), ('remaining_qty', '<', 0)] + Move._get_all_base_domain())
+        moves_to_vacuum._fifo_vacuum()
+
+        if self.compute_at_date and self.date:
             action = self.env['ir.model.data'].xmlid_to_object('stock_account.stock_move_valuation_action')
             if not action:
                 action = {

From e735e4f6bbb0ec07c433efc6d9b13aaa510c1cc7 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 23 Aug 2017 23:44:36 +0200
Subject: [PATCH 048/119] [REF] product, stock_account: valuation related
 tooltips

---
 addons/product/models/product.py          |  5 +--
 addons/product/models/product_template.py |  4 ++-
 addons/stock_account/models/product.py    | 42 ++++++++++-------------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/addons/product/models/product.py b/addons/product/models/product.py
index c550e063709..91cdbefeaa7 100644
--- a/addons/product/models/product.py
+++ b/addons/product/models/product.py
@@ -131,8 +131,9 @@ class ProductProduct(models.Model):
         'Cost', company_dependent=True,
         digits=dp.get_precision('Product Price'),
         groups="base.group_user",
-        help="Cost used for standard stock valuation in accounting and used as a base price on purchase orders. "
-             "Expressed in the default unit of measure of the product.")
+        help = "Cost used for stock valuation in standard price and as a first price to set in average/fifo. "
+               "Also used as a base price for pricelists. "
+               "Expressed in the default unit of measure of the product.")
     volume = fields.Float('Volume', help="The volume in m3.")
     weight = fields.Float(
         'Weight', digits=dp.get_precision('Stock Weight'),
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index a15704940b8..4789302a38b 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -80,7 +80,9 @@ class ProductTemplate(models.Model):
         'Cost', compute='_compute_standard_price',
         inverse='_set_standard_price', search='_search_standard_price',
         digits=dp.get_precision('Product Price'), groups="base.group_user",
-        help="Cost of the product, in the default unit of measure of the product.")
+        help = "Cost used for stock valuation in standard price and as a first price to set in average/fifo. "
+               "Also used as a base price for pricelists. "
+               "Expressed in the default unit of measure of the product. ")
 
     volume = fields.Float(
         'Volume', compute='_compute_volume', inverse='_set_volume',
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 75baea62cb2..d8f631e975e 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -16,17 +16,17 @@ class ProductTemplate(models.Model):
         ('manual_periodic', 'Periodic (manual)'),
         ('real_time', 'Perpetual (automated)')], string='Inventory Valuation',
         company_dependent=True, copy=True, default='manual_periodic',
-        help="If perpetual valuation is enabled for a product, the system will automatically create journal entries corresponding to stock moves, with product price as specified by the 'Costing Method'" \
-             "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products.")
+        help="""Manual: The accounting entries to value the inventory are not posted automatically.
+        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company.""")
     valuation = fields.Char(compute='_compute_valuation_type', inverse='_set_valuation_type')
     property_cost_method = fields.Selection([
         ('standard', 'Standard Price'),
-        ('fifo', '(financial) FIFO'),
-        ('average', 'AVCO')], string='Costing Method',
+        ('fifo', 'First In First Out (FIFO)'),
+        ('average', 'Average Cost (AVCO)')], string='Costing Method',
         company_dependent=True, copy=True,
-        help="""Standard Price: The cost price is manually updated at the end of a specific period (usually once a year).
-                Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.
-                Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example).""")
+        help="""Standard Price: The products are valued at their standard cost defined on the product.
+        Average Cost (AVCO): The products are valued at weighted average cost.
+        First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first.""")
     cost_method = fields.Char(compute='_compute_cost_method', inverse='_set_cost_method')
     property_stock_account_input = fields.Many2one(
         'account.account', 'Stock Input Account',
@@ -161,27 +161,21 @@ class ProductCategory(models.Model):
     _inherit = 'product.category'
 
     property_valuation = fields.Selection([
-        ('manual_periodic', 'Periodic (manual)'),
-        ('real_time', 'Perpetual (automated)')], string='Inventory Valuation',
+        ('manual_periodic', 'Manual'),
+        ('real_time', 'Automated')], string='Inventory Valuation',
         company_dependent=True, copy=True, required=True,
-        help="If perpetual valuation is enabled for a product, the system "
-             "will automatically create journal entries corresponding to "
-             "stock moves, with product price as specified by the 'Costing "
-             "Method'. The inventory variation account set on the product "
-             "category will represent the current inventory value, and the "
-             "stock input and stock output account will hold the counterpart "
-             "moves for incoming and outgoing products.")
+        help="""Manual: The accounting entries to value the inventory are not posted automatically.
+        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company.
+        """)
     property_cost_method = fields.Selection([
         ('standard', 'Standard Price'),
-        ('fifo', '(financial) FIFO)'),
-        ('average', 'AVCO')], string="Costing Method",
+        ('fifo', 'First In First Out (FIFO)'),
+        ('average', 'Average Cost (AVCO)')], string="Costing Method",
         company_dependent=True, copy=True, required=True,
-        help="Standard Price: The cost price is manually updated at the end "
-             "of a specific period (usually once a year).\nAverage Price: "
-             "The cost price is recomputed at each incoming shipment and "
-             "used for the product valuation.\nReal Price: The cost price "
-             "displayed is the price of the last outgoing product (will be "
-             "used in case of inventory loss for example).""")
+        help=""""Standard Price: The products are valued at their standard cost defined on the product.
+        Average Cost (AVCO): The products are valued at weighted average cost.
+        First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first.
+        """)
     property_stock_journal = fields.Many2one(
         'account.journal', 'Stock Journal', company_dependent=True,
         help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed.")

From 11dc6d27029f85a78d22243595bee571ff0ea404 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 24 Aug 2017 16:12:17 +0200
Subject: [PATCH 049/119] [REF] stock_account: valuation wizard

display available quantity in the valuation now

FIXME: what to do with valuation at date? also with price history thing
---
 addons/stock_account/views/product_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 33c686fdba0..db3a52bb0b2 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -94,6 +94,7 @@
                 <tree>
                     <field name="name"/>
                     <field name="stock_value" sum="Stock Valuation"/>
+                    <field name="qty_available" context="{'company_owned': True}"/>
                 </tree>
             </field>
         </record>

From 3ed024e898193a419593b410c25ed3ff490134c8 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 24 Aug 2017 16:39:47 +0200
Subject: [PATCH 050/119] [REF] stock_account: make standard price readonly if
 perpetual

This was the case in saas-16.
---
 addons/stock_account/views/product_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index db3a52bb0b2..fcd8b68ddd2 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -39,8 +39,8 @@
                     </field>
                     <field name="standard_price" position="replace">
                         <field name="standard_price"
+                            attrs="{'readonly':[('valuation','=','real_time')]}"
                             widget='monetary' options="{'currency_field': 'currency_id'}"/>
-
                     </field>
                     <div name="standard_price_uom" position="after">
                         <button string="Update Cost" type="action"

From 757758624f2fd699a932d2232b51b3698a793fd5 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 24 Aug 2017 23:25:20 +0200
Subject: [PATCH 051/119] [REF] purchase: adapt tests

avergae price is now merged back in standard_price
negative stock are only corrected by the vacuum, so call it
---
 addons/purchase/test/average_price.yml | 8 ++++----
 addons/purchase/test/fifo_price.yml    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/test/average_price.yml b/addons/purchase/test/average_price.yml
index fdcbc9f3b9f..c4871884087 100644
--- a/addons/purchase/test/average_price.yml
+++ b/addons/purchase/test/average_price.yml
@@ -47,7 +47,7 @@
 - 
   !python {model: product.product, id: product_average_icecream}: |
     assert self.qty_available == 10.0, 'Wrong quantity in stock after first reception'
-    assert self.average_price == 60.0, 'Standard price should be the price of the first reception!'
+    assert self.standard_price == 60.0, 'Standard price should be the price of the first reception!'
 - 
   I create a draft Purchase Order for second incoming shipment for 30 pieces at 80€
 - 
@@ -75,7 +75,7 @@
   Check the standard price
 - 
   !python {model: product.product, id: product_average_icecream}: |
-    assert self.average_price == 75.0, 'After second reception, we should have an average price of 75.0 on the product'
+    assert self.standard_price == 75.0, 'After second reception, we should have an average price of 75.0 on the product'
 - 
   Create picking to send some goods
 - 
@@ -101,7 +101,7 @@
   Check the standard price (60 * 10 + 30 * 80) / 40 = 75.0 did not change
 - 
   !python {model: product.product, id: product_average_icecream}: |
-    assert self.average_price == 75.0, 'Average price should not have changed with outgoing picking!'
+    assert self.standard_price == 75.0, 'Average price should not have changed with outgoing picking!'
     assert self.qty_available == 20.0, 'Pieces were not picked correctly as the quantity on hand is wrong'
 - 
   Make a new purchase order with 500 g Average Ice Cream at a price of 0.2€/g
@@ -131,4 +131,4 @@
 - 
   !python {model: product.product, id: product_average_icecream}: |
     assert self.qty_available == 20.5, 'Reception of purchase order in grams leads to wrong quantity in stock'
-    assert round(self.average_price, 2) == 78.05, 'Standard price as average price of third reception with other UoM incorrect! Got %s instead of 78.05' % (round(self.standard_price, 2),)
+    assert round(self.standard_price, 2) == 78.05, 'Standard price as average price of third reception with other UoM incorrect! Got %s instead of 78.05' % (round(self.standard_price, 2),)
diff --git a/addons/purchase/test/fifo_price.yml b/addons/purchase/test/fifo_price.yml
index 598e41844e8..cbbe151e040 100644
--- a/addons/purchase/test/fifo_price.yml
+++ b/addons/purchase/test/fifo_price.yml
@@ -341,10 +341,7 @@
   !python {model: purchase.order, id: purchase_order_fifo_neg}: |
     picking = self.picking_ids[0]
     self.env['stock.immediate.transfer'].create({'pick_id': picking.id}).process()
-    original_out_move = self.env['stock.picking'].browse(ref('outgoing_fifo_shipment_neg')).move_lines[0]
-    assert original_out_move.remaining_qty == 50.0, 'On the out move of 100, 50 still needs to be matched'
-    assert original_out_move.value == -2500, 'Value of the move should be -2500'
-- 
+-
   Receive purchase order with 600 kg FIFO Ice Cream at 80 euro/kg
 - 
   !record {model: purchase.order, id: purchase_order_fifo_neg2}:
@@ -368,6 +365,9 @@
     picking = self.picking_ids[0]
     self.env['stock.immediate.transfer'].create({'pick_id': picking.id}).process()
     original_out_move = self.env['stock.picking'].browse(ref('outgoing_fifo_shipment_neg')).move_lines[0]
+    outgoing_shipment_fifo_icecream_neg2 = self.env['stock.picking'].browse(ref('outgoing_fifo_shipment_neg2')).move_lines[0]
+    original_out_move._fifo_vacuum()
+    outgoing_shipment_fifo_icecream_neg2._fifo_vacuum()
     assert original_out_move.value == -6500.0, 'First original out move should have -6500 as value'
     assert original_out_move.product_id.stock_value == 12000.0, 'Stock Value should be 12000'
     assert original_out_move.product_id.qty_available == 150.0, 'Qty available should be 150'
\ No newline at end of file

From 6df482eb99e83dbe3f6b51d950e70d8d7c5e4015 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 25 Aug 2017 16:13:57 +0200
Subject: [PATCH 052/119] [FIX] barcodes: barcode handlers should return a
 deferred

This was the case about 15minutes ago. But before pushing we
decided to change the Barcode override of FormController to
directly use handlers of the FormController when it could (e.g.
to handle 'Edit', 'Discard' actions). This wasn't a good idea as
those handlers don't return anything, and the barcode mechanism
requires its handlers to return a deferred. So basically, it
crashed when such a barcode was scanned. Having a test suite is
nice, but you should not forget to relaunch it before pushing...
---
 .../static/src/js/barcode_form_view.js        | 109 ++++++++++--------
 1 file changed, 60 insertions(+), 49 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 5b042999bf6..3f1c5ef1a86 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -26,13 +26,13 @@ FormController.include({
         this.activeBarcode = {
             form_view: {
                 commands: {
-                    'O-CMD.EDIT': this._onEdit.bind(this),
-                    'O-CMD.CANCEL': this._onDiscard.bind(this),
-                    'O-CMD.SAVE': this._onCommandSave.bind(this),
-                    'O-CMD.PAGER-PREV': this._onCommandPrevious.bind(this),
-                    'O-CMD.PAGER-NEXT': this._onCommandNext.bind(this),
-                    'O-CMD.PAGER-FIRST': this._onCommandFirst.bind(this),
-                    'O-CMD.PAGER-LAST': this._onCommandLast.bind(this),
+                    'O-CMD.EDIT': this._barcodeEdit.bind(this),
+                    'O-CMD.CANCEL': this._barcodeDiscard.bind(this),
+                    'O-CMD.SAVE': this._barcodeSave.bind(this),
+                    'O-CMD.PAGER-PREV': this._barcodePagerPrevious.bind(this),
+                    'O-CMD.PAGER-NEXT': this._barcodePagerNext.bind(this),
+                    'O-CMD.PAGER-FIRST': this._barcodePagerFirst.bind(this),
+                    'O-CMD.PAGER-LAST': this._barcodePagerLast.bind(this),
                 },
             },
         };
@@ -73,6 +73,53 @@ FormController.include({
             return this._barcodeWithoutCandidate(record, barcode, activeBarcode);
         }
     },
+    /**
+     * @private
+     */
+    _barcodeDiscard: function () {
+        return this.discardChanges();
+    },
+    /**
+     * @private
+     */
+    _barcodeEdit: function () {
+        return this._setMode('edit');
+    },
+    /**
+     * @private
+     */
+    _barcodePagerFirst: function () {
+        var self = this;
+        return this.mutex.exec(function () {}).then(function () {
+            self.pager.updateState({
+                current_min: 1,
+            }, {notifyChange: true});
+        });
+    },
+    /**
+     * @private
+     */
+    _barcodePagerLast: function () {
+        var self = this;
+        return this.mutex.exec(function () {}).then(function () {
+            var state = self.model.get(self.handle, {raw: true});
+            self.pager.updateState({
+                current_min: state.count,
+            }, {notifyChange: true});
+        });
+    },
+    /**
+     * @private
+     */
+    _barcodePagerNext: function () {
+        return this.mutex.exec(function () {}).then(this.pager.next.bind(this.pager));
+    },
+    /**
+     * @private
+     */
+    _barcodePagerPrevious: function () {
+        return this.mutex.exec(function () {}).then(this.pager.previous.bind(this.pager));
+    },
     /**
      * Returns true iff the given barcode matches the given record (candidate).
      *
@@ -85,6 +132,12 @@ FormController.include({
     _barcodeRecordFilter: function (candidate, barcode, activeBarcode) {
         return candidate.data.product_barcode === barcode;
     },
+    /**
+     * @private
+     */
+    _barcodeSave: function () {
+        return this.saveRecord();
+    },
     /**
      * @private
      * @param {Object} candidate: record in the x2m
@@ -111,7 +164,6 @@ FormController.include({
         core.bus.on('barcode_scanned', this, this._barcodeScanned);
         core.bus.on('keypress', this, this._quantityListener);
     },
-
     /**
      * @private
      */
@@ -258,47 +310,6 @@ FormController.include({
             });
         });
     },
-    /**
-     * @private
-     */
-    _onCommandFirst: function () {
-        var self = this;
-        return this.mutex.exec(function () {}).then(function () {
-            self.pager.updateState({
-                current_min: 1,
-            }, {notifyChange: true});
-        });
-    },
-    /**
-     * @private
-     */
-    _onCommandLast: function () {
-        var self = this;
-        return this.mutex.exec(function () {}).then(function () {
-            var state = self.model.get(self.handle, {raw: true});
-            self.pager.updateState({
-                current_min: state.count,
-            }, {notifyChange: true});
-        });
-    },
-    /**
-     * @private
-     */
-    _onCommandNext: function () {
-        return this.mutex.exec(function () {}).then(this.pager.next.bind(this.pager));
-    },
-    /**
-     * @private
-     */
-    _onCommandPrevious: function () {
-        return this.mutex.exec(function () {}).then(this.pager.previous.bind(this.pager));
-    },
-    /**
-     * @private
-     */
-    _onCommandSave: function () {
-        return this.saveRecord();
-    },
     /**
      * @private
      * @param {KeyEvent} event

From 0c1c93002c9bba02ae6a95d0af3b4706d0870a17 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Fri, 25 Aug 2017 16:40:22 +0200
Subject: [PATCH 053/119] [FIX] base_automation: race condition on time-based
 automated action

When used on a large db with lots of records to process, `last_run`
date that was written on the base.automation could be a few seconds
later than `now` that was used to check whether to run the automated
action. This caused some small time frames to be never checked, and some
records to be missed. We fix this by using exactly the same timestamp.

opw-766182
---
 addons/base_automation/models/base_automation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_automation/models/base_automation.py b/addons/base_automation/models/base_automation.py
index c9c0a150364..68698fe6ef7 100644
--- a/addons/base_automation/models/base_automation.py
+++ b/addons/base_automation/models/base_automation.py
@@ -12,6 +12,7 @@ from dateutil.relativedelta import relativedelta
 
 from odoo import api, fields, models, SUPERUSER_ID
 from odoo.modules.registry import Registry
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from odoo.tools.safe_eval import safe_eval
 
 _logger = logging.getLogger(__name__)
@@ -350,7 +351,7 @@ class BaseAutomation(models.Model):
                     except Exception:
                         _logger.error(traceback.format_exc())
 
-            action.write({'last_run': fields.Datetime.now()})
+            action.write({'last_run': now.strftime(DEFAULT_SERVER_DATETIME_FORMAT)})
 
             if automatic:
                 # auto-commit for batch processing

From feb97a9d7da407e1da4ecc74e4ea7e8b44cdd53a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 25 Aug 2017 15:53:15 +0200
Subject: [PATCH 054/119] [FIX] web: bump test timeout

---
 addons/web/tests/test_js.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py
index 2253b1b73fc..c2f29ba0d0d 100644
--- a/addons/web/tests/test_js.py
+++ b/addons/web/tests/test_js.py
@@ -10,4 +10,4 @@ class WebSuite(odoo.tests.HttpCase):
     at_install = False
 
     def test_01_js(self):
-        self.phantom_js('/web/tests?mod=web', "", "", login='admin', timeout=180)
+        self.phantom_js('/web/tests?mod=web', "", "", login='admin', timeout=240)

From dc07fc8baca782734215e25ef9ea6674cfb845bf Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 25 Aug 2017 18:44:09 +0200
Subject: [PATCH 055/119] [FIX] barcodes: tests: don't add undefined widget to
 registry

Resetting the key 'test_barcode_handler' to its value before the
test was technically the best solution, as a test should leave the
environment unchanged. However, in this case, the widget is
undefined (there is obviously no 'test_barcode_handler').
Whereas this should not be a problem (the fields in the registry
are supposed to be accessed using get(), and the presence of a
key mapping undefined is equivalent to the absence of the key in
this case), this breaks a test in Studio if the latter one is
executed after the barcode test. This is because Studio browses the
map of the field registry to access each field's prototype. When it
encounters an undefined value, it crashes.
---
 addons/barcodes/static/tests/barcode_tests.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/barcodes/static/tests/barcode_tests.js b/addons/barcodes/static/tests/barcode_tests.js
index add55ed4d5d..7487972ea62 100644
--- a/addons/barcodes/static/tests/barcode_tests.js
+++ b/addons/barcodes/static/tests/barcode_tests.js
@@ -348,7 +348,6 @@ QUnit.test('specification of widget barcode_handler', function (assert) {
             });
         },
     });
-    var previousField = fieldRegistry.get('test_barcode_handler');
     fieldRegistry.add('test_barcode_handler', TestBarcodeHandler);
 
     var form = createView({
@@ -402,6 +401,6 @@ QUnit.test('specification of widget barcode_handler', function (assert) {
 
     form.destroy();
     barcodeEvents.BarcodeEvents.max_time_between_keys_in_ms = delay;
-    fieldRegistry.add('test_barcode_handler', previousField);
+    delete fieldRegistry.map.test_barcode_handler;
 });
 });

From b5aaf0d527cdab794058ccbbf3cd5d215fd9a5af Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Mon, 21 Aug 2017 18:34:56 -0700
Subject: [PATCH 056/119] [FIX] point_of_sale: handle fiscal positions that
 remove taxes

A tax can be mapped to nothing, so first check if
_map_tax_fiscal_position actually returned something.

Fixes #17963
---
 addons/point_of_sale/static/src/js/models.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 5d7d96b5178..31c678e107c 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1360,6 +1360,9 @@ exports.Orderline = Backbone.Model.extend({
             if (!no_map_tax){
                 tax = self._map_tax_fiscal_position(tax);
             }
+            if (!tax){
+                return;
+            }
             if (tax.amount_type === 'group'){
                 var ret = self.compute_all(tax.children_tax_ids, price_unit, quantity, currency_rounding);
                 total_excluded = ret.total_excluded;

From bb28a2d7f68b49f526b9829023c1f9979623ddfc Mon Sep 17 00:00:00 2001
From: Odoo Translation Bot <c3p@odoo.com>
Date: Sun, 27 Aug 2017 04:40:12 +0200
Subject: [PATCH 057/119] [I18N] Update translation terms from Transifex

---
 addons/account/i18n/da.po                     |   28 +-
 addons/account/i18n/es.po                     |    8 +-
 addons/account/i18n/hr.po                     |    4 +-
 addons/account/i18n/sv.po                     |  198 ++--
 addons/account/i18n/tr.po                     |   68 +-
 addons/account/i18n/uk.po                     |    4 +-
 addons/account_asset/i18n/da.po               |    2 +-
 .../account_bank_statement_import/i18n/da.po  |    2 +-
 addons/account_cancel/i18n/da.po              |   12 +-
 addons/account_check_printing/i18n/he.po      |    9 +-
 addons/auth_oauth/i18n/da.po                  |    2 +-
 addons/auth_oauth/i18n/sv.po                  |    5 +-
 addons/barcodes/i18n/da.po                    |    9 +-
 addons/barcodes/i18n/hr.po                    |    2 +-
 addons/barcodes/i18n/sv.po                    |    5 +-
 addons/base_action_rule/i18n/da.po            |    5 +-
 addons/base_action_rule/i18n/zh_CN.po         |    6 +-
 addons/base_geolocalize/i18n/da.po            |    5 +-
 addons/base_import/i18n/ja.po                 |    2 +-
 addons/board/i18n/da.po                       |    5 +-
 addons/crm/i18n/da.po                         |    2 +-
 addons/crm/i18n/es.po                         |   25 +-
 addons/crm/i18n/sv.po                         |    5 +-
 addons/delivery/i18n/sv.po                    |    9 +-
 addons/delivery/i18n/zh_CN.po                 |    2 +-
 addons/event/i18n/da.po                       |    4 +-
 addons/event/i18n/de.po                       |    7 +-
 addons/event_sale/i18n/da.po                  |    7 +-
 addons/event_sale/i18n/de.po                  |   13 +-
 addons/fetchmail/i18n/da.po                   |    5 +-
 addons/fleet/i18n/da.po                       |    9 +-
 addons/fleet/i18n/ja.po                       |    4 +-
 addons/fleet/i18n/sv.po                       |    5 +-
 addons/fleet/i18n/zh_CN.po                    |    4 +-
 addons/gamification/i18n/hr.po                |    4 +-
 addons/google_drive/i18n/zh_CN.po             |    2 +-
 addons/hr_attendance/i18n/zh_CN.po            |    4 +-
 addons/hr_expense/i18n/da.po                  |    4 +-
 addons/hr_recruitment/i18n/da.po              |    2 +-
 addons/hr_recruitment/i18n/fi.po              |    2 +-
 addons/hr_recruitment/i18n/hr.po              |    4 +-
 addons/hr_timesheet/i18n/da.po                |    7 +-
 addons/im_livechat/i18n/da.po                 |    7 +-
 addons/link_tracker/i18n/da.po                |    7 +-
 addons/mail/i18n/da.po                        |   10 +-
 addons/maintenance/i18n/da.po                 |   10 +-
 addons/maintenance/i18n/sv.po                 |    5 +-
 addons/mass_mailing/i18n/da.po                |    4 +-
 addons/mass_mailing/i18n/zh_CN.po             |   10 +-
 addons/membership/i18n/da.po                  |    5 +-
 addons/membership/i18n/es.po                  |    3 +-
 addons/membership/i18n/sv.po                  |    5 +-
 addons/mrp/i18n/da.po                         |   35 +-
 addons/mrp/i18n/hr.po                         |    6 +-
 addons/mrp_repair/i18n/da.po                  |    7 +-
 addons/payment/i18n/ja.po                     |    6 +-
 addons/payment_authorize/i18n/ja.po           |    2 +-
 addons/payment_ogone/i18n/ja.po               |    2 +-
 addons/payment_payumoney/i18n/da.po           |    5 +-
 addons/payment_stripe/i18n/ja.po              |    8 +-
 addons/payment_stripe/i18n/zh_CN.po           |    6 +-
 addons/point_of_sale/i18n/da.po               |   10 +-
 addons/point_of_sale/i18n/es.po               |    2 +-
 addons/point_of_sale/i18n/hu.po               |    8 +-
 addons/point_of_sale/i18n/uk.po               |    7 +-
 addons/point_of_sale/i18n/zh_CN.po            |    4 +-
 addons/pos_cache/i18n/da.po                   |    5 +-
 addons/pos_mercury/i18n/da.po                 |    7 +-
 addons/pos_mercury/i18n/ja.po                 |    2 +-
 addons/pos_mercury/i18n/sv.po                 |    5 +-
 addons/pos_mercury/i18n/zh_CN.po              |    4 +-
 addons/pos_restaurant/i18n/zh_CN.po           |    2 +-
 addons/product/i18n/da.po                     |   10 +-
 addons/product/i18n/ja.po                     |    2 +-
 addons/product/i18n/sv.po                     |    5 +-
 addons/product_margin/i18n/sv.po              |    7 +-
 addons/project/i18n/da.po                     |   12 +-
 addons/project/i18n/hr.po                     |    2 +-
 addons/project/i18n/zh_CN.po                  |    4 +-
 addons/project_issue/i18n/da.po               |    5 +-
 addons/project_issue_sheet/i18n/ja.po         |    2 +-
 addons/purchase/i18n/da.po                    |    8 +-
 addons/purchase/i18n/hr.po                    |    6 +-
 addons/purchase/i18n/sv.po                    |    9 +-
 addons/purchase/i18n/zh_CN.po                 |    2 +-
 addons/purchase_requisition/i18n/da.po        |    7 +-
 addons/rating_project/i18n/zh_CN.po           |    2 +-
 addons/report_intrastat/i18n/da.po            |    2 +-
 addons/report_intrastat/i18n/sv.po            |    9 +-
 addons/report_intrastat/i18n/zh_CN.po         |    2 +-
 addons/sale/i18n/fi.po                        |   38 +
 addons/sale/i18n/hr.po                        |    2 +-
 addons/sale/i18n/ja.po                        |    2 +-
 addons/sale/i18n/sv.po                        |    5 +-
 addons/sale_crm/i18n/da.po                    |   10 +-
 addons/sale_margin/i18n/da.po                 |    8 +-
 addons/sale_order_dates/i18n/da.po            |    3 +-
 addons/sale_stock/i18n/zh_CN.po               |    2 +-
 addons/sale_timesheet/i18n/da.po              |   34 +-
 addons/sales_team/i18n/da.po                  |   95 +-
 addons/sales_team/i18n/es.po                  |    3 +-
 addons/stock/i18n/da.po                       | 1010 +++++++++++------
 addons/stock/i18n/it.po                       |    6 +-
 addons/stock/i18n/nl.po                       |    5 +-
 addons/stock/i18n/sv.po                       |    9 +-
 addons/stock/i18n/zh_CN.po                    |   24 +-
 addons/stock_account/i18n/da.po               |    4 +-
 addons/stock_calendar/i18n/da.po              |   20 +-
 addons/stock_dropshipping/i18n/da.po          |    8 +-
 addons/stock_picking_wave/i18n/da.po          |   42 +-
 addons/survey/i18n/da.po                      |    4 +-
 addons/survey/i18n/zh_CN.po                   |    2 +-
 addons/survey_crm/i18n/da.po                  |    5 +-
 addons/utm/i18n/da.po                         |   22 +-
 addons/web/i18n/ja.po                         |    8 +-
 addons/web_diagram/i18n/ja.po                 |    2 +-
 addons/web_editor/i18n/zh_CN.po               |   14 +-
 addons/web_settings_dashboard/i18n/zh_CN.po   |    2 +-
 addons/website/i18n/da.po                     |  209 ++--
 addons/website/i18n/ja.po                     |    2 +-
 addons/website_blog/i18n/zh_CN.po             |    4 +-
 addons/website_crm/i18n/zh_CN.po              |    2 +-
 addons/website_crm_partner_assign/i18n/es.po  |    5 +-
 .../website_crm_partner_assign/i18n/zh_CN.po  |    2 +-
 addons/website_event/i18n/da.po               |    6 +-
 addons/website_event/i18n/zh_CN.po            |    2 +-
 addons/website_event_track/i18n/da.po         |    7 +-
 addons/website_event_track/i18n/fi.po         |    2 +-
 addons/website_forum/i18n/da.po               |    7 +-
 addons/website_forum_doc/i18n/da.po           |    5 +-
 addons/website_hr_recruitment/i18n/da.po      |    5 +-
 addons/website_hr_recruitment/i18n/zh_CN.po   |    4 +-
 addons/website_links/i18n/da.po               |    8 +-
 addons/website_links/i18n/zh_CN.po            |    8 +-
 addons/website_partner/i18n/zh_CN.po          |    8 +-
 addons/website_payment/i18n/ja.po             |    2 +-
 addons/website_portal/i18n/ar.po              |    4 +-
 addons/website_portal/i18n/bg.po              |    4 +-
 addons/website_portal/i18n/bs.po              |    2 +-
 addons/website_portal/i18n/ca.po              |    2 +-
 addons/website_portal/i18n/cs.po              |    2 +-
 addons/website_portal/i18n/da.po              |    4 +-
 addons/website_portal/i18n/de.po              |    7 +-
 addons/website_portal/i18n/el.po              |    2 +-
 addons/website_portal/i18n/es.po              |    7 +-
 addons/website_portal/i18n/et.po              |    2 +-
 addons/website_portal/i18n/fa.po              |    2 +-
 addons/website_portal/i18n/fi.po              |    7 +-
 addons/website_portal/i18n/fr.po              |    7 +-
 addons/website_portal/i18n/he.po              |    2 +-
 addons/website_portal/i18n/hr.po              |    4 +-
 addons/website_portal/i18n/hu.po              |    4 +-
 addons/website_portal/i18n/hy.po              |    2 +-
 addons/website_portal/i18n/id.po              |    2 +-
 addons/website_portal/i18n/it.po              |    2 +-
 addons/website_portal/i18n/ja.po              |    2 +-
 addons/website_portal/i18n/kab.po             |    6 +-
 addons/website_portal/i18n/km.po              |    2 +-
 addons/website_portal/i18n/lo.po              |    2 +-
 addons/website_portal/i18n/lt.po              |    2 +-
 addons/website_portal/i18n/lv.po              |    4 +-
 addons/website_portal/i18n/mn.po              |    4 +-
 addons/website_portal/i18n/my.po              |    2 +-
 addons/website_portal/i18n/nb.po              |    2 +-
 addons/website_portal/i18n/nl.po              |    5 +-
 addons/website_portal/i18n/pl.po              |    4 +-
 addons/website_portal/i18n/pt.po              |    4 +-
 addons/website_portal/i18n/pt_BR.po           |    4 +-
 addons/website_portal/i18n/ro.po              |    4 +-
 addons/website_portal/i18n/ru.po              |    4 +-
 addons/website_portal/i18n/sk.po              |    4 +-
 addons/website_portal/i18n/sl.po              |    2 +-
 addons/website_portal/i18n/sq.po              |    2 +-
 addons/website_portal/i18n/sr.po              |    2 +-
 addons/website_portal/i18n/sv.po              |    2 +-
 addons/website_portal/i18n/th.po              |    2 +-
 addons/website_portal/i18n/tr.po              |    4 +-
 addons/website_portal/i18n/uk.po              |    2 +-
 addons/website_portal/i18n/vi.po              |    2 +-
 addons/website_portal/i18n/zh_CN.po           |    2 +-
 addons/website_project/i18n/da.po             |    7 +-
 addons/website_project_issue/i18n/da.po       |    2 +-
 addons/website_quote/i18n/da.po               |    4 +-
 .../website_rating_project_issue/i18n/da.po   |    7 +-
 .../website_rating_project_issue/i18n/ja.po   |    4 +-
 addons/website_sale/i18n/es.po                |    4 +-
 addons/website_sale/i18n/hr.po                |    3 +
 addons/website_sale/i18n/ja.po                |    4 +-
 addons/website_sale_delivery/i18n/hr.po       |    6 +-
 addons/website_sale_options/i18n/hr.po        |    5 +-
 addons/website_sale_options/i18n/zh_CN.po     |    2 +-
 addons/website_twitter/i18n/da.po             |    2 +-
 odoo/addons/base/i18n/da.po                   |   44 +-
 odoo/addons/base/i18n/es.po                   |    2 +-
 odoo/addons/base/i18n/hr.po                   |    2 +-
 odoo/addons/base/i18n/sv.po                   |    5 +-
 odoo/addons/base/i18n/zh_CN.po                |    2 +-
 197 files changed, 1598 insertions(+), 1133 deletions(-)

diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 7d875477100..1b4fe91e694 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -1635,7 +1635,7 @@ msgstr "Udvidede indstillinger"
 #: model:ir.ui.menu,name:account.menu_finance_entries
 #: model:res.groups,name:account.group_account_manager
 msgid "Adviser"
-msgstr "Rådgiver"
+msgstr "Manager"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_include_base_amount
@@ -1997,7 +1997,7 @@ msgstr "Analytisk regnskab"
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 #: model:ir.ui.view,arch_db:account.partner_view_button_contracts_count
 msgid "Analytic Accounts"
-msgstr "Analysekonto"
+msgstr "Analysekonti"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_analytic_tag_menu
@@ -2014,7 +2014,7 @@ msgstr "Analytiske omostninger"
 #: model:ir.ui.menu,name:account.menu_action_analytic_lines_reporting
 #: model:ir.ui.menu,name:account.menu_action_analytic_lines_tree
 msgid "Analytic Entries"
-msgstr "Analyseposteringer"
+msgstr "Posteringer på analysekonti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
@@ -5201,7 +5201,7 @@ msgstr "Indkommende"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_initial_balance
 msgid "Include Initial Balances"
-msgstr "Medtag tidligere balance"
+msgstr "Medtag primo balance"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_analytic
@@ -5697,7 +5697,7 @@ msgstr "Journal og partner"
 #: model:ir.ui.view,arch_db:account.view_move_tree
 #, python-format
 msgid "Journal Entries"
-msgstr "Posteringer"
+msgstr "Journalposter"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_move_filter
@@ -6186,7 +6186,7 @@ msgstr "Låsedato"
 #: model:ir.model.fields,field_description:account.field_account_config_settings_period_lock_date
 #: model:ir.model.fields,field_description:account.field_res_company_period_lock_date
 msgid "Lock Date for Non-Advisers"
-msgstr "Låsedato for ikke-rådgivere"
+msgstr "Låsedato for andre end Manager"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_config_settings
@@ -6569,7 +6569,7 @@ msgstr "Opret"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "New Statement"
-msgstr "Nyt udsagn"
+msgstr "Nyt kontoudtog"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -6627,8 +6627,8 @@ msgid ""
 "No users, including Advisers, can edit accounts prior to and inclusive of "
 "this date. Use it for fiscal year locking for example."
 msgstr ""
-"Ingen brugere, herunder rådgivere, kan redigere konti før og inklusive denne"
-" dato. Brug det til regnskabsårets låsning for eksempel."
+"Ingen brugere, herunder Managers, kan redigere konti før og inklusive denne "
+"dato. Brug det til regnskabsårets låsning for eksempel."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_chart_template_code_digits
@@ -6903,7 +6903,7 @@ msgid ""
 "of this date. Use it for period locking inside an open fiscal year, for "
 "example."
 msgstr ""
-"Kun brugere med \"Rådgiver\" -rollen kan redigere konti før og inklusive "
+"Kun brugere med \"Manager\" -rollen kan redigere konti før og inklusive "
 "denne dato. Brug det til periode låsning inde i et åbent regnskabsår, for "
 "eksempel."
 
@@ -7718,7 +7718,7 @@ msgstr "Indtægtskonto"
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit and Loss"
-msgstr "Resultatopgørelse/drift"
+msgstr "Resultatopgørelse"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -8345,7 +8345,7 @@ msgstr "Søg efter handling"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Search Operations"
-msgstr "Søg efter operationer"
+msgstr "Søg efter posteringer"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_search
@@ -8467,7 +8467,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_product_template_action
 msgid "Sellable Products"
-msgstr "Salgsbare produkter"
+msgstr "Produkter (salg)"
 
 #. module: account
 #: selection:account.abstract.payment,payment_type:0
@@ -10300,7 +10300,7 @@ msgstr ""
 #: model:ir.model.fields,help:account.field_res_partner_currency_id
 #: model:ir.model.fields,help:account.field_res_users_currency_id
 msgid "Utility field to express amount currency"
-msgstr ""
+msgstr "Værktøjsfelt til at vise valutabeløbet"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_vat_required
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index c2743f48095..c7198fb91a5 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -2540,7 +2540,7 @@ msgstr "Por devolución"
 #. module: account
 #: model:ir.filters,name:account.filter_invoice_salespersons
 msgid "By Salespersons"
-msgstr "Por comerciales"
+msgstr "Por Vendedores"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_position_active
@@ -8351,7 +8351,7 @@ msgstr "Impuesto sobre ventas (%)"
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
 #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: account
 #. openerp-web
@@ -10801,8 +10801,8 @@ msgid ""
 "You cannot change the value of the reconciliation on this account as it "
 "already has some moves"
 msgstr ""
-"No puede cambiar al propietario de la compañía en una cuenta que ya contiene"
-" asientos"
+"No puede cambiar el valor de la conciliación en una cuenta que ya contiene "
+"asientos"
 
 #. module: account
 #: code:addons/account/models/account_move.py:418
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 8ccd50a8422..103cc2761bd 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -238,7 +238,7 @@ msgstr ": Glavna knjiga"
 #: code:addons/account/models/account.py:397
 #, python-format
 msgid ": Refund"
-msgstr ":Povrat"
+msgstr ": Povrat"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_trialbalance
@@ -6092,7 +6092,7 @@ msgstr "Datum zaključavanja za ne-savjetnike"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_config_settings
 msgid "Lock Entries"
-msgstr "Zaključaj sstavke"
+msgstr "Zaključaj stavke"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 8f0b7f5ec38..0f03ab9a028 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -9,6 +9,7 @@
 # lasch a <bmail440@gmail.com>, 2016
 # Anders Wallenquist <anders.wallenquist@vertel.se>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
+# lynnliuying <lynn.liu1971@gmail.com>, 2016
 # Leif Persson <leifpz54@gmail.com>, 2016
 # Jan-Eric Lindh <jelindh@gmail.com>, 2016
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
@@ -167,7 +168,7 @@ msgstr "-> Förlika"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_line_form
 msgid "-> View partially reconciled entries"
-msgstr ""
+msgstr "Visa delvis avstämda poster"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:468
@@ -204,7 +205,7 @@ msgstr ": Huvudbok"
 #: code:addons/account/models/account.py:397
 #, python-format
 msgid ": Refund"
-msgstr ""
+msgstr ": Kreditfaktura"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_trialbalance
@@ -465,7 +466,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span title=\"Balance in Odoo\">Balance in GL</span>"
-msgstr ""
+msgstr "<span title=\"Balance in Odoo\">Balans i huvudboken</span> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -574,6 +575,8 @@ msgid ""
 "<strong>Banking interface:</strong> with live bank feed synchronization and "
 "bank statement import."
 msgstr ""
+"<strong>Bankgränssnitt:</strong> Med synkronisering av bankmatning och "
+"import av bankredovisning."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -585,7 +588,7 @@ msgstr "<strong>"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Check the Taxes configuration:</strong>"
-msgstr ""
+msgstr "<strong>Kontrollera skatten konfiguration:</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -610,7 +613,7 @@ msgstr "<strong>Kommentar:</strong>"
 #: model:ir.ui.view,arch_db:account.report_journal
 #: model:ir.ui.view,arch_db:account.report_partnerledger
 msgid "<strong>Company:</strong>"
-msgstr ""
+msgstr "<strong>Företag:</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -685,7 +688,7 @@ msgstr "<strong>Förfallodatum:</strong>"
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_journal
 msgid "<strong>Entries Sorted By:</strong>"
-msgstr ""
+msgstr "<strong>Poster sorterade på</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -695,7 +698,7 @@ msgstr "<strong>Utgifter</strong>"
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Fiscal Position Remark:</strong>"
-msgstr ""
+msgstr "<strong>Skatterregion Anmärkning:</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_invoice_document
@@ -763,7 +766,7 @@ msgstr "<strong>Inköp</strong>"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Reconcile Bank Statement</strong>"
-msgstr ""
+msgstr "<strong>Avstämma Bankdeklarationen</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -775,7 +778,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Reconcile your Bank Statements</strong>"
-msgstr ""
+msgstr "<strong>Avstämma Din Bankdeklarationen</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -787,7 +790,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Record Bank Statement</strong>"
-msgstr ""
+msgstr "<strong>Skriv in Bankdeklaration</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -811,7 +814,7 @@ msgstr "<strong>Referens:</strong>"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "<strong>Revenue Recognition</strong>"
-msgstr ""
+msgstr "<strong>Intäktsredovisning</strong> "
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -836,7 +839,7 @@ msgstr "<strong>Startdatum:</strong>"
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_overdue_document
 msgid "<strong>Subtotal :</strong>"
-msgstr ""
+msgstr "<strong>delsumma:</strong>"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_invoice_document
@@ -980,7 +983,7 @@ msgstr ""
 #: code:addons/account/models/account_bank_statement.py:218
 #, python-format
 msgid "A statement cannot be canceled when its lines are reconciled."
-msgstr ""
+msgstr "Ett kontoutdrag kan inte avbrytas när linjerna överensstämmer."
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -991,7 +994,7 @@ msgstr ""
 #: code:addons/account/models/account_bank_statement.py:380
 #, python-format
 msgid "A transaction can't have a 0 amount."
-msgstr ""
+msgstr "En transaktion kan inte ha en 0-belopp."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -1095,7 +1098,7 @@ msgstr "Kontotransaktion"
 #: model:ir.ui.view,arch_db:account.view_account_journal_form
 #: model:ir.ui.view,arch_db:account.view_account_journal_tree
 msgid "Account Journal"
-msgstr "Dagbok"
+msgstr "Journal"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_account_line_id
@@ -1112,7 +1115,7 @@ msgstr "Account Mapping"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_move_reversal
 msgid "Account Move Reversal"
-msgstr ""
+msgstr "Konto Flytta Återföring"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard_acc_name
@@ -1194,13 +1197,13 @@ msgstr "Konto-tagg"
 #: model:ir.ui.view,arch_db:account.view_tax_form
 #: model:ir.ui.view,arch_db:account.view_tax_tree
 msgid "Account Tax"
-msgstr "Account Tax"
+msgstr "Konto Skatt"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_form
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_tree
 msgid "Account Tax Template"
-msgstr "Account Tax Template"
+msgstr "Konto Skattemall"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
@@ -1379,7 +1382,7 @@ msgstr "Inställningar för bokföring"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_partner_property_form
 msgid "Accounting-related settings are managed on"
-msgstr ""
+msgstr "Redovisningsinställningarna hanteras på"
 
 #. module: account
 #: selection:account.account.tag,applicability:0
@@ -1578,11 +1581,12 @@ msgid ""
 "All invoices and payments have been matched, your accounts' balances are "
 "clean."
 msgstr ""
+"Alla fakturor och betalningar har matchats, dina konton saldon är rena."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_all_lines_reconciled
 msgid "All lines reconciled"
-msgstr ""
+msgstr "Alla linjer försonades"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_state
@@ -1612,7 +1616,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,group_warning_account:0
 msgid "All the partners can be used in invoices"
-msgstr ""
+msgstr "Samtliga partners kan användas i fakturor"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_update_posted
@@ -1622,7 +1626,7 @@ msgstr "Tillåt makulering av post"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
 msgid "Allow Invoices & payments Matching"
-msgstr ""
+msgstr "Tillåt fakturor och betalningar matchande"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_reconcile
@@ -1705,12 +1709,12 @@ msgstr "Att betala"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_residual_company_signed
 msgid "Amount Due in Company Currency"
-msgstr ""
+msgstr "Belopp i Bolagsvaluta"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_residual_signed
 msgid "Amount Due in Invoice Currency"
-msgstr ""
+msgstr "Belopp i Faktura Valuta"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal_signed
@@ -1779,7 +1783,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,group_warning_account:0
 msgid "An informative or blocking warning can be set on a partner"
-msgstr ""
+msgstr "En informativ eller blockerande varning kan ställas in på en partner"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_line_form
@@ -1888,7 +1892,7 @@ msgstr "Ansök"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_position_auto_apply
 msgid "Apply automatically this fiscal position."
-msgstr ""
+msgstr "Ansök automatiskt denna skatterregion."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_position_country_group_id
@@ -1973,13 +1977,13 @@ msgstr "Automatisk formattering"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:15
 #, python-format
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatisk avstämning"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:473
 #, python-format
 msgid "Automatically reconciled items"
-msgstr ""
+msgstr "Artiklar försonas automatiskt"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_price_average
@@ -2076,12 +2080,12 @@ msgstr "Bankkonton"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_bank_account_code_prefix
 msgid "Bank Accounts Prefix"
-msgstr ""
+msgstr "Bankkonto prefix"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_config_settings_bank_account_code_prefix
 msgid "Bank Accounts Prefix *"
-msgstr ""
+msgstr "Bankkonto prefix *"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_bank_statements_source
@@ -2152,12 +2156,12 @@ msgstr "Bank-konto(n)"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_config_settings_company_footer
 msgid "Bank accounts as printed in the footer of each printed document"
-msgstr ""
+msgstr "Bankkonton som skrivs ut i sidfoten för varje tryckt dokument"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_config_settings_company_footer
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Bankkonton footer förhandsvisning"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_liquidity
@@ -2167,7 +2171,7 @@ msgstr "Bank och kontant"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_statement_line_id
 msgid "Bank statement line reconciled with this entry"
-msgstr ""
+msgstr "En bankräkningslinje är förenlig med denna journal."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -3072,19 +3076,19 @@ msgstr "Skapa kredit"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Create Vendors"
-msgstr ""
+msgstr "Skapa Leverantörer"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/js/account_reconciliation_widgets.js:1887
 #, python-format
 msgid "Create Write-off"
-msgstr ""
+msgstr "Skapa Avskrivning"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Skapa en preliminär kreditfaktura"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
@@ -3115,7 +3119,7 @@ msgstr ""
 #: code:addons/account/static/src/js/account_reconciliation_widgets.js:2493
 #, python-format
 msgid "Create writeoff"
-msgstr ""
+msgstr "Skapa avskrivning"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -3261,7 +3265,7 @@ msgstr "Kredit"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_credit_card
 msgid "Credit Card"
-msgstr ""
+msgstr "kreditkort"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_refund
@@ -3271,7 +3275,7 @@ msgstr "Kreditnota"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id
 msgid "Credit account"
-msgstr ""
+msgstr "kreditkonto"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_credit
@@ -5387,20 +5391,20 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_move_line_move_id
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Journal Entry"
-msgstr "Journalrad"
+msgstr "Verifikation"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_move_name
 #: model:ir.model.fields,field_description:account.field_account_invoice_move_name
 #: model:ir.model.fields,field_description:account.field_account_payment_move_name
 msgid "Journal Entry Name"
-msgstr ""
+msgstr "Verifikation Namn"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 #: model:ir.ui.view,arch_db:account.report_journal
 msgid "Journal Entry Number"
-msgstr "Verifikatnummer"
+msgstr "Verifikation nummer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line
@@ -5414,7 +5418,7 @@ msgstr "Journalpost"
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_label
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 msgid "Journal Item Label"
-msgstr ""
+msgstr "Journalrader märka"
 
 #. module: account
 #: code:addons/account/models/account_payment.py:271
@@ -5450,7 +5454,7 @@ msgstr "Journalrader"
 #: model:ir.actions.client,name:account.action_manual_reconcile
 #, python-format
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Journalrader att förena"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_name
@@ -5942,7 +5946,7 @@ msgstr "Hantering"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Managing bank fees"
-msgstr ""
+msgstr "Hantera bank kostnad"
 
 #. module: account
 #: model:account.payment.method,name:account.account_payment_method_manual_in
@@ -5960,7 +5964,7 @@ msgstr "Manuell fakturaskatt"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_manual_reconciliation
 msgid "Manual Payments & Invoices Matching"
-msgstr ""
+msgstr "Manuella betalningar och fakturor matchande"
 
 #. module: account
 #: model:ir.actions.client,name:account.action_manual_reconciliation
@@ -5986,7 +5990,7 @@ msgstr "Markera fakturan som helt betald"
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_reconciled_line_ids
 #: model:ir.ui.view,arch_db:account.view_full_reconcile_form
 msgid "Matched Journal Items"
-msgstr ""
+msgstr "Matchade Journalrader"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_matched_credit_ids
@@ -6152,7 +6156,7 @@ msgstr "Flytta rad"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment_move_line_ids
 msgid "Move line ids"
-msgstr ""
+msgstr "Flytta linje ids"
 
 #. module: account
 #: code:addons/account/models/account_move.py:1155
@@ -6168,7 +6172,7 @@ msgstr "Fler-valuta"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Multi Currency"
-msgstr ""
+msgstr "Fler Valut"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_config_multi_currency
@@ -6219,7 +6223,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.act_account_tax_net
 #: model:ir.actions.act_window,name:account.act_account_tax_net_posted
 msgid "Net Tax Lines"
-msgstr ""
+msgstr "Netto momslinje"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -6240,12 +6244,12 @@ msgstr "Nya transaktioner"
 #: code:addons/account/models/account_move.py:1132
 #, python-format
 msgid "New expected payment date: "
-msgstr ""
+msgstr "Nytt förväntade betalningsdatum"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Next, register any unmatched payments:<br/>"
-msgstr ""
+msgstr "Nästa, registrera oöverträffade betalningar:<br/> "
 
 #. module: account
 #: selection:accounting.report,filter_cmp:0
@@ -6302,12 +6306,12 @@ msgstr "Antal siffror i kontokoderna"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_non_current_assets
 msgid "Non-current Assets"
-msgstr ""
+msgstr "Icke-aktuella Tillgångar"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_non_current_liabilities
 msgid "Non-current Liabilities"
-msgstr ""
+msgstr "Icke-aktuella Skulder"
 
 #. module: account
 #: selection:account.tax,type_tax_use:0
@@ -6318,7 +6322,7 @@ msgstr "Inga"
 #. module: account
 #: selection:res.partner,trust:0
 msgid "Normal Debtor"
-msgstr ""
+msgstr "Normal Debitor"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -6795,12 +6799,12 @@ msgstr "Kund/leverantörsreskontra"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_ledger_payable
 msgid "Partner Ledger: Payable"
-msgstr ""
+msgstr "Leverantörsreskontra"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_ledger_receivable
 msgid "Partner Ledger: Receivable"
-msgstr ""
+msgstr "Kundkontra"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_name
@@ -7045,7 +7049,7 @@ msgstr "Betalningar att göra"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_payments_widget
 msgid "Payments widget"
-msgstr ""
+msgstr "Betalnings widget"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -7060,7 +7064,7 @@ msgstr "Procent"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_matched_percentage
 msgid "Percentage Matched"
-msgstr ""
+msgstr "Procentuell Matchning"
 
 #. module: account
 #: selection:account.tax,amount_type:0
@@ -7156,7 +7160,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Fixed Assets"
-msgstr ""
+msgstr "Plus Materiella Anläggningstillgångar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
@@ -7181,12 +7185,12 @@ msgstr "Post"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Post All Entries"
-msgstr ""
+msgstr "Posta alla verifikat"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form
 msgid "Post Difference In"
-msgstr ""
+msgstr "Posta skillnaden i"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -7200,12 +7204,12 @@ msgstr "Bokför verifikat"
 #: model:ir.ui.view,arch_db:account.view_account_move_line_filter
 #: model:ir.ui.view,arch_db:account.view_account_payment_search
 msgid "Posted"
-msgstr "Publicerad"
+msgstr "Postat"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_move_filter
 msgid "Posted Journal Entries"
-msgstr "Bokförda verifikat"
+msgstr "Bokförda verifikationer"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_move_line_filter
@@ -7216,23 +7220,23 @@ msgstr "Bokförda tranksationer"
 #: model:ir.model.fields,field_description:account.field_account_chart_template_bank_account_code_prefix
 #: model:ir.model.fields,field_description:account.field_res_company_bank_account_code_prefix
 msgid "Prefix of the bank accounts"
-msgstr ""
+msgstr "Prefix av bankkonton"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_cash_account_code_prefix
 msgid "Prefix of the cash accounts"
-msgstr ""
+msgstr "Prefix av konton konton"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template_cash_account_code_prefix
 msgid "Prefix of the main cash accounts"
-msgstr ""
+msgstr "Prefix av huvudkonton konton"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_prepayments
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Prepayments"
-msgstr ""
+msgstr "Förbetalningar"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -7416,7 +7420,7 @@ msgstr "Kvantitet"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_config_settings_currency_exchange_journal_id
 msgid "Rate Difference Journal"
-msgstr ""
+msgstr "Kursdifferens Journals"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_description
@@ -7428,7 +7432,7 @@ msgstr "Anledning"
 #. module: account
 #: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
 msgid "Reason..."
-msgstr ""
+msgstr "Anledning..."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_receivable
@@ -7548,7 +7552,7 @@ msgstr "Reconciliation Transactions"
 #: model:ir.actions.client,name:account.action_bank_reconcile
 #: model:ir.actions.client,name:account.action_bank_reconcile_bank_statements
 msgid "Reconciliation on Bank Statements"
-msgstr ""
+msgstr "Avstämning på Bankredovisningar"
 
 #. module: account
 #. openerp-web
@@ -7789,17 +7793,17 @@ msgstr "Ansvarig"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_deferred_revenue
 msgid "Revenue Recognition"
-msgstr ""
+msgstr "Intäktsredovisning"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_date
 msgid "Reversal date"
-msgstr ""
+msgstr "Omvänd Datum"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
 msgid "Reverse Entry"
-msgstr ""
+msgstr "Omvänd Verifikat"
 
 #. module: account
 #: code:addons/account/wizard/account_move_reversal.py:20
@@ -7807,7 +7811,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.view_account_move_reversal
 #, python-format
 msgid "Reverse Moves"
-msgstr ""
+msgstr "Omvänd Konto Moves"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -7817,7 +7821,7 @@ msgstr "Tecken för omvänd balans"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review Fiscal Positions"
-msgstr ""
+msgstr "Granska Skatterregion"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -8390,12 +8394,12 @@ msgstr "Skattekonto"
 #: model:ir.model.fields,field_description:account.field_account_tax_refund_account_id
 #: model:ir.model.fields,field_description:account.field_account_tax_template_refund_account_id
 msgid "Tax Account on Refunds"
-msgstr ""
+msgstr "Skattekonto på Kreditfakturor"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_journal
 msgid "Tax Amount"
-msgstr "Skattebelopp"
+msgstr "Moms belopp"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_search
@@ -9447,7 +9451,7 @@ msgstr "Totalt kvarvarande"
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_price_total
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_user_currency_price_total
 msgid "Total Without Tax"
-msgstr "Totalt utan skatt"
+msgstr "Totalt utan Moms"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_amount_total_company_signed
@@ -9482,7 +9486,7 @@ msgstr "Totalt i företagets valuta"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_amount_total_signed
 msgid "Total in Invoice Currency"
-msgstr ""
+msgstr "Totalt i fakturing valuta"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_total_entry_encoding
@@ -9571,7 +9575,7 @@ msgstr "Typ"
 #: code:addons/account/models/chart_template.py:819
 #, python-format
 msgid "Undistributed Profits/Losses"
-msgstr ""
+msgstr "Utdelade vinster / förluster"
 
 #. module: account
 #. openerp-web
@@ -9603,7 +9607,7 @@ msgstr "Okänt företag"
 #: model:ir.actions.act_window,name:account.act_account_partner_ledger_payable_no_partner
 #: model:ir.actions.act_window,name:account.act_account_partner_ledger_receivable_no_partner
 msgid "Unknown Partner Ledger"
-msgstr ""
+msgstr "Okänt Kund/leverantörsreskontra"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -9837,7 +9841,7 @@ msgstr "Leverantör"
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #, python-format
 msgid "Vendor Bill"
-msgstr ""
+msgstr "Leverantörsfaktura"
 
 #. module: account
 #: code:addons/account/models/chart_template.py:183
@@ -9846,7 +9850,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.account_planner
 #, python-format
 msgid "Vendor Bills"
-msgstr ""
+msgstr "Leverantörsfakturor"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -9857,19 +9861,19 @@ msgstr ""
 #: code:addons/account/models/account_payment.py:515
 #, python-format
 msgid "Vendor Payment"
-msgstr ""
+msgstr "Leverantörsbetalning"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_partner_property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:account.field_res_users_property_supplier_payment_term_id
 msgid "Vendor Payment Terms"
-msgstr ""
+msgstr "Leverantörens betalningsvillkor"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_reference
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Vendor Reference"
-msgstr ""
+msgstr "Leverantör Referens"
 
 #. module: account
 #: selection:account.invoice,type:0 selection:account.invoice.report,type:0
@@ -9878,13 +9882,13 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #, python-format
 msgid "Vendor Refund"
-msgstr ""
+msgstr "Leverantörskreditfakturor"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_product_product_supplier_taxes_id
 #: model:ir.model.fields,field_description:account.field_product_template_supplier_taxes_id
 msgid "Vendor Taxes"
-msgstr ""
+msgstr "Inköps moms"
 
 #. module: account
 #. openerp-web
@@ -9892,7 +9896,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #, python-format
 msgid "Vendors"
-msgstr ""
+msgstr "Leverantörer"
 
 #. module: account
 #: selection:account.financial.report,type:0
@@ -10302,7 +10306,7 @@ msgstr "Du måste först välja en partner!"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:26
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Du måste ange en längd längre än 0."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:28
@@ -10467,7 +10471,7 @@ msgstr "kod"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "create a journal entry"
-msgstr ""
+msgstr "Skapa en verifikation"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_form
@@ -10506,7 +10510,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
 msgid "invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_aged_balance_view
@@ -10518,12 +10522,12 @@ msgstr "eller"
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "outstanding debits"
-msgstr ""
+msgstr "utestående debiteringar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_form
 msgid "outstanding payments"
-msgstr ""
+msgstr "utestående betalningar"
 
 #. module: account
 #. openerp-web
@@ -10583,7 +10587,7 @@ msgstr ""
 #: code:addons/account/models/account_move.py:215
 #, python-format
 msgid "reversal of: "
-msgstr ""
+msgstr "återföring av:"
 
 #. module: account
 #. openerp-web
@@ -10638,7 +10642,7 @@ msgstr "att stämma av"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "to set the balance of all of your accounts."
-msgstr ""
+msgstr "för att ställa in balansen mellan alla dina konton."
 
 #. module: account
 #. openerp-web
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 55d11dcc843..dcde3a8a218 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -6365,22 +6365,22 @@ msgstr "Fatura Mesajı"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Cost of Revenue"
-msgstr ""
+msgstr "-Gelir Maliyeti"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Credit Card Accounts"
-msgstr ""
+msgstr "-Kredi Kartı Hesapları"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Current Liabilities"
-msgstr ""
+msgstr "--Kısa Vadeli Borçlar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Expenses"
-msgstr ""
+msgstr "-Giderler"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
@@ -6787,6 +6787,8 @@ msgid ""
 "                invoice by email and he can pay online and/or import it\n"
 "                in his own system."
 msgstr ""
+"Odoo'nun elektronik faturalaması müşteri ödemelerini de kolaylaştırır.\n"
+"Müşterileriniz faturayı e-posta ile alır ve online olarak ödeme yapabilir."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_invoice_confirm_view
@@ -6812,6 +6814,8 @@ msgid ""
 "Once you have created your chart of accounts, you will need to update your "
 "account balances."
 msgstr ""
+"Hesap planınızı oluşturduktan sonra hesapların açılış bakiyelerini "
+"güncellemeniz gerekecek."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -6820,6 +6824,8 @@ msgid ""
 "                        to access your statements from the Accounting Dashboard. \n"
 "                        The available methods for synchronization are as follows."
 msgstr ""
+"Banka hesaplarınızı tanımladıktan sonra muhasebe panelinden banka hareketlerine erişebilirsiniz.\n"
+"Mevcut senkronizasyon yöntemleri aşağıdaki gibidir."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -6829,7 +6835,7 @@ msgstr "Firma bilgileriniz doğru olduğunda,"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "One bank statement for each bank account you hold."
-msgstr ""
+msgstr "Tuttuğunuz her banka hesabı için bir banka hesap özeti.."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_only_one_chart_template
@@ -6842,6 +6848,8 @@ msgstr "Yalnızca Bir Hesap Şablonu Mevcuttur"
 msgid ""
 "Only a draft payment can be posted. Trying to post a payment in state %s."
 msgstr ""
+"Yalnızca durumu taslak olan bir ödeme doğrulanabilir. İlgili kaydın durumu "
+":%s"
 
 #. module: account
 #: code:addons/account/models/chart_template.py:780
@@ -6894,7 +6902,7 @@ msgstr "Açılış Birim Numaraları"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 msgid "Operation Templates"
-msgstr ""
+msgstr "Operasyon Şablonları"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:1000
@@ -6919,7 +6927,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template_nocreate
 msgid "Optional Create"
-msgstr ""
+msgstr "İsteğe Bağlı Oluştur"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_line_form2
@@ -6944,12 +6952,12 @@ msgstr "Seçenekler"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_payment_id
 msgid "Originator Payment"
-msgstr ""
+msgstr "Üretici Ödemesi"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_tax_line_id
 msgid "Originator tax"
-msgstr ""
+msgstr "Orijinatör Vergisi"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_other_income
@@ -6978,18 +6986,18 @@ msgstr "Giden"
 #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_output_categ_id
 #: model:ir.model.fields,field_description:account.field_res_company_property_stock_account_output_categ_id
 msgid "Output Account for Stock Valuation"
-msgstr ""
+msgstr "Stok Değerlemesi İçin Çıkış Hesabı"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Outstanding Transactions"
-msgstr ""
+msgstr "Açık İşlemler"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:116
 #, python-format
 msgid "Outstanding credits"
-msgstr ""
+msgstr "Tahsil Edilmeyen Alacaklar"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_outstanding_credits_debits_widget
@@ -7000,7 +7008,7 @@ msgstr ""
 #: code:addons/account/models/account_invoice.py:119
 #, python-format
 msgid "Outstanding debits"
-msgstr ""
+msgstr "Ödenmeyen Borçlar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -7415,13 +7423,15 @@ msgstr "Tutar yüzdesi"
 #: selection:account.reconcile.model,amount_type:0
 #: selection:account.reconcile.model.template,amount_type:0
 msgid "Percentage of balance"
-msgstr ""
+msgstr "Bakiye Yüzdesi"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:1470
 #, python-format
 msgid "Percentages for Payment Terms Line must be between 0 and 100."
 msgstr ""
+"Ödeme Koşulları Satırı yüzde (%) tanımı, 0 ile 100 arasında bir değer "
+"olmalıdır."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -7454,6 +7464,8 @@ msgstr "Banka Hesap Özetinde 'Yevmiye' alanının ayarlandığından emin olun"
 #, python-format
 msgid "Please check that the field 'Transfer Account' is set on the company."
 msgstr ""
+"Lütfen 'Transfer Hesabı' alanının firma ayarlarında tanımlandığını kontrol "
+"edin."
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:811
@@ -7465,7 +7477,7 @@ msgstr "Lütfen birkaç fatura satırı oluşturun."
 #: code:addons/account/models/account_move.py:140
 #, python-format
 msgid "Please define a sequence for the refunds"
-msgstr ""
+msgstr "Lütfen iadeler için bir sıra tanımlayın"
 
 #. module: account
 #: code:addons/account/models/account_move.py:141
@@ -7482,7 +7494,7 @@ msgstr "Bu faturayla ilgili yevmiyeye lütfen bir sıra tanımlayın."
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Bank"
-msgstr ""
+msgstr "+Banka"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
@@ -7492,17 +7504,17 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Net Profit"
-msgstr ""
+msgstr "+Net Kâr"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Non-Current Assets"
-msgstr ""
+msgstr "+Dönen Varlıklar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Other Income"
-msgstr ""
+msgstr "+Diğer Gelirler"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
@@ -7547,12 +7559,12 @@ msgstr "Onaylı Yevmiye Kalemleri"
 #: model:ir.model.fields,field_description:account.field_account_chart_template_bank_account_code_prefix
 #: model:ir.model.fields,field_description:account.field_res_company_bank_account_code_prefix
 msgid "Prefix of the bank accounts"
-msgstr ""
+msgstr "Banka hesaplarının ön eki"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_cash_account_code_prefix
 msgid "Prefix of the cash accounts"
-msgstr ""
+msgstr "Nakit hesapların ön eki"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template_cash_account_code_prefix
@@ -8129,12 +8141,12 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_date
 msgid "Reversal date"
-msgstr ""
+msgstr "Ters Kayıt Tarihi"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
 msgid "Reverse Entry"
-msgstr ""
+msgstr "Ters Kayıt Girişi"
 
 #. module: account
 #: code:addons/account/wizard/account_move_reversal.py:20
@@ -8142,7 +8154,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.view_account_move_reversal
 #, python-format
 msgid "Reverse Moves"
-msgstr ""
+msgstr "Ters Kayıt Hareketleri"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -8152,12 +8164,12 @@ msgstr "Ters bakiye imi"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review Fiscal Positions"
-msgstr ""
+msgstr "Mali Koşulları İncele"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review Terms"
-msgstr ""
+msgstr "Koşulları Gözden Geçiş"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -8167,7 +8179,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review the Chart of Accounts"
-msgstr ""
+msgstr "Hesap Planını İncele"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -8359,7 +8371,7 @@ msgstr "İş Ortağı Seçin"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:235
 #, python-format
 msgid "Select a partner or choose a counterpart"
-msgstr ""
+msgstr "Bir iş ortağı veya kaşı hesap seçin"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment_term_line_value
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 8a9920eed1b..3b834e1e6e5 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -11,6 +11,7 @@
 # Kateryna Onyshchenko <Katrona17@gmail.com>, 2016
 # Evgen Zherdev <e.v.zherdev@gmail.com>, 2017
 # Анатолій Пономаренко <aponomarenko020@gmail.com>, 2017
+# Oleksandr Basenko <oleksandr.basenko@gmail.com>, 2017
 # Анатолій Пономаренко <Ponomarenkoa@minfin.gov.ua>, 2017
 msgid ""
 msgstr ""
@@ -525,7 +526,8 @@ msgstr "<span> До </span>"
 msgid ""
 "<span>(*) This configuration is related to the company you're logged "
 "into.</span>"
-msgstr "Ця конфігурація пов'язана з компанією, в яку ви ввійшли .<span>"
+msgstr ""
+"<span>Ця конфігурація пов'язана з компанією, до якої ви ввійшли.</span>"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
diff --git a/addons/account_asset/i18n/da.po b/addons/account_asset/i18n/da.po
index 346b9691547..e8f256ad1c8 100644
--- a/addons/account_asset/i18n/da.po
+++ b/addons/account_asset/i18n/da.po
@@ -645,7 +645,7 @@ msgstr "Gruppér efter..."
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_group_entries
 msgid "Group Journal Entries"
-msgstr "Gruppejournal poster"
+msgstr "Grupper journalposter"
 
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_id
diff --git a/addons/account_bank_statement_import/i18n/da.po b/addons/account_bank_statement_import/i18n/da.po
index 0e4fe9d2524..d34d5b1d58d 100644
--- a/addons/account_bank_statement_import/i18n/da.po
+++ b/addons/account_bank_statement_import/i18n/da.po
@@ -435,7 +435,7 @@ msgstr ""
 "Vælg \"Salg\" for kundefaktura journaler.\n"
 "Vælg 'Køb' for leverandørfaktura journaler.\n"
 "Vælg 'Kontant' eller 'Bank' for journaler, der bruges til kunde- eller leverandørbetalinger.\n"
-"Vælg 'Generelt' for diverse operation journaler."
+"Vælg 'Generelt' for diverse poster."
 
 #. module: account_bank_statement_import
 #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index 6ecf644da5b..c2ba6808147 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.po
@@ -3,15 +3,15 @@
 # * account_cancel
 # 
 # Translators:
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
-# Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:56+0000\n"
 "PO-Revision-Date: 2016-09-07 08:56+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr "Bank kontoudtog"
 #. module: account_cancel
 #: model:ir.model,name:account_cancel.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Bank kontoudtogslinie"
+msgstr "Bank kontoudtogslinje"
 
 #. module: account_cancel
 #: model:ir.ui.view,arch_db:account_cancel.bank_statement_cancel_form_inherit
@@ -39,15 +39,15 @@ msgstr "Annuller"
 #: model:ir.ui.view,arch_db:account_cancel.invoice_form_cancel_inherit
 #: model:ir.ui.view,arch_db:account_cancel.invoice_supplier_cancel_form_inherit
 msgid "Cancel Invoice"
-msgstr "Annuller Faktura"
+msgstr "Annuller faktura"
 
 #. module: account_cancel
 #: code:addons/account_cancel/models/account_bank_statement.py:28
 #, python-format
 msgid "Please set the bank statement to New before canceling."
-msgstr "Indstil venligst kontoudtoget til ny før du annullerer."
+msgstr "Indstil venligst kontoudtoget til Ny før du annullerer."
 
 #. module: account_cancel
 #: model:ir.ui.view,arch_db:account_cancel.bank_statement_draft_form_inherit
 msgid "Reset to New"
-msgstr "Nulstil til ny"
+msgstr "Nulstil til Ny"
diff --git a/addons/account_check_printing/i18n/he.po b/addons/account_check_printing/i18n/he.po
index 01dc13e2c27..a5be7cf1d0c 100644
--- a/addons/account_check_printing/i18n/he.po
+++ b/addons/account_check_printing/i18n/he.po
@@ -6,13 +6,14 @@
 # ExcaliberX <excaliberx@gmail.com>, 2017
 # Moshe Flam <pashute@gmail.com>, 2017
 # Martin Trigaux <mat@odoo.com>, 2017
+# Yihya Hugirat <hugirat@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Yihya Hugirat <hugirat@gmail.com>, 2017\n"
 "Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +54,7 @@ msgstr "בטל"
 #. module: account_check_printing
 #: model:account.payment.method,name:account_check_printing.account_payment_method_check
 msgid "Check"
-msgstr ""
+msgstr "שיק"
 
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_number
@@ -168,7 +169,7 @@ msgstr "מספור ידני"
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_next_number
 #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks_next_check_number
 msgid "Next Check Number"
-msgstr ""
+msgstr "מספר השיק הבא"
 
 #. module: account_check_printing
 #: model:ir.model.fields,help:account_check_printing.field_account_register_payments_check_number
@@ -196,7 +197,7 @@ msgstr ""
 msgid ""
 "Please enter the number of the first pre-printed check that you are about to"
 " print on."
-msgstr ""
+msgstr "בבקשה להקליד את מספר השיק המודפס שאתה רוצה להדפיס עלוי"
 
 #. module: account_check_printing
 #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view
diff --git a/addons/auth_oauth/i18n/da.po b/addons/auth_oauth/i18n/da.po
index cd1f190d564..bb5cb69b5c9 100644
--- a/addons/auth_oauth/i18n/da.po
+++ b/addons/auth_oauth/i18n/da.po
@@ -466,7 +466,7 @@ msgstr "Brugere"
 #. module: auth_oauth
 #: model:ir.model.fields,help:auth_oauth.field_res_users_currency_id
 msgid "Utility field to express amount currency"
-msgstr ""
+msgstr "Værktøjsfelt til at vise valutabeløbet"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_validation_endpoint
diff --git a/addons/auth_oauth/i18n/sv.po b/addons/auth_oauth/i18n/sv.po
index d25651e3ff9..07bc894c22b 100644
--- a/addons/auth_oauth/i18n/sv.po
+++ b/addons/auth_oauth/i18n/sv.po
@@ -10,13 +10,14 @@
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2016
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:56+0000\n"
 "PO-Revision-Date: 2016-09-07 08:56+0000\n"
-"Last-Translator: Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2016\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -459,7 +460,7 @@ msgstr "Gransknings-URL"
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_supplier_payment_term_id
 msgid "Vendor Payment Terms"
-msgstr ""
+msgstr "Leverantörens betalningsvillkor"
 
 #. module: auth_oauth
 #: code:addons/auth_oauth/controllers/main.py:101
diff --git a/addons/barcodes/i18n/da.po b/addons/barcodes/i18n/da.po
index 3c7c1df0553..853e7b02ba7 100644
--- a/addons/barcodes/i18n/da.po
+++ b/addons/barcodes/i18n/da.po
@@ -7,13 +7,14 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-14 15:54+0000\n"
 "PO-Revision-Date: 2016-11-14 15:54+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,13 +95,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
 msgid "Barcode Nomenclature"
-msgstr ""
+msgstr "Stregkode nomenklatur"
 
 #. module: barcodes
 #: model:ir.actions.act_window,name:barcodes.action_barcode_nomenclature_form
 #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_tree
 msgid "Barcode Nomenclatures"
-msgstr ""
+msgstr "Stregkode numenklaturer"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern
@@ -405,7 +406,7 @@ msgstr ""
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcode_rule
 msgid "barcode.rule"
-msgstr ""
+msgstr "barcode.rule"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin
diff --git a/addons/barcodes/i18n/hr.po b/addons/barcodes/i18n/hr.po
index 05959c0c2fe..44d89bf3be0 100644
--- a/addons/barcodes/i18n/hr.po
+++ b/addons/barcodes/i18n/hr.po
@@ -390,7 +390,7 @@ msgstr "Jedinica proizvoda"
 msgid ""
 "Used to order rules such that rules with a smaller sequence match first"
 msgstr ""
-"Koristi se za redosljed pravila tako da pravilo sa manjom sekvencom primjeni"
+"Koristi se za redoslijed pravila tako da pravilo s manjom sekvencom primjeni"
 " prije"
 
 #. module: barcodes
diff --git a/addons/barcodes/i18n/sv.po b/addons/barcodes/i18n/sv.po
index d3a75890938..7f08c336f84 100644
--- a/addons/barcodes/i18n/sv.po
+++ b/addons/barcodes/i18n/sv.po
@@ -9,13 +9,14 @@
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-14 15:54+0000\n"
 "PO-Revision-Date: 2016-11-14 15:54+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -149,7 +150,7 @@ msgstr "Skapad den"
 #. module: barcodes
 #: selection:barcode.rule,type:0
 msgid "Credit Card"
-msgstr ""
+msgstr "kreditkort"
 
 #. module: barcodes
 #. openerp-web
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 3f4249000ea..91f0c60e9df 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.po
@@ -6,13 +6,14 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Jesper Carstensen <jc@danodoo.dk>, 2016\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -255,7 +256,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_customer
 msgid "Is a Customer"
-msgstr ""
+msgstr "Er en kunde"
 
 #. module: base_action_rule
 #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_date_action_last
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 8d534692da6..11e83733eea 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -64,7 +64,7 @@ msgstr "添加关注者"
 #. module: base_action_rule
 #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_is_assigned_to_admin
 msgid "Assigned to admin user"
-msgstr ""
+msgstr "指派给管理用户"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -144,7 +144,7 @@ msgstr "天数"
 #. module: base_action_rule
 #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_deadline
 msgid "Deadline"
-msgstr ""
+msgstr "截止日"
 
 #. module: base_action_rule
 #: model:ir.ui.view,arch_db:base_action_rule.view_base_action_rule_form
@@ -362,7 +362,7 @@ msgstr "暂停"
 #. module: base_action_rule
 #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_priority
 msgid "Priority"
-msgstr ""
+msgstr "优先级"
 
 #. module: base_action_rule
 #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_model_id
diff --git a/addons/base_geolocalize/i18n/da.po b/addons/base_geolocalize/i18n/da.po
index f38c19bf34b..439192da256 100644
--- a/addons/base_geolocalize/i18n/da.po
+++ b/addons/base_geolocalize/i18n/da.po
@@ -5,13 +5,14 @@
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:56+0000\n"
 "PO-Revision-Date: 2016-09-07 08:56+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #. module: base_geolocalize
 #: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form
 msgid "<span class=\"oe_inline\"> ( On  </span>"
-msgstr ""
+msgstr "<span class=\"oe_inline\"> ( På  </span>"
 
 #. module: base_geolocalize
 #: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form
diff --git a/addons/base_import/i18n/ja.po b/addons/base_import/i18n/ja.po
index 4180ae8b6ec..b58a5a8fb38 100644
--- a/addons/base_import/i18n/ja.po
+++ b/addons/base_import/i18n/ja.po
@@ -168,7 +168,7 @@ msgstr "ドット"
 #: code:addons/base_import/static/src/js/base_import.js:120
 #, python-format
 msgid "Encoding:"
-msgstr "エンコード："
+msgstr "エンコード:"
 
 #. module: base_import
 #: code:addons/base_import/models/base_import.py:621
diff --git a/addons/board/i18n/da.po b/addons/board/i18n/da.po
index 9bac905a747..ec835eb836e 100644
--- a/addons/board/i18n/da.po
+++ b/addons/board/i18n/da.po
@@ -3,6 +3,7 @@
 # * board
 # 
 # Translators:
+# Ejner Sønniksen <ejner@vkdata.dk>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
@@ -85,7 +86,7 @@ msgstr "Skift layout ..."
 #: code:addons/board/static/src/xml/board.xml:37
 #, python-format
 msgid "Choose dashboard layout"
-msgstr "Vælg layout for kontrolpanel"
+msgstr "Vælg layout for dashboard"
 
 #. module: board
 #. openerp-web
@@ -124,7 +125,7 @@ msgstr "Sidst ændret den"
 #: model:ir.ui.view,arch_db:board.board_my_dash_view
 #, python-format
 msgid "My Dashboard"
-msgstr "Mit kontrolpanel"
+msgstr "Mit dashboard"
 
 #. module: board
 #: model:ir.actions.act_window,help:board.open_board_my_dash_action
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
index e92e46108ff..ddab58c0f0d 100644
--- a/addons/crm/i18n/da.po
+++ b/addons/crm/i18n/da.po
@@ -4347,7 +4347,7 @@ msgstr "E-mail skabeloner"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Templates of quotations (use Odoo Online Proposals for this)"
-msgstr "Tilbuds skabeloner (brug Odoo's Online forslag til dette)"
+msgstr "Tilbudsskabeloner (brug Odoo's Online forslag til dette)"
 
 #. module: crm
 #. openerp-web
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index fdf39a93906..b3bbfc64f75 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -31,6 +31,7 @@
 # Andres Ruiz <andres.ruiz.otalora@gmail.com>, 2016
 # Miguel Orueta <mo@landoo.es>, 2016
 # phoenixsampras <phoenixsampras@gmail.com>, 2016
+# Daniel Blanco Martin <daniel@bmya.cl>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2016
 # Mariano Rodríguez <mahrodriguez@gmail.com>, 2017
@@ -687,7 +688,7 @@ msgid ""
 "                                    <span>(Salesperson)</span>"
 msgstr ""
 "<span class=\"panel-title\"><span data-icon=\"&#57438;\"/><strong> Ejercicio 3</strong></span>\n"
-"                                    <span>(comercial)</span>"
+"                                    <span>(Vendedor)</span>"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
@@ -771,7 +772,7 @@ msgid ""
 "and by creation date"
 msgstr ""
 "<strong>Ejercicio:</strong> Trate de obtener el número de iniciativas por "
-"comercial y por fecha de creación"
+"vendedor y por fecha de creación"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
@@ -2092,7 +2093,7 @@ msgid ""
 "Every salesperson can analyze their own pipe by clicking on the 'switch view"
 " to graph' icon."
 msgstr ""
-"Cada comercial puede analizar su propio canal haciendo clic en el icono "
+"Cada vendedor puede analizar su propio flujo haciendo clic en el icono "
 "'cambiar la vista a gráfico'."
 
 #. module: crm
@@ -2493,7 +2494,7 @@ msgstr "Importe usando el botón superior izquierda en"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Improve average revenue per salesperson"
-msgstr "Mejorar la media de ingresos por vendedor"
+msgstr "Mejorar el promedio de ingresos por vendedor"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
@@ -2727,7 +2728,7 @@ msgstr ""
 #. module: crm
 #: model:ir.filters,name:crm.filter_opportunity_salesperson
 msgid "Leads By Salespersons"
-msgstr "Iniciativas por Comerciales"
+msgstr "Iniciativas por Vendedores"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_sale_config_settings
@@ -3174,7 +3175,7 @@ msgstr "Nueva oportunidad"
 #: code:addons/crm/static/src/js/web_planner_crm.js:17
 #, python-format
 msgid "New propspect assigned to the right salesperson"
-msgstr "Nueva perspectiva asignada al vendedor adecuado"
+msgstr "Nuevo prospecto asignado al vendedor correcto"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_date_action_next
@@ -3240,7 +3241,7 @@ msgstr "Ninguna actividad siguiente planeada"
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "No salesperson"
-msgstr "Sin comercial"
+msgstr "Sin vendedor"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.opportunity.report,priority:0
@@ -3939,7 +3940,7 @@ msgstr "Requerimientos"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Revenue by Salesperson"
-msgstr "Ingresos por Comercial"
+msgstr "Ingresos por Vendedor"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
@@ -3998,7 +3999,7 @@ msgstr "Vendedores"
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
@@ -4291,8 +4292,8 @@ msgid ""
 "Stages allow salespersons to easily track how a specific opportunity\n"
 "            is positioned in the sales cycle."
 msgstr ""
-"Los estados permiten a los comerciales a seguir fácilmente como una "
-"oportunidad especifica es posicionada en el ciclo de ventas."
+"Las Etapas permiten a los vendedores a seguir fácilmente como una "
+"oportunidad especifica está posicionada en el ciclo de ventas."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_state
@@ -4636,7 +4637,7 @@ msgstr "Actividades de Hoy"
 #. module: crm
 #: model:crm.lost.reason,name:crm.lost_reason_1
 msgid "Too expensive"
-msgstr "También costoso"
+msgstr "Demasiado costoso"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_total_revenue
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 6abe233214a..aa0c28a4e2e 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -20,13 +20,14 @@
 # Robert Frykelius <robert.frykelius@linserv.se>, 2016
 # Frida E <frida.eddestal@gmail.com>, 2017
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:26+0000\n"
 "PO-Revision-Date: 2017-06-23 13:26+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1394,7 +1395,7 @@ msgstr "Skapa affärstillfälle"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_planner
 msgid "Create Vendors"
-msgstr ""
+msgstr "Skapa Leverantörer"
 
 #. module: crm
 #. openerp-web
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index af1199ee03b..0db8693298b 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -5,7 +5,7 @@
 # Translators:
 # Anders Wallenquist <anders.wallenquist@vertel.se>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
-# larmar <martin.wilderoth@linserv.se>, 2016
+# Martin Wilderoth <martin.wilderoth@linserv.se>, 2016
 # Haojun Zou <apollo_zhj@msn.com>, 2016
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
 # Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2016
@@ -14,13 +14,14 @@
 # Zou Haojun <haojunzou84@gmail.com>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:56+0000\n"
 "PO-Revision-Date: 2016-09-07 08:56+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1751,12 +1752,12 @@ msgstr ""
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_supplier_taxes_id
 msgid "Vendor Taxes"
-msgstr ""
+msgstr "Inköps moms"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_seller_ids
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: delivery
 #: selection:delivery.price.rule,variable:0
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index ad0c664ec67..103fb09d7bc 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -1316,7 +1316,7 @@ msgstr "订货最小数量"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_return_picking
 msgid "Return Picking"
-msgstr "退货拣货"
+msgstr "退回作业"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_route_ids
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
index f7c8415620d..6ecc93c48f5 100644
--- a/addons/event/i18n/da.po
+++ b/addons/event/i18n/da.po
@@ -385,7 +385,7 @@ msgstr ""
 #: model:event.event,description:event.event_1
 #: model:event.event,description:event.event_3
 msgid "<small>John Doe, CEO</small>"
-msgstr ""
+msgstr "<small>John Doe, CEO</small>"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_form
@@ -1849,7 +1849,7 @@ msgstr ""
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_sale
 msgid "Tickets"
-msgstr ""
+msgstr "Opgaver"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_date_tz
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index b6bd1490ed7..6aef11d6849 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Anja Funk <anja.funk@afimage.de>, 2016
-# Thomas A. Jaeger <tj@jamotion.ch>, 2016
+# Renzo Meister <info@jamotion.ch>, 2016
 # Philipp Hug <philipp@hug.cx>, 2016
 # Tina Rittmüller <tr@ife.de>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
@@ -20,13 +20,14 @@
 # Ralf Hilgenstock <rh@dialoge.info>, 2016
 # Niki Waibel <niki.waibel@gmail.com>, 2016
 # Thomas Neu <t.neu@runbox.com>, 2016
+# Malte Jansen <work@maltejansen.de>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-10-10 08:43+0000\n"
 "PO-Revision-Date: 2016-10-10 08:43+0000\n"
-"Last-Translator: Thomas Neu <t.neu@runbox.com>, 2016\n"
+"Last-Translator: Malte Jansen <work@maltejansen.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1449,7 +1450,7 @@ msgstr "Manager"
 #. module: event
 #: selection:event.config.settings,auto_confirmation:0
 msgid "Manually confirm every registration"
-msgstr ""
+msgstr "Manuelle Bestätigung jeder Anmeldung"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_report_event_registration_seats_max
diff --git a/addons/event_sale/i18n/da.po b/addons/event_sale/i18n/da.po
index 97caea01f67..d4789f6b8d7 100644
--- a/addons/event_sale/i18n/da.po
+++ b/addons/event_sale/i18n/da.po
@@ -9,13 +9,14 @@
 # jonas jensen <j.jensen@tcomp.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -369,12 +370,12 @@ msgstr "Teknisk træning"
 #: model:ir.ui.view,arch_db:event_sale.event_event_report_template_badge
 #: model:ir.ui.view,arch_db:event_sale.view_event_registration_ticket_search
 msgid "Ticket Type"
-msgstr ""
+msgstr "Opgave type"
 
 #. module: event_sale
 #: model:ir.ui.view,arch_db:event_sale.view_event_form_inherit_ticket
 msgid "Tickets"
-msgstr ""
+msgstr "Opgaver"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_seats_unconfirmed
diff --git a/addons/event_sale/i18n/de.po b/addons/event_sale/i18n/de.po
index c97c645065b..3d705a4e542 100644
--- a/addons/event_sale/i18n/de.po
+++ b/addons/event_sale/i18n/de.po
@@ -11,6 +11,7 @@
 # Ermin Trevisan <trevi@twanda.com>, 2016
 # Renzo Meister <info@jamotion.ch>, 2016
 # JackTheHunter <Maximilian.N98@gmail.com>, 2016
+# Malte Jansen <work@maltejansen.de>, 2016
 # darenkster <inactive+darenkster@transifex.com>, 2016
 # Martin K <martinkuenz@gmail.com>, 2016
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2016
@@ -147,7 +148,7 @@ msgstr "Event"
 #. module: event_sale
 #: model:ir.ui.view,arch_db:event_sale.event_ticket_form_view
 msgid "Event Name"
-msgstr "Termin Bezeichnung"
+msgstr "Veranstaltungsname"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_product_product_event_ok
@@ -170,12 +171,12 @@ msgstr "Veranstaltungsanmeldungen"
 #: model:ir.model.fields,field_description:event_sale.field_registration_editor_line_event_ticket_id
 #: model:ir.model.fields,field_description:event_sale.field_sale_order_line_event_ticket_id
 msgid "Event Ticket"
-msgstr "Veranstaltungskarte"
+msgstr "Veranstaltungs-Ticket"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_product_product_event_ticket_ids
 msgid "Event Tickets"
-msgstr "Veranstaltungskarten"
+msgstr "Veranstaltungs-Tickets"
 
 #. module: event_sale
 #: model:ir.ui.view,arch_db:event_sale.event_ticket_form_view
@@ -288,7 +289,7 @@ msgstr "Reduzierter Preis"
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_price_reduce_taxinc
 msgid "Price Reduce Tax inc"
-msgstr ""
+msgstr "Reduzierter Preis inkl. MwSt"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -352,7 +353,7 @@ msgstr "Auftragsposition"
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_seats_used
 msgid "Seats used"
-msgstr "Genutzte Sitzplätze"
+msgstr "Gebuchte Sitzplätze"
 
 #. module: event_sale
 #: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
@@ -387,7 +388,7 @@ msgstr "Tickettyp"
 #. module: event_sale
 #: model:ir.ui.view,arch_db:event_sale.view_event_form_inherit_ticket
 msgid "Tickets"
-msgstr "Veranstaltungskarten"
+msgstr "Veranstaltungs-Ticket"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_seats_unconfirmed
diff --git a/addons/fetchmail/i18n/da.po b/addons/fetchmail/i18n/da.po
index 2148ea49f2e..4a2e9194431 100644
--- a/addons/fetchmail/i18n/da.po
+++ b/addons/fetchmail/i18n/da.po
@@ -7,13 +7,14 @@
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # jonas jensen <j.jensen@tcomp.dk>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:56+0000\n"
 "PO-Revision-Date: 2016-09-07 08:56+0000\n"
-"Last-Translator: jonas jensen <j.jensen@tcomp.dk>, 2016\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.ui.view,arch_db:fetchmail.view_email_server_tree
 msgid "# of emails"
-msgstr ""
+msgstr "# af e-mails"
 
 #. module: fetchmail
 #: model:ir.ui.view,arch_db:fetchmail.view_email_server_form
diff --git a/addons/fleet/i18n/da.po b/addons/fleet/i18n/da.po
index 009f153615f..0cd301e5cd2 100644
--- a/addons/fleet/i18n/da.po
+++ b/addons/fleet/i18n/da.po
@@ -11,13 +11,14 @@
 # Jesper Carstensen <info@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2016
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:28+0000\n"
 "PO-Revision-Date: 2017-06-23 13:28+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,13 +30,13 @@ msgstr ""
 #: code:addons/fleet/models/fleet.py:307
 #, python-format
 msgid "%s %s has been added to the fleet!"
-msgstr ""
+msgstr "%s %s er blevet tilføjet til flåden!"
 
 #. module: fleet
 #: code:addons/fleet/models/fleet.py:652
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
-msgstr ""
+msgstr "%s kontrakt(er) der mangler at blive gentegnet og/eller lukket!"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
@@ -262,7 +263,7 @@ msgstr "Klik her for at tilføje et nyt tag."
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action
 msgid "Click to create a new contract."
-msgstr ""
+msgstr "Klik her for at oprette en ny kontrakt."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_action
diff --git a/addons/fleet/i18n/ja.po b/addons/fleet/i18n/ja.po
index 0c37b9b5982..9fd45fd86f3 100644
--- a/addons/fleet/i18n/ja.po
+++ b/addons/fleet/i18n/ja.po
@@ -1999,7 +1999,7 @@ msgstr "と"
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
 msgid "e.g. Model S"
-msgstr "例 ： Sモデル"
+msgstr "例: モデルS"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
@@ -2009,7 +2009,7 @@ msgstr ""
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
 msgid "e.g. Tesla"
-msgstr "例 ： トヨタ"
+msgstr "例: テスラ"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_state
diff --git a/addons/fleet/i18n/sv.po b/addons/fleet/i18n/sv.po
index 7d1fdd09c4c..2a3053fe93c 100644
--- a/addons/fleet/i18n/sv.po
+++ b/addons/fleet/i18n/sv.po
@@ -13,13 +13,14 @@
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Frida E <frida.eddestal@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:28+0000\n"
 "PO-Revision-Date: 2017-06-23 13:28+0000\n"
-"Last-Translator: Frida E <frida.eddestal@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1907,7 +1908,7 @@ msgstr "Leverantör"
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_vendors
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_days_left
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po
index 76f7dcf7f0a..22be4441d34 100644
--- a/addons/fleet/i18n/zh_CN.po
+++ b/addons/fleet/i18n/zh_CN.po
@@ -322,7 +322,7 @@ msgstr "车辆颜色"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
 msgid "Compact"
-msgstr ""
+msgstr "紧凑"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_company_id
@@ -403,7 +403,7 @@ msgstr "合约"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
 msgid "Convertible"
-msgstr ""
+msgstr "可转换"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_cost_id
diff --git a/addons/gamification/i18n/hr.po b/addons/gamification/i18n/hr.po
index cef1ec7740f..fddebb5692d 100644
--- a/addons/gamification/i18n/hr.po
+++ b/addons/gamification/i18n/hr.po
@@ -9,8 +9,8 @@
 # Karolina Tonković <karolina.tonkovic@storm.hr>, 2016
 # Vladimir Olujić <olujic.vladimir@storm.hr>, 2016
 # Đurđica Žarković <durdica.zarkovic@storm.hr>, 2016
-# KRISTINA PALAŠ <kristina.palas@storm.hr>, 2016
 # Ivica Dimjašević <ivica.dimjasevic@storm.hr>, 2016
+# KRISTINA PALAŠ <kristina.palas@storm.hr>, 2016
 # Tina Milas <tina@uvid.hr>, 2017
 msgid ""
 msgstr ""
@@ -172,7 +172,7 @@ msgid ""
 "<br/>Special rewards were sent to the top competing users. The ranking for "
 "this challenge is :"
 msgstr ""
-"<br/>Specijalne nagrade su dodijeljene najboljim učesnicima. Redosljed za "
+"<br/>Specijalne nagrade su dodijeljene najboljim učesnicima. Redoslijed za "
 "ovaj izazov je:"
 
 #. module: gamification
diff --git a/addons/google_drive/i18n/zh_CN.po b/addons/google_drive/i18n/zh_CN.po
index 51a6704b7bd..c1895d68094 100644
--- a/addons/google_drive/i18n/zh_CN.po
+++ b/addons/google_drive/i18n/zh_CN.po
@@ -109,7 +109,7 @@ msgstr "至配置面板"
 #. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config_google_drive_client_id
 msgid "Google Client"
-msgstr ""
+msgstr "谷歌客户端"
 
 #. module: google_drive
 #: model:ir.ui.menu,name:google_drive.menu_google_drive_config
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index c41a9af2cf1..6014594e34f 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -29,13 +29,13 @@ msgstr "\"签出\"时间不能早于\"签入\"时间。"
 #: code:addons/hr_attendance/models/hr_attendance.py:29
 #, python-format
 msgid "%(empl_name)s from %(check_in)s"
-msgstr ""
+msgstr "%(empl_name)s 来自%(check_in)s"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_attendance.py:34
 #, python-format
 msgid "%(empl_name)s from %(check_in)s to %(check_out)s"
-msgstr ""
+msgstr "%(empl_name)s 从%(check_in)s 到 %(check_out)s"
 
 #. module: hr_attendance
 #. openerp-web
diff --git a/addons/hr_expense/i18n/da.po b/addons/hr_expense/i18n/da.po
index 8484a135242..8636f60530a 100644
--- a/addons/hr_expense/i18n/da.po
+++ b/addons/hr_expense/i18n/da.po
@@ -9,10 +9,10 @@
 # Jesper Carstensen <info@danodoo.dk>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Ronni Poulsen <rp@flexonet.dk>, 2016
+# Ejner Sønniksen <ejner@vkdata.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Jarnhold Nattestad <nattestads@gmail.com>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
-# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 # Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
@@ -926,7 +926,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
 msgid "Post Journal Entries"
-msgstr "Bogfør journal poster"
+msgstr "Bogfør journalposter"
 
 #. module: hr_expense
 #: selection:hr.expense,state:0 selection:hr.expense.sheet,state:0
diff --git a/addons/hr_recruitment/i18n/da.po b/addons/hr_recruitment/i18n/da.po
index 8613e50d0ef..b8c19975e17 100644
--- a/addons/hr_recruitment/i18n/da.po
+++ b/addons/hr_recruitment/i18n/da.po
@@ -1025,7 +1025,7 @@ msgstr "Dato for næste handling"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
 msgid "Next Actions"
-msgstr ""
+msgstr "Næste aktiviteter"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/models/hr_recruitment.py:384
diff --git a/addons/hr_recruitment/i18n/fi.po b/addons/hr_recruitment/i18n/fi.po
index ae2431b394f..1bab5737b4c 100644
--- a/addons/hr_recruitment/i18n/fi.po
+++ b/addons/hr_recruitment/i18n/fi.po
@@ -224,7 +224,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
 msgid "Application"
-msgstr "Sovellus"
+msgstr "Hakemus"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
diff --git a/addons/hr_recruitment/i18n/hr.po b/addons/hr_recruitment/i18n/hr.po
index 6638773c97d..f09b1eaa824 100644
--- a/addons/hr_recruitment/i18n/hr.po
+++ b/addons/hr_recruitment/i18n/hr.po
@@ -733,12 +733,12 @@ msgstr "Preklapljeno u u procesu zapošljavanja"
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_degree_sequence
 msgid "Gives the sequence order when displaying a list of degrees."
-msgstr "Daje redosljed kod listanja stupnjeva"
+msgstr "Daje redoslijed kod listanja stupnjeva"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_sequence
 msgid "Gives the sequence order when displaying a list of stages."
-msgstr "Daje redosljed kod listanja faza"
+msgstr "Daje redoslijed kod listanja faza"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index d4f95600842..2bdabd2e594 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -6,13 +6,14 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-29 13:59+0000\n"
 "PO-Revision-Date: 2016-09-29 13:59+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +24,12 @@ msgstr ""
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.view_project_kanban_inherited
 msgid "<span class=\"o_label\">Timesheets</span>"
-msgstr ""
+msgstr "<span class=\"o_label\">Timesedler</span>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "<span>Timesheet Entries</span>"
-msgstr ""
+msgstr "<span>Timeseddel indtastninger</span>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
diff --git a/addons/im_livechat/i18n/da.po b/addons/im_livechat/i18n/da.po
index f494456c4ca..59ca7d64680 100644
--- a/addons/im_livechat/i18n/da.po
+++ b/addons/im_livechat/i18n/da.po
@@ -9,13 +9,14 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2016
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:58+0000\n"
 "PO-Revision-Date: 2016-09-07 08:58+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,13 +32,13 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_nbr_speaker
 msgid "# of speakers"
-msgstr ""
+msgstr "# foredragsholdere"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rating_percentage_satisfaction
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
 msgid "% Happy"
-msgstr ""
+msgstr "% Glad"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_action
diff --git a/addons/link_tracker/i18n/da.po b/addons/link_tracker/i18n/da.po
index e3619ae9913..56b08d40a36 100644
--- a/addons/link_tracker/i18n/da.po
+++ b/addons/link_tracker/i18n/da.po
@@ -9,13 +9,14 @@
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2016
 # Jonathan Stein <cgs@image.dk>, 2016
 # Sanne Kristensen <sanne@vkdata.dk>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr ""
 #. module: link_tracker
 #: sql_constraint:link.tracker.code:0
 msgid "Code must be unique."
-msgstr ""
+msgstr "Koden skal være unik."
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_link_code_ids
@@ -128,7 +129,7 @@ msgstr "Link"
 #: model:ir.actions.act_window,name:link_tracker.action_link_tracker
 #: model:ir.ui.menu,name:link_tracker.menu_url_shortener_main
 msgid "Link Tracker"
-msgstr ""
+msgstr "Link Tracker"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_count
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index d0b4a2b5080..c13b53e9fc6 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.po
@@ -2482,6 +2482,8 @@ msgid ""
 "Log an internal note which will not be sent to followers, but which can be read\n"
 "                    by users accessing this document."
 msgstr ""
+"Log en intern note der ikke vil blive sendt til følgerne, men som kan læses\n"
+"                    af brugere der har adgang til dette dokument."
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_channel_view_form
@@ -2867,21 +2869,21 @@ msgstr ""
 #: code:addons/mail/static/src/xml/systray.xml:24
 #, python-format
 msgid "New message"
-msgstr "Send en meddelelse"
+msgstr "Ny meddelelse"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:146
 #, python-format
 msgid "New messages"
-msgstr "Nye meddelser"
+msgstr "Nye meddelelser"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/thread.xml:25
 #, python-format
 msgid "New messages appear here."
-msgstr "Nye meddelser kommer her."
+msgstr "Nye meddelelser vises her."
 
 #. module: mail
 #. openerp-web
@@ -2936,7 +2938,7 @@ msgstr "Notat"
 #: code:addons/mail/static/src/xml/thread.xml:72
 #, python-format
 msgid "Note by"
-msgstr ""
+msgstr "Note af"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.view_mail_search
diff --git a/addons/maintenance/i18n/da.po b/addons/maintenance/i18n/da.po
index 567c2710d4f..957c1170183 100644
--- a/addons/maintenance/i18n/da.po
+++ b/addons/maintenance/i18n/da.po
@@ -38,7 +38,7 @@ msgstr ""
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
 msgid "<b>Model Number:</b>"
-msgstr ""
+msgstr "<b>Model nummer:</b>"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
@@ -872,7 +872,7 @@ msgstr ""
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
 msgid "Scheduled"
-msgstr ""
+msgstr "Planlagt"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_request_schedule_date
@@ -882,7 +882,7 @@ msgstr "Planlagt dato"
 #. module: maintenance
 #: model:maintenance.stage,name:maintenance.stage_4
 msgid "Scrap"
-msgstr ""
+msgstr "Kassér"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_scrap_date
@@ -935,7 +935,7 @@ msgstr "Faser"
 #. module: maintenance
 #: model:mail.message.subtype,name:maintenance.mt_req_status
 msgid "Status Changed"
-msgstr ""
+msgstr "Status ændret"
 
 #. module: maintenance
 #: model:mail.message.subtype,description:maintenance.mt_req_status
@@ -1040,7 +1040,7 @@ msgstr "To Do"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
 msgid "To do"
-msgstr ""
+msgstr "To do"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count
diff --git a/addons/maintenance/i18n/sv.po b/addons/maintenance/i18n/sv.po
index b3798252f8a..befb7aa6fcd 100644
--- a/addons/maintenance/i18n/sv.po
+++ b/addons/maintenance/i18n/sv.po
@@ -14,13 +14,14 @@
 # Haojun Zou <apollo_zhj@msn.com>, 2016
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:28+0000\n"
 "PO-Revision-Date: 2017-06-23 13:28+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1098,7 +1099,7 @@ msgstr "Leverantör"
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_partner_ref
 msgid "Vendor Reference"
-msgstr ""
+msgstr "Leverantör Referens"
 
 #. module: maintenance
 #: selection:maintenance.request,priority:0
diff --git a/addons/mass_mailing/i18n/da.po b/addons/mass_mailing/i18n/da.po
index 57c6f24d7f6..dec8da243dd 100644
--- a/addons/mass_mailing/i18n/da.po
+++ b/addons/mass_mailing/i18n/da.po
@@ -134,7 +134,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.snippet_options
 msgid "<i class=\"fa fa-eyedropper\"/>Background Color"
-msgstr ""
+msgstr "<i class=\"fa fa-eyedropper\"/>Baggrundsfarve"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
@@ -1377,7 +1377,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_scheduled
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_scheduled
 msgid "Scheduled"
-msgstr ""
+msgstr "Planlagt"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
diff --git a/addons/mass_mailing/i18n/zh_CN.po b/addons/mass_mailing/i18n/zh_CN.po
index 2d60779f2d0..a2c1c224318 100644
--- a/addons/mass_mailing/i18n/zh_CN.po
+++ b/addons/mass_mailing/i18n/zh_CN.po
@@ -171,7 +171,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
 msgid "<small>Step 3:</small>"
-msgstr ""
+msgstr "<small>步骤3:</small>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
@@ -232,7 +232,7 @@ msgstr "AB测试"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
 msgid "ALL DAY"
-msgstr ""
+msgstr "全天"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_active
@@ -518,7 +518,7 @@ msgstr "信息安全"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "DEFAULT"
-msgstr ""
+msgstr "默认"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_exception
@@ -655,7 +655,7 @@ msgstr "邮件统计"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
 msgid "Enjoy!"
-msgstr ""
+msgstr "享受!"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
@@ -1162,7 +1162,7 @@ msgstr "点击数"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
 msgid "OFF"
-msgstr ""
+msgstr "关闭"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
diff --git a/addons/membership/i18n/da.po b/addons/membership/i18n/da.po
index 38591c2b4f7..ca02f9e9e34 100644
--- a/addons/membership/i18n/da.po
+++ b/addons/membership/i18n/da.po
@@ -9,13 +9,14 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 # Sanne Kristensen <sanne@vkdata.dk>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,6 +45,8 @@ msgid ""
 "A member with whom you want to associate your membership. It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Et medlem med hvem du vil tilknytte dit medlemskab. Det vil tage hensyn til "
+"medlemskabet af det tilknyttede medlem."
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line_account_invoice_line
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index f9793674b68..79239d06449 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -12,6 +12,7 @@
 # oihane <oihanecruce@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
+# Gustavo Valverde <g.valverde02@gmail.com>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
@@ -581,7 +582,7 @@ msgstr "Ingreso realizado"
 #: model:ir.ui.view,arch_db:membership.view_report_membership_search
 #: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_free_member
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index 8ae6a94e837..afd64419e0c 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.po
@@ -12,13 +12,14 @@
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
 # Haojun Zou <apollo_zhj@msn.com>, 2016
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Daniel Forslund <daniel.forslund@gmail.com>, 2016\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -620,7 +621,7 @@ msgstr "Till"
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index 26f3d79ac0a..6d495f59c19 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.po
@@ -32,7 +32,7 @@ msgstr ""
 #: code:addons/mrp/models/stock_warehouse.py:43
 #, python-format
 msgid " Manufacture"
-msgstr ""
+msgstr "Produktion"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_product_product_bom_count
@@ -163,7 +163,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
 msgid "<strong>Barcode</strong>"
-msgstr ""
+msgstr "<strong>Stregkode</strong>"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
@@ -616,7 +616,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_message_action_main
 msgid "Click to create a new message."
-msgstr ""
+msgstr "Klik for at oprette en ny meddelelse"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_routing_action
@@ -1156,6 +1156,9 @@ msgid ""
 "next procurement) is cancelled or split, the move generated by this move "
 "will too"
 msgstr ""
+"Hvis afkrydset, vil der, når den forrige flytning (flytning genereret af et "
+"næste indkøb) bliver annulleret eller splittet, så vil flytningen genereret "
+"af denne flytning også bliver det. "
 
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_bom_active
@@ -1438,7 +1441,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.config.settings,module_quality_mrp:0
 msgid "Manage quality control points, checks and measures"
-msgstr ""
+msgstr "Anvend kvalitetskontrol steder, checks og målinger"
 
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
@@ -1905,7 +1908,7 @@ msgstr "Afventer"
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
 #: selection:mrp.workcenter.productivity.loss,loss_type:0
 msgid "Performance"
-msgstr ""
+msgstr "Resultater"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
@@ -2171,13 +2174,13 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_location_path
 msgid "Pushed Flow"
-msgstr ""
+msgstr "Push'et flow"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_quality_mrp
 #: selection:mrp.workcenter.productivity.loss,loss_type:0
 msgid "Quality"
-msgstr ""
+msgstr "Kvalitet"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
@@ -2453,13 +2456,13 @@ msgstr "Planlagt måned"
 #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
 #, python-format
 msgid "Scrap"
-msgstr ""
+msgstr "Kassér"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_scrap_count
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_count
 msgid "Scrap Move"
-msgstr ""
+msgstr "Kassationsbevægelse"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids
@@ -2469,7 +2472,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_scrap_ids
 msgid "Scraps"
-msgstr ""
+msgstr "Kasserer"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
@@ -2760,7 +2763,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking_type
 msgid "The picking type determines the picking view"
-msgstr ""
+msgstr "Plukketypen bestemmer plukkevisningen"
 
 #. module: mrp
 #: sql_constraint:mrp.production:0
@@ -2960,7 +2963,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
 msgid "Unit Cost"
-msgstr ""
+msgstr "Enhedsomkostning"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_move_unit_factor
@@ -2986,7 +2989,7 @@ msgstr "Enhed (lagerenhed)"
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
 msgid "Unreserve"
-msgstr ""
+msgstr "Ophæv reservering"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
@@ -3071,7 +3074,7 @@ msgstr "Venter"
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Afventer tilgængelighed"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action_waiting
@@ -3287,6 +3290,8 @@ msgid ""
 "Work with product variant allows you to define some variant of the same "
 "products, an ease the product management in the ecommerce for example"
 msgstr ""
+"Brug produktvarianter for at definere varianter af det samme produkt, og fx "
+"lette håndteringen af produkter ved e-handel hermed. "
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.oee_search_view
@@ -3486,7 +3491,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
 msgid "minutes"
-msgstr ""
+msgstr "minutter"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_line
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index c8ae7d29b11..110c0ab17f8 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -1084,7 +1084,7 @@ msgstr "Definira poredak dok prikazuje listu usmjerenja radnih centara."
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_ir_attachment_priority
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr "Zadaje redosljed za prikaz popisa zadataka."
+msgstr "Zadaje redoslijed za prikaz popisa zadataka."
 
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_workcenter_sequence
@@ -1094,7 +1094,7 @@ msgstr "Definira poredak dok prikazuje listu radnih centara."
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_bom_line_sequence
 msgid "Gives the sequence order when displaying."
-msgstr "Određuje redosljed stavaka u prikazu."
+msgstr "Određuje redoslijed stavaka u prikazu."
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
@@ -1883,7 +1883,7 @@ msgstr "Nalozi"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_qty_production
 msgid "Original Production Quantity"
-msgstr "Originalna količina za proizvosti"
+msgstr "Originalna količina za proizvesti"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_report
diff --git a/addons/mrp_repair/i18n/da.po b/addons/mrp_repair/i18n/da.po
index 1f81a89792e..d79178d8a5b 100644
--- a/addons/mrp_repair/i18n/da.po
+++ b/addons/mrp_repair/i18n/da.po
@@ -9,13 +9,14 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-14 15:55+0000\n"
 "PO-Revision-Date: 2016-11-14 15:55+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr ""
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "(<i>Remove</i>)"
-msgstr ""
+msgstr "(<i>Fjern</i>)"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
@@ -342,7 +343,7 @@ msgstr "Interne noter"
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_move_id
 msgid "Inventory Move"
-msgstr ""
+msgstr "Lagerbevægelse"
 
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_invoice_id
diff --git a/addons/payment/i18n/ja.po b/addons/payment/i18n/ja.po
index 7b57edbce24..f7ea4f265a0 100644
--- a/addons/payment/i18n/ja.po
+++ b/addons/payment/i18n/ja.po
@@ -118,7 +118,7 @@ msgstr ""
 msgid ""
 "<span><i>Pending,</i> Your online payment has been successfully processed. "
 "But your order is not validated yet.</span>"
-msgstr "<span><i>保留中,</i> オンライン支払いが正常に処理されました。 しかし、あなたの注文はまだ確認されていません。</span>"
+msgstr "<span><i>保留中</i> オンライン支払が正常に処理されましたが、ご注文はまだ確認されていません。</span>"
 
 #. module: payment
 #: model:payment.acquirer,pending_msg:payment.payment_acquirer_transfer
@@ -945,7 +945,7 @@ msgstr "電信送金"
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_stripe
 msgid "You will be prompt with Stripe Payment page for payment information."
-msgstr "支払い情報については、スStripe Paymentのページが表示されます。"
+msgstr "支払情報は、Stripe Payment のページに表示されます。"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_adyen
@@ -1018,7 +1018,7 @@ msgstr "amount:取引金額、浮動小数点"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
 msgid "context: the current context dictionary"
-msgstr "context：現在のコンテキスト辞書"
+msgstr "context: 現在のコンテキストディクショナリ"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
diff --git a/addons/payment_authorize/i18n/ja.po b/addons/payment_authorize/i18n/ja.po
index fd2711c859e..bc2eee917ee 100644
--- a/addons/payment_authorize/i18n/ja.po
+++ b/addons/payment_authorize/i18n/ja.po
@@ -53,7 +53,7 @@ msgstr ""
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
 msgid "CVC"
-msgstr ""
+msgstr "CVC"
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
diff --git a/addons/payment_ogone/i18n/ja.po b/addons/payment_ogone/i18n/ja.po
index 1949f99013f..700df849d48 100644
--- a/addons/payment_ogone/i18n/ja.po
+++ b/addons/payment_ogone/i18n/ja.po
@@ -49,7 +49,7 @@ msgstr ""
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
 msgid "CVC"
-msgstr ""
+msgstr "CVC"
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
diff --git a/addons/payment_payumoney/i18n/da.po b/addons/payment_payumoney/i18n/da.po
index 684a4a09bab..a89c2e40391 100644
--- a/addons/payment_payumoney/i18n/da.po
+++ b/addons/payment_payumoney/i18n/da.po
@@ -5,13 +5,14 @@
 # Translators:
 # jonas jensen <j.jensen@tcomp.dk>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #. module: payment_payumoney
 #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer_payumoney_merchant_key
 msgid "Merchant Key"
-msgstr ""
+msgstr "Indløser nøgle"
 
 #. module: payment_payumoney
 #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer_payumoney_merchant_salt
diff --git a/addons/payment_stripe/i18n/ja.po b/addons/payment_stripe/i18n/ja.po
index 23efb926be0..e9289d1617b 100644
--- a/addons/payment_stripe/i18n/ja.po
+++ b/addons/payment_stripe/i18n/ja.po
@@ -32,7 +32,7 @@ msgstr ""
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
 msgid "CVC"
-msgstr ""
+msgstr "CVC"
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
@@ -66,7 +66,7 @@ msgstr "確認<span class=\"fa fa-long-arrow-right\"/>"
 #: code:addons/payment_stripe/static/src/xml/stripe_templates.xml:9
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
@@ -98,12 +98,12 @@ msgstr ""
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key
 msgid "Stripe publishable key"
-msgstr ""
+msgstr "Stripe公開可能鍵"
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_secret_key
 msgid "Stripe secret key"
-msgstr ""
+msgstr "Stripe秘密鍵"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:120
diff --git a/addons/payment_stripe/i18n/zh_CN.po b/addons/payment_stripe/i18n/zh_CN.po
index 9203b424881..cd7f6926799 100644
--- a/addons/payment_stripe/i18n/zh_CN.po
+++ b/addons/payment_stripe/i18n/zh_CN.po
@@ -46,7 +46,7 @@ msgstr "卡号"
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url
 msgid "Checkout Image URL"
-msgstr ""
+msgstr "检出图像URL"
 
 #. module: payment_stripe
 #. openerp-web
@@ -65,7 +65,7 @@ msgstr "确认<span class=\"fa fa-long-arrow-right\"/>"
 #: code:addons/payment_stripe/static/src/xml/stripe_templates.xml:9
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
@@ -92,7 +92,7 @@ msgstr "付款交易"
 #: code:addons/payment_stripe/static/src/js/stripe.js:43
 #, python-format
 msgid "Payment error"
-msgstr ""
+msgstr "付款错误"
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index e69b157ab3f..2d4f11ee80c 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -8,6 +8,7 @@
 # jonas jensen <j.jensen@tcomp.dk>, 2016
 # Jesper Carstensen <info@danodoo.dk>, 2016
 # peso <peer.sommerlund@gmail.com>, 2016
+# Ejner Sønniksen <ejner@vkdata.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2016
 # Nicolaj Helmer Hansen <nhh@softwarehuset.com>, 2016
@@ -15,14 +16,13 @@
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2016
 # Jarnhold Nattestad <nattestads@gmail.com>, 2016
 # Sanne Kristensen <sanne@vkdata.dk>, 2017
-# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -456,7 +456,7 @@ msgstr "Stregkode"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_barcode_nomenclature_all
 msgid "Barcode Nomenclatures"
-msgstr ""
+msgstr "Stregkode numenklaturer"
 
 #. module: point_of_sale
 #. openerp-web
@@ -894,7 +894,7 @@ msgstr "Kunde faltura"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard
 msgid "Dashboard"
-msgstr "Instrumentbræt"
+msgstr "Dashboard"
 
 #. module: point_of_sale
 #: model:product.product,name:point_of_sale.partner_product_7
@@ -3777,7 +3777,7 @@ msgstr "på"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_barcode_rule
 msgid "barcode.rule"
-msgstr ""
+msgstr "barcode.rule"
 
 #. module: point_of_sale
 #. openerp-web
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index c9499d1255f..0be6e5d5405 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -2713,7 +2713,7 @@ msgstr "Vendedor"
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_user_id
 #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: point_of_sale
 #. openerp-web
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 4e3fbbc2ff9..ab67764d9ea 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -7,14 +7,14 @@
 # krnkris <krnkris@freemail.hu>, 2016
 # Kovács Tibor <kovika@gmail.com>, 2016
 # gezza <geza.nagy@oregional.hu>, 2016
-# Attila Szöllősi <ata@openmailbox.org>, 2017
+# Attila Szöllősi <ata@openmailbox.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Attila Szöllősi <ata@openmailbox.org>, 2017\n"
+"Last-Translator: Attila Szöllősi <ata@openmailbox.org>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -414,7 +414,7 @@ msgstr "Elérhető fizetési módok"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
 msgid "Available in POS"
-msgstr ""
+msgstr "Elérhető az Értékesítési pontban"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_product_product_available_in_pos
@@ -3461,7 +3461,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:649
 #, python-format
 msgid "Tip"
-msgstr "Tippek"
+msgstr "Borravaló"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tip_product_id
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 5991fe352cb..1f2a8c234a5 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.po
@@ -8,13 +8,14 @@
 # Yaroslav Molochko <onorua@gmail.com>, 2016
 # ТАрас <tratatuta@i.ua>, 2016
 # Zoriana Zaiats <sorenabell@quintagroup.com>, 2016
+# Oleksandr Basenko <oleksandr.basenko@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Zoriana Zaiats <sorenabell@quintagroup.com>, 2016\n"
+"Last-Translator: Oleksandr Basenko <oleksandr.basenko@gmail.com>, 2017\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1590,7 +1591,7 @@ msgstr ""
 #: model:product.product,name:point_of_sale.citron
 #: model:product.template,name:point_of_sale.citron_product_template
 msgid "Lemon"
-msgstr ""
+msgstr "Лимон"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_name
@@ -1863,7 +1864,7 @@ msgstr ""
 #: model:product.product,name:point_of_sale.Onions
 #: model:product.template,name:point_of_sale.Onions_product_template
 msgid "Onions"
-msgstr ""
+msgstr "Цибуля"
 
 #. module: point_of_sale
 #. openerp-web
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index fd873a76067..796c762cb02 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -2597,7 +2597,7 @@ msgstr "退回产品"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_amount_return
 msgid "Returned"
-msgstr "退货"
+msgstr "退回"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -3880,7 +3880,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:1592
 #, python-format
 msgid "return"
-msgstr "退货"
+msgstr "退回"
 
 #. module: point_of_sale
 #. openerp-web
diff --git a/addons/pos_cache/i18n/da.po b/addons/pos_cache/i18n/da.po
index c2fc049e3fd..6925a4120c3 100644
--- a/addons/pos_cache/i18n/da.po
+++ b/addons/pos_cache/i18n/da.po
@@ -7,13 +7,14 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
 "PO-Revision-Date: 2015-09-29 10:26+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_cache
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_compute_user_id
diff --git a/addons/pos_mercury/i18n/da.po b/addons/pos_mercury/i18n/da.po
index e36c7dfe561..10e0eaa8891 100644
--- a/addons/pos_mercury/i18n/da.po
+++ b/addons/pos_mercury/i18n/da.po
@@ -8,13 +8,14 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 # Sanne Kristensen <sanne@vkdata.dk>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:26+0000\n"
 "PO-Revision-Date: 2017-06-23 13:26+0000\n"
-"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgstr ""
 #: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:75
 #, python-format
 msgid "&nbsp;&nbsp;APPROVAL CODE:"
-msgstr ""
+msgstr "&nbsp;&nbsp;GODKENDELSES KODE:"
 
 #. module: pos_mercury
 #. openerp-web
@@ -974,7 +975,7 @@ msgstr ""
 #. module: pos_mercury
 #: model:ir.model,name:pos_mercury.model_barcode_rule
 msgid "barcode.rule"
-msgstr ""
+msgstr "barcode.rule"
 
 #. module: pos_mercury
 #: model:ir.model,name:pos_mercury.model_ir_autovacuum
diff --git a/addons/pos_mercury/i18n/ja.po b/addons/pos_mercury/i18n/ja.po
index b286124c7f7..86e2e1a0ef5 100644
--- a/addons/pos_mercury/i18n/ja.po
+++ b/addons/pos_mercury/i18n/ja.po
@@ -213,7 +213,7 @@ msgstr ""
 #: code:addons/pos_mercury/static/src/js/pos_mercury.js:638
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #. module: pos_mercury
 #. openerp-web
diff --git a/addons/pos_mercury/i18n/sv.po b/addons/pos_mercury/i18n/sv.po
index bd33c51d51b..fc0771f179d 100644
--- a/addons/pos_mercury/i18n/sv.po
+++ b/addons/pos_mercury/i18n/sv.po
@@ -10,13 +10,14 @@
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:26+0000\n"
 "PO-Revision-Date: 2017-06-23 13:26+0000\n"
-"Last-Translator: Daniel Forslund <daniel.forslund@gmail.com>, 2016\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -172,7 +173,7 @@ msgstr "Skapad den"
 #: code:addons/pos_mercury/models/pos_mercury.py:15
 #, python-format
 msgid "Credit Card"
-msgstr ""
+msgstr "kreditkort"
 
 #. module: pos_mercury
 #. openerp-web
diff --git a/addons/pos_mercury/i18n/zh_CN.po b/addons/pos_mercury/i18n/zh_CN.po
index 12a586e1abe..4506bec710b 100644
--- a/addons/pos_mercury/i18n/zh_CN.po
+++ b/addons/pos_mercury/i18n/zh_CN.po
@@ -209,7 +209,7 @@ msgstr "空命令字符串"
 #: code:addons/pos_mercury/static/src/js/pos_mercury.js:638
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "错误"
 
 #. module: pos_mercury
 #. openerp-web
@@ -718,7 +718,7 @@ msgstr "请设置你的Mercury商人账户"
 #. module: pos_mercury
 #: model:ir.model,name:pos_mercury.model_pos_order
 msgid "Point of Sale Orders"
-msgstr ""
+msgstr "POS订单"
 
 #. module: pos_mercury
 #. openerp-web
diff --git a/addons/pos_restaurant/i18n/zh_CN.po b/addons/pos_restaurant/i18n/zh_CN.po
index 9fadcaad8ce..3f134b6ad75 100644
--- a/addons/pos_restaurant/i18n/zh_CN.po
+++ b/addons/pos_restaurant/i18n/zh_CN.po
@@ -377,7 +377,7 @@ msgstr "POS"
 #. module: pos_restaurant
 #: model:ir.model,name:pos_restaurant.model_pos_order
 msgid "Point of Sale Orders"
-msgstr ""
+msgstr "POS订单"
 
 #. module: pos_restaurant
 #. openerp-web
diff --git a/addons/product/i18n/da.po b/addons/product/i18n/da.po
index 9a66d4a8543..12fa436241a 100644
--- a/addons/product/i18n/da.po
+++ b/addons/product/i18n/da.po
@@ -7,18 +7,18 @@
 # Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Jesper Carstensen <info@danodoo.dk>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
+# Ejner Sønniksen <ejner@vkdata.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # peso <peer.sommerlund@gmail.com>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2016
 # Visti Kristensen <visti@vkdata.dk>, 2017
-# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Visti Kristensen <visti@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2222,12 +2222,12 @@ msgstr ""
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
 msgid "Rounding Method"
-msgstr "Afrundingsmåde"
+msgstr "Afrundingsmetode"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_uom_rounding
 msgid "Rounding Precision"
-msgstr "Afrundings nøjagtighed"
+msgstr "Afrunding"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_description_sale
@@ -3080,6 +3080,8 @@ msgid ""
 "Work with product variant allows you to define some variant of the same "
 "products, an ease the product management in the ecommerce for example"
 msgstr ""
+"Brug produktvarianter for at definere varianter af det samme produkt, og fx "
+"lette håndteringen af produkter ved e-handel hermed. "
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 2fc9830e3c1..b0bd8725466 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -2085,7 +2085,7 @@ msgstr "インベントリ内のお店の製品"
 #: code:addons/product/models/product.py:466
 #, python-format
 msgid "Products: "
-msgstr "製品： "
+msgstr "製品:"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_template_lst_price
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 98b7162955c..6c7b2cf8032 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -15,13 +15,14 @@
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2876,7 +2877,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:product.field_product_product_seller_ids
 #: model:ir.model.fields,field_description:product.field_product_template_seller_ids
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: product
 #: selection:product.category,type:0
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 91487c22d06..cd9a877522a 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.po
@@ -9,16 +9,17 @@
 # Daniel Forslund <daniel.forslund@gmail.com>, 2016
 # Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2016
 # Anders Wallenquist <anders.wallenquist@vertel.se>, 2016
-# larmar <martin.wilderoth@linserv.se>, 2016
+# Martin Wilderoth <martin.wilderoth@linserv.se>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -390,7 +391,7 @@ msgstr ""
 #. module: product_margin
 #: model:ir.model.fields,field_description:product_margin.field_product_product_supplier_taxes_id
 msgid "Vendor Taxes"
-msgstr ""
+msgstr "Inköps moms"
 
 #. module: product_margin
 #: model:ir.model.fields,help:product_margin.field_product_product_email_template_id
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 3bb09f1d8ad..6478a807d2f 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.po
@@ -1178,6 +1178,8 @@ msgstr ""
 #: model:ir.model.fields,help:project.field_project_project_use_tasks
 msgid "Check this box to manage internal activities through this project"
 msgstr ""
+"Marker dette felt for at administrere interne aktiviteter gennem dette "
+"projekt"
 
 #. module: project
 #. openerp-web
@@ -1275,7 +1277,7 @@ msgstr "Virksomhed"
 #: model:ir.model.fields,field_description:project.field_account_analytic_account_company_uom_id
 #: model:ir.model.fields,field_description:project.field_project_project_company_uom_id
 msgid "Company UOM"
-msgstr ""
+msgstr "Virksomhed UOM"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config
@@ -1948,7 +1950,7 @@ msgstr ""
 #: code:addons/project/models/project.py:567
 #, python-format
 msgid "I take it"
-msgstr ""
+msgstr "Jeg tager opgaven"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_config_settings_id
@@ -2681,7 +2683,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:project.field_account_analytic_account_project_count
 #: model:ir.model.fields,field_description:project.field_project_project_project_count
 msgid "Project Count"
-msgstr ""
+msgstr "Projekttælling"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_config_settings
@@ -3387,6 +3389,8 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Dette sætter måleenheden, der anvendes i projekter og opgaver.\n"
+"Hvis du bruger timesedler knyttet til projekter, skal du huske at angive den rigtige måleenhed på dine medarbejdere."
 
 #. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
@@ -3402,7 +3406,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:project.field_res_company_project_time_mode_id
 #: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
 msgid "Timesheet UoM"
-msgstr ""
+msgstr "Timeseddel enheder"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_planner
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index dde05f839d5..59f1541273a 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -2059,7 +2059,7 @@ msgstr "Daje redoslijed kada se prikazuje lista projekata"
 #. module: project
 #: model:ir.model.fields,help:project.field_project_task_sequence
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr "Zadaje redosljed za prikaz popisa zadataka."
+msgstr "Zadaje redoslijed za prikaz popisa zadataka."
 
 #. module: project
 #. openerp-web
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index c8eab89d1ab..67a9a02fdb7 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -146,12 +146,12 @@ msgstr "# 分配的天数"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_closing_days
 msgid "# Days to Close"
-msgstr ""
+msgstr "# 到关闭的天数"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_delay_endings_days
 msgid "# Days to Deadline"
-msgstr ""
+msgstr "# 到截止天数"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_res_partner_task_count
diff --git a/addons/project_issue/i18n/da.po b/addons/project_issue/i18n/da.po
index 6452208a42c..6825f0d0184 100644
--- a/addons/project_issue/i18n/da.po
+++ b/addons/project_issue/i18n/da.po
@@ -6,6 +6,7 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 msgid ""
 msgstr ""
@@ -24,7 +25,7 @@ msgstr ""
 #. module: project_issue
 #: model:ir.model.fields,field_description:project_issue.field_project_issue_report_email
 msgid "# Emails"
-msgstr "Emails"
+msgstr "E-mails"
 
 #. module: project_issue
 #: model:ir.model.fields,field_description:project_issue.field_res_partner_issue_count
@@ -361,7 +362,7 @@ msgstr "Høj"
 #: code:addons/project_issue/models/project_issue.py:271
 #, python-format
 msgid "I take it"
-msgstr ""
+msgstr "Jeg tager opgaven"
 
 #. module: project_issue
 #: model:ir.model.fields,field_description:project_issue.field_project_issue_id
diff --git a/addons/project_issue_sheet/i18n/ja.po b/addons/project_issue_sheet/i18n/ja.po
index 72f2c450811..7a1bbcc0dd2 100644
--- a/addons/project_issue_sheet/i18n/ja.po
+++ b/addons/project_issue_sheet/i18n/ja.po
@@ -32,7 +32,7 @@ msgstr "分析行"
 #. module: project_issue_sheet
 #: model:ir.model.fields,help:project_issue_sheet.field_project_issue_progress
 msgid "Computed as: Time Spent / Total Time."
-msgstr "計算式：消費時間 / 合計時間"
+msgstr "計算式: 消費時間 / 合計時間"
 
 #. module: project_issue_sheet
 #: model:ir.ui.view,arch_db:project_issue_sheet.project_issue_form_view
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index 0547c7e626a..b1cfb08ad34 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -262,7 +262,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.config.settings,module_stock_dropshipping:0
 msgid "Allow suppliers to deliver directly to your customers"
-msgstr ""
+msgstr "Tillad leverandører at levere direkte til dine kunder"
 
 #. module: purchase
 #: selection:res.company,po_lock:0
@@ -1156,7 +1156,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_normal_action_puchased
 msgid "Purchasable Products"
-msgstr "Produkt kan indkøbes"
+msgstr "Produkter (indkøb)"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
@@ -1814,7 +1814,7 @@ msgstr "Bruger"
 #. module: purchase
 #: model:ir.model.fields,help:purchase.field_purchase_config_settings_company_currency_id
 msgid "Utility field to express amount currency"
-msgstr ""
+msgstr "Værktøjsfelt til at vise valutabeløbet"
 
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
@@ -1929,6 +1929,8 @@ msgid ""
 "Work with product variant allows you to define some variant of the same "
 "products, an ease the product management in the ecommerce for example"
 msgstr ""
+"Brug produktvarianter for at definere varianter af det samme produkt, og fx "
+"lette håndteringen af produkter ved e-handel hermed. "
 
 #. module: purchase
 #: code:addons/purchase/models/purchase.py:770
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 62c5f5f70cf..08289f1d23b 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -11,14 +11,14 @@
 # Bole <bole@dajmi5.com>, 2016
 # Ivica Dimjašević <ivica.dimjasevic@storm.hr>, 2016
 # Jasmina Otročak <jasmina@uvid.hr>, 2016
-# Tina Milas <tina@uvid.hr>, 2017
+# Tina Milas <tina@uvid.hr>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Tina Milas <tina@uvid.hr>, 2017\n"
+"Last-Translator: Tina Milas <tina@uvid.hr>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -423,7 +423,7 @@ msgstr "Nije moguće pronaći generičku rutu nabave."
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 #: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
 msgid "Cancel"
-msgstr "Odustani"
+msgstr "Otkaži"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index f564357e2da..a042ad0a130 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -16,13 +16,14 @@
 # Haojun Zou <apollo_zhj@msn.com>, 2016
 # Patrik Lermon <patrik.lermon@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1787,7 +1788,7 @@ msgstr "Leverantör"
 #: model:ir.ui.view,arch_db:purchase.purchase_order_form
 #: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_account_buttons
 msgid "Vendor Bills"
-msgstr ""
+msgstr "Leverantörsfakturor"
 
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_account_buttons
@@ -1807,13 +1808,13 @@ msgstr ""
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_partner_ref
 msgid "Vendor Reference"
-msgstr ""
+msgstr "Leverantör Referens"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_supplier_name
 #: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 728d8034436..098f12d3bca 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -335,7 +335,7 @@ msgstr "开单数量"
 #: code:addons/purchase/models/purchase.py:581
 #, python-format
 msgid "Billed Quantity"
-msgstr ""
+msgstr "开单数量"
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_status
diff --git a/addons/purchase_requisition/i18n/da.po b/addons/purchase_requisition/i18n/da.po
index 98c8e58841c..72e15058cfb 100644
--- a/addons/purchase_requisition/i18n/da.po
+++ b/addons/purchase_requisition/i18n/da.po
@@ -10,13 +10,14 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 # Kenneth Hansen <kenneth@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-14 15:54+0000\n"
 "PO-Revision-Date: 2016-11-14 15:54+0000\n"
-"Last-Translator: Kenneth Hansen <kenneth@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr ""
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
 msgid "<strong>Date</strong>"
-msgstr ""
+msgstr "<strong>Dato</strong>"
 
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
@@ -57,7 +58,7 @@ msgstr ""
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
 msgid "<strong>Scheduled Date</strong>"
-msgstr ""
+msgstr "<strong>Planlagt dato</strong>"
 
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
diff --git a/addons/rating_project/i18n/zh_CN.po b/addons/rating_project/i18n/zh_CN.po
index 5b061ef35d1..87eab593431 100644
--- a/addons/rating_project/i18n/zh_CN.po
+++ b/addons/rating_project/i18n/zh_CN.po
@@ -98,7 +98,7 @@ msgstr ""
 #. module: rating_project
 #: model:mail.template,subject:rating_project.rating_project_request_email_template
 msgid "${object.project_id.company_id.name}: Service Rating Request"
-msgstr ""
+msgstr "${object.project_id.company_id.name}: 服务点评请求"
 
 #. module: rating_project
 #: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_form
diff --git a/addons/report_intrastat/i18n/da.po b/addons/report_intrastat/i18n/da.po
index 22901b69d9c..e22f079e16c 100644
--- a/addons/report_intrastat/i18n/da.po
+++ b/addons/report_intrastat/i18n/da.po
@@ -32,7 +32,7 @@ msgstr "<strong>Kommentar:</strong>"
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "<strong>Document:</strong>"
-msgstr ""
+msgstr "<strong>Dokument:</strong>"
 
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index eb7ddfab0d6..6280caa60ad 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -10,13 +10,14 @@
 # Anders Wallenquist <anders.wallenquist@vertel.se>, 2016
 # Martin Wilderoth <martin.wilderoth@linserv.se>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +38,7 @@ msgstr "<strong>Dokument:</strong>"
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "<strong>Fiscal Position Remark:</strong>"
-msgstr ""
+msgstr "<strong>Skatterregion Anmärkning\\:</strong> "
 
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
@@ -315,12 +316,12 @@ msgstr "Värde"
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "Vendor Bill"
-msgstr ""
+msgstr "Leverantörsfaktura"
 
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "Vendor Refund"
-msgstr ""
+msgstr "Leverantörskreditfakturor"
 
 #. module: report_intrastat
 #: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_weight
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index 012d0ab4ee2..29297a803cb 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -31,7 +31,7 @@ msgstr "<strong>文档:</strong>"
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "<strong>Fiscal Position Remark:</strong>"
-msgstr ""
+msgstr "<strong>财政状况标记:</strong>"
 
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 22027699cd6..0fbc5dca2ae 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -75,6 +75,44 @@ msgid ""
 "% endif\n"
 "</p>\n"
 msgstr ""
+"\n"
+"<p>Hyvä ${object.partner_id.name}\n"
+"% set access_action = object.with_context(force_website=True).get_access_action()\n"
+"% set doc_name = 'tarjous' if object.state in ('draft', 'sent') else 'tilausvahvistus'\n"
+"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
+"% set access_name = is_online and object.template_id and doc_name == 'tarjous' and 'Hyväksy ja maksa %s verkossa' % doc_name or 'Katso %s' % doc_name\n"
+"% set access_url = is_online and access_action['url'] or None\n"
+"\n"
+"% if object.partner_id.parent_id:\n"
+"    (<i>${object.partner_id.parent_id.name}</i>)\n"
+"% endif\n"
+",</p>\n"
+"<p>\n"
+"Tässä on meidän ${doc_name} <strong>${object.name}</strong>\n"
+"% if object.origin:\n"
+"(viitteellä: ${object.origin} )\n"
+"% endif\n"
+"yhteissummaltaan <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong>\n"
+"</p>\n"
+"\n"
+"    <br/><br/>\n"
+"% if is_online:\n"
+"    <center>\n"
+"        <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">${access_name}</a>\n"
+"        <br/><br/>\n"
+"        <span style=\"color:#888888\">(tai katso liitteen PDF)</span>\n"
+"    </center>\n"
+"    <br/>\n"
+"% endif\n"
+"\n"
+"<p>Voit vastata tähän sähköpostiin mikäli sinulla on kysyttävää.</p>\n"
+"<p>Ystävällisin terveisin,</p>\n"
+"\n"
+"<p style=\"color:#eeeeee;\">\n"
+"% if object.user_id and object.user_id.signature:\n"
+"    ${object.user_id.signature | safe}\n"
+"% endif\n"
+"</p>\n"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_product_product_sales_count
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 60779bcf5d8..a4a7d655ee7 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -474,7 +474,7 @@ msgstr "Može uređivati isporučeno"
 #: model:ir.ui.view,arch_db:sale.view_order_form
 #: model:ir.ui.view,arch_db:sale.view_sale_advance_payment_inv
 msgid "Cancel"
-msgstr "Odustani"
+msgstr "Otkaži"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 885750991de..d9512f939dd 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -1962,7 +1962,7 @@ msgstr "サービス"
 #: code:addons/sale/static/src/js/sale.js:19
 #, python-format
 msgid "Set an invoicing target: "
-msgstr "請求対象の設定："
+msgstr "請求対象の設定:"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.view_order_form
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 5b0c6b0b0d9..7986bb11adb 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -16,13 +16,14 @@
 # Haojun Zou <apollo_zhj@msn.com>, 2016
 # Christelle Wehbe <libanon_cristelle@hotmail.com>, 2016
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Jonathan S <jonathan.c.strom@gmail.com>, 2016\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -249,7 +250,7 @@ msgstr ""
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "<strong>Fiscal Position Remark:</strong>"
-msgstr ""
+msgstr "<strong>Skatterregion Anmärkning\\:</strong> "
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
diff --git a/addons/sale_crm/i18n/da.po b/addons/sale_crm/i18n/da.po
index 61a56e4b2a6..087b32fde13 100644
--- a/addons/sale_crm/i18n/da.po
+++ b/addons/sale_crm/i18n/da.po
@@ -48,6 +48,8 @@ msgid ""
 "A member with whom you want to associate your membership. It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Et medlem med hvem du vil tilknytte dit medlemskab. Det vil tage hensyn til"
+"  medlemskabet af det tilknyttede medlem."
 
 #. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_res_users_associate_member
@@ -109,7 +111,7 @@ msgstr "Faktura"
 #. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_res_users_target_sales_invoiced
 msgid "Invoiced in Sale Orders Target"
-msgstr ""
+msgstr "Faktureret i salgsordrer"
 
 #. module: sale_crm
 #: model:ir.model.fields,help:sale_crm.field_res_users_membership_state
@@ -190,7 +192,7 @@ msgstr "Antal tilbud"
 #. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_sale_order_opportunity_id
 msgid "Opportunity"
-msgstr "Kval. emne"
+msgstr "Salgsmulighed"
 
 #. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_crm_lead_order_ids
@@ -263,6 +265,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"Denne lagerplacering vil blive brugt i stedet for standardværdien som "
+"destinationssted for varer, du sender til denne partner"
 
 #. module: sale_crm
 #: model:ir.model.fields,help:sale_crm.field_res_users_property_stock_supplier
@@ -270,6 +274,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
+"Denne lagerplacering vil blive brugt i stedet for standardværdien som "
+"kildeplacering for varer, du modtager fra den nuværende partner"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
diff --git a/addons/sale_margin/i18n/da.po b/addons/sale_margin/i18n/da.po
index 2549438f55e..4b0e2ebd59d 100644
--- a/addons/sale_margin/i18n/da.po
+++ b/addons/sale_margin/i18n/da.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Morten Schou <ms@msteknik.dk>, 2016\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,13 +32,15 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost."
 msgstr ""
+"Det giver rentabilitet ved at beregne forskellen mellem enhedsprisen og "
+"omkostningen."
 
 #. module: sale_margin
 #: model:ir.model.fields,field_description:sale_margin.field_sale_order_line_margin
 #: model:ir.model.fields,field_description:sale_margin.field_sale_order_margin
 #: model:ir.model.fields,field_description:sale_margin.field_sale_report_margin
 msgid "Margin"
-msgstr "Margen"
+msgstr "Avance"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
diff --git a/addons/sale_order_dates/i18n/da.po b/addons/sale_order_dates/i18n/da.po
index 5fa143ef1fb..b809d6450bb 100644
--- a/addons/sale_order_dates/i18n/da.po
+++ b/addons/sale_order_dates/i18n/da.po
@@ -3,6 +3,7 @@
 # * sale_order_dates
 # 
 # Translators:
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
 # Kenneth Hansen <kenneth@vkdata.dk>, 2016
 msgid ""
@@ -22,7 +23,7 @@ msgstr ""
 #. module: sale_order_dates
 #: model:ir.model.fields,field_description:sale_order_dates.field_sale_order_commitment_date
 msgid "Commitment Date"
-msgstr "Leverings dato"
+msgstr "Leveringsdato"
 
 #. module: sale_order_dates
 #: model:ir.model.fields,help:sale_order_dates.field_sale_order_requested_date
diff --git a/addons/sale_stock/i18n/zh_CN.po b/addons/sale_stock/i18n/zh_CN.po
index 5107f6ecc39..f923123d1e1 100644
--- a/addons/sale_stock/i18n/zh_CN.po
+++ b/addons/sale_stock/i18n/zh_CN.po
@@ -222,7 +222,7 @@ msgstr "销售订单行的属性"
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "退货拣货"
+msgstr "退回作业"
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_route_id
diff --git a/addons/sale_timesheet/i18n/da.po b/addons/sale_timesheet/i18n/da.po
index c36feb2442d..bbd89c348bd 100644
--- a/addons/sale_timesheet/i18n/da.po
+++ b/addons/sale_timesheet/i18n/da.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
-# Morten Schou <ms@msteknik.dk>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
@@ -49,12 +49,12 @@ msgstr ""
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_hr_employee
 msgid "Employee"
-msgstr "Ansat"
+msgstr "Medarbejder"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
 msgid "Order Line"
-msgstr "Ordre linie"
+msgstr "Ordrelinje"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_procurement_order
@@ -65,7 +65,7 @@ msgstr "Indkøb"
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_product_product
 msgid "Product"
-msgstr "Vare"
+msgstr "Produkt"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_product_product_alert_time
@@ -102,7 +102,7 @@ msgstr "Projekt"
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_project_project_id
 msgid "Project associated to this sale"
-msgstr ""
+msgstr "Projekt tilknyttet dette salg"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_sale_order
@@ -114,7 +114,7 @@ msgstr "Salgsordre"
 #: model:ir.model,name:sale_timesheet.model_sale_order_line
 #: model:ir.model.fields,field_description:sale_timesheet.field_project_task_sale_line_id
 msgid "Sales Order Line"
-msgstr "Salgsordrelinie"
+msgstr "Salgsordrelinje"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_project_task
@@ -128,6 +128,8 @@ msgstr "Opgave"
 msgid ""
 "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
 msgstr ""
+"Opgave oprettet (%s): <a href=# data-oe-model=project.task data-oe-"
+"id=%d>%s</a>"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_tasks_count
@@ -138,7 +140,7 @@ msgstr "Opgaver"
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_tasks_ids
 msgid "Tasks associated to this sale"
-msgstr ""
+msgstr "Opgaver tilknyttet dette salg"
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/models/procurement.py:84
@@ -147,6 +149,8 @@ msgid ""
 "This task has been created from: <a href=# data-oe-model=sale.order data-oe-"
 "id=%d>%s</a> (%s)"
 msgstr ""
+"Denne opgave er oprettet fra: <a href=# data-oe-model=sale.order data-oe-"
+"id=%d>%s</a> (%s)"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.project_time_mode_id_duplicate_xmlid
@@ -154,32 +158,34 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Dettesætter måleenheden, der anvendes i projekter og opgaver.\n"
+"Hvis du bruger timeskemaet knyttet til projekter, skal du huske at angive den rigtige måleenhed på dine medarbejdere."
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_timesheet_cost
 msgid "Timesheet Cost"
-msgstr "Tidsskema kost"
+msgstr "Timeseddel kostpris"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.project_time_mode_id_duplicate_xmlid
 msgid "Timesheet UoM"
-msgstr ""
+msgstr "Timeseddel UoM"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_timesheet_count
 msgid "Timesheet activities"
-msgstr "Tidsskema aktiviteter"
+msgstr "Timeseddels aktiviteter"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_timesheet_ids
 msgid "Timesheet activities associated to this sale"
-msgstr ""
+msgstr "Aktiviteter knyttet til dette salg"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
 #: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
 msgid "Timesheets"
-msgstr "Tidsskemaer"
+msgstr "Timesedler"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_product_product_alert_time
@@ -224,6 +230,8 @@ msgid ""
 "should split your order to include only one contract based on time and "
 "material."
 msgstr ""
+"Du kan kun bruge et produkt på timesedler i samme salgsordre. Du skal opdele"
+" din ordre for kun at omfatte en kontrakt baseret på tid og materiale."
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/models/project.py:17
@@ -232,3 +240,5 @@ msgid ""
 "You cannot delete a task related to a Sale Order. You can only archive this "
 "task."
 msgstr ""
+"Du kan ikke slette en opgave relateret til en salgsordre. Du kan kun "
+"arkivere denne opgave."
diff --git a/addons/sales_team/i18n/da.po b/addons/sales_team/i18n/da.po
index 0e273d277af..3381d155b15 100644
--- a/addons/sales_team/i18n/da.po
+++ b/addons/sales_team/i18n/da.po
@@ -5,10 +5,9 @@
 # Translators:
 # peso <peer.sommerlund@gmail.com>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
-# jonas jensen <j.jensen@tcomp.dk>, 2016
+# Ejner Sønniksen <ejner@vkdata.dk>, 2016
 # Jarnhold Nattestad <nattestads@gmail.com>, 2016
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2016
-# Ejner Sønniksen <ejner@vkdata.dk>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
@@ -32,28 +31,28 @@ msgstr ""
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:91
 #, python-format
 msgid "3 exp. closing"
-msgstr ""
+msgstr "3 forv. lukning"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:137
 #, python-format
 msgid "35,029.39€"
-msgstr ""
+msgstr "35,029.39€"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:124
 #, python-format
 msgid "78,140.03€"
-msgstr ""
+msgstr "78,140.03€"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:169
 #, python-format
 msgid "80.000€"
-msgstr ""
+msgstr "80.000€"
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
@@ -126,7 +125,7 @@ msgstr "Klik her for at oprette et nyt salgsteam."
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:182
 #, python-format
 msgid "Click to set"
-msgstr "Klik for at indstille"
+msgstr "Klik for at sætte"
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_color
@@ -148,17 +147,17 @@ msgstr "Konfiguration"
 #: model:ir.actions.act_window,name:sales_team.action_sale_config
 #: model:ir.ui.view,arch_db:sales_team.view_sale_config_settings
 msgid "Configure Sales"
-msgstr "Tilpas Ordre"
+msgstr "Konfigurer salg"
 
 #. module: sales_team
 #: model:ir.ui.menu,name:sales_team.menu_partner_category_form
 msgid "Contact Tags"
-msgstr ""
+msgstr "Kontakt tags"
 
 #. module: sales_team
 #: model:ir.ui.menu,name:sales_team.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "Kontakt titler"
 
 #. module: sales_team
 #: model:ir.ui.menu,name:sales_team.menu_config_address_book
@@ -180,7 +179,7 @@ msgstr "Landegruppe"
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:215
 #, python-format
 msgid "Create a few opportunities in it."
-msgstr ""
+msgstr "Opret nogle få salgsmuligheder i den."
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_create_uid
@@ -211,7 +210,7 @@ msgstr "Kunder"
 #: model:ir.ui.menu,name:sales_team.menu_sales_team_act
 #, python-format
 msgid "Dashboard"
-msgstr "Instrumentbræt"
+msgstr "Dashboard"
 
 #. module: sales_team
 #: model:crm.team,name:sales_team.team_sales_department
@@ -227,21 +226,22 @@ msgstr "Vis navn"
 #. module: sales_team
 #: model:ir.ui.menu,name:sales_team.menu_country_state_partner
 msgid "Fed. States"
-msgstr ""
+msgstr "Føderale Stater"
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
 msgid ""
 "Follow this salesteam to automatically track the events associated to users "
 "of this team."
-msgstr "Følg dette salgs team og dets medlemmers handlinger."
+msgstr ""
+"Følg dette salgsteam for automatisk at tracke medlemmernes handlinger."
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:214
 #, python-format
 msgid "Great sales journeys start with a clean pipeline."
-msgstr ""
+msgstr "En fantastisk salgsrejse starter med en blank pipeline."
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
@@ -268,6 +268,8 @@ msgid ""
 "If set, sale team used notably for sales and assignations related to this "
 "partner"
 msgstr ""
+"Hvis sat, salgsteam benyttes ved salg og tildelinger relateret til denne "
+"partner. "
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_active
@@ -275,6 +277,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the sales "
 "team without removing it."
 msgstr ""
+"Hvis aktiv feltet er sat til false, vil det være muligt at skjule "
+"salgsteamet uden at slette det. "
 
 #. module: sales_team
 #: model:crm.team,name:sales_team.crm_team_1
@@ -352,21 +356,21 @@ msgstr "Min Pipeline"
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
 msgid "My Salesteams"
-msgstr "Mit salgs team"
+msgstr "Mit salgsteam"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:50
 #, python-format
 msgid "Next 7 days"
-msgstr ""
+msgstr "De næste 7 dage"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:38
 #, python-format
 msgid "Next Actions"
-msgstr ""
+msgstr "Næste aktiviteter"
 
 #. module: sales_team
 #. openerp-web
@@ -385,7 +389,7 @@ msgstr "Kontakt"
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
 #, python-format
 msgid "Performance"
-msgstr ""
+msgstr "Resultater"
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_reply_to
@@ -400,7 +404,7 @@ msgstr "Rapporter"
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_res_users_property_product_pricelist
 msgid "Sale Pricelist"
-msgstr "Salgs prisliste"
+msgstr "Salgsprisliste"
 
 #. module: sales_team
 #: model:ir.ui.menu,name:sales_team.menu_base_partner
@@ -425,28 +429,30 @@ msgid ""
 "Sales Team the user is member of. Used to compute the members of a sales "
 "team through the inverse one2many"
 msgstr ""
+"Salgsteamet brugeren er medlem af. Anvendes for at beregne medlemmer af et "
+"salgsteam gennem den inverse one2many. "
 
 #. module: sales_team
 #: model:ir.actions.act_window,name:sales_team.crm_team_act
 #: model:ir.actions.act_window,name:sales_team.sales_team_config_action
 #: model:ir.ui.menu,name:sales_team.sales_team_config
 msgid "Sales Teams"
-msgstr "Salgs teams"
+msgstr "Salgsteams"
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
 msgid "Sales team"
-msgstr "Salgs team"
+msgstr "Salgsteam"
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
 msgid "Salesteam name..."
-msgstr "Salgs team navn..."
+msgstr "Salgsteam navn..."
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
 msgid "Salesteams Search"
-msgstr "Salgs team søgning"
+msgstr "Salgsteam søgning"
 
 #. module: sales_team
 #: model:ir.ui.menu,name:sales_team.menu_sale_general_settings
@@ -459,7 +465,7 @@ msgstr "Opsætning"
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:146
 #, python-format
 msgid "Target"
-msgstr ""
+msgstr "Mål"
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_user_id
@@ -476,7 +482,7 @@ msgstr "Team medlemmer"
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_color
 msgid "The color of the team"
-msgstr ""
+msgstr "Farven på teamet"
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_reply_to
@@ -510,7 +516,7 @@ msgstr ""
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:76
 #, python-format
 msgid "To Activities"
-msgstr ""
+msgstr "Til aktiviteter"
 
 #. module: sales_team
 #. openerp-web
@@ -518,7 +524,7 @@ msgstr ""
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:189
 #, python-format
 msgid "To Activity Report"
-msgstr ""
+msgstr "Til aktivitetsrapport"
 
 #. module: sales_team
 #. openerp-web
@@ -526,7 +532,7 @@ msgstr ""
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:51
 #, python-format
 msgid "To Calendar"
-msgstr ""
+msgstr "Til kalender"
 
 #. module: sales_team
 #. openerp-web
@@ -534,14 +540,14 @@ msgstr ""
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:199
 #, python-format
 msgid "To Invoice Report"
-msgstr ""
+msgstr "Til fakturarapport"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:86
 #, python-format
 msgid "To Opportunities"
-msgstr ""
+msgstr "Til salgsmuligheder"
 
 #. module: sales_team
 #. openerp-web
@@ -549,14 +555,14 @@ msgstr ""
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:194
 #, python-format
 msgid "To Opportunity Report"
-msgstr ""
+msgstr "Til rapport over salgsmuligheder"
 
 #. module: sales_team
 #. openerp-web
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:13
 #, python-format
 msgid "To do"
-msgstr ""
+msgstr "To do"
 
 #. module: sales_team
 #. openerp-web
@@ -574,16 +580,19 @@ msgid ""
 "                    departments into separate teams. Each team will work in\n"
 "                    its own list of opportunities."
 msgstr ""
+"Anvend salgsteams til at organisere dine sælgere eller\n"
+"                    afdelinger i separate teams. Hvert team vil arbejde\n"
+"                    i deres egen liste over salgsmuligheder."
 
 #. module: sales_team
 #: model:res.groups,name:sales_team.group_sale_salesman_all_leads
 msgid "User: All Documents"
-msgstr ""
+msgstr "Bruger: Alle dokumenter"
 
 #. module: sales_team
 #: model:res.groups,name:sales_team.group_sale_salesman
 msgid "User: Own Documents Only"
-msgstr ""
+msgstr "Bruger: Kun egne dokumenter"
 
 #. module: sales_team
 #: model:ir.model,name:sales_team.model_res_users
@@ -600,7 +609,7 @@ msgstr "Website salg"
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:127
 #, python-format
 msgid "Won in Opportunities"
-msgstr ""
+msgstr "Salgsmuligheder vundet"
 
 #. module: sales_team
 #. openerp-web
@@ -614,7 +623,7 @@ msgstr "Forkert værdi indtastet"
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:89
 #, python-format
 msgid "exp. closing"
-msgstr ""
+msgstr "forv. lukning"
 
 #. module: sales_team
 #: model:ir.model,name:sales_team.model_ir_ui_view
@@ -626,12 +635,12 @@ msgstr "ir.ui.view"
 #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:79
 #, python-format
 msgid "overdue"
-msgstr ""
+msgstr "forfalden"
 
 #. module: sales_team
 #: model:ir.model,name:sales_team.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr "Salgskonfigurations opsætninger"
+msgstr "sale.config.settings"
 
 #. module: sales_team
 #: model:res.groups,comment:sales_team.group_sale_salesman_all_leads
@@ -639,13 +648,12 @@ msgid ""
 "the user will have access to all records of everyone in the sales "
 "application."
 msgstr ""
-"Brugeren vil have adgang til alle registreringer af alle i salgs "
-"ansøgningen."
+"Brugeren vil have adgang til alle registreringer om alle i salgsmodulet."
 
 #. module: sales_team
 #: model:res.groups,comment:sales_team.group_sale_salesman
 msgid "the user will have access to his own data in the sales application."
-msgstr "Brugeren vil have adgang til sine egne data i salgs ansøgningen."
+msgstr "Brugeren vil have adgang til sine egne data i salgsmodulet."
 
 #. module: sales_team
 #: model:res.groups,comment:sales_team.group_sale_manager
@@ -653,5 +661,4 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic"
 " reports."
 msgstr ""
-"Brugeren vil have  en adgang til salgs konfiguration samt statistiske "
-"rapporter."
+"Brugeren vil have adgang til salgsopsætningen samt statistiske rapporter."
diff --git a/addons/sales_team/i18n/es.po b/addons/sales_team/i18n/es.po
index 0fa12a149e8..3f8c444f1b4 100644
--- a/addons/sales_team/i18n/es.po
+++ b/addons/sales_team/i18n/es.po
@@ -12,6 +12,7 @@
 # Sergio Hevia <sah@talleresbernesga.com>, 2016
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
 # RGB Consulting <odoo@rgbconsulting.com>, 2016
+# Gustavo Valverde <g.valverde02@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # David Perez <david@closemarketing.es>, 2016
@@ -592,7 +593,7 @@ msgid ""
 "                    departments into separate teams. Each team will work in\n"
 "                    its own list of opportunities."
 msgstr ""
-"Use equipos de ventas para organizar a sus comerciales o\n"
+"Use equipos de ventas para organizar a sus vendedores o\n"
 "departamentos en distintos equipos. Cada equipo trabajará\n"
 "en su propia lista de oportunidades."
 
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
index e2e9ba74540..a2b9db302a7 100644
--- a/addons/stock/i18n/da.po
+++ b/addons/stock/i18n/da.po
@@ -36,6 +36,9 @@ msgid ""
 "Creates the dropship route and add more complex tests\n"
 "-This installs the module stock_dropshipping."
 msgstr ""
+"\n"
+"Opretter dropship rute og tilføjer flere komplekse tests\n"
+"-Installerer modulet stock_dropshipping."
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:217
@@ -61,6 +64,13 @@ msgid ""
 " * Transferred: has been processed, can't be modified or cancelled anymore\n"
 " * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+" * Kladde: endnu ikke bekræftet og vil derfor ikke blive planlagt\n"
+" * Venter på en anden handling: venter på en anden handling før den fortsætter og bliver automatisk tilgængelig (fx i et Make-To-Order flow)\n"
+" * Afventer tilgængelighed: venter stadig på at kommem på lager\n"
+" * Delvis tilgængelig: nogle produkter er tilgængelige og reserverede\n"
+" * Klar til levering: reserverede produkter der afventer bekræftelse\n"
+" * Leveret: er behandlet og ikke længere ændres eller annulleres\n"
+" * Annulleret: er annulleret og kan ikke længere bekræftes"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
@@ -88,6 +98,11 @@ msgid ""
 "* Available: When products are reserved, it is set to 'Available'.\n"
 "* Done: When the shipment is processed, the state is 'Done'."
 msgstr ""
+"* Ny: Når lagerflytningen er oprettet men endnu ikke bekræftet.\n"
+"* Afventer en anden handling: Denne status ses når en flytning afventer en anden, fx i en flow kæde.\n"
+"* Afventer tilgængelighed: Denne status opstår når løsningen på et indkøb ikke er ligetil. Fx behøves at planlægningen køres eller en komponent der skal produceres...\n"
+"* Tilgængelig: Når produkter er reserverede, sættes de til status 'Tilgængelig'.\n"
+"* Udført: Når leveringen er gennemført sættes status til 'Udført'."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_usage
@@ -284,6 +299,9 @@ msgid ""
 "                                        <strong>From the Inventory application</strong>\n"
 "                                    </span>"
 msgstr ""
+"<span class=\"panel-title\">\n"
+"                                        <strong>Fra lagermodulet</strong>\n"
+"                                    </span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -292,6 +310,9 @@ msgid ""
 "                                        <strong>From the Purchase application</strong>\n"
 "                                    </span>"
 msgstr ""
+"<span class=\"panel-title\">\n"
+"                                        <strong>Fra indkøbsmodulet</strong>\n"
+"                                    </span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -300,6 +321,9 @@ msgid ""
 "                                        <strong>From the Sales application</strong>\n"
 "                                    </span>"
 msgstr ""
+"<span class=\"panel-title\">\n"
+"                                        <strong>Fra salgsmodulet</strong>\n"
+"                                    </span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
@@ -343,23 +367,25 @@ msgid ""
 "<span>You need to install the Accounting or Purchases app to manage "
 "vendors.</span>"
 msgstr ""
+"<span>Du skal installere Finans eller Indkøbs modulet for at håndtere "
+"leverandører.</span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid ""
 "<span>You need to install the Purchases Management app for this flow.</span>"
-msgstr ""
+msgstr "<span>Du skal installere Indkøbsmodulet for dette flow.</span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid ""
 "<span>You need to install the Sales Management app for this flow.</span>"
-msgstr ""
+msgstr "<span>Du skal installere Salgsmodulet for dette flow.</span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>Activate <i>Track lots or serial numbers</i></strong> in your"
-msgstr ""
+msgstr "<strong>Aktiver <i>Spor lot eller serienumre</i></strong> i din"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -367,11 +393,13 @@ msgid ""
 "<strong>Automated flows</strong>: from sale to delivery, and purchase to "
 "reception"
 msgstr ""
+"<strong>Automatiske flows</strong>: fra salg til levering, og indkøb til "
+"modtagelse"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>Automated replenishment rules</strong>"
-msgstr ""
+msgstr "<strong>Automatiske genbestillingsregler</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -381,11 +409,15 @@ msgid ""
 "quantity does not include items already allocated to other orders or items "
 "that are in transit from a supplier"
 msgstr ""
+"<strong>Tilgængelige produkter</strong> er aktuelt tilgængelige til nye "
+"ordrer til fx produktion eller salg. Antallet inkluderer ikke emner, der "
+"allerede er allokerede til ordrer eller emner der er undervejs fra "
+"leverandører."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Barcode</strong>"
-msgstr ""
+msgstr "<strong>Stregkode</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -393,11 +425,12 @@ msgid ""
 "<strong>Buy:</strong> the product is bought from a vendor through a Purchase"
 " Order"
 msgstr ""
+"<strong>Køb:</strong> produktet købes fra en leverandør via en indkøbsordre"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Commitment Date</strong>"
-msgstr ""
+msgstr "<strong>Forpligtende dato</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -405,47 +438,49 @@ msgid ""
 "<strong>Consumable products</strong> are always assumed to be in sufficient "
 "quantity in your stock, therefore their available quantities are not tracked"
 msgstr ""
+"<strong>Forbrugsvarer</strong> antages altid for at være på lager i "
+"tilstrækkelig mængde, hvorfor lagerbeholdningen ikke bliver registreret"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "<strong>Date</strong>"
-msgstr ""
+msgstr "<strong>Dato</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
 msgid "<strong>Delivered Quantity</strong>"
-msgstr ""
+msgstr "<strong>Leveret mængde</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Destination</strong>"
-msgstr ""
+msgstr "<strong>Destination</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>Enjoy your Inventory management with Odoo!</strong>"
-msgstr ""
+msgstr "<strong>Nyd lagerstyring med Odoo!</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>Import data</strong>"
-msgstr ""
+msgstr "<strong>Importer data</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "<strong>Inventory</strong>"
-msgstr ""
+msgstr "<strong>Lager</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "<strong>Location</strong>"
-msgstr ""
+msgstr "<strong>Lokation</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Lot/Serial Number</strong>"
-msgstr ""
+msgstr "<strong>Lot/Serie Nummer</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -455,6 +490,10 @@ msgid ""
 "in the medium term because you restock with the exact amount that was "
 "ordered"
 msgstr ""
+"<strong>Make to Order:</strong> Produktet erhverves kun når den "
+"efterspørges, hver gang en salgsordre bliver bekræftet. Dette ændrer ikke i "
+"lagerbeholdningen på kort sigt, fordi du øger lageret med det samme kvantum "
+"som der var bestilt. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -464,6 +503,10 @@ msgid ""
 "Purchase Order is generated according the minimum stock rules in order to "
 "get the products required"
 msgstr ""
+"<strong>Make to Stock:</strong> Dine kunder får leveret fra den "
+"lagerbeholdning der er til rådighed. Hvis der ikke er nok på lager ift. "
+"salgsordren, vil der blive dannet en indkøbsordre iht. reglerne for "
+"minimumslager på produktet, så ordren kan leveres. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -471,6 +514,8 @@ msgid ""
 "<strong>Manufacture:</strong> the product is manufactured internally or the "
 "service is supplied from internal resources"
 msgstr ""
+"<strong>Producer:</strong> Produktet produceres internt eller serviceydelsen"
+" leveres af interne ressourcer."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -478,6 +523,8 @@ msgid ""
 "<strong>No address defined on the supplier partner:</strong> you have to "
 "complete an address for the default supplier for the product concerned."
 msgstr ""
+"<strong>Adresse ikke defineret for leverandøren:</strong> du skal oprette en"
+" adresse for standardleverandøren for det dette produkt."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -485,6 +532,8 @@ msgid ""
 "<strong>No bill of materials defined for production:</strong> you need to "
 "create a BoM or indicate that the product can be purchased instead."
 msgstr ""
+"<strong>Ingen stykliste til rådighed for produktion:</strong> du skal "
+"oprette en stykliste eller angive at produktet kan indkøbes i stedet."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -492,6 +541,8 @@ msgid ""
 "<strong>No quantity available in stock:</strong> you have to create a "
 "reordering rule and put it in the order, or manually procure it."
 msgstr ""
+"<strong>Intet til rådighed på lageret:</strong> du skal oprette en "
+"genbestillingsregel eller indkøbe det manuelt."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -499,6 +550,8 @@ msgid ""
 "<strong>No supplier available for a purchase:</strong> you have to define a "
 "supplier in the Procurements tab of the product form."
 msgstr ""
+"<strong>Ingen leverandør til rådighed for indkøb:</strong> du skal oprette "
+"en leverandør i indkøbsfanen under produktet."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -507,22 +560,25 @@ msgid ""
 "location at the current time. This includes items that are already allocated"
 " to fulfilling production needs or sales orders"
 msgstr ""
+"<strong>Produkter på lager</strong> er fysisk tilstede på lageret på "
+"nuværende tidspunkt. Dette inkluderer produkter, der allerede er allokeret "
+"til enten produktions- eller salgsordrer. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Order (Origin)</strong>"
-msgstr ""
+msgstr "<strong>Ordre (Oprindelse)</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
 msgid "<strong>Ordered Quantity</strong>"
-msgstr ""
+msgstr "<strong>Bestilt kvantum</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "<strong>Package</strong>"
-msgstr ""
+msgstr "<strong>Forpakning</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
@@ -534,7 +590,7 @@ msgstr "<strong>Produkt</strong>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "<strong>Production Lot</strong>"
-msgstr ""
+msgstr "<strong>Produktions Lot</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
@@ -545,7 +601,7 @@ msgstr "<strong>Antal</strong>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Scheduled Date</strong>"
-msgstr ""
+msgstr "<strong>Planlagt dato</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -553,16 +609,18 @@ msgid ""
 "<strong>Service products</strong> are non-material products provided by a "
 "company or an individual"
 msgstr ""
+"<strong>Ydelser</strong> er immaterielle produkter leveret af en virksomhed "
+"eller persoon"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>Source</strong>"
-msgstr ""
+msgstr "<strong>Kilde</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<strong>State</strong>"
-msgstr ""
+msgstr "<strong>Status</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -570,16 +628,18 @@ msgid ""
 "<strong>Stockable products</strong> are subject to the full inventory "
 "management system: minimum stock rules, automatic procurement, etc."
 msgstr ""
+"<strong>Lagerførte produkter</strong> er underlagt alle "
+"lagerstyringssystemer: regler for minimumslager, automatisk indkøb, etc."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "<strong>Total Quantity</strong>"
-msgstr ""
+msgstr "<strong>Kvantum i alt</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "<strong>Warehouse Locations</strong>"
-msgstr ""
+msgstr "<strong>Lagerlokationer</strong>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -588,6 +648,10 @@ msgid ""
 "delivery</strong>, assign a lot number or different lot numbers or serial "
 "numbers to a product by clicking on the <span class=\"fa fa-list\"/> icon"
 msgstr ""
+"<strong>Når du håndterer en indgående levering, en intern overførsel eller "
+"en levering</strong>, tildel et lot nummer, forskellige lot numre eller "
+"serienumre til et produkt ved at klikke på <span class=\"fa fa-list\"/> "
+"ikonet"
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:102
@@ -598,12 +662,12 @@ msgstr "En pakke"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "A classic purchase flow looks like the following:"
-msgstr ""
+msgstr "Et klassisk indkøbsflow ser således ud:"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "A classic sales flow looks like the following:"
-msgstr ""
+msgstr "Et klassisk salgsflow ser således ud:"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -612,21 +676,24 @@ msgid ""
 "                        you may find yourself out of stock) and not too high (your products occupy\n"
 "                        space and may lose value)."
 msgstr ""
+"En optimal lagerstyrings mål er at optimere lagerbeholdningen: ikke for lille (du\n"
+"                        kan løbe tør for varer) og ikke for stor (dine produkter optager\n"
+"                        plads og kan miste værdi)."
 
 #. module: stock
 #: model:res.groups,name:stock.group_warning_stock
 msgid "A warning can be set on a partner (Stock)"
-msgstr ""
+msgstr "En advarsel kan sættes på en partner (Lager)"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "API Documentation"
-msgstr ""
+msgstr "API Dokumentation"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Accurate visibility on all your operations"
-msgstr ""
+msgstr "Nøjagtig synlighed på alle dine operationer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_active
@@ -644,12 +711,14 @@ msgstr "Aktiv"
 #: selection:stock.config.settings,module_stock_calendar:0
 msgid "Adapt lead times using the suppliers' open days calendars (advanced)"
 msgstr ""
+"Tilpas lead time ved at benytte leverandørens åbningstidskalender "
+"(avanceret)"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid ""
 "Add an internal note that will be printed on the Picking Operations sheet"
-msgstr ""
+msgstr "Tilføj en intern note der vil blive printet på plukkesedlen"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -675,7 +744,7 @@ msgstr "Avanceret"
 #. module: stock
 #: selection:stock.config.settings,group_stock_adv_location:0
 msgid "Advanced routing of products using rules"
-msgstr ""
+msgstr "Avancerede ruter på produkter ved brug af regler"
 
 #. module: stock
 #: selection:stock.move,procure_method:0
@@ -690,7 +759,7 @@ msgstr "Alle"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_children_quant_ids
 msgid "All Bulk Content"
-msgstr ""
+msgstr "Alt bulk indhold"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_type_list
@@ -701,7 +770,7 @@ msgstr "Alle operationer"
 #: model:ir.actions.act_window,name:stock.stock_picking_action_picking_type
 #: model:ir.ui.menu,name:stock.all_picking
 msgid "All Transfers"
-msgstr ""
+msgstr "Alle overførsler"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -714,6 +783,8 @@ msgid ""
 "All items couldn't be shipped, the remaining ones will be shipped as soon as"
 " they become available."
 msgstr ""
+"Ikke alle varer kunne leveres. De resterende vil blive leveret så snart de "
+"er til rådighed. "
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:90
@@ -724,7 +795,7 @@ msgstr "Alle varer"
 #. module: stock
 #: selection:stock.config.settings,group_stock_tracking_owner:0
 msgid "All products in your warehouse belong to your company"
-msgstr ""
+msgstr "Alle produkter på dit lager tilhører din virksomhed"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_returned_move_ids
@@ -740,18 +811,18 @@ msgstr "Alle bevægelser for denne genanskaffelse er annullereret."
 #. module: stock
 #: selection:stock.config.settings,group_warning_stock:0
 msgid "All the partners can be used in pickings"
-msgstr ""
+msgstr "Alle partnere kan anvendes ved plukning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_entire_packs
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_show_entire_packs
 msgid "Allow moving packs"
-msgstr ""
+msgstr "Tillad flytning af forpakninger"
 
 #. module: stock
 #: selection:stock.config.settings,module_stock_dropshipping:0
 msgid "Allow suppliers to deliver directly to your customers"
-msgstr ""
+msgstr "Tillad leverandører at levere direkte til dine kunder"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_module_procurement_jit
@@ -760,6 +831,9 @@ msgid ""
 "        products when confirming a sale order.\n"
 "            This installs the module procurement_jit."
 msgstr ""
+"Tillader dig automatisk at reservere tilgængelige\n"
+"        produkter når salgsordren bekræftes.\n"
+"            Dette installere modulet procurement_jit."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_packaging
@@ -784,7 +858,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_ancestor_ids
 msgid "Ancestors"
-msgstr ""
+msgstr "Forfædre"
 
 #. module: stock
 #: model:stock.inventory.line,product_name:stock.stock_inventory_line_2
@@ -819,7 +893,7 @@ msgstr "Gældende for lager"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit
 msgid "Applied On"
-msgstr ""
+msgstr "Anvendt på"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_stock_config_settings
@@ -879,7 +953,7 @@ msgstr "Automatisk flytning"
 #. module: stock
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automatisk No Step er tilføjet"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_procurement
@@ -910,13 +984,13 @@ msgstr "Restordre på"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 msgid "Back Orders"
-msgstr ""
+msgstr "Restordrer"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_backorder_confirmation.py:31
 #, python-format
 msgid "Back order <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "Restordre <em>%s</em> <b>annulleret</b>."
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:974
@@ -927,12 +1001,12 @@ msgstr "Restordre <em>%s</em> <b>oprettet</b>."
 #. module: stock
 #: model:ir.model,name:stock.model_stock_backorder_confirmation
 msgid "Backorder Confirmation"
-msgstr ""
+msgstr "Restordre bekræftelse"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 msgid "Backorder creation"
-msgstr ""
+msgstr "Restordre oprettelse"
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:66
@@ -959,29 +1033,29 @@ msgstr "Stregkode Interface"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_barcode_nomenclature_id
 msgid "Barcode Nomenclature"
-msgstr ""
+msgstr "Stregkode nomenklatur"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_wms_barcode_nomenclature_all
 msgid "Barcode Nomenclatures"
-msgstr ""
+msgstr "Stregkode numenklaturer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_barcode
 msgid "Barcode scanner support"
-msgstr ""
+msgstr "Support for stregkodescanner"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid ""
 "Before creating your products, here are a few concepts your should "
 "understand:"
-msgstr ""
+msgstr "Inden du opretter produkter, er her nogle få koncepter du bør forstå:"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Big Vendors"
-msgstr ""
+msgstr "Store leverandører"
 
 #. module: stock
 #: selection:res.partner,picking_warn:0
@@ -1007,12 +1081,12 @@ msgstr "Bulk indhold"
 #. module: stock
 #: selection:product.template,tracking:0
 msgid "By Lots"
-msgstr ""
+msgstr "Per lot"
 
 #. module: stock
 #: selection:product.template,tracking:0
 msgid "By Unique Serial Number"
-msgstr ""
+msgstr "Per unik serienummer"
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:397
@@ -1030,6 +1104,8 @@ msgid ""
 "By default, Odoo measures products by 'units', which are generic and "
 "represent just about anything"
 msgstr ""
+"Som standard måler Odoo produkter per 'stk', som er generisk og kan "
+"repræsentere næsten alt"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_procure_method
@@ -1040,6 +1116,12 @@ msgid ""
 "stock) to gather products. If we want to chain moves and have this one to "
 "wait for the previous,this second option should be chosen."
 msgstr ""
+"Som standard vil systemet tage fra lageret angivet i kildelokationen, og "
+"afvente varens tilgængelighed. Den anden mulighed tillader dig direkte at "
+"oprette et indkøb til kildelokationen (og dermed ignorere den aktuelle "
+"lagerbeholdning) for at samle indkøb. Hvis du ønsker at kæde lagerbevægelser"
+" sammen og have denne afvente den forrige, så skal du vælge denne anden "
+"mulighed."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_active
@@ -1123,7 +1205,7 @@ msgstr "Kan ikke afreservere en gennemført flytning"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 msgid "Carriers"
-msgstr ""
+msgstr "Transportører"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_route_from_categ_ids
@@ -1144,17 +1226,19 @@ msgstr "Ændre vare antal"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_quant_reserved_exist
 msgid "Check the existance of quants linked to this picking"
-msgstr ""
+msgstr "Kontroller om der findes et antal forbundet med denne plukning"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_pack_operation_exist
 msgid "Check the existence of pack operation on the picking"
-msgstr ""
+msgstr "Kontroller eksistensen pakkehandlinger på plukningen"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_return_location
 msgid "Check this box to allow using this location as a return location."
 msgstr ""
+"Check denne boks for at tillade lokationen at være en lokation for "
+"returvarer."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_scrap_location
@@ -1186,47 +1270,47 @@ msgstr "Tjekker om flytningen har reservationer på lager"
 #: model:ir.actions.act_window,help:stock.action_picking_tree_waiting
 #: model:ir.actions.act_window,help:stock.stock_picking_action_picking_type
 msgid "Click here to create a new transfer."
-msgstr ""
+msgstr "Klik her for at oprette en ny lagerflytning."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_deliver_move
 msgid "Click to add a delivery order for this product."
-msgstr ""
+msgstr "Klik for at tilføje en leveringsordre for dette produkt. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
 msgid "Click to add a location."
-msgstr ""
+msgstr "Klik for at tilføje en lokation."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
 msgid "Click to add a lot/serial number."
-msgstr ""
+msgstr "Klik for at tilføje et lot/serienummer."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_orderpoint_form
 msgid "Click to add a reordering rule."
-msgstr ""
+msgstr "Klik for at oprette en genbestillingsregel."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_routes_form
 msgid "Click to add a route."
-msgstr ""
+msgstr "Klik for at oprette en rute."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.stock_picking_type_action
 msgid "Click to create a new picking type."
-msgstr ""
+msgstr "Klik for at oprette en ny plukketype."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.stock_move_action
 msgid "Click to create a stock movement."
-msgstr ""
+msgstr "Klik for at oprette en ny lagerbevægelse."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
 msgid "Click to create a stock operation."
-msgstr ""
+msgstr "Klik for at oprette en lageroperation. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.product_template_action_product
@@ -1236,32 +1320,32 @@ msgstr "Klik for at oprette en nyt produkt."
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_type_list
 msgid "Click to define a new transfer."
-msgstr ""
+msgstr "Klik for at definere en ny overførsel. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid "Click to define a new warehouse."
-msgstr ""
+msgstr "Klik for at definere et nyt lager. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_receipt_picking_move
 msgid "Click to register a product receipt."
-msgstr ""
+msgstr "Klik for at registrere en produktmodtagelse. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_receive_move
 msgid "Click to register a receipt for this product."
-msgstr ""
+msgstr "Klik for at registrere en modtagelse for dette produkt. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_scrap
 msgid "Click to scrap products."
-msgstr ""
+msgstr "Klik for at skrotte produkter. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
 msgid "Click to start an inventory."
-msgstr ""
+msgstr "Klik for at starte en lageroptælling."
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_incoterms_code
@@ -1299,7 +1383,7 @@ msgstr "Virksomhed"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_date_done
 msgid "Completion Date of Transfer"
-msgstr ""
+msgstr "Færdiggørelsesdato for overførsel"
 
 #. module: stock
 #: model:ir.model,name:stock.model_procurement_orderpoint_compute
@@ -1340,7 +1424,7 @@ msgstr "Bekræftede flytninger"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Congratulations!"
-msgstr ""
+msgstr "Tillykke! "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
@@ -1375,47 +1459,49 @@ msgid ""
 "Could not reserve all requested products. Please use the 'Mark as Todo' "
 "button to handle the reservation manually."
 msgstr ""
+"Kunne ikke reservere alle anmodede produkter. Venligst brug \"Mærk som To-"
+"Do\" knappen for at håndtere reservationen manuelt. "
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking
 msgid "Count picking"
-msgstr ""
+msgstr "Tæl plukning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_backorders
 msgid "Count picking backorders"
-msgstr ""
+msgstr "Tæl plukkerestordrer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_draft
 msgid "Count picking draft"
-msgstr ""
+msgstr "Tæl plukkekladder"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_late
 msgid "Count picking late"
-msgstr ""
+msgstr "Tæl overskredne plukninger"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_ready
 msgid "Count picking ready"
-msgstr ""
+msgstr "Tæl plukninger der er klar"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_waiting
 msgid "Count picking waiting"
-msgstr ""
+msgstr "Tæl plukninger der venter"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 msgid "Create Backorder"
-msgstr ""
+msgstr "Opret restordre"
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:810
 #, python-format
 msgid "Create Backorder?"
-msgstr ""
+msgstr "Opret restordre?"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_scrap_tree_view
@@ -1425,7 +1511,7 @@ msgstr "Oprettelses dato"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_use_create_lots
 msgid "Create New Lots/Serial Numbers"
-msgstr ""
+msgstr "Opret nye lot/serienumre"
 
 #. module: stock
 #: selection:procurement.rule,procure_method:0
@@ -1440,12 +1526,12 @@ msgstr "Opret leverandører"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Create a Quotation"
-msgstr ""
+msgstr "Opret til tilbud"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Create a RFQ"
-msgstr ""
+msgstr "Opret en forespørgsel på tilbud"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
@@ -1454,11 +1540,14 @@ msgid ""
 "                        products later.  Do not create a backorder if you will not\n"
 "                        supply the remaining products."
 msgstr ""
+"Opret en restordre hvis du forventer at håndtere de resterende\n"
+"                        produkter senere. Opret ikke en restordre, hvis ikke du vil\n"
+"                        levere de resterende produkter."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Create an Inventory Adjustment"
-msgstr ""
+msgstr "Opret en lagerjustering"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -1541,7 +1630,7 @@ msgstr "Oprettet den"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit
 msgid "Creates"
-msgstr ""
+msgstr "Opretter"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
@@ -1575,7 +1664,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_report_stock_forecast_cumulative_quantity
 msgid "Cumulative Quantity"
-msgstr ""
+msgstr "Akkumuleret antal"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.location_open_quants
@@ -1676,7 +1765,7 @@ msgstr "DHL integration"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Daily Operations"
-msgstr ""
+msgstr "Daglige aktiviteter"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.stock_picking_type_menu
@@ -1731,12 +1820,12 @@ msgstr "Lagerdatoer og seneste flytnings datoer"
 #. module: stock
 #: selection:stock.warehouse.orderpoint,lead_type:0
 msgid "Day(s) to get the products"
-msgstr ""
+msgstr "Dag(e) til modtagelse af produkterne"
 
 #. module: stock
 #: selection:stock.warehouse.orderpoint,lead_type:0
 msgid "Day(s) to purchase"
-msgstr ""
+msgstr "Dag(e) til indkøb"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_1
@@ -1750,6 +1839,14 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Kære Kunde\n"
+"\n"
+"Vores registreringer viser, at nogle betalinger på din konto stadig er ubetalte. Find venligst detaljer nedenfor.\n"
+"Hvis beløbet allerede er betalt, bedes du se bort fra denne meddelelse. Ellers kan du sende os det samlede beløb angivet nedenfor.\n"
+"Hvis du har spørgsmål vedrørende din konto, bedes du kontakte os\n"
+"\n"
+"Tak på forhånd for dit samarbejde\n"
+"Med venlig hilsen,"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_decimal_precision
@@ -1806,7 +1903,7 @@ msgstr "Standard ruter gennem lageret"
 #. module: stock
 #: selection:stock.config.settings,module_product_expiry:0
 msgid "Define Expiration Date on serial numbers"
-msgstr ""
+msgstr "Definer udløbsdato for serienumre"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -1814,6 +1911,8 @@ msgid ""
 "Define routes within your warehouse according to business needs, such as "
 "Quality Control, After Sales Services or Supplier Returns"
 msgstr ""
+"Definer ruter på dit lager efter dine behov, som fx kvalitetskontrol, after-"
+"sale service eller returneringer til leverandører."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -1889,7 +1988,7 @@ msgstr "Leverings rute"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.action_report_delivery
 msgid "Delivery Slip"
-msgstr ""
+msgstr "Følgeseddel"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_move_type
@@ -1919,12 +2018,12 @@ msgstr "Beskrivelse"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
 msgid "Description for Pickings"
-msgstr ""
+msgstr "Beskrivelse til plukning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
 msgid "Description for Pickings (Rack, Row and Case Information)"
-msgstr ""
+msgstr "Beskrivelse til plukning (hylde, række, kasse information)"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_description_picking
@@ -1955,7 +2054,7 @@ msgstr "Destinations lokation"
 #: model:ir.model.fields,field_description:stock.field_stock_picking_location_dest_id
 #: model:ir.ui.view,arch_db:stock.view_stock_quant_form
 msgid "Destination Location Zone"
-msgstr ""
+msgstr "Lokationszone for destination"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_order_move_dest_id
@@ -2049,22 +2148,24 @@ msgid ""
 "Do not hesitate to send us an email to describe your experience or to "
 "suggest improvements!"
 msgstr ""
+"Tøv ikke med at sende os en mail for at beskrive din erfaring eller foreslå "
+"forbedringer!"
 
 #. module: stock
 #: selection:stock.config.settings,group_stock_packaging:0
 #: selection:stock.config.settings,group_stock_tracking_lot:0
 msgid "Do not manage packaging"
-msgstr ""
+msgstr "Håntér ikke forpakning"
 
 #. module: stock
 #: selection:stock.config.settings,group_stock_production_lot:0
 msgid "Do not track individual product items"
-msgstr ""
+msgstr "Spor ikke individuelle produkt enheder"
 
 #. module: stock
 #: selection:stock.config.settings,module_product_expiry:0
 msgid "Do not use Expiration Date on serial numbers"
-msgstr ""
+msgstr "Anvend ikke udløbsdato på serienumre"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_is_done
@@ -2118,7 +2219,7 @@ msgstr "EX WORKS"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Edit its details or add new ones"
-msgstr ""
+msgstr "Rediger dets information eller tilføj ny"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -2166,7 +2267,7 @@ msgstr "Forventet dato"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_product_expiry
 msgid "Expiration Dates"
-msgstr ""
+msgstr "Udløbsdato"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_location_form
@@ -2277,7 +2378,7 @@ msgstr "Fra"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_complete_name
 msgid "Full Location Name"
-msgstr ""
+msgstr "Fuldt lokationsnavn"
 
 #. module: stock
 #: code:addons/stock/models/product.py:346
@@ -2289,7 +2390,7 @@ msgstr "Fremtidige leveringer"
 #: code:addons/stock/models/product.py:351
 #, python-format
 msgid "Future P&L"
-msgstr ""
+msgstr "Fremtidig P&L"
 
 #. module: stock
 #: code:addons/stock/models/product.py:361
@@ -2322,7 +2423,7 @@ msgstr "Gate B"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Vendors"
-msgstr ""
+msgstr "Generiske IT leverandører"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_fixed_putaway_strat_sequence
@@ -2330,6 +2431,8 @@ msgid ""
 "Give to the more specialized category, a higher priority to have them in top"
 " of the list."
 msgstr ""
+"Giv den mere specialiserede kategori en højere prioritet for at få dem "
+"øverst på listen."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_filter
@@ -2339,12 +2442,12 @@ msgstr "Globalt"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_procurement_rules
 msgid "Global Procurement Rules"
-msgstr ""
+msgstr "Globale indkøbsregler"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_location_path
 msgid "Global Push Rules"
-msgstr ""
+msgstr "Globale Push regler"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_default_resupply_wh_id
@@ -2391,17 +2494,17 @@ msgstr "HDD SH-1"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_exist
 msgid "Has Pack Operations"
-msgstr ""
+msgstr "Har pakkehandlinger"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_has_scrap_move
 msgid "Has Scrap Moves"
-msgstr ""
+msgstr "Har skrot posteringer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_quant_reserved_exist
 msgid "Has quants already reserved"
-msgstr ""
+msgstr "Har allerede reserverede antal"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_posz
@@ -2414,11 +2517,13 @@ msgid ""
 "Help rental management, by generating automated return moves for rented "
 "products"
 msgstr ""
+"Hjælper håndtering af udlejning, ved at generere automatiske returordrer for"
+" udlejede produkter"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Here are some usual problems and their solutions:"
-msgstr ""
+msgstr "Her er nogle sædvanlige problemer og deres løsninger:"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_receipt_picking_move
@@ -2438,6 +2543,9 @@ msgid ""
 "                this product, as well as all the products you must deliver to\n"
 "                customers."
 msgstr ""
+"Her finder du historikken over alle tidligere leverancer relateret til \n"
+" dette produkt samt alle de produkter, du skal levere til \n"
+" kunder."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_receive_move
@@ -2446,6 +2554,9 @@ msgid ""
 "                this product, as well as all future receipts you are waiting\n"
 "                from your suppliers."
 msgstr ""
+"Her finder du historikken over alle indtægter relateret til \n"
+" dette produkt samt alle fremtidige indtægter du venter \n"
+"fra dine leverandører."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_stock_quant_form
@@ -2455,7 +2566,7 @@ msgstr "Historik"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "How to use Lot Tracking:"
-msgstr ""
+msgstr "Hvordan du anvender tracking på Lot"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_make_procurement_id
@@ -2507,7 +2618,7 @@ msgstr "F: %s"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Vendors"
-msgstr ""
+msgstr "IT leverandører"
 
 #. module: stock
 #: model:product.product,name:stock.product_icecream
@@ -2549,6 +2660,8 @@ msgid ""
 "If checked, this shows the packs to be moved as a whole in the Operations "
 "tab all the time, even if there was no entire pack reserved."
 msgstr ""
+"Hvis afkrydset, viser dette at pakkerne altid skal flyttes samlet i "
+"handlingsfanen, selv hvis der ikke var reserveret en hel pakke. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_path_propagate
@@ -2556,6 +2669,8 @@ msgid ""
 "If checked, when the previous move is cancelled or split, the move generated"
 " by this move will too"
 msgstr ""
+"Hvis afkrydset, vil der, hvis den forrige flytning er annulleret eller "
+"splittet, vil flytningen genereret af denne flytning også blive det. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_rule_propagate
@@ -2564,11 +2679,16 @@ msgid ""
 "next procurement) is cancelled or split, the move generated by this move "
 "will too"
 msgstr ""
+"Hvis afkrydset, vil der, når den forrige flytning (flytning genereret af et "
+"næste indkøb) bliver annulleret eller splittet, så vil flytningen genereret "
+"af denne flytning også bliver det. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_propagate
 msgid "If checked, when this move is cancelled, cancel the linked move too"
 msgstr ""
+"Hvis afkrydset, når denne flytning annulleres, skal den forbundne flytning "
+"også. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_rule_route_id
@@ -2578,7 +2698,7 @@ msgstr "Hvis rute_id er falsk, så er reglen global"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_pack_operation_result_package_id
 msgid "If set, the operations are packed into this package"
-msgstr ""
+msgstr "Hvis sat, handlingerne pakkes i denne pakke"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_active
@@ -2586,6 +2706,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Hvis det aktive felt er sat til 'False', vil det tillade dig at skjule "
+"ordretidspunktet uden at fjerne det. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_route_active
@@ -2593,6 +2715,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the route "
 "without removing it."
 msgstr ""
+"Hvis det aktive felt er sat til 'False', vil det tillade dig at skjule ruten"
+" uden at fjerne det. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_filter
@@ -2605,6 +2729,8 @@ msgid ""
 "If this is a negative quant, this will be the move that caused this negative"
 " quant."
 msgstr ""
+"Hvis dette er et negativt antal, dette vil være flytningen der forårsager "
+"dette negative antal. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_type_use_create_lots
@@ -2612,6 +2738,8 @@ msgid ""
 "If this is checked only, it will suppose you want to create new Lots/Serial "
 "Numbers, so you can provide them in a text field. "
 msgstr ""
+"Hvis kun denne er valgt, vil der gås ud fra, at du vil oprette et "
+"log/serienummer, og du kan angive dem i et tekstfelt."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_type_use_existing_lots
@@ -2620,6 +2748,10 @@ msgid ""
 "can also decide to not put lots in this picking type.  This means it will "
 "create stock with no lot or not put a restriction on the lot taken. "
 msgstr ""
+"Hvis denne er valgt, vil du kunne vælge lot/serienummer. Du kan også "
+"beslutte ikke at anvende lots i denne plukketype. Det betyder, at der vil "
+"oprettes lagerbeholdning uden lot eller uden restriktioner på det brugte "
+"lot. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_backorder_id
@@ -2628,6 +2760,8 @@ msgid ""
 "If this shipment was split, then this field links to the shipment which "
 "contains the already processed part."
 msgstr ""
+"Hvis denne levering var splittet, vil dette felt linke til den levering der "
+"allerede er gennemført. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -2636,6 +2770,9 @@ msgid ""
 "                        API</strong> to load data automatically through\n"
 "                        scripts: take a look at our"
 msgstr ""
+"Hvis du er en udvikler <strong>kan du bruge vores\n"
+"                        API</strong> for at loade data automatisk gennem\n"
+"                        scripts: tag et kig på vores"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -2662,6 +2799,8 @@ msgid ""
 "If you have less than 50 vendors, we recommend you\n"
 "                                        to create them manually."
 msgstr ""
+"Har du mindre end 50 leverandører anbefaler vi dig \n"
+"  at oprette dem manuelt."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -2671,18 +2810,18 @@ msgstr "Hvis du selv vil gøre det:"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_immediate_transfer
 msgid "Immediate Transfer"
-msgstr ""
+msgstr "Omgående overførsel"
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:792
 #, python-format
 msgid "Immediate Transfer?"
-msgstr ""
+msgstr "Omgående overførsel?"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_immediate_transfer
 msgid "Immediate transfer?"
-msgstr ""
+msgstr "Omgående overførsel?"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -2696,6 +2835,9 @@ msgid ""
 "                        Odoo will automatically propose a procurement to buy new products if you are\n"
 "                        running out of stock."
 msgstr ""
+"I Odoo, anvendes <strong>genbestillingsregler</strong> til at genopfylde din produkter.\n"
+"                        Odoo vil automatisk foreslå et indkøb hvis din lagerbeholdning\n"
+"                        er ved at være lav."
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -2722,6 +2864,9 @@ msgid ""
 "                        to exactly one piece.  In case of lots, you need to supply the quantity\n"
 "                        for each lot when you move that product."
 msgstr ""
+"I tilfælde af unikke serienumre svarer hvert serienummer til \n"
+" præcis et stykke. I tilfælde af lots skal du levere mængden \n"
+" for hvert lot, når du flytter det pågældende produkt."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -2729,11 +2874,13 @@ msgid ""
 "In short, you will get a more efficient warehouse management that leads\n"
 "                        to inventory reduction and better efficiencies in your daily operations."
 msgstr ""
+"Kort fortalt, så vil du opnå en mere effektiv lagerstyring som fører til\n"
+"                        en reduktion i din lagerbeholdning og mere effektive daglige rutiner."
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_exhausted
 msgid "Include Exhausted Products"
-msgstr ""
+msgstr "Inkludér udgåede produkter"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_incoming_qty
@@ -2785,12 +2932,12 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Initial Demand"
-msgstr ""
+msgstr "Primo efterspørgsel"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Initial Inventory"
-msgstr ""
+msgstr "Primo lager"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:93
@@ -2810,11 +2957,13 @@ msgid ""
 "Install the picking wave module which will help you grouping your pickings "
 "and processing them in batch"
 msgstr ""
+"Installer plukkemodulet som vil hjælpe dig med at gruppere din plukninger og"
+" håndtere dem i batches. "
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_inter_wh
 msgid "Inter Company Transit"
-msgstr ""
+msgstr "Inter Company forsendelse"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_location_search
@@ -2866,6 +3015,8 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's "
 "lot/serial number"
 msgstr ""
+"Internt referencenummer såfremt det er anderledes end producentens "
+"lot/serienummer"
 
 #. module: stock
 #: code:addons/stock/models/product.py:257
@@ -2877,7 +3028,7 @@ msgstr ""
 #: code:addons/stock/models/product.py:259
 #, python-format
 msgid "Invalid domain operator %s"
-msgstr ""
+msgstr "Ugyldig domæne operatør%s"
 
 #. module: stock
 #: code:addons/stock/models/product.py:261
@@ -2888,7 +3039,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_category_id
 msgid "Inventoried Category"
-msgstr ""
+msgstr "Lagerførte kategorier"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_location_id
@@ -2903,12 +3054,12 @@ msgstr "Lagerførte Lot/serienumre"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_partner_id
 msgid "Inventoried Owner"
-msgstr ""
+msgstr "Lagerført ejer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_package_id
 msgid "Inventoried Pack"
-msgstr ""
+msgstr "Lagerført pakke"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_product_id
@@ -2952,7 +3103,7 @@ msgstr "Lagerjusteringer"
 #. module: stock
 #: model:web.planner,tooltip_planner:stock.planner_inventory
 msgid "Inventory Configuration: a step-by-step guide."
-msgstr ""
+msgstr "Konfiguration af Lager: en step-by-step guide."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -2988,12 +3139,12 @@ msgstr "Lager lokationer"
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Inventory Loss"
-msgstr ""
+msgstr "Lagernedskrivning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
 msgid "Inventory Move"
-msgstr ""
+msgstr "Lagerbevægelse"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_name
@@ -3009,7 +3160,7 @@ msgstr "Lager ruter"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Inventory Settings"
-msgstr ""
+msgstr "Lageropsætning"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.quantsact
@@ -3029,7 +3180,7 @@ msgstr "Lager værdi"
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory adjustment"
-msgstr ""
+msgstr "Lagerjustering"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
@@ -3048,7 +3199,7 @@ msgstr "Lager af"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_return_location
 msgid "Is a Return Location?"
-msgstr ""
+msgstr "Er en retur lokation?"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_scrap_location
@@ -3073,18 +3224,18 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "It is time to make your initial Inventory. In order to do so:"
-msgstr ""
+msgstr "Det er tid at registrere din primo lagerbeholdning. For at gøre det: "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_product_packaging
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr ""
+msgstr "Specificerer egenskaber for forpakning som type, antal pakker, etc. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_move_type
 msgid "It specifies goods to be deliver partially or all at once"
-msgstr ""
+msgstr "Specificerer om varer skal leveres successivt eller alle på én gang"
 
 #. module: stock
 #: model:stock.inventory.line,product_name:stock.stock_inventory_line_13
@@ -3224,22 +3375,23 @@ msgstr "Sidste beholdninger og flytninger"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_launch_pack_operations
 msgid "Launch Pack Operations"
-msgstr ""
+msgstr "Kør pakkeoperationer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_lead_days
 msgid "Lead Time"
-msgstr ""
+msgstr "Leveringstid"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_lead_type
 msgid "Lead Type"
-msgstr ""
+msgstr "Lead type"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_route_company_id
 msgid "Leave this field empty if this route is shared between all companies"
 msgstr ""
+"Lad dette felt være tomt, hvis denne rute deles mellem alle virksomheder"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_parent_left
@@ -3282,7 +3434,7 @@ msgstr "Lokalisering"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_production_lot_form
 msgid "Locate"
-msgstr ""
+msgstr "Lokaliser"
 
 #. module: stock
 #: code:addons/stock/models/barcode.py:12
@@ -3329,7 +3481,7 @@ msgstr "Lokations gange"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_lot_stock_id
 msgid "Location Stock"
-msgstr ""
+msgstr "Lagerlokation"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_usage
@@ -3373,7 +3525,7 @@ msgstr "Lot stregkode"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Lot Split"
-msgstr ""
+msgstr "Lot split"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -3399,18 +3551,18 @@ msgstr "Lot/serienummer"
 #: code:addons/stock/models/stock_pack_operation.py:198
 #, python-format
 msgid "Lot/Serial Number Details"
-msgstr ""
+msgstr "Detaljer for Lot/Serienummer"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_tree
 msgid "Lot/Serial Number Inventory"
-msgstr ""
+msgstr "Lager for Lot/Serienummer"
 
 #. module: stock
 #: code:addons/stock/models/stock_pack_operation.py:268
 #, python-format
 msgid "Lot/Serial Number required"
-msgstr ""
+msgstr "Lot/Serienummer er obligatorisk"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_pack_operation_lot
@@ -3420,7 +3572,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_production_lot
 msgid "Lots and Serial Numbers"
-msgstr ""
+msgstr "Lot og Serienumre"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -3434,7 +3586,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lots_visible
 msgid "Lots visible"
-msgstr ""
+msgstr "Lots synlige"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -3443,23 +3595,23 @@ msgstr ""
 #: model:ir.ui.view,arch_db:stock.view_production_lot_form
 #: model:ir.ui.view,arch_db:stock.view_production_lot_tree
 msgid "Lots/Serial Numbers"
-msgstr ""
+msgstr "Lot/Serienumre"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_pack_lot_ids
 msgid "Lots/Serial Numbers Used"
-msgstr ""
+msgstr "Brugte Lot/Serienumre"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:504
 #, python-format
 msgid "MTO"
-msgstr ""
+msgstr "MTO"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_mto_pull_id
 msgid "MTO rule"
-msgstr ""
+msgstr "MTO regel"
 
 #. module: stock
 #: model:ir.model,name:stock.model_make_procurement
@@ -3503,7 +3655,7 @@ msgstr "Håndtér Push & Pull lager flow"
 #. module: stock
 #: selection:stock.config.settings,group_stock_packaging:0
 msgid "Manage available packaging options per products"
-msgstr ""
+msgstr "Håndtér tilgængelige forpakningsegenskaber per produkt"
 
 #. module: stock
 #: selection:stock.config.settings,group_stock_tracking_owner:0
@@ -3513,37 +3665,37 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Manage default locations per product"
-msgstr ""
+msgstr "Håndtér standard lokation per produkt"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_multi_locations
 msgid "Manage multiple stock_locations"
-msgstr ""
+msgstr "Håndtér flere lagerlokationer"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_multi_warehouses
 msgid "Manage multiple warehouses"
-msgstr ""
+msgstr "Håndtér flere lagre"
 
 #. module: stock
 #: selection:stock.config.settings,warehouse_and_location_usage_level:0
 msgid "Manage only 1 Warehouse with only 1 stock location"
-msgstr ""
+msgstr "Anvend 1 lager med 1 lokation"
 
 #. module: stock
 #: selection:stock.config.settings,warehouse_and_location_usage_level:0
 msgid "Manage only 1 Warehouse, composed by several stock locations"
-msgstr ""
+msgstr "Anvend 1 lager med flere lokationer"
 
 #. module: stock
 #: selection:stock.config.settings,module_stock_picking_wave:0
 msgid "Manage picking in batch per worker"
-msgstr ""
+msgstr "Anvend batchplukning per medarbejder"
 
 #. module: stock
 #: selection:stock.config.settings,module_stock_picking_wave:0
 msgid "Manage pickings one at a time"
-msgstr ""
+msgstr "Anvend plukning én ad gangen"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -3553,23 +3705,23 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 msgid "Manage quality control points, checks and measures"
-msgstr ""
+msgstr "Anvend kvalitetskontrol steder, checks og målinger"
 
 #. module: stock
 #: selection:stock.config.settings,warehouse_and_location_usage_level:0
 msgid ""
 "Manage several Warehouses, each one composed by several stock locations"
-msgstr ""
+msgstr "Anvend flere lagre der hvert har flere lokationer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_locations
 msgid "Manage several stock locations"
-msgstr ""
+msgstr "Anvend flere lagerlokationer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_warehouses
 msgid "Manage several warehouses"
-msgstr ""
+msgstr "Anvend flere lagre"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
@@ -3584,7 +3736,7 @@ msgstr "Manuel operation"
 #. module: stock
 #: selection:stock.picking.type,code:0
 msgid "Manufacturing Operation"
-msgstr ""
+msgstr "Produktionsaktivitet"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -3722,7 +3874,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_origin_returned_move_id
 msgid "Move that created the return move"
-msgstr ""
+msgstr "Bevægelse der skabte returposteringen"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_order_move_dest_id
@@ -3767,6 +3919,7 @@ msgid ""
 "Moves impacted by this operation for the computation of the remaining "
 "quantities"
 msgstr ""
+"Bevægelser påvirket af denne aktivitet for at beregne de resterende antal"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_quant_history_ids
@@ -3784,7 +3937,7 @@ msgstr "Navn"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.quant_search_view
 msgid "Negative"
-msgstr ""
+msgstr "Negativ"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_negative_dest_location_id
@@ -3812,17 +3965,17 @@ msgstr "Nyt antal på lager"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_form
 msgid "New Transfer"
-msgstr ""
+msgstr "Ny lagerflytning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_fresh_record
 msgid "Newly created pack operation"
-msgstr ""
+msgstr "Nyligt oprettede pakkehandlinger"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 msgid "No Backorder"
-msgstr ""
+msgstr "Ingen restordre"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
@@ -3842,18 +3995,18 @@ msgstr "Ingen lagerbevægelse endnu"
 #. module: stock
 #: selection:product.template,tracking:0
 msgid "No Tracking"
-msgstr ""
+msgstr "Ingen tracking"
 
 #. module: stock
 #: selection:stock.config.settings,group_stock_adv_location:0
 msgid "No automatic routing of products"
-msgstr ""
+msgstr "Ingen automatiske ruter på produkter"
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:823
 #, python-format
 msgid "No negative quantities allowed"
-msgstr ""
+msgstr "Negative antal er ikke tilladt"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:60
@@ -3884,7 +4037,7 @@ msgstr "Ikke Europæiske kunder"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_product_ids
 msgid "Non pack"
-msgstr ""
+msgstr "Ikke pakke"
 
 #. module: stock
 #: selection:stock.move,priority:0 selection:stock.picking,priority:0
@@ -3912,7 +4065,7 @@ msgstr "Intet at tjekke beholdning for"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Now, all your product quantities are correctly set."
-msgstr ""
+msgstr "Nu er alle dine produktmængder korrekt indstillet."
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_delay
@@ -3929,7 +4082,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_path_delay
 msgid "Number of days needed to transfer the goods"
-msgstr ""
+msgstr "Antal dage der behøves for at flytte varerne"
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:68
@@ -3947,7 +4100,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Odoo has preconfigured <strong>one Warehouse</strong> for you."
-msgstr ""
+msgstr "Odoo har allerede konfigureret <strong>ét lager</strong> for dig."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -3971,17 +4124,20 @@ msgid ""
 "convert units within the same category, for example, liters to gallons in "
 "the volume category"
 msgstr ""
+"Selvfølgelig er du velkommen til at tilføje din egen. Bemærk, at Odoo kan "
+"konvertere enheder inden for samme kategori, for eksempel liter til gallon i"
+" volumenkategorien"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
 #: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
 msgid "On Hand"
-msgstr ""
+msgstr "På lager"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "On Hand / Available Quantities"
-msgstr ""
+msgstr "På lager / antal til rådighed"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.product_template_kanban_stock_view
@@ -3995,6 +4151,9 @@ msgid ""
 "customer. It would be great if you could send us a photo of your warehouse "
 "to"
 msgstr ""
+"Når det virker fuldt ud, giv os en tilbagemelding: vi elsker at høre fra "
+"vores kunder. Det ville være fantastisk, hvis du kunne sende os et foto af "
+"dit lager også"
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:100
@@ -4012,7 +4171,7 @@ msgstr "Kun én ejer"
 #: code:addons/stock/models/stock_inventory.py:91
 #, python-format
 msgid "One product category"
-msgstr ""
+msgstr "En produktkategori"
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:98
@@ -4035,7 +4194,7 @@ msgstr "Handling"
 #: code:addons/stock/models/stock_pack_operation.py:215
 #, python-format
 msgid "Operation Details"
-msgstr ""
+msgstr "Detaljer for aktivitet"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_name
@@ -4048,12 +4207,12 @@ msgstr "Handlings navn"
 #: model:ir.ui.view,arch_db:stock.view_picking_type_tree
 #: model:ir.ui.view,arch_db:stock.view_warehouse
 msgid "Operation Types"
-msgstr ""
+msgstr "Aktivitetstyper"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_operation_id
 msgid "Operation id"
-msgstr ""
+msgstr "Operation id"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -4064,7 +4223,7 @@ msgstr "Operationer"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_pickingtype
 msgid "Operations Types"
-msgstr ""
+msgstr "Aktivitetstyper"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_linked_move_operation_ids
@@ -4085,22 +4244,22 @@ msgstr "Optionel adresse varerne skal leveres, specielt ved tildeling"
 #: model:ir.model.fields,help:stock.field_stock_location_posy
 #: model:ir.model.fields,help:stock.field_stock_location_posz
 msgid "Optional localization details, for information purpose only"
-msgstr ""
+msgstr "Valgfrie lokaliseringsoplysninger, kun til orienteringsformål"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_returned_move_ids
 msgid "Optional: all returned moves created from this move"
-msgstr ""
+msgstr "Valgfrit: all returnerede poster oprettet fra denne bevægelse"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_move_dest_id
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Valgfrit: næste lagerbevægelse når de sammenkædes"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_move_orig_ids
 msgid "Optional: previous stock move when chaining them"
-msgstr ""
+msgstr "Valgfrit: forrige lagerbevægelse når de sammenkædes"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -4110,7 +4269,7 @@ msgstr "Ordredato"
 #. module: stock
 #: model:stock.location,name:stock.location_order
 msgid "Order Processing"
-msgstr ""
+msgstr "Ordrebearbejdning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_ordered_qty
@@ -4132,7 +4291,7 @@ msgstr "Oprindelse"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_origin_returned_move_id
 msgid "Origin return move"
-msgstr ""
+msgstr "Returlevering til oprindelsen"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_move_orig_ids
@@ -4142,13 +4301,13 @@ msgstr "Oprindelig bevægelse"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_original_location_id
 msgid "Original location id"
-msgstr ""
+msgstr "Original location id"
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:222
 #, python-format
 msgid "Otherwise make sure the right stock/owner is set."
-msgstr ""
+msgstr "Ellers vær sikker på det korrekte lager/ejer er angivet. "
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_out_type_id
@@ -4222,12 +4381,12 @@ msgstr "Pakke"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.pack_details
 msgid "Pack Details"
-msgstr ""
+msgstr "Pakke detaljer"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_operation_link
 msgid "Pack Operation / Moves Link"
-msgstr ""
+msgstr "Pakkeoperationer / Posteringlink"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_pack_type_id
@@ -4270,22 +4429,22 @@ msgstr "Pakke reference"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Package To Move"
-msgstr ""
+msgstr "Pakke til flytning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_quant_package_form
 msgid "Package Transfers"
-msgstr ""
+msgstr "Pakke overførsler"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_packaging_id
 msgid "Package Type"
-msgstr ""
+msgstr "Pakke type"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_packagings
 msgid "Package Types"
-msgstr ""
+msgstr "Pakke typer"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_package_view
@@ -4305,6 +4464,11 @@ msgid ""
 " A package can also be unpacked, allowing the disposal of its former content"
 " as single units again."
 msgstr ""
+"Pakker er normalt lavet af pakkehandlinger foretaget ved overførsler, og kan"
+" indeholder flere forskellige produkter. Du kan så genbruge en pakke til at "
+"flytte hele indholdet andetsteds eller til at pakke det ind i en anden "
+"større pakke. En pakke kan også udpakkes, hvilket gør det muligt at bruge "
+"dets tidligere indhold som en enhed igen."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.quant_package_search_view
@@ -4314,7 +4478,7 @@ msgstr "Pakning"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging
 msgid "Packaging Methods"
-msgstr ""
+msgstr "Forpakningsmetoder"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_wh_pack_stock_loc_id
@@ -4336,7 +4500,7 @@ msgstr "Pakke Zone"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_type_form
 msgid "Packs and Lots"
-msgstr ""
+msgstr "Forpakning og Lots"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
@@ -4357,7 +4521,7 @@ msgstr "Hoved pakke"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_parent_location_id
 msgid "Parent location id"
-msgstr ""
+msgstr "Parent location id"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -4396,11 +4560,15 @@ msgid ""
 "            the general inventory or whenever you need it, to adapt the\n"
 "            current inventory level of a product."
 msgstr ""
+"Periodisk lager anvendes til at tælle antallet af produkter\n"
+"            tilgængelige per lokation. Du kan anvende det årligt når du laver\n"
+"            den regnskabsmæssige lageroptælling eller på ethvert tidspunkt\n"
+"            du har behov for tilpasse den aktuelle lagerbeholdning på et produkt."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Periodical Tasks"
-msgstr ""
+msgstr "Periodisk opgave"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_filter
@@ -4444,7 +4612,7 @@ msgstr "Pluk type"
 #: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_pick_id
 #: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer_pick_id
 msgid "Pick id"
-msgstr ""
+msgstr "Pick id"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_picking_id
@@ -4465,7 +4633,7 @@ msgstr "Plukke lister"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.action_report_picking
 msgid "Picking Operations"
-msgstr ""
+msgstr "Plukkeaktiviteter"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_picking_type_id
@@ -4498,7 +4666,7 @@ msgstr "Plukke type for returneringer"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_picking_wave
 msgid "Picking Waves"
-msgstr ""
+msgstr "Plukkecyklus"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.vpicktree
@@ -4547,12 +4715,14 @@ msgid ""
 "Please create some Initial Demand or Mark as Todo and create some "
 "Operations. "
 msgstr ""
+"Venligst opret startefterspørgsel eller marker som To-Do og opret nogle "
+"handlinger."
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:1008
 #, python-format
 msgid "Please process some quantities to put in the pack first!"
-msgstr ""
+msgstr "Behandl venligst nogle mængder der skal i pakken først!"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:139
@@ -4563,17 +4733,17 @@ msgstr "Angiv mindst et positivt antal"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_plus_visible
 msgid "Plus visible"
-msgstr ""
+msgstr "Plus synlige"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.quant_search_view
 msgid "Positive"
-msgstr ""
+msgstr "Positiv"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_product_packaging
 msgid "Preferred Packaging"
-msgstr ""
+msgstr "Foretrukken forpakning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_make_procurement_route_ids
@@ -4753,7 +4923,7 @@ msgstr "Produktnavn"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_owner
 msgid "Product Owners"
-msgstr ""
+msgstr "Produktejer"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4765,7 +4935,7 @@ msgstr "Produktskabelon"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Product Types"
-msgstr ""
+msgstr "Produkttyper"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_product_uom_id
@@ -4827,6 +4997,8 @@ msgid ""
 "Products you scrap will be removed from the stock and moved to a specific "
 "scrap location, for reporting purposes."
 msgstr ""
+"Produkter du kasserer, vil blive flyttet fra lageret til en specifik "
+"kassationslokation for analyseformål. "
 
 #. module: stock
 #: code:addons/stock/models/product.py:326
@@ -4844,7 +5016,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Purchase Flow"
-msgstr ""
+msgstr "Indkøbsflow"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_push_rule_id
@@ -4861,7 +5033,7 @@ msgstr "Push regler (skub)"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location_path
 msgid "Pushed Flow"
-msgstr ""
+msgstr "Push'et flow"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_putaway_id
@@ -4892,7 +5064,7 @@ msgstr "Multipelt antal skal være større eller = 0"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_quality
 msgid "Quality"
-msgstr ""
+msgstr "Kvalitet"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:94
@@ -4963,7 +5135,7 @@ msgstr "Antal i standard enheden af varen"
 #. module: stock
 #: sql_constraint:stock.pack.operation.lot:0
 msgid "Quantity must be greater than or equal to 0.0!"
-msgstr ""
+msgstr "Antal skal være større end eller lig med 0,0!"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_quant_qty
@@ -5066,13 +5238,13 @@ msgstr "Modtagelse i 1 trin"
 #: code:addons/stock/models/stock_warehouse.py:400
 #, python-format
 msgid "Receipt in 2 steps"
-msgstr ""
+msgstr "Varemodtagelse i 2 steps"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:401
 #, python-format
 msgid "Receipt in 3 steps"
-msgstr ""
+msgstr "Varemodtagelse i 3 steps"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:199
@@ -5082,12 +5254,12 @@ msgstr ""
 #: model:stock.picking.type,name:stock.picking_type_in
 #, python-format
 msgid "Receipts"
-msgstr ""
+msgstr "Varemodtagelse"
 
 #. module: stock
 #: selection:stock.warehouse,reception_steps:0
 msgid "Receive goods directly in stock (1 step)"
-msgstr ""
+msgstr "Varemodtag varer direkte til lager (1 step)"
 
 #. module: stock
 #: code:addons/stock/models/product.py:340
@@ -5098,7 +5270,7 @@ msgstr "Modtaget antal"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Recompute"
-msgstr ""
+msgstr "Genberegn"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_recompute_pack_op
@@ -5123,32 +5295,32 @@ msgstr "Reference"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_sequence_id
 msgid "Reference Sequence"
-msgstr ""
+msgstr "Reference nummerserie"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per company!"
-msgstr ""
+msgstr "Nummerserie skal være unik per virksomhed!"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_origin
 msgid "Reference of the document"
-msgstr ""
+msgstr "Dokumentets reference"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_ids
 msgid "Related Packing Operations"
-msgstr ""
+msgstr "Relaterede pakkeaktiviteter"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_remaining_qty
 msgid "Remaining Qty"
-msgstr ""
+msgstr "Resterende antal"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_remaining_qty
 msgid "Remaining Quantity"
-msgstr ""
+msgstr "Resterende antal"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_remaining_qty
@@ -5156,11 +5328,13 @@ msgid ""
 "Remaining Quantity in default UoM according to operations matched with this "
 "move"
 msgstr ""
+"Resterende antal i standardenheden iht. aktiviteter der er matched med denne"
+" flytning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 msgid "Remaining parts of picking partially processed"
-msgstr ""
+msgstr "Resterende del af plukningen er delvist gennemført"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_pack_operation_remaining_qty
@@ -5168,23 +5342,25 @@ msgid ""
 "Remaining quantity in default UoM according to moves matched with this "
 "operation."
 msgstr ""
+"Resterende antal i standardenheden iht. flytninger der er matched med denne "
+"aktivitet"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_removal
 msgid "Removal"
-msgstr ""
+msgstr "Nedskrivning"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_removal
 #: model:ir.model.fields,field_description:stock.field_stock_location_removal_strategy_id
 msgid "Removal Strategy"
-msgstr ""
+msgstr "Nedskrivningsstrategi"
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:467
 #, python-format
 msgid "Removal strategy %s not implemented."
-msgstr ""
+msgstr "Nedskrivningsstrategi %s er ikke implementeret."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_warehouse_2_stock_warehouse_orderpoint
@@ -5203,7 +5379,7 @@ msgstr "Genbestillingsregler"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
 msgid "Reordering Rules Search"
-msgstr ""
+msgstr "Søg genbestillingsregler"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_reordering_max_qty
@@ -5230,22 +5406,23 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Reserve"
-msgstr ""
+msgstr "Reserver"
 
 #. module: stock
 #: selection:stock.config.settings,module_procurement_jit:0
 msgid "Reserve products immediately after the sale order confirmation"
-msgstr ""
+msgstr "Reserver produktet straks efter salgsordren er bekræftet"
 
 #. module: stock
 #: selection:stock.config.settings,module_procurement_jit:0
 msgid "Reserve products manually or based on automatic scheduler"
 msgstr ""
+"Reserver produkterne manuelt eller baseret på den automatiske planlægger"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
 msgid "Reserved"
-msgstr ""
+msgstr "Reserveret"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_reserved_quant_id
@@ -5260,7 +5437,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_reservation_id
 msgid "Reserved for Move"
-msgstr ""
+msgstr "Reserveret til lagerflytning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_reserved_quant_ids
@@ -5270,33 +5447,33 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Reset Operations"
-msgstr ""
+msgstr "Nulstil handlinger"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Resolve Procurement Exceptions"
-msgstr ""
+msgstr "Løs indkøbsundtagelser"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_resupply_route_ids
 msgid "Resupply Routes"
-msgstr ""
+msgstr "Genbestillingsruter"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_resupply_wh_ids
 msgid "Resupply Warehouses"
-msgstr ""
+msgstr "Genbestillingslager"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 #: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form
 msgid "Return"
-msgstr ""
+msgstr "Returner"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_location_id
 msgid "Return Location"
-msgstr ""
+msgstr "Returlokation"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking
@@ -5307,12 +5484,12 @@ msgstr "Retur plukning"
 #: code:addons/stock/wizard/stock_picking_return.py:161
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "Returneret plukning"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 msgid "Reverse Transfer"
-msgstr ""
+msgstr "Tilbagefør flytning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_parent_right
@@ -5331,13 +5508,13 @@ msgstr "Rute"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_name
 msgid "Route Name"
-msgstr ""
+msgstr "Rutenavn"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_route_sequence
 #: model:ir.model.fields,field_description:stock.field_stock_location_path_route_sequence
 msgid "Route Sequence"
-msgstr ""
+msgstr "Nummerserie for ruter"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_routes_form
@@ -5358,7 +5535,7 @@ msgstr "Ruter"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Routes Management"
-msgstr ""
+msgstr "Rutehåndtering"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_resupply_route_ids
@@ -5376,7 +5553,7 @@ msgstr "Regler"
 #: model:ir.actions.act_window,name:stock.action_procurement_compute
 #: model:ir.ui.menu,name:stock.menu_procurement_compute
 msgid "Run Reordering Rules"
-msgstr ""
+msgstr "Kør genbestillingsregler"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_proc_schedulers
@@ -5391,7 +5568,7 @@ msgstr "Salgsbetingelser"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Sales Flow"
-msgstr ""
+msgstr "Salgsflow"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form_save
@@ -5402,7 +5579,7 @@ msgstr "Gem"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Scheduled"
-msgstr ""
+msgstr "Planlagt"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_min_date
@@ -5412,7 +5589,7 @@ msgstr "Planlagt dato"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_date_expected
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Planlagt dato for behandling af denne flytning"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_min_date
@@ -5440,55 +5617,55 @@ msgstr "Behovs beregner"
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 #, python-format
 msgid "Scrap"
-msgstr ""
+msgstr "Kassér"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_scrap_location_id
 #: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
 msgid "Scrap Location"
-msgstr ""
+msgstr "Kassationslokation"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_scrap_move_id
 msgid "Scrap Move"
-msgstr ""
+msgstr "Kassationsbevægelse"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_scrapped
 #: model:stock.location,name:stock.stock_location_scrapped
 msgid "Scrapped"
-msgstr ""
+msgstr "Kasseret"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Scraps"
-msgstr ""
+msgstr "Kasserer"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_filter
 msgid "Search Inventory"
-msgstr ""
+msgstr "Lagersøgning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
 msgid "Search Scrap"
-msgstr ""
+msgstr "Kassationssøgning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_filter
 msgid "Search Stock Location Paths"
-msgstr ""
+msgstr "Søg lagerlokationsstier"
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:93
 #, python-format
 msgid "Select products manually"
-msgstr ""
+msgstr "Vælg produkter manuelt"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
 msgid "Select the places where this route can be selected"
-msgstr ""
+msgstr "Vælg de steder hvor denne rute kan vælges"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_res_partner_picking_warn
@@ -5515,41 +5692,41 @@ msgstr "Rækkefølge"
 #: code:addons/stock/models/stock_warehouse.py:658
 #, python-format
 msgid "Sequence in"
-msgstr ""
+msgstr "Nummerserie ind"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:662
 #, python-format
 msgid "Sequence internal"
-msgstr ""
+msgstr "Nummerserie intern"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:659
 #, python-format
 msgid "Sequence out"
-msgstr ""
+msgstr "Nummerserie ud"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:660
 #, python-format
 msgid "Sequence packing"
-msgstr ""
+msgstr "Nummerserie forpakning"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:661
 #, python-format
 msgid "Sequence picking"
-msgstr ""
+msgstr "Nummerserie plukning"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_prodlot_name
 msgid "Serial Number Name"
-msgstr ""
+msgstr "Serienummer navn"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_warehouse_id
 msgid "Served Warehouse"
-msgstr ""
+msgstr "Betjent lager"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_product_category_removal_strategy_id
@@ -5557,6 +5734,8 @@ msgid ""
 "Set a specific removal strategy that will be used regardless of the source "
 "location for this product category"
 msgstr ""
+"Sæt en specifik nedskrivningsmetode der vil blive valgt uanset "
+"kildelokationen for denne produktkategori"
 
 #. module: stock
 #: selection:stock.config.settings,module_stock_calendar:0
@@ -5569,6 +5748,7 @@ msgid ""
 "Set the <i>Real Quantity</i> for each Product and <i>Validate the "
 "Inventory</i>"
 msgstr ""
+"Angiv det <i>reelle antal</i> for hvert produkt og <i>validér lageret</i>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -5598,28 +5778,28 @@ msgstr "Opsætning"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr ""
+msgstr "Hylde 1"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Hylde 2"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_posy
 msgid "Shelves (Y)"
-msgstr ""
+msgstr "Hylder (Y)"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:402
 #, python-format
 msgid "Ship Only"
-msgstr ""
+msgstr "Send, ikke andet"
 
 #. module: stock
 #: selection:stock.warehouse,delivery_steps:0
 msgid "Ship directly from stock (Ship only)"
-msgstr ""
+msgstr "Send direkte fra lager (Send, ikke andet)"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_stock_config_settings
@@ -5634,24 +5814,24 @@ msgstr "Kort navn"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_code
 msgid "Short name used to identify your warehouse"
-msgstr ""
+msgstr "Forkortelse der bruges til at identificere dit lager"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_string_availability_info
 msgid "Show various information on stock availability for this move"
 msgstr ""
+"Vis forskellig information omkring lagerbeholdningen for denne flytning"
 
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Lille køleskab"
 
 #. module: stock
 #: selection:stock.config.settings,group_uom:0
 msgid ""
 "Some products may be sold/purchased in different units of measure (advanced)"
-msgstr ""
-"Nogle produkter kan sælges / købes i forskellige måleenheder (avanceret)"
+msgstr "Nogle produkter kan sælges / købes i forskellige enheder (avanceret)"
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:787
@@ -5660,6 +5840,7 @@ msgid ""
 "Some products require lots/serial numbers, so you need to specify those "
 "first!"
 msgstr ""
+"Nogle produkter kræver lot/serienummer, så du skal specificere dem først!"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
@@ -5686,12 +5867,12 @@ msgstr "Kilde placering"
 #: model:ir.model.fields,field_description:stock.field_stock_picking_location_id
 #: model:ir.ui.view,arch_db:stock.view_stock_quant_form
 msgid "Source Location Zone"
-msgstr ""
+msgstr "Zone for kildelokation"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_package_id
 msgid "Source Package"
-msgstr ""
+msgstr "Kildeforpakning"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_rule_location_src_id
@@ -5734,7 +5915,7 @@ msgstr "Del"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "Start Inventory"
-msgstr ""
+msgstr "Kør lagerjustering"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_state
@@ -5760,25 +5941,25 @@ msgstr "Lager"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Lagerbeholdning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_inventory_line_tree
 msgid "Stock Inventory Lines"
-msgstr ""
+msgstr "Lagerbeholdningslinjer"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_level_forecast_report_product
 #: model:ir.actions.act_window,name:stock.action_stock_level_forecast_report_template
 msgid "Stock Level Forecast"
-msgstr ""
+msgstr "Anslået lagerbeholdning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_stock_level_forecast_filter
 #: model:ir.ui.view,arch_db:stock.view_stock_level_forecast_graph
 #: model:ir.ui.view,arch_db:stock.view_stock_level_forecast_pivot
 msgid "Stock Level forecast"
-msgstr ""
+msgstr "Anslået lagerbeholdning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_location_form
@@ -5813,23 +5994,23 @@ msgstr "Lagerflytning"
 #: model:ir.ui.view,arch_db:stock.view_move_graph
 #: model:ir.ui.view,arch_db:stock.view_move_pivot
 msgid "Stock Moves Analysis"
-msgstr ""
+msgstr "Analyse af lagerflytninger"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.product_open_quants
 #: model:ir.actions.act_window,name:stock.product_template_open_quants
 msgid "Stock On Hand"
-msgstr ""
+msgstr "Lagerbeholdning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
 msgid "Stock Operation"
-msgstr ""
+msgstr "Lageraktivitet"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_all
 msgid "Stock Operations"
-msgstr ""
+msgstr "Lageraktiviteter"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn
@@ -5845,12 +6026,12 @@ msgstr "Lagerbevægelse ids"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "Lagerflytninger der er tilgængelige (klar til at udføre)"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Lagerflytninger der er bekræftet, tilgængelige eller ventende"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_search
@@ -5865,12 +6046,12 @@ msgstr "Varelager quant ids"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
 msgid "Stockable"
-msgstr ""
+msgstr "Lagerførbar"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_supplied_wh_id
 msgid "Supplied Warehouse"
-msgstr ""
+msgstr "Leveret lager"
 
 #. module: stock
 #: selection:stock.config.settings,module_stock_dropshipping:0
@@ -5880,27 +6061,27 @@ msgstr "Leverandører leverer altid til dit lager"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Supply Chain"
-msgstr ""
+msgstr "Supply Chain"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_procure_method
 msgid "Supply Method"
-msgstr ""
+msgstr "Leveringsmetode"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_route_supplier_wh_id
 msgid "Supplying Warehouse"
-msgstr ""
+msgstr "Leverende lager"
 
 #. module: stock
 #: selection:procurement.rule,procure_method:0
 msgid "Take From Stock"
-msgstr ""
+msgstr "Tag fra lager"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_warehouse
 msgid "Technical Information"
-msgstr ""
+msgstr "Teknisk information"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_operation_link_reserved_quant_id
@@ -6100,7 +6281,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_type
 msgid "The picking type determines the picking view"
-msgstr ""
+msgstr "Plukketypen bestemmer plukkevisningen"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.stock_picking_type_action
@@ -6121,12 +6302,12 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_rule_id
 msgid "The procurement rule that created this stock move"
-msgstr ""
+msgstr "Indkøbsreglen der skabte denne lagerbevægelse"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_push_rule_id
 msgid "The push rule that created this stock move"
-msgstr ""
+msgstr "Push reglen der skabte denne lagerbevægelse"
 
 #. module: stock
 #: code:addons/stock/models/stock_pack_operation.py:170
@@ -6137,7 +6318,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "The quotation becomes a Sale Order and a Transfer Order is created"
-msgstr ""
+msgstr "Tilbuddet bliver en salgsordre og en leveringsordre oprettes"
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:166
@@ -6169,13 +6350,14 @@ msgstr ""
 #: code:addons/stock/models/stock_quant.py:222
 #, python-format
 msgid "The serial number %s is already in stock."
-msgstr ""
+msgstr "Serienummeret %s findes allerede på lageret."
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:515
 #, python-format
 msgid "The source location must be the same for all the moves of the picking."
 msgstr ""
+"Kildelokationen skal være den samme for alle bevægelser på plukningen."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_pack_operation_picking_id
@@ -6185,7 +6367,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_rule_warehouse_id
 msgid "The warehouse this rule is for"
-msgstr ""
+msgstr "Lageret denne regel er sat for"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_rule_propagate_warehouse_id
@@ -6198,7 +6380,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_theoretical_qty
 msgid "Theoretical Quantity"
-msgstr ""
+msgstr "Teoretisk antal"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_tracking_lot
@@ -6285,7 +6467,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_path_picking_type_id
 msgid "This is the picking type that will be put on the stock moves"
-msgstr ""
+msgstr "Dette er plukketypen der vil blive sat på lagerbevægelserne"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_product_uom_qty
@@ -6309,7 +6491,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_module_quality
 msgid "This module allows you to generate quality alerts and quality check"
-msgstr ""
+msgstr "Med dette modul kan du generere kvalitetsalarmer og kvalitetschecks"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_adv_location
@@ -6331,7 +6513,7 @@ msgstr ""
 #: model:ir.model.fields,help:stock.field_stock_change_product_qty_new_quantity
 msgid ""
 "This quantity is expressed in the Default Unit of Measure of the product."
-msgstr ""
+msgstr "Dette antal er udtrykt i standardenheden for produktet."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_path_location_from_id
@@ -6343,7 +6525,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_delivery_document
 msgid "This shipment is a backorder of"
-msgstr ""
+msgstr "Denne levering er en restordre fra"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_res_partner_property_stock_customer
@@ -6351,6 +6533,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"Denne lagerplacering vil blive brugt i stedet for standardværdien som "
+"destinationssted for varer, du sender til denne partner"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_res_partner_property_stock_supplier
@@ -6358,6 +6542,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
+"Denne lagerplacering vil blive brugt i stedet for standardværdien som "
+"kildeplacering for varer, du modtager fra den nuværende partner"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_product_product_property_stock_production
@@ -6411,7 +6597,7 @@ msgstr "To Do"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
 msgid "To Receive"
-msgstr ""
+msgstr "Modtagelse"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -6458,7 +6644,7 @@ msgstr "Total antal/sum"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_category_total_route_ids
 msgid "Total routes"
-msgstr ""
+msgstr "Ruter i alt"
 
 #. module: stock
 #: code:addons/stock/models/stock_production_lot.py:42
@@ -6469,7 +6655,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:stock.view_stock_config_settings
 #, python-format
 msgid "Traceability"
-msgstr ""
+msgstr "Sporbarhed"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_module_product_expiry
@@ -6486,7 +6672,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.config.settings,group_stock_production_lot:0
 msgid "Track lots or serial numbers"
-msgstr ""
+msgstr "Spor lot og serienumre"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_product_tracking
@@ -6507,12 +6693,12 @@ msgstr "Overfør"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_picking_partner_id
 msgid "Transfer Destination Address"
-msgstr ""
+msgstr "Flyt destinationsadressen"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_picking_id
 msgid "Transfer Reference"
-msgstr ""
+msgstr "Reference for flytning"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
@@ -6523,12 +6709,12 @@ msgstr "Overførsler"
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Transit Location"
-msgstr ""
+msgstr "Forsendelseslokation"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.quant_search_view
 msgid "Transit Locations"
-msgstr ""
+msgstr "Forsendelseslokationer"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_recompute_pack_op
@@ -6546,7 +6732,7 @@ msgstr "Type af drift"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_packaging_type_id
 msgid "Type of packaging"
-msgstr ""
+msgstr "Forpakningstype"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_ups
@@ -6568,17 +6754,17 @@ msgstr ""
 #: model:ir.model.fields,help:stock.field_stock_inventory_line_prodlot_name
 #: model:ir.model.fields,help:stock.field_stock_production_lot_name
 msgid "Unique Lot/Serial Number"
-msgstr ""
+msgstr "Unik lot/serienummer"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_cost
 msgid "Unit Cost"
-msgstr ""
+msgstr "Enhedsomkostning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
 msgid "Unit Of Measure"
-msgstr ""
+msgstr "Enhed"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_price_unit
@@ -6612,18 +6798,18 @@ msgstr "Enheds-kategorier"
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Units of Measure"
-msgstr "Måleenheder"
+msgstr "Enheder"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Units of Measures"
-msgstr ""
+msgstr "Enheder"
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:569
 #, python-format
 msgid "Unknown Pack"
-msgstr ""
+msgstr "Ukendt forpakning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -6647,7 +6833,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_quant_package_form
 msgid "Unpack"
-msgstr ""
+msgstr "Pak ud"
 
 #. module: stock
 #: code:addons/stock/models/product.py:358
@@ -6658,12 +6844,12 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "Unreserve"
-msgstr ""
+msgstr "Ophæv reservering"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "UoM"
-msgstr ""
+msgstr "Enhed"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
@@ -6676,7 +6862,7 @@ msgstr "Opdatér vare antal"
 #: model:ir.ui.view,arch_db:stock.product_product_view_form_easy_inherit_stock
 #: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
 msgid "Update Qty On Hand"
-msgstr ""
+msgstr "Opdater lagerbeholdning"
 
 #. module: stock
 #: selection:stock.move,priority:0 selection:stock.picking,priority:0
@@ -6686,7 +6872,7 @@ msgstr "Haster"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_use_existing_lots
 msgid "Use Existing Lots/Serial Numbers"
-msgstr ""
+msgstr "Brug eksisterende lot/serienumre"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
@@ -6720,7 +6906,7 @@ msgstr "Validér"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Validér lagerbeholdning"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -6730,12 +6916,12 @@ msgstr "Valideret"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_product_variant_count
 msgid "Variant Count"
-msgstr ""
+msgstr "Antal varianter"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_make_procurement_product_variant_count
 msgid "Variant Number"
-msgstr ""
+msgstr "Variant nummer"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_location_search
@@ -6751,7 +6937,7 @@ msgstr "Leverandør lokation"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_location_search
 msgid "Vendor Locations"
-msgstr ""
+msgstr "Leverandørlokationer"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
@@ -6777,12 +6963,12 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_view_location_id
 msgid "View Location"
-msgstr ""
+msgstr "Se lokation"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr ""
+msgstr "Virtuelle lokationer"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
@@ -6797,28 +6983,28 @@ msgstr "Venter"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "Afventer en anden lagerbevægelse"
 
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Afventer en anden aktivitet"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Afventer tilgængelighed"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 msgid "Waiting Moves"
-msgstr ""
+msgstr "Afventer lagerflytning"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_waiting
 msgid "Waiting Transfers"
-msgstr ""
+msgstr "Afventer overførsler"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -6841,7 +7027,7 @@ msgstr "Lagerstyring"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_warehouse
 msgid "Warehouse Configuration"
-msgstr ""
+msgstr "Lagerkonfiguration"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
@@ -6851,7 +7037,7 @@ msgstr "Lager administration"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse_name
 msgid "Warehouse Name"
-msgstr ""
+msgstr "Lagernavn"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_propagate_warehouse_id
@@ -6861,13 +7047,13 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_order_warehouse_id
 msgid "Warehouse to consider for the route selection"
-msgstr ""
+msgstr "Lagre til overvejelse for udvælgelse af rute"
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:688
 #, python-format
 msgid "Warehouse's Routes"
-msgstr ""
+msgstr "Lagerets ruter"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -6891,7 +7077,7 @@ msgstr "Advarsel!"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_partner_stock_warnings_form
 msgid "Warning on the Picking"
-msgstr ""
+msgstr "Advarsel på plukning"
 
 #. module: stock
 #: code:addons/stock/models/product.py:319
@@ -6921,6 +7107,8 @@ msgstr ""
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "We hope this guide helped you implement Odoo Inventory."
 msgstr ""
+"Vi håber at denne guide har hjulpet dig med at implementere Odoo "
+"lagerstyring."
 
 #. module: stock
 #: code:addons/stock/models/barcode.py:11
@@ -6941,6 +7129,10 @@ msgid ""
 " can be overridden by the routes on the Product/Product Categories or by the"
 " Preferred Routes on the Procurement"
 msgstr ""
+"Hvis et lager er valgt for denne rute, bør ruten anses for at være "
+"standardruten når produkter går gennem dette lager. Denne opførsel kan "
+"overstyres af ruten på et produkt, produktkategori eller den foretrukne rute"
+" på indkøbet. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_route_product_selectable
@@ -6948,6 +7140,8 @@ msgid ""
 "When checked, the route will be selectable in the Inventory tab of the "
 "Product form.  It will take priority over the Warehouse route. "
 msgstr ""
+"Hvis afkrydse, vil ruten være valgbar på lagerfanen på produktet. Denne vil "
+"have højere prioritet end ruten på lageret. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_route_product_categ_selectable
@@ -6955,17 +7149,20 @@ msgid ""
 "When checked, the route will be selectable on the Product Category.  It will"
 " take priority over the Warehouse route. "
 msgstr ""
+"Hvis afkrydset, vil ruten være valgbar på produktkategorien. Denne vil have "
+"højere prioritet end ruten på lageret. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "When everything is set, click on <i>Start Inventory</i>"
-msgstr ""
+msgstr "Når alt er sat, så klik på <i>Start lagerkørsel</i>"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_product_putaway_fixed_location_ids
 msgid ""
 "When the method is fixed, this location will be used to store the products"
 msgstr ""
+"Hvis metoden er fast, vil denne lokation anvendes som lager for produkterne"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_product_min_qty
@@ -6974,6 +7171,9 @@ msgid ""
 " Odoo generates a procurement to bring the forecasted quantity to the Max "
 "Quantity."
 msgstr ""
+"Når det virtuelle lager bliver lavere end minimumslageret for det "
+"specificerede felt, vil Odoo generere et indkøb for at bringe det beregnede "
+"antal op på maksimumslageret. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_product_max_qty
@@ -6982,6 +7182,9 @@ msgid ""
 "procurement to bring the forecasted quantity to the Quantity specified as "
 "Max Quantity."
 msgstr ""
+"Når det virtuelle lager bliver lavere end minimumslageret, vil Odoo generere"
+" et indkøb for at bringe det beregnede antal op på antallet specificeret som"
+" maksimumslager. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_change_product_quantity
@@ -6989,6 +7192,8 @@ msgid ""
 "When you select a serial number (lot), the quantity is corrected with respect to\n"
 "                            the quantity of that serial number (lot) and not to the total quantity of the product."
 msgstr ""
+"Når du vælger et serienummer (lot), vil antallet reguleres iht.\n"
+"                            antallet på det pågældende serienummer (lot) og ikke iht. totalantallet for produktet."
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_wizard_id
@@ -7000,6 +7205,8 @@ msgstr "Guide"
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Wizard undersøger alle reglerne for minimumslager og genererer "
+"indkøbsordrer. "
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_config_settings_group_product_variant
@@ -7007,6 +7214,8 @@ msgid ""
 "Work with product variant allows you to define some variant of the same "
 "products, an ease the product management in the ecommerce for example"
 msgstr ""
+"Brug produktvarianter for at definere varianter af det samme produkt, og fx "
+"lette håndteringen af produkter ved e-handel hermed. "
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_routes_form
@@ -7016,6 +7225,10 @@ msgid ""
 "                    routes can be assigned to a product, a product category or be fixed\n"
 "                    on procurement or sales order."
 msgstr ""
+"Du kan definere den primære rute gennem\n"
+"                    dit lager, og det definerer flowet på dine produkter. Disse\n"
+"                    ruter kan tildeles et produkt, en produktkategori eller være angivet\n"
+"                    på en indkøbs- eller salgsordre."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_orderpoint_form
@@ -7027,11 +7240,17 @@ msgid ""
 " generate a procurement request to increase the stock up to the maximum "
 "quantity."
 msgstr ""
+"Du kan definere dine regler for minimumslager sådan, at Odoo automatisk vil "
+"oprette produktionsordrekladder eller indkøbsanmodninger afhængig af din "
+"lagerbeholdning. Når et virtuelt lager på et produkt (=lagerbeholdning minus"
+" alle bekræftede ordrer og reservationer) er lavere end minimumslageret, vil"
+" Odoo generere et indkøbsforslag for at øge lagerbeholdningen op til "
+"maksimumslageret. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "You can delete lines to ignore some products."
-msgstr ""
+msgstr "Du kan slette linjer for at ignorere nogle produkter."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_form
@@ -7048,6 +7267,8 @@ msgid ""
 "You can either do it immediately or mark it as Todo for future processing. "
 "Use your scanner to validate the transferred quantity quicker."
 msgstr ""
+"Du kan enten gøre det straks eller markere det som To-Do for at gennemføre "
+"den senere. Brug din scanner til at validere det flyttede antal hurtigere. "
 
 #. module: stock
 #: code:addons/stock/models/product.py:486
@@ -7057,41 +7278,44 @@ msgid ""
 "used in a done stock move. If you need to change the unit of measure, you "
 "may deactivate this product."
 msgstr ""
+"Du kan ikke ændre enheden på et produkt der allerede har været brugt i en "
+"lagertransaktion. Hvis du har behov for at ændre enheden, bør du deaktivere "
+"dette produkt. "
 
 #. module: stock
 #: code:addons/stock/models/stock_pack_operation.py:160
 #, python-format
 msgid "You can not delete pack operations of a done picking"
-msgstr ""
+msgstr "Du kan ikke slette en pakkehandling på en afsluttet plukning"
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:143
 #, python-format
 msgid "You can not reserve a negative quantity or a negative quant."
-msgstr ""
+msgstr "Du kan ikke reservere et negativt antal eller et negativt tal. "
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:901
 #, python-format
 msgid "You can only delete draft moves."
-msgstr ""
+msgstr "Du kan kun slette lagerbevægelser i status kladde."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "You can review and edit the predefined units via the"
-msgstr ""
+msgstr "Du kan gennemgå og ændre på de prædefinerede enheder via"
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:652
 #, python-format
 msgid "You cannot cancel a stock move that has been set to 'Done'."
-msgstr ""
+msgstr "Du kan ikke fortryde en lagerbevægelse der er sat til \"Udført\". "
 
 #. module: stock
 #: code:addons/stock/models/stock_scrap.py:72
 #, python-format
 msgid "You cannot delete a scrap which is done."
-msgstr ""
+msgstr "Du kan ikke slette en kassation der er udført. "
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:374
@@ -7102,12 +7326,15 @@ msgid ""
 "Please first validatethe first inventory adjustement with this product "
 "before creating another one."
 msgstr ""
+"Du kan ikke have to lagerreguleringer med status 'Igangværende' med det "
+"samme produkt(%s), samme lokation(%s), samme forpakning, samme ejer og samme"
+" lot. Venligst valider den første lagerjustering inden du opretter en ny."
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:176
 #, python-format
 msgid "You cannot move to a location of type view %s."
-msgstr ""
+msgstr "Du kan ikke flytte til en lokation af typen 'view' %s."
 
 #. module: stock
 #: code:addons/stock/models/stock_scrap.py:85
@@ -7116,6 +7343,8 @@ msgid ""
 "You cannot scrap a move without having available stock for %s. You can "
 "correct it with an inventory adjustment."
 msgstr ""
+"Du kan ikke kassere en overførsel uden at have tilgængelig lagerbeholdning "
+"for %s. Du kan ændre det via en lagerregulering."
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:144
@@ -7124,24 +7353,26 @@ msgid ""
 "You cannot set a negative product quantity in an inventory line:\n"
 "\t%s - qty: %s"
 msgstr ""
+"Du kan ikke sætte et negativt produktantal på en lagerlinje:\n"
+"\t%s - ant.: %s"
 
 #. module: stock
 #: code:addons/stock/models/stock_production_lot.py:37
 #, python-format
 msgid "You are not allowed to create a lot for this picking type"
-msgstr ""
+msgstr "Det er ikke tilladt af oprette en lot for denne plukketype"
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:919
 #, python-format
 msgid "You cannot split a draft move. It needs to be confirmed first."
-msgstr ""
+msgstr "Du kan ikke splitte en kladdeoverførsel. Den skal først bekræftes. "
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:915
 #, python-format
 msgid "You cannot split a move done"
-msgstr ""
+msgstr "Du kan ikke splitte en overførsel der er udført"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
@@ -7149,6 +7380,8 @@ msgid ""
 "You do not have any products reserved for this picking.  Please click the 'Reserve' button\n"
 "                                to check if products are available."
 msgstr ""
+"Du har ikke reserveret nogle produkter til denne plukning. Klik venligst på 'Reservér' knappen\n"
+"                                for at undersøge om produktet er tilgængeligt."
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:800
@@ -7157,27 +7390,30 @@ msgid ""
 "You have a difference between the quantity on the operation and the "
 "quantities specified for the lots. "
 msgstr ""
+"Der er en difference mellem antallet på handlingen og antallet specificeret "
+"for disse lots."
 
 #. module: stock
 #: sql_constraint:stock.pack.operation.lot:0
 msgid "You have already mentioned this lot in another line"
-msgstr ""
+msgstr "Du har allerede brugt dette lot i en anden linje"
 
 #. module: stock
 #: sql_constraint:stock.pack.operation.lot:0
 msgid "You have already mentioned this lot name in another line"
-msgstr ""
+msgstr "Du har allerede brugt dette lot navn i en anden linje"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:114
 #, python-format
 msgid "You have manually created product lines, please delete them to proceed"
 msgstr ""
+"Du har oprettet produktlinjer manuelt. Slet dem venligst for du fortsætter. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 msgid "You have processed less products than the initial demand."
-msgstr ""
+msgstr "Du har håndteret færre produkter end det oprindelige behov."
 
 #. module: stock
 #: code:addons/stock/models/product.py:320
@@ -7186,6 +7422,8 @@ msgid ""
 "You have products in stock that have no lot number.  You can assign serial "
 "numbers by doing an inventory.  "
 msgstr ""
+"Du har produkter på lager der ikke har noget lot nummer. Du kan tildele "
+"serienumre ved at køre en lagerjustering. "
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:768
@@ -7194,6 +7432,8 @@ msgid ""
 "You have to select a product unit of measure in the same category than the "
 "default unit of measure of the product"
 msgstr ""
+"Du skal vælge en enhed fra den samme kategori som standardenheden for "
+"produktet. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_immediate_transfer
@@ -7201,37 +7441,39 @@ msgid ""
 "You haven't set processed (<i>done</i>) quantities. Click <i>apply</i> and\n"
 "                        Odoo will process all quantities to do."
 msgstr ""
+"Du har ikke registreret (<i>udførte</i>) antal. Klik <i>udfør</i> og\n"
+"                        Odoo will registrere alle antal der mangler."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:43
 #, python-format
 msgid "You may only return Done pickings"
-msgstr ""
+msgstr "Du må kun returnere udførte plukninger"
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:21
 #, python-format
 msgid "You must define a warehouse for the company: %s."
-msgstr ""
+msgstr "Du skal definere et lager for virksomheden: %s."
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:553
 #: code:addons/stock/models/stock_pack_operation.py:234
 #, python-format
 msgid "You need to provide a Lot/Serial Number for product %s"
-msgstr ""
+msgstr "Du skal angive et Lot/Serienummer for produktet %s"
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:260
 #, python-format
 msgid "You should only receive by the piece with the same serial number"
-msgstr ""
+msgstr "Du bør kun lagermodtage stykvis med det samme serienummer"
 
 #. module: stock
 #: code:addons/stock/models/stock_pack_operation.py:238
 #, python-format
 msgid "You should provide a different serial number for each piece"
-msgstr ""
+msgstr "Du bør angive et forskelligt serienummer for hver del"
 
 #. module: stock
 #: code:addons/stock/models/stock_move.py:226
@@ -7240,6 +7482,9 @@ msgid ""
 "You try to move a product using a UoM that is not compatible with the UoM of"
 " the product moved. Please use an UoM in the same UoM category."
 msgstr ""
+"Du forsøger at flytte en produkt ved at bruge en enhed der ikke er "
+"kompatibel produktets enhed. Brug venligst en enhed fra samme "
+"enhedskategori."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -7249,17 +7494,17 @@ msgstr "Dine varer"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Your Situation"
-msgstr ""
+msgstr "Din situation"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Your Vendors"
-msgstr ""
+msgstr "Dine leverandører"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Your Warehouse"
-msgstr ""
+msgstr "Dine lagre"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_change_product_quantity
@@ -7271,27 +7516,27 @@ msgstr "_Anvend"
 #: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
 #: model:ir.ui.view,arch_db:stock.view_change_product_quantity
 msgid "_Cancel"
-msgstr ""
+msgstr "_Fortryd"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "a stockable Product"
-msgstr ""
+msgstr "et lagerført produkt"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "and simply enter a minimum and maximum quantity."
-msgstr ""
+msgstr "og helt enkelt angive et minimum og maksimum antal. "
 
 #. module: stock
 #: model:ir.model,name:stock.model_barcode_rule
 msgid "barcode.rule"
-msgstr ""
+msgstr "barcode.rule"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "configuration menu"
-msgstr ""
+msgstr "konfigurationsmenu"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_form
@@ -7308,12 +7553,12 @@ msgstr "F.eks. årligt lager"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_production_lot_form
 msgid "e.g. LOT/0001/20121"
-msgstr ""
+msgstr "fx. LOT/0001/20121"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "e.g. PO0032"
-msgstr ""
+msgstr "fx. PO0032"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -7321,6 +7566,8 @@ msgid ""
 "either by manually updating the Done quantity on the product lines, or let "
 "Odoo do it automatically while validating"
 msgstr ""
+"enten ved manuelt at opdatere udførte antal på produktlinjerne, eller lade "
+"Odoo gøre det automatisk ved validering. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -7329,16 +7576,19 @@ msgid ""
 "them with the Odoo Barcode app, or let Odoo do it automatically while "
 "validating"
 msgstr ""
+"enten ved manuelt at opdatere registrerede antal på produktlinjerne, eller "
+"scan dem med Odoo Stregkode app'en, eller lade Odoo gøre det automatisk ved "
+"validering. "
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "feedback@mail.odoo.com"
-msgstr ""
+msgstr "feedback@mail.odoo.com"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "for a customer and add products"
-msgstr ""
+msgstr "for en kunde og tilføj produkter"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -7346,11 +7596,13 @@ msgid ""
 "for more\n"
 "                        information."
 msgstr ""
+"for mere\n"
+"                        information."
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "from your vendor with the products and the requested quantities"
-msgstr ""
+msgstr "fra din leverandør med produkterne og ønskede antal"
 
 #. module: stock
 #: model:stock.inventory.line,product_name:stock.stock_inventory_line_3
@@ -7368,6 +7620,8 @@ msgid ""
 "is displayed on the transfer if your products supply chain is properly "
 "configured. Otherwise, <strong>Check the availability</strong> manually"
 msgstr ""
+"vises på overførslen hvis din supply chain er korrekt opsat. Ellers, "
+"<strong>Check tilgængeligheden</strong> manuelt"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_template_property_form
@@ -7391,11 +7645,13 @@ msgid ""
 "on the purchase order form or click on <i>Receive Products</i> to see the "
 "Transfer Order"
 msgstr ""
+"på indkøbsordre billedet eller klik på <i>Modtag produkter</i> for at se "
+"lagerflytningsordren"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "on the sale order form to see Transfer Order"
-msgstr ""
+msgstr "på salgsordre billedet for at se lagerflytningsordren"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_forecast
@@ -7425,12 +7681,12 @@ msgstr "stock.scrap"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "the list of products"
-msgstr ""
+msgstr "listen over produkter"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "the list of vendors"
-msgstr ""
+msgstr "listen over leverandører"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -7440,29 +7696,29 @@ msgstr "til"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "to mark the products as transferred to your stock location"
-msgstr ""
+msgstr "for at markere produkterne som værende flyttet til din lagerlokation"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "via the"
-msgstr ""
+msgstr "via"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "when you receive the ordered products"
-msgstr ""
+msgstr "når du lagermodtager de bestilte produkter"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "with the <i>Validate</i> button"
-msgstr ""
+msgstr "med <i>Validér</i> knappen"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 msgid "↳Put in Pack"
-msgstr ""
+msgstr "↳Put i forpakning"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "⇒ Set quantities to 0"
-msgstr ""
+msgstr "⇒ Sæt antal til 0"
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 17cb6d2a168..e6719cacae8 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -4991,7 +4991,7 @@ msgstr "La quantità non può essere negativa."
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_availability
 msgid "Quantity in stock that can still be reserved for this move"
-msgstr ""
+msgstr "La Quantità in stock può ancora essere riservata per questo movimento"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_product_qty
@@ -5049,7 +5049,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_reserved_availability
 msgid "Quantity that has already been reserved for this move"
-msgstr ""
+msgstr "La Quantità è già stata riservata per questo movimento"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.lot_open_quants
@@ -5302,7 +5302,7 @@ msgstr "Quantità Riservate"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_reservation_id
 msgid "Reserved for Move"
-msgstr ""
+msgstr "Riservato per Movimento"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_reserved_quant_ids
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 38aec816e6d..f395cde152e 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -3310,15 +3310,14 @@ msgstr "Het is tijd om uw initiële voorraad te maken. Om dit te doen:"
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
-"Het specificeert de kenmerken van verpakkingen, zoals soort, hoeveelheid en "
+"Het geeft aan de kenmerken van verpakkingen, zoals soort, hoeveelheid en "
 "verpakking, etc."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_picking_move_type
 msgid "It specifies goods to be deliver partially or all at once"
 msgstr ""
-"Het specificeert goederen welke in één keer of gedeeltelijk geleverd moeten "
-"worden"
+"Het geeft aan of de goederen in één keer of gedeeltelijk geleverd worden"
 
 #. module: stock
 #: model:stock.inventory.line,product_name:stock.stock_inventory_line_13
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 4eebcf74582..695af4855bb 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -17,13 +17,14 @@
 # Zou Haojun <haojunzou84@gmail.com>, 2016
 # Jonathan S <jonathan.c.strom@gmail.com>, 2016
 # Kim Asplund <kim.asplund@gmail.com>, 2017
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-22 14:03+0000\n"
 "PO-Revision-Date: 2016-11-22 14:03+0000\n"
-"Last-Translator: Kim Asplund <kim.asplund@gmail.com>, 2017\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -747,7 +748,7 @@ msgstr "Tillåter val och underhåll av flera enheter på produkt."
 #. module: stock
 #: selection:stock.config.settings,group_warning_stock:0
 msgid "An informative or blocking warning can be set on a partner"
-msgstr ""
+msgstr "En informativ eller blockerande varning kan ställas in på en partner"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant_package_ancestor_ids
@@ -1395,7 +1396,7 @@ msgstr "Skapa anskaffning"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
 msgid "Create Vendors"
-msgstr ""
+msgstr "Skapa Leverantörer"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -6679,7 +6680,7 @@ msgstr ""
 #: model:stock.location,name:stock.stock_location_suppliers
 #: selection:stock.picking.type,code:0
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: stock
 #: selection:stock.move,priority:0 selection:stock.picking,priority:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index a29ee5e89db..483492a6ec1 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -724,7 +724,7 @@ msgstr "仓库中的所有产品都属于公司"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_returned_move_ids
 msgid "All returned moves"
-msgstr "所有退货移动"
+msgstr "全部退回移动"
 
 #. module: stock
 #: code:addons/stock/models/procurement.py:221
@@ -1141,7 +1141,7 @@ msgstr "检查在拣货打包作业的存在"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_return_location
 msgid "Check this box to allow using this location as a return location."
-msgstr "勾选允许这个位置作为默认的退货位置"
+msgstr "勾选允许这个位置作为默认的退回位置"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_location_scrap_location
@@ -3045,7 +3045,7 @@ msgstr "盘点"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_return_location
 msgid "Is a Return Location?"
-msgstr "是一个退货位置？"
+msgstr "是一个退回位置？"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_location_scrap_location
@@ -3722,7 +3722,7 @@ msgstr "移动日期: 安排的日期直到移动完成的日期，这日期是
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_origin_returned_move_id
 msgid "Move that created the return move"
-msgstr "创建退货移库的移库"
+msgstr "创建退回移库的移库"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_procurement_order_move_dest_id
@@ -3861,7 +3861,7 @@ msgstr "不允许负数"
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
 "can be returned)!"
-msgstr "没有产品被退货（只有完成状态和未完全退货的 行能被退货）！"
+msgstr "没有产品被退回（只有完成状态和未完全退回的 行能被退回）！"
 
 #. module: stock
 #: code:addons/stock/models/procurement.py:182
@@ -4092,7 +4092,7 @@ msgstr "可选的定位细节，仅供参考"
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_returned_move_ids
 msgid "Optional: all returned moves created from this move"
-msgstr "选项: 所有的退货移动来自此移动"
+msgstr "选项: 所有的退回移动来自此移动"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_move_dest_id
@@ -4134,7 +4134,7 @@ msgstr "原始"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_origin_returned_move_id
 msgid "Origin return move"
-msgstr "原始退货移动"
+msgstr "原始退回移动"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move_move_orig_ids
@@ -4495,7 +4495,7 @@ msgstr "拣货类型决定了展示拣货在视图、报告...等中的展示方
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_return_picking_type_id
 msgid "Picking Type for Returns"
-msgstr "退货的拣货类型"
+msgstr "退回的拣货类型"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_picking_wave
@@ -5287,17 +5287,17 @@ msgstr "补充仓库"
 #: model:ir.ui.view,arch_db:stock.view_picking_form
 #: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form
 msgid "Return"
-msgstr "退货"
+msgstr "退回"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_location_id
 msgid "Return Location"
-msgstr "退货位置"
+msgstr "退回位置"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "退货拣货"
+msgstr "退回作业"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:161
@@ -6427,7 +6427,7 @@ msgid ""
 msgstr ""
 "为了更好的管理库存，你可以为你的仓库创建\n"
 "                            叫做 <strong>位置</strong>的分支 (例如:\n"
-"                            发货区, 退货区, 货架 34等等).\n"
+"                            发货区, 退回区, 货架 34等等).\n"
 "                            原则是涉及盘点的区域都要创建位置."
 
 #. module: stock
diff --git a/addons/stock_account/i18n/da.po b/addons/stock_account/i18n/da.po
index 9989ad79e16..8a7cf8e4ce4 100644
--- a/addons/stock_account/i18n/da.po
+++ b/addons/stock_account/i18n/da.po
@@ -5,8 +5,8 @@
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
-# Jesper Carstensen <jc@danodoo.dk>, 2016
 # Sanne Kristensen <sanne@vkdata.dk>, 2016
+# Jesper Carstensen <jc@danodoo.dk>, 2016
 # Visti Kristensen <visti@vkdata.dk>, 2017
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
@@ -26,7 +26,7 @@ msgstr ""
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_tree
 msgid "# of Products"
-msgstr "# produkter"
+msgstr "# af produkter"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_category_property_form
diff --git a/addons/stock_calendar/i18n/da.po b/addons/stock_calendar/i18n/da.po
index c96191a5b6d..795a1615be4 100644
--- a/addons/stock_calendar/i18n/da.po
+++ b/addons/stock_calendar/i18n/da.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:56+0000\n"
 "PO-Revision-Date: 2016-09-07 08:56+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 #. module: stock_calendar
 #: model:ir.ui.view,arch_db:stock_calendar.view_procurement_form_stock_inherit
 msgid "Calculate dates according to Orderpoint"
-msgstr ""
+msgstr "Beregner datoer iht. ordrepunktet"
 
 #. module: stock_calendar
 #: model:ir.model.fields,field_description:stock_calendar.field_stock_warehouse_orderpoint_calendar_id
@@ -35,11 +36,14 @@ msgid ""
 "That way the scheduler will only take into account the goods needed until "
 "the second delivery and put the procurement date as the first delivery."
 msgstr ""
+"I kalenderen kan du definere dagene for varernes levering. På denne måde vil"
+" planlægningsfunktionen kun tage hensyn til manglende varer indtil den anden"
+" levering, og sætte indkøbsdatoen som den første levering. "
 
 #. module: stock_calendar
 #: model:ir.model.fields,field_description:stock_calendar.field_stock_warehouse_orderpoint_last_execution_date
 msgid "Last Execution Date"
-msgstr ""
+msgstr "Sidste udførelsesdato"
 
 #. module: stock_calendar
 #: model:ir.model,name:stock_calendar.model_resource_calendar_leaves
@@ -54,12 +58,12 @@ msgstr "Minimum lager regel"
 #. module: stock_calendar
 #: model:ir.model.fields,field_description:stock_calendar.field_procurement_order_next_delivery_date
 msgid "Next Delivery Date"
-msgstr ""
+msgstr "Næste leveringsdato"
 
 #. module: stock_calendar
 #: model:ir.model.fields,field_description:stock_calendar.field_procurement_order_next_purchase_date
 msgid "Next Purchase Date"
-msgstr ""
+msgstr "Næste indkøbsdato"
 
 #. module: stock_calendar
 #: model:ir.model,name:stock_calendar.model_procurement_order
@@ -75,7 +79,7 @@ msgstr "Indkøbs gruppe"
 #. module: stock_calendar
 #: model:ir.model.fields,field_description:stock_calendar.field_stock_warehouse_orderpoint_purchase_calendar_id
 msgid "Purchase Calendar"
-msgstr ""
+msgstr "Indkøbskalender"
 
 #. module: stock_calendar
 #: model:ir.model,name:stock_calendar.model_resource_calendar
@@ -88,11 +92,13 @@ msgid ""
 "The date of the next delivery for this procurement group, when this group is"
 " on the purchase calendar of the orderpoint"
 msgstr ""
+"Datoen for næste levering for denne indkøbsgruppe, når denne gruppe er på "
+"indkøbskalenderen på ordrepunktet"
 
 #. module: stock_calendar
 #: model:ir.model.fields,help:stock_calendar.field_procurement_order_next_purchase_date
 msgid "The date the next purchase order should be sent to the vendor"
-msgstr ""
+msgstr "Datoen for hvornår den næste indkøbsordre bør sendes til leverandøren"
 
 #. module: stock_calendar
 #: model:ir.model,name:stock_calendar.model_resource_calendar_attendance
diff --git a/addons/stock_dropshipping/i18n/da.po b/addons/stock_dropshipping/i18n/da.po
index 04590c59a9d..3754cdd5dbd 100644
--- a/addons/stock_dropshipping/i18n/da.po
+++ b/addons/stock_dropshipping/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # jonas jensen <j.jensen@tcomp.dk>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +24,7 @@ msgstr ""
 #. module: stock_dropshipping
 #: model:stock.location.route,name:stock_dropshipping.route_drop_shipping
 msgid "Drop Shipping"
-msgstr ""
+msgstr "Drop Shipping"
 
 #. module: stock_dropshipping
 #: model:stock.picking.type,name:stock_dropshipping.picking_type_dropship
@@ -37,4 +39,4 @@ msgstr "Faktura"
 #. module: stock_dropshipping
 #: model:procurement.rule,name:stock_dropshipping.procurement_rule_drop_shipping
 msgid "Vendor → Customer"
-msgstr ""
+msgstr "Leverandør → Kunde"
diff --git a/addons/stock_picking_wave/i18n/da.po b/addons/stock_picking_wave/i18n/da.po
index 2846d3ec9ba..3532386975d 100644
--- a/addons/stock_picking_wave/i18n/da.po
+++ b/addons/stock_picking_wave/i18n/da.po
@@ -27,12 +27,12 @@ msgstr ""
 #. module: stock_picking_wave
 #: model:ir.model,name:stock_picking_wave.model_stock_picking_to_wave
 msgid "Add pickings to a picking wave"
-msgstr ""
+msgstr "Tilføj plukninger til en plukkesekvens"
 
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.picking_to_wave_form
 msgid "Add pickings to wave"
-msgstr ""
+msgstr "Tilføj plukninger to sekvens"
 
 #. module: stock_picking_wave
 #: model:ir.actions.act_window,name:stock_picking_wave.action_picking_to_wave
@@ -60,7 +60,7 @@ msgstr "Annulleret"
 #. module: stock_picking_wave
 #: model:ir.actions.act_window,help:stock_picking_wave.action_picking_wave
 msgid "Click to create a Picking Wave."
-msgstr ""
+msgstr "Klik for at oprette en plukkesekvens"
 
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
@@ -121,13 +121,13 @@ msgstr "ID"
 #: model:product.product,name:stock_picking_wave.product_product_ice_cream_choco
 #: model:product.template,name:stock_picking_wave.product_product_ice_cream_choco_product_template
 msgid "Ice Cream Chocolate"
-msgstr ""
+msgstr "Chokoladeis"
 
 #. module: stock_picking_wave
 #: model:product.product,description_sale:stock_picking_wave.product_product_ice_cream_choco
 #: model:product.template,description_sale:stock_picking_wave.product_product_ice_cream_choco_product_template
 msgid "Ice Cream Chocolate with sticks"
-msgstr ""
+msgstr "Chokoladeis med sticks"
 
 #. module: stock_picking_wave
 #: model:product.product,description_sale:stock_picking_wave.product_product_ice_cream_vani
@@ -135,7 +135,7 @@ msgstr ""
 #: model:product.template,description_sale:stock_picking_wave.product_product_ice_cream_vani_product_template
 #: model:product.template,name:stock_picking_wave.product_product_ice_cream_vani_product_template
 msgid "Ice Cream Vanilla"
-msgstr ""
+msgstr "Vanillieis"
 
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
@@ -163,12 +163,12 @@ msgstr "Sidst opdateret den"
 #. module: stock_picking_wave
 #: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_picking_ids
 msgid "List of picking associated to this wave"
-msgstr ""
+msgstr "Liste over plukninger relateret til denne sekvens"
 
 #. module: stock_picking_wave
 #: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_name
 msgid "Name of the picking wave"
-msgstr ""
+msgstr "Navnet på plukkesekvensen"
 
 #. module: stock_picking_wave
 #: code:addons/stock_picking_wave/models/stock_picking_wave.py:52
@@ -179,7 +179,7 @@ msgstr "Der er ikke noget at printe."
 #. module: stock_picking_wave
 #: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_user_id
 msgid "Person responsible for this wave"
-msgstr ""
+msgstr "Ansvarlig person for denne sekvens"
 
 #. module: stock_picking_wave
 #: code:addons/stock_picking_wave/models/stock_picking_wave.py:64
@@ -189,28 +189,28 @@ msgstr ""
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
 #, python-format
 msgid "Picking Wave"
-msgstr ""
+msgstr "Plukkesekvens"
 
 #. module: stock_picking_wave
 #: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_name
 msgid "Picking Wave Name"
-msgstr ""
+msgstr "Navn på plukkesekvens"
 
 #. module: stock_picking_wave
 #: model:ir.actions.act_window,name:stock_picking_wave.action_picking_wave
 #: model:ir.ui.menu,name:stock_picking_wave.menu_action_picking_wave
 msgid "Picking Waves"
-msgstr ""
+msgstr "Plukkecyklus"
 
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
 msgid "Picking Waves not finished"
-msgstr ""
+msgstr "Uafsluttede plukkesekvenser"
 
 #. module: stock_picking_wave
 #: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_id_9894
 msgid "Picking wave associated to this picking"
-msgstr ""
+msgstr "Plukkesekvens relateret til denne plukning"
 
 #. module: stock_picking_wave
 #: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_picking_ids
@@ -236,12 +236,12 @@ msgstr "Kører"
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
 msgid "Search Picking Waves"
-msgstr ""
+msgstr "Søg plukkesekvens"
 
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.picking_to_wave_form
 msgid "Select a wave"
-msgstr ""
+msgstr "Vælg en sekvens"
 
 #. module: stock_picking_wave
 #: code:addons/stock_picking_wave/models/stock_picking_wave.py:59
@@ -250,6 +250,8 @@ msgid ""
 "Some pickings are still waiting for goods. Please check or force their "
 "availability before setting this wave to done."
 msgstr ""
+"Nogle plukninger venter stadig på varer. Venligst undersøg for, eller "
+"gennemtving deres tilgængelighed før du sætter denne sekvens til udført. "
 
 #. module: stock_picking_wave
 #: model:product.product,name:stock_picking_wave.product_product_dry_specu
@@ -279,7 +281,7 @@ msgstr "Status"
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_tree
 msgid "Stock Picking Waves"
-msgstr ""
+msgstr "Lager plukkesekvens"
 
 #. module: stock_picking_wave
 #: model:ir.actions.act_window,help:stock_picking_wave.action_picking_wave
@@ -289,6 +291,10 @@ msgid ""
 "                It may also be useful to assign jobs (one person = one wave) or\n"
 "                help the timing management of operations (tasks to be done at 1pm)."
 msgstr ""
+"Målet med plukkesekvenser er at gruppere operationer der\n"
+"                (skal) udføres sammen for at øge effektiviteten.\n"
+"                Det kan også være nyttigt til at tildele opgaver (en person = en sekvens) eller\n"
+"                hjælpe med at holde styr på opgaver (opgver der skal udføres før kl. 13.00)."
 
 #. module: stock_picking_wave
 #: model:ir.model,name:stock_picking_wave.model_stock_picking
@@ -309,4 +315,4 @@ msgstr "Bruger"
 #. module: stock_picking_wave
 #: model:ir.ui.view,arch_db:stock_picking_wave.view_stock_picking_wave_search_inherit
 msgid "Wave"
-msgstr ""
+msgstr "Sekvens"
diff --git a/addons/survey/i18n/da.po b/addons/survey/i18n/da.po
index bc166d7e0d8..a98d2ae4586 100644
--- a/addons/survey/i18n/da.po
+++ b/addons/survey/i18n/da.po
@@ -673,7 +673,7 @@ msgstr ""
 #. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_stage_fold
 msgid "Folded in kanban view"
-msgstr ""
+msgstr "Foldet i kanban visning"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -1181,7 +1181,7 @@ msgstr "Kontakt"
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_partner_survey_mail
 msgid "Partner Survey Mailing"
-msgstr ""
+msgstr "Partner spørgeskema mails"
 
 #. module: survey
 #: model:survey.stage,name:survey.stage_permanent
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index ff87680ba5b..7fce2abb75d 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -352,7 +352,7 @@ msgstr "选择..."
 #. module: survey
 #: model:ir.actions.server,name:survey.survey_action_server_clean_test_answers
 msgid "Clean test answers"
-msgstr ""
+msgstr "清除测试答案"
 
 #. module: survey
 #: code:addons/survey/models/survey.py:112
diff --git a/addons/survey_crm/i18n/da.po b/addons/survey_crm/i18n/da.po
index 5b05ba444b6..3557480c941 100644
--- a/addons/survey_crm/i18n/da.po
+++ b/addons/survey_crm/i18n/da.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,4 +27,4 @@ msgstr "Guide til email oprettelse ved undersøgelser"
 #. module: survey_crm
 #: model:ir.actions.act_window,name:survey_crm.action_partner_survey_mail_crm
 msgid "Partner Survey Mailing"
-msgstr ""
+msgstr "Partner spørgeskema mails"
diff --git a/addons/utm/i18n/da.po b/addons/utm/i18n/da.po
index 250dd07e1e5..52564573605 100644
--- a/addons/utm/i18n/da.po
+++ b/addons/utm/i18n/da.po
@@ -6,6 +6,7 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # peso <peer.sommerlund@gmail.com>, 2016
 msgid ""
 msgstr ""
@@ -69,17 +70,17 @@ msgstr "Kanaler"
 #. module: utm
 #: model:utm.campaign,name:utm.utm_campaign_christmas_special
 msgid "Christmas Special"
-msgstr ""
+msgstr "Julespecial"
 
 #. module: utm
 #: model:ir.actions.act_window,help:utm.utm_medium_action
 msgid "Click to define a new medium."
-msgstr ""
+msgstr "Klik for at definere et nyt medium."
 
 #. module: utm
 #: model:ir.actions.act_window,help:utm.utm_source_action
 msgid "Click to define a new source."
-msgstr ""
+msgstr "Klik for at definere en ny kilde."
 
 #. module: utm
 #: model:ir.model.fields,field_description:utm.field_utm_campaign_create_uid
@@ -106,12 +107,12 @@ msgstr "Vis navn"
 #. module: utm
 #: model:utm.campaign,name:utm.utm_campaign_email_campaign_services
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "E-mailkampagne - Serviceydelse"
 
 #. module: utm
 #: model:utm.source,name:utm.utm_source_facebook
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. module: utm
 #: model:ir.model,name:utm.model_ir_http
@@ -151,12 +152,12 @@ msgstr "Sidst opdateret den"
 #. module: utm
 #: model:ir.ui.menu,name:utm.menu_link_tracker_root
 msgid "Link Tracker"
-msgstr ""
+msgstr "Link Tracker"
 
 #. module: utm
 #: model:utm.source,name:utm.utm_source_mailing
 msgid "Mailing Partner"
-msgstr "Mailing partner"
+msgstr "Mailpartner"
 
 #. module: utm
 #: model:ir.actions.act_window,name:utm.utm_medium_action
@@ -208,7 +209,7 @@ msgstr "Kildenavn"
 #: model:ir.actions.act_window,name:utm.utm_source_action
 #: model:ir.ui.menu,name:utm.menu_utm_source
 msgid "Sources"
-msgstr ""
+msgstr "Kilder"
 
 #. module: utm
 #: model:ir.model.fields,help:utm.field_account_invoice_campaign_id
@@ -232,6 +233,7 @@ msgstr ""
 #: model:ir.model.fields,help:utm.field_utm_mixin_medium_id
 msgid "This is the method of delivery.Ex: Postcard, Email, or Banner Ad"
 msgstr ""
+"Dette er leveringsmetoderne. Eksempel: Postkort, E-mail eller bannerannonce"
 
 #. module: utm
 #: model:ir.model.fields,help:utm.field_account_invoice_source_id
@@ -244,11 +246,13 @@ msgid ""
 "This is the source of the link Ex:Search Engine, another domain,or name of "
 "email list"
 msgstr ""
+"Dette er kilden til linket Ex: Søgemaskine, et andet domæne eller navnet på "
+"e-maillisten"
 
 #. module: utm
 #: model:utm.source,name:utm.utm_source_twitter
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #. module: utm
 #: model:ir.ui.menu,name:utm.marketing_utm
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 5532eca510c..9c59cd41348 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -660,7 +660,7 @@ msgstr "日付の作成："
 #: code:addons/web/static/src/xml/base.xml:179
 #, python-format
 msgid "Creation User:"
-msgstr "ユーザの作成："
+msgstr "作成ユーザ:"
 
 #. module: web
 #. openerp-web
@@ -2151,7 +2151,7 @@ msgstr "合計"
 #: code:addons/web/static/src/js/abstract_web_client.js:114
 #, python-format
 msgid "Traceback:"
-msgstr "トレースバック："
+msgstr "トレースバック:"
 
 #. module: web
 #. openerp-web
@@ -2172,7 +2172,7 @@ msgstr "再接続中です..."
 #: code:addons/web/static/src/xml/base_common.xml:47
 #, python-format
 msgid "Type:"
-msgstr "タイプ："
+msgstr "タイプ:"
 
 #. module: web
 #. openerp-web
@@ -2395,7 +2395,7 @@ msgstr "入力した値が間違っています!"
 #: code:addons/web/static/src/xml/base.xml:171
 #, python-format
 msgid "XML ID:"
-msgstr "XML ID："
+msgstr "XML ID:"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 9c265ec770f..eaaa9d4b8fe 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -33,7 +33,7 @@ msgstr "活動"
 #: code:addons/web_diagram/static/src/js/diagram.js:314
 #, python-format
 msgid "Create:"
-msgstr "作成："
+msgstr "作成:"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_editor/i18n/zh_CN.po b/addons/web_editor/i18n/zh_CN.po
index a7c5ce57e68..a13d8b2025a 100644
--- a/addons/web_editor/i18n/zh_CN.po
+++ b/addons/web_editor/i18n/zh_CN.po
@@ -36,7 +36,7 @@ msgstr "(Youtube, Vimeo, Dailymotion)"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% Black"
-msgstr ""
+msgstr "25% 黑"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -46,22 +46,22 @@ msgstr ""
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% Black"
-msgstr ""
+msgstr "50% 黑"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% White"
-msgstr ""
+msgstr "50% 白"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% Black"
-msgstr ""
+msgstr "75% 黑"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% White"
-msgstr ""
+msgstr "75% 白"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.snippets
@@ -166,7 +166,7 @@ msgstr "背景颜色"
 #: code:addons/web_editor/static/src/js/snippets.options.js:667
 #, python-format
 msgid "Background Image Sizing"
-msgstr ""
+msgstr "背景图像尺寸"
 
 #. module: web_editor
 #. openerp-web
@@ -363,7 +363,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Delta"
-msgstr ""
+msgstr "差异"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_settings_dashboard/i18n/zh_CN.po b/addons/web_settings_dashboard/i18n/zh_CN.po
index 8a1633e164b..ce914a692c5 100644
--- a/addons/web_settings_dashboard/i18n/zh_CN.po
+++ b/addons/web_settings_dashboard/i18n/zh_CN.po
@@ -124,7 +124,7 @@ msgstr "按照这些实施指导来有效利用Odoo."
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:156
 #, python-format
 msgid "GNU LGPL Licenced"
-msgstr ""
+msgstr "GNU LGPL 授权"
 
 #. module: web_settings_dashboard
 #. openerp-web
diff --git a/addons/website/i18n/da.po b/addons/website/i18n/da.po
index ad4579ec51a..079a9948802 100644
--- a/addons/website/i18n/da.po
+++ b/addons/website/i18n/da.po
@@ -96,17 +96,17 @@ msgstr "1. Definer Nøgleord"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "10s"
-msgstr ""
+msgstr "10s"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "12"
-msgstr ""
+msgstr "12"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "1s"
-msgstr ""
+msgstr "1s"
 
 #. module: website
 #. openerp-web
@@ -118,12 +118,12 @@ msgstr "2. Beskriv din side"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "24x7 toll-free support"
-msgstr ""
+msgstr "24x7 momsfri support"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "2s"
-msgstr ""
+msgstr "2s"
 
 #. module: website
 #. openerp-web
@@ -135,7 +135,7 @@ msgstr "3. Forhåndsvisning"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "3s"
-msgstr ""
+msgstr "3s"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.403
@@ -150,26 +150,26 @@ msgstr "404: Siden blev ikke fundet!"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "5s"
-msgstr ""
+msgstr "5s"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.xml:69
 #, python-format
 msgid ":&nbsp;"
-msgstr ""
+msgstr ":&nbsp;"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_big_picture
 msgid "<b>A Small Subtitle</b>"
-msgstr ""
+msgstr "<b>En lille undertekst</b>"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/js/website.tour.banner.js:15
 #, python-format
 msgid "<b>Click Edit</b> to start designing your homepage."
-msgstr ""
+msgstr "<b>Klik rediger</b> for at starte med at designe din hjemmeside."
 
 #. module: website
 #. openerp-web
@@ -179,6 +179,8 @@ msgid ""
 "<b>Click on a text</b> to start editing it. <i>It's that easy to edit your "
 "content!</i>"
 msgstr ""
+"<b>Klik på en tekst</b> for at starte med at redigere det. <i>Så nemt er det"
+" at redigere dit indhold!</i>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -205,7 +207,7 @@ msgstr ""
 #: code:addons/website/static/src/js/website.tour.banner.js:72
 #, python-format
 msgid "<b>Install a contact form</b> to improve this page."
-msgstr ""
+msgstr "<b>Installer en kontaktformular</b> for at forbedre denne side."
 
 #. module: website
 #. openerp-web
@@ -215,26 +217,28 @@ msgid ""
 "<b>Install new apps</b> to get more features. Let's install the <i>'Contact "
 "form'</i> app."
 msgstr ""
+"<b>Installer nye apps</b> for at få flere funktioner. Lad os installere "
+"<i>kontaktformular</i> appen."
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
 msgid "<b>No theme module found!</b>"
-msgstr ""
+msgstr "<b>Intet skabelonmodul fundet!</b>"
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_website
 msgid "<b>No website module found!</b>"
-msgstr ""
+msgstr "<b>Intet webside modul fundet!</b>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<b>Set Custom Image...</b>"
-msgstr ""
+msgstr "<b>Indstil brugerdefineret billede...</b>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_sign_in
 msgid "<b>Sign in</b>"
-msgstr ""
+msgstr "<b>Log ind</b>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -242,11 +246,13 @@ msgid ""
 "<br/>\n"
 "                                    Make sure the Advanced Options are set to your country and language."
 msgstr ""
+"<br/>\n"
+"Sørg for, at de avancerede indstillinger er indstillet til dit land og sprog."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-arrows\"/>Background Image Sizing"
-msgstr ""
+msgstr "<i class=\"fa fa-arrows\"/>Baggrundsbillede størrelse"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -256,52 +262,52 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-clock-o\"/>Scroll Speed"
-msgstr ""
+msgstr "<i class=\"fa fa-clock-o\"/>Scrollhastighed"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-clock-o\"/>Slideshow speed"
-msgstr ""
+msgstr "<i class=\"fa fa-clock-o\"/>Diashow hastighed"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-diamond\"/> Feature"
-msgstr ""
+msgstr "<i class=\"fa fa-diamond\"/>Funktion"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<i class=\"fa fa-envelope-o\"/> Contact Our Website Experts"
-msgstr ""
+msgstr "<i class=\"fa fa-envelope-o\"/>Kontakt vore webside eksperter"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-expand\"/>Margin"
-msgstr ""
+msgstr "<i class=\"fa fa-expand\"/>Margin"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-eyedropper\"/>Background Color"
-msgstr ""
+msgstr "<i class=\"fa fa-eyedropper\"/>Baggrundsfarve"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-eyedropper\"/>Overlay color"
-msgstr ""
+msgstr "<i class=\"fa fa-eyedropper\"/>Overlagsfarve"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-indent\"/> Inner content"
-msgstr ""
+msgstr "<i class=\"fa fa-indent\"/>Indre indhold"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-magic icon-fix\"/> Effect"
-msgstr ""
+msgstr "<i class=\"fa fa-magic icon-fix\"/>Effekt"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-magic\"/>Mode"
-msgstr ""
+msgstr "<i class=\"fa fa-magic\"/>Tilstand"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -311,12 +317,12 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-paint-brush\"/>Styling"
-msgstr ""
+msgstr "<i class=\"fa fa-paint-brush\"/>Styling"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-picture-o\"/>Background Image"
-msgstr ""
+msgstr "<i class=\"fa fa-picture-o\"/>Baggrundsbillede"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.language_selector
@@ -324,46 +330,48 @@ msgid ""
 "<i class=\"fa fa-plus-circle\"/>\n"
 "                Add a language..."
 msgstr ""
+"<i class=\"fa fa-plus-circle\"/>\n"
+"Tilføj et sprog..."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-plus-circle\"/>Add Slide"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/>Tilføj slide"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-plus-circle\"/>Add images"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/>Tilføj billeder"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-refresh\"/>Re-order"
-msgstr ""
+msgstr "<i class=\"fa fa-refresh\"/>Flyt rundt"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-th\"/>Columns"
-msgstr ""
+msgstr "<i class=\"fa fa-th\"/>Kolonner"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-th-large\"/> Structure"
-msgstr ""
+msgstr "<i class=\"fa fa-th-large\"/>Struktur"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "<i class=\"fa fa-th-large\"/> WEBSITE <b class=\"caret\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-th-large\"/>WEBSIDE<b class=\"caret\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-trash\"/>Remove all images"
-msgstr ""
+msgstr "<i class=\"fa fa-trash\"/>Fjern alle billeder"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-trash-o\"/>Remove Slide"
-msgstr ""
+msgstr "<i class=\"fa fa-trash-o\"/>Fjern slide"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -372,6 +380,9 @@ msgid ""
 "                        The whole process may take a few hours, some discussions with your colleagues and\n"
 "                    several cups of coffee to go through. But don't worry, you can return to this tool at any time.</i>"
 msgstr ""
+"<i>\n"
+"                        Hele processen kan tage et par timer, nogle diskussioner med dine kolleger og\n"
+" flere kopper kaffe at gå igennem. Men bare rolig, du kan til enhver tid vende tilbage til dette værktøj.</i>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -380,6 +391,9 @@ msgid ""
 "                        Whether you're a beginner or a pro, we have everything you need to plan, create,\n"
 "                    publish and grow your site, blog or online store.</i>"
 msgstr ""
+"<i>\n"
+"                        Uanset om du er en nybegynder eller en proffs, har vi alt hvad du behøver for at planlægge, oprette,\n"
+" udgive og dyrke dit websted, blog eller online butik.</i>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -394,16 +408,18 @@ msgid ""
 "<i>Congratulations on taking the leap and deciding to build your own "
 "website!</i>"
 msgstr ""
+"<i>Tillykke med at du tager springer og beslutter at starte din egen "
+"hjemmeside!</i>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<i>Instant setup, satisfied or reimbursed.</i>"
-msgstr ""
+msgstr "<i>Øjeblikkeligt setup, tilfreds eller refunderet.</i>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<i>We wish you a fun time!</i>"
-msgstr ""
+msgstr "<i>Vi ønsker dig en sjov tid!</i>"
 
 #. module: website
 #. openerp-web
@@ -421,16 +437,19 @@ msgid ""
 "to tell a story. Everything you consider writing can be told as a "
 "story.</small>"
 msgstr ""
+"<small class=\"text-muted\">En god måde at fange din læsers opmærksomhed på "
+"er at fortælle en historie. Alt hvad du overvejer at skrive kan fortælles "
+"som en historie.</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_parallax_slider
 msgid "<small>Author of this quote</small>"
-msgstr ""
+msgstr "<small>Forfatter af dette citat</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_parallax_slider
 msgid "<small>John Doe, CEO</small>"
-msgstr ""
+msgstr "<small>John Doe, CEO</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -443,16 +462,18 @@ msgid ""
 "<span class=\"fa fa-lightbulb-o fa-2x\"/>\n"
 "                                <strong>Tips for a good domain:</strong>"
 msgstr ""
+"<span class=\"fa fa-lightbulb-o fa-2x\"/>\n"
+"<strong>Tips for et godt domæne:</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "<span class=\"fa fa-pencil\"/>Edit"
-msgstr ""
+msgstr "<span class=\"fa fa-pencil\"/>Rediger"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "<span class=\"fa fa-plus\"/>New"
-msgstr ""
+msgstr "<span class=\"fa fa-plus\"/>Ny"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -498,17 +519,17 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<span>$</span><b style=\"font-size: 60px\">125</b><small>.00</small>"
-msgstr ""
+msgstr "<span>$</span><b style=\"font-size: 60px\">125</b><small>.00</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<span>$</span><b style=\"font-size: 60px\">35</b><small>.00</small>"
-msgstr ""
+msgstr "<span>$</span><b style=\"font-size: 60px\">35</b><small>.00</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<span>$</span><b style=\"font-size: 60px\">65</b><small>.00</small>"
-msgstr ""
+msgstr "<span>$</span><b style=\"font-size: 60px\">65</b><small>.00</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_button
@@ -516,11 +537,13 @@ msgid ""
 "<span>Contact Us Now</span>\n"
 "                        <i class=\"fa fa-chevron-right\"/>"
 msgstr ""
+"<span>Kontakt os nu</span>\n"
+"                        <i class=\"fa fa-chevron-right\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_share
 msgid "<span>Share</span>"
-msgstr ""
+msgstr "<span>Del</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -580,7 +603,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Blogs</strong>"
-msgstr ""
+msgstr "<strong>Blogs</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -595,12 +618,12 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Contact Form</strong>"
-msgstr ""
+msgstr "<strong>Kontaktformular</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Discuss live</strong>"
-msgstr ""
+msgstr "<strong>Diskuter live</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -614,12 +637,12 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
 msgid "<strong>Error message:</strong>"
-msgstr ""
+msgstr "<strong>Fejlbesked:</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Event Tickets</strong>"
-msgstr ""
+msgstr "<strong>Event billetter</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -627,6 +650,8 @@ msgid ""
 "<strong>Find 3 websites that you like</strong> and write down what you like "
 "about them."
 msgstr ""
+"<strong>Find 3 hjemmesider som du kan lide</strong> og skriv ned hvad du kan"
+" lide ved dem."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -639,7 +664,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>How to get a custom domain name?</strong><br/>"
-msgstr ""
+msgstr "<strong>Hvordan får man et brugerdefineret domænenavn?</strong><br/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -653,17 +678,17 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Install</strong> what you need:"
-msgstr ""
+msgstr "<strong>Installer</strong> hvad du har brug for:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Jobs</strong>"
-msgstr ""
+msgstr "<strong>Jobs</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Launch a forum</strong>"
-msgstr ""
+msgstr "<strong>Lancer et forum</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -678,12 +703,12 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Publish documentation</strong>"
-msgstr ""
+msgstr "<strong>Udgiv dokumentation</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Publish events</strong>"
-msgstr ""
+msgstr "<strong>Udgiv events</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -698,7 +723,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Send mass mails</strong>"
-msgstr ""
+msgstr "<strong>Send masse e-mails</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -715,22 +740,22 @@ msgstr "<strong>Abonnementer</strong>"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>The big launch</strong><br/>"
-msgstr ""
+msgstr "<strong>Den store lancering</strong><br/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Use Google Webmaster</strong><br/>"
-msgstr ""
+msgstr "<strong>Brug Google Webmaster</strong><br/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Use contact forms</strong>"
-msgstr ""
+msgstr "<strong>Brug kontaktformular</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>Use relevant keywords</strong><br/>"
-msgstr ""
+msgstr "<strong>Brug relevante nøgleord</strong><br/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -738,11 +763,13 @@ msgid ""
 "<strong>With that in mind, try to define the structure of your main "
 "menu:</strong>"
 msgstr ""
+"<strong>Med det for øje, så prøv at definere strukturen i din "
+"hovedmenu:</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>You own your domain name?</strong><br/>"
-msgstr ""
+msgstr "<strong>Ejer du dit domænenavn?</strong><br/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -752,12 +779,12 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "<strong>eCommerce</strong>"
-msgstr ""
+msgstr "<strong>Nethandel</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "@odoo"
-msgstr ""
+msgstr "@odoo"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -767,13 +794,13 @@ msgstr "En stor overskrift"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_big_picture
 msgid "A Punchy Headline"
-msgstr ""
+msgstr "En fængende overskrift"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_text
 #: model:ir.ui.view,arch_db:website.s_text_image
 msgid "A Section Subtitle"
-msgstr ""
+msgstr "En sektion undertekst"
 
 #. module: website
 #: model:ir.model.fields,help:website.field_ir_act_server_website_published
@@ -787,7 +814,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
 msgid "A good subtitle"
-msgstr ""
+msgstr "En god undertekst"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -795,11 +822,13 @@ msgid ""
 "A great way to catch your reader's attention is to tell a story.\n"
 "                        Everything you consider writing can be told as a story."
 msgstr ""
+"En god måde at fange din læsers opmærksomhed på er at fortælle en historie. \n"
+" Alt hvad du overvejer at skrive kan fortælles som en historie."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_features
 msgid "A small explanation of this great<br/>feature, in clear words."
-msgstr ""
+msgstr "En lille forklaring af denne super gode <br/> funktion, i stikord."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_version
@@ -848,7 +877,7 @@ msgstr "Tilføj"
 #: model:ir.ui.view,arch_db:website.s_image_gallery
 #, python-format
 msgid "Add Images from the 'Customize' menu"
-msgstr ""
+msgstr "Tilføj billeder fra \"Tilpas\" menuen"
 
 #. module: website
 #. openerp-web
@@ -867,7 +896,7 @@ msgstr "Indtast et godt slogan"
 #: code:addons/website/static/src/xml/website.gallery.xml:18
 #, python-format
 msgid "Add images"
-msgstr ""
+msgstr "Tilføj billeder"
 
 #. module: website
 #. openerp-web
@@ -886,7 +915,7 @@ msgstr "Tilføj side i menuen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Adding relevant and popular keywords"
-msgstr ""
+msgstr "Tilføjer relevante og populære nøgleord"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_config_settings
@@ -897,7 +926,7 @@ msgstr "Avanceret"
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid ""
 "Advertise a keyword if you answer YES to the three following questions:"
-msgstr ""
+msgstr "Annoncer et søgeord, hvis du svarer JA til de tre følgende spørgsmål:"
 
 #. module: website
 #. openerp-web
@@ -905,6 +934,7 @@ msgstr ""
 #, python-format
 msgid "After having checked how it looks on mobile, <b>close the preview</b>."
 msgstr ""
+"Efter du har tjekket hvordan det ser ud på mobil, <b>luk visningen</b>."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -918,7 +948,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Aim for a .com and/or your country extension"
-msgstr ""
+msgstr "Gå efter en .com og / eller din landekode"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -930,29 +960,31 @@ msgstr ""
 #. module: website
 #: selection:website.config.settings,module_website_version:0
 msgid "Allow multiple versions of the same page (advanced)"
-msgstr ""
+msgstr "Tillad flere versioner af samme side (avanceret)"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid ""
 "Allows your community to ask and answer questions about their interests"
 msgstr ""
+"Tillader dit fællesskab at spørge og besvare spørgsmål om deres interesser"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
 msgid "An error occured while rendering the template"
-msgstr ""
+msgstr "Der opstod en fejl under udgivelsen af skabelonen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_title
 msgid "And a great subtitle too"
-msgstr ""
+msgstr "Og også en god undertekst"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid ""
 "Announce it on social media: Twitter, Facebook, LinkedIn, Youtube, etc."
 msgstr ""
+"Annoncer det på sociale medier: Twitter, Facebook, LinkedIn, Youtube, etc."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_config_settings
@@ -963,7 +995,7 @@ msgstr "Anvend"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Apply it to your website from your database admin page"
-msgstr ""
+msgstr "Anvend det på din hjemmeside fra din database admin side"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_attachment_website_url
@@ -973,12 +1005,12 @@ msgstr "Vedhæftning URL"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Attract more visitors with a content marketing strategy."
-msgstr ""
+msgstr "Tiltræk flere besøgende med en content marketing strategi."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Attract new leads"
-msgstr ""
+msgstr "Tiltræk nye leads"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_act_server_website_published
@@ -988,7 +1020,7 @@ msgstr "Synlig på websiten"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Avoid special characters"
-msgstr ""
+msgstr "Undgå specielle tegn"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -1006,12 +1038,12 @@ msgstr "Tilbage"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Background image"
-msgstr ""
+msgstr "Baggrundsbillede"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Banner Odoo Image"
-msgstr ""
+msgstr "Banner Odoo billede"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -1021,7 +1053,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Be mobile"
-msgstr ""
+msgstr "Vær mobil"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -1034,16 +1066,19 @@ msgid ""
 "Being clear on why you're creating your site is an essential first step to "
 "ensure your content and structure meet business objectives."
 msgstr ""
+"At være klar over hvorfor du opretter dit websted er et vigtigt første "
+"skridt for at sikre, at dit indhold og din struktur opfylder "
+"forretningsmålene."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Best if you have language skills"
-msgstr ""
+msgstr "Foretrækkes at du har sprogfærdigheder"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Big"
-msgstr ""
+msgstr "Stor"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
@@ -1053,7 +1088,7 @@ msgstr "Forbedre dit online salg med elegante produktsider."
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_planner
 msgid "Build awareness and credibility"
-msgstr ""
+msgstr "Opbyg opmærksomhed og troværdighed"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
diff --git a/addons/website/i18n/ja.po b/addons/website/i18n/ja.po
index f136482f3ec..9d847cc19b3 100644
--- a/addons/website/i18n/ja.po
+++ b/addons/website/i18n/ja.po
@@ -3180,7 +3180,7 @@ msgstr "TRANSLATE"
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
 msgid "Technical name:"
-msgstr "技術名称："
+msgstr "技術名称:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
diff --git a/addons/website_blog/i18n/zh_CN.po b/addons/website_blog/i18n/zh_CN.po
index 00a0490671c..91c87278e9a 100644
--- a/addons/website_blog/i18n/zh_CN.po
+++ b/addons/website_blog/i18n/zh_CN.po
@@ -127,7 +127,7 @@ msgstr ""
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "A new post"
-msgstr ""
+msgstr "新帖"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
@@ -382,7 +382,7 @@ msgstr ""
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Filter Color"
-msgstr ""
+msgstr "过滤颜色"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
diff --git a/addons/website_crm/i18n/zh_CN.po b/addons/website_crm/i18n/zh_CN.po
index 2feabfd7314..d3c935164e0 100644
--- a/addons/website_crm/i18n/zh_CN.po
+++ b/addons/website_crm/i18n/zh_CN.po
@@ -124,7 +124,7 @@ msgstr "感谢！"
 #: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:15
 #, python-format
 msgid "There is no recent lead."
-msgstr ""
+msgstr "没有最近的线索"
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
diff --git a/addons/website_crm_partner_assign/i18n/es.po b/addons/website_crm_partner_assign/i18n/es.po
index 14e4188a335..389524b6af0 100644
--- a/addons/website_crm_partner_assign/i18n/es.po
+++ b/addons/website_crm_partner_assign/i18n/es.po
@@ -15,11 +15,12 @@
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2016
 # Antonio Trueba <atgayol@gmail.com>, 2016
-# José Vicente <txusev@gmail.com>, 2016
+# Gustavo Valverde <g.valverde02@gmail.com>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Felix Villafranca Encinas <f.villafranca@obj3ct.es>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
+# José Vicente <txusev@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
@@ -984,7 +985,7 @@ msgstr "Equipo de ventas"
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.index
diff --git a/addons/website_crm_partner_assign/i18n/zh_CN.po b/addons/website_crm_partner_assign/i18n/zh_CN.po
index cac74c04bdc..b88911d74ab 100644
--- a/addons/website_crm_partner_assign/i18n/zh_CN.po
+++ b/addons/website_crm_partner_assign/i18n/zh_CN.po
@@ -126,7 +126,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "<span>at </span>"
-msgstr ""
+msgstr "<span>在</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
diff --git a/addons/website_event/i18n/da.po b/addons/website_event/i18n/da.po
index 62fe56b250f..efa0040406a 100644
--- a/addons/website_event/i18n/da.po
+++ b/addons/website_event/i18n/da.po
@@ -26,12 +26,12 @@ msgstr ""
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_attendee_details
 msgid "(Free)"
-msgstr ""
+msgstr "(Ledig)"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.country_events_list
 msgid "<b>Upcoming Events</b>"
-msgstr ""
+msgstr "<b>Kommende arrangementer</b>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
@@ -483,7 +483,7 @@ msgstr "Denne måned"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "Ticket Type"
-msgstr ""
+msgstr "Opgave type"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_attendee_details
diff --git a/addons/website_event/i18n/zh_CN.po b/addons/website_event/i18n/zh_CN.po
index 4c9e6e738f2..2ad7dd67997 100644
--- a/addons/website_event/i18n/zh_CN.po
+++ b/addons/website_event/i18n/zh_CN.po
@@ -99,7 +99,7 @@ msgstr "<strong>电话</strong> <span class=\"text-muted\">(可选)</span>"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
 msgid "<strong>Use this tag:</strong>"
-msgstr ""
+msgstr "<strong>使用此标签:</strong>"
 
 #. module: website_event
 #: code:addons/website_event/controllers/main.py:96
diff --git a/addons/website_event_track/i18n/da.po b/addons/website_event_track/i18n/da.po
index ba08d55da50..955a7bd121d 100644
--- a/addons/website_event_track/i18n/da.po
+++ b/addons/website_event_track/i18n/da.po
@@ -9,13 +9,14 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2016
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,12 +27,12 @@ msgstr ""
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_count_sponsor
 msgid "# Sponsors"
-msgstr ""
+msgstr "# sponsorer"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
 msgid "<b>Date</b><br/>"
-msgstr ""
+msgstr "<b>Dato</b><br/>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
diff --git a/addons/website_event_track/i18n/fi.po b/addons/website_event_track/i18n/fi.po
index d88de149e8d..4d6378fe213 100644
--- a/addons/website_event_track/i18n/fi.po
+++ b/addons/website_event_track/i18n/fi.po
@@ -171,7 +171,7 @@ msgstr "Julkistettu"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
 msgid "Application"
-msgstr "Sovellus"
+msgstr "Hakemus"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
diff --git a/addons/website_forum/i18n/da.po b/addons/website_forum/i18n/da.po
index e6013a13579..647cc70c468 100644
--- a/addons/website_forum/i18n/da.po
+++ b/addons/website_forum/i18n/da.po
@@ -12,13 +12,14 @@
 # Jonathan Stein <cgs@image.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-10-10 08:44+0000\n"
 "PO-Revision-Date: 2016-10-10 08:44+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -337,7 +338,7 @@ msgstr ""
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.close_post
 msgid "<span class=\"text-muted\">or</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\">eller</span>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.user_detail_full
@@ -360,7 +361,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_forum.display_post_question_block
 #: model:ir.ui.view,arch_db:website_forum.post_description_full
 msgid "<span>By </span>"
-msgstr ""
+msgstr "<span>Af </span>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
diff --git a/addons/website_forum_doc/i18n/da.po b/addons/website_forum_doc/i18n/da.po
index 294d7473cc0..0389fc48b49 100644
--- a/addons/website_forum_doc/i18n/da.po
+++ b/addons/website_forum_doc/i18n/da.po
@@ -9,13 +9,14 @@
 # Morten Schou <ms@msteknik.dk>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgstr "&amp;times;"
 #. module: website_forum_doc
 #: model:ir.ui.view,arch_db:website_forum_doc.promote_question
 msgid "<span class=\"text-muted\">or</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\">eller</span>"
 
 #. module: website_forum_doc
 #: model:forum.documentation.toc,name:website_forum_doc.toc_crm_after_sale
diff --git a/addons/website_hr_recruitment/i18n/da.po b/addons/website_hr_recruitment/i18n/da.po
index 13bf9aaa53f..441229db995 100644
--- a/addons/website_hr_recruitment/i18n/da.po
+++ b/addons/website_hr_recruitment/i18n/da.po
@@ -8,13 +8,14 @@
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2016
 # Morten Schou <ms@msteknik.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "10  / 40 people"
-msgstr ""
+msgstr "10  / 40 personer"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
diff --git a/addons/website_hr_recruitment/i18n/zh_CN.po b/addons/website_hr_recruitment/i18n/zh_CN.po
index 6307a719d59..33e4b8a9506 100644
--- a/addons/website_hr_recruitment/i18n/zh_CN.po
+++ b/addons/website_hr_recruitment/i18n/zh_CN.po
@@ -128,7 +128,7 @@ msgstr "公司增长"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Company Maturity:"
-msgstr ""
+msgstr "公司成熟度:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
@@ -297,7 +297,7 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Prime location"
-msgstr ""
+msgstr "主要地点"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
diff --git a/addons/website_links/i18n/da.po b/addons/website_links/i18n/da.po
index 060905d52dc..012a497f327 100644
--- a/addons/website_links/i18n/da.po
+++ b/addons/website_links/i18n/da.po
@@ -6,13 +6,15 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Jarnhold Nattestad <nattestads@gmail.com>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-19 12:36+0000\n"
 "PO-Revision-Date: 2016-09-19 12:36+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +71,7 @@ msgstr ""
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
 msgid "<strong>Source</strong>"
-msgstr ""
+msgstr "<strong>Kilde</strong>"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
@@ -122,7 +124,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
 #: model:ir.ui.view,arch_db:website_links.graphs
 msgid "Link Tracker"
-msgstr ""
+msgstr "Link Tracker"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
diff --git a/addons/website_links/i18n/zh_CN.po b/addons/website_links/i18n/zh_CN.po
index 7542b3bb252..64719b72776 100644
--- a/addons/website_links/i18n/zh_CN.po
+++ b/addons/website_links/i18n/zh_CN.po
@@ -23,21 +23,21 @@ msgstr ""
 #: code:addons/website_links/static/src/js/website_links_charts.js:53
 #, python-format
 msgid " clicks"
-msgstr ""
+msgstr "点击"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links_charts.js:104
 #, python-format
 msgid " countries"
-msgstr ""
+msgstr "国家"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links_charts.js:57
 #, python-format
 msgid "# of clicks"
-msgstr ""
+msgstr "# 点击"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.share_page_menu
@@ -214,7 +214,7 @@ msgstr "无法获取最近链接"
 #: code:addons/website_links/static/src/js/website_links_charts.js:99
 #, python-format
 msgid "Undefined"
-msgstr ""
+msgstr "未定义"
 
 #. module: website_links
 #. openerp-web
diff --git a/addons/website_partner/i18n/zh_CN.po b/addons/website_partner/i18n/zh_CN.po
index 838c03c83cc..aa7191e8e20 100644
--- a/addons/website_partner/i18n/zh_CN.po
+++ b/addons/website_partner/i18n/zh_CN.po
@@ -36,7 +36,7 @@ msgstr ""
 #. module: website_partner
 #: model:ir.model.fields,field_description:website_partner.field_res_users_website_published
 msgid "Visible in Website"
-msgstr ""
+msgstr "在网站可见"
 
 #. module: website_partner
 #: model:ir.model.fields,field_description:website_partner.field_res_partner_website_description
@@ -53,7 +53,7 @@ msgstr "网站业务伙伴简介"
 #. module: website_partner
 #: model:ir.model.fields,field_description:website_partner.field_res_users_website_url
 msgid "Website URL"
-msgstr ""
+msgstr "网站URL"
 
 #. module: website_partner
 #: model:ir.model.fields,field_description:website_partner.field_res_users_website_meta_description
@@ -63,9 +63,9 @@ msgstr ""
 #. module: website_partner
 #: model:ir.model.fields,field_description:website_partner.field_res_users_website_meta_keywords
 msgid "Website meta keywords"
-msgstr ""
+msgstr "网站元关键词"
 
 #. module: website_partner
 #: model:ir.model.fields,field_description:website_partner.field_res_users_website_meta_title
 msgid "Website meta title"
-msgstr ""
+msgstr "网站元标题"
diff --git a/addons/website_payment/i18n/ja.po b/addons/website_payment/i18n/ja.po
index 0b9260271e1..10d839f85a9 100644
--- a/addons/website_payment/i18n/ja.po
+++ b/addons/website_payment/i18n/ja.po
@@ -34,7 +34,7 @@ msgstr "決済サービス"
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.pay_methods
 msgid "Add a new payment method:"
-msgstr "新しい支払い方法を追加："
+msgstr "新しい支払方法を追加:"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.confirm
diff --git a/addons/website_portal/i18n/ar.po b/addons/website_portal/i18n/ar.po
index 3d5ba562231..4a69818f355 100644
--- a/addons/website_portal/i18n/ar.po
+++ b/addons/website_portal/i18n/ar.po
@@ -6,7 +6,7 @@
 # Mustafa Rawi <mustafa@cubexco.com>, 2016
 # Mohammed Ibrahim <m.ibrahim@mussder.com>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
-# hoxhe aits <hoxhe0@gmail.com>, 2016
+# hoxhe Aits <hoxhe0@gmail.com>, 2016
 # amrnegm <amrnegm.01@gmail.com>, 2016
 msgid ""
 msgstr ""
@@ -116,7 +116,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/bg.po b/addons/website_portal/i18n/bg.po
index 6ce75b8e4c7..5a3724c9b98 100644
--- a/addons/website_portal/i18n/bg.po
+++ b/addons/website_portal/i18n/bg.po
@@ -116,8 +116,8 @@ msgstr "Поставате вашето съдържание тук."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Продавач"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/bs.po b/addons/website_portal/i18n/bs.po
index f035805e386..b8b447dad52 100644
--- a/addons/website_portal/i18n/bs.po
+++ b/addons/website_portal/i18n/bs.po
@@ -118,7 +118,7 @@ msgstr "Postavite vaš sadržaj ovdje"
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/ca.po b/addons/website_portal/i18n/ca.po
index a6ee3e7e3e0..2c3146c34cd 100644
--- a/addons/website_portal/i18n/ca.po
+++ b/addons/website_portal/i18n/ca.po
@@ -115,7 +115,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/cs.po b/addons/website_portal/i18n/cs.po
index 668febd8e9a..edc7e14835b 100644
--- a/addons/website_portal/i18n/cs.po
+++ b/addons/website_portal/i18n/cs.po
@@ -113,7 +113,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/da.po b/addons/website_portal/i18n/da.po
index 1792fcebbad..a625e6e7f5d 100644
--- a/addons/website_portal/i18n/da.po
+++ b/addons/website_portal/i18n/da.po
@@ -119,8 +119,8 @@ msgstr "Indsæt dit indhold her."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Sælger"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/de.po b/addons/website_portal/i18n/de.po
index c2b64d6bc49..194e8a5941f 100644
--- a/addons/website_portal/i18n/de.po
+++ b/addons/website_portal/i18n/de.po
@@ -10,14 +10,13 @@
 # Renzo Meister <info@jamotion.ch>, 2016
 # Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2016
 # Philipp Hug <philipp@hug.cx>, 2016
-# Andi <flimflam@salasar.de>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-11 13:04+0000\n"
 "PO-Revision-Date: 2017-01-11 13:04+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: Philipp Hug <philipp@hug.cx>, 2016\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,8 +120,8 @@ msgstr "Platzieren Sie Ihren Inhalt hier."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Verkäufer"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/el.po b/addons/website_portal/i18n/el.po
index d90d6f0590e..139d1484c95 100644
--- a/addons/website_portal/i18n/el.po
+++ b/addons/website_portal/i18n/el.po
@@ -115,7 +115,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/es.po b/addons/website_portal/i18n/es.po
index a8a4dfa50ee..e3a8bc47ebb 100644
--- a/addons/website_portal/i18n/es.po
+++ b/addons/website_portal/i18n/es.po
@@ -9,14 +9,13 @@
 # Alejandro Santana <alejandrosantana@anubia.es>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Jose Manuel <admin@jaboweb.com>, 2016
-# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-11 13:04+0000\n"
 "PO-Revision-Date: 2017-01-11 13:04+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: Jose Manuel <admin@jaboweb.com>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -120,8 +119,8 @@ msgstr "Ubique su contenido aquí."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Vendedor"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/et.po b/addons/website_portal/i18n/et.po
index befc0ff6553..ced1e1406b1 100644
--- a/addons/website_portal/i18n/et.po
+++ b/addons/website_portal/i18n/et.po
@@ -113,7 +113,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/fa.po b/addons/website_portal/i18n/fa.po
index a9ab956e2a7..6ec887b3e51 100644
--- a/addons/website_portal/i18n/fa.po
+++ b/addons/website_portal/i18n/fa.po
@@ -113,7 +113,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/fi.po b/addons/website_portal/i18n/fi.po
index c9a8d40c7b2..e69109e1dd7 100644
--- a/addons/website_portal/i18n/fi.po
+++ b/addons/website_portal/i18n/fi.po
@@ -10,14 +10,13 @@
 # Tuomo Aura <tuomo.aura@web-veistamo.fi>, 2016
 # Kari Lindgren <karisatu@gmail.com>, 2016
 # Pekko Tuomisto <pekko.tuomisto@web-veistamo.fi>, 2016
-# Mikko Närjänen <mikko.narjanen@web-veistamo.fi>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-11 13:04+0000\n"
 "PO-Revision-Date: 2017-01-11 13:04+0000\n"
-"Last-Translator: Mikko Närjänen <mikko.narjanen@web-veistamo.fi>, 2017\n"
+"Last-Translator: Pekko Tuomisto <pekko.tuomisto@web-veistamo.fi>, 2016\n"
 "Language-Team: Finnish (https://www.transifex.com/odoo/teams/41243/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -119,8 +118,8 @@ msgstr "Lisää sisältösi tähän."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Myyjä"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/fr.po b/addons/website_portal/i18n/fr.po
index 036b7d61fcb..0476dd6e58a 100644
--- a/addons/website_portal/i18n/fr.po
+++ b/addons/website_portal/i18n/fr.po
@@ -12,14 +12,13 @@
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
-# Clo <clo@odoo.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-11 13:04+0000\n"
 "PO-Revision-Date: 2017-01-11 13:04+0000\n"
-"Last-Translator: Clo <clo@odoo.com>, 2017\n"
+"Last-Translator: Sébastien Le Ray <sebastien-github@orniz.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,8 +126,8 @@ msgstr "Mettez votre contenu ici."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Commercial"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/he.po b/addons/website_portal/i18n/he.po
index acf2059571e..e54ae525aaf 100644
--- a/addons/website_portal/i18n/he.po
+++ b/addons/website_portal/i18n/he.po
@@ -114,7 +114,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/hr.po b/addons/website_portal/i18n/hr.po
index 3200fc65439..efcd8f186f2 100644
--- a/addons/website_portal/i18n/hr.po
+++ b/addons/website_portal/i18n/hr.po
@@ -121,8 +121,8 @@ msgstr "Postavite sadržaj ovdje."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Prodavač"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/hu.po b/addons/website_portal/i18n/hu.po
index bc219a08963..1608b24b1b4 100644
--- a/addons/website_portal/i18n/hu.po
+++ b/addons/website_portal/i18n/hu.po
@@ -119,8 +119,8 @@ msgstr "Tegye ide a tartalmat."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Értékesítő"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/hy.po b/addons/website_portal/i18n/hy.po
index 70874d71f1b..cb2c70c69dc 100644
--- a/addons/website_portal/i18n/hy.po
+++ b/addons/website_portal/i18n/hy.po
@@ -112,7 +112,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/id.po b/addons/website_portal/i18n/id.po
index ab81fa6f61c..8ce55b7874c 100644
--- a/addons/website_portal/i18n/id.po
+++ b/addons/website_portal/i18n/id.po
@@ -120,7 +120,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/it.po b/addons/website_portal/i18n/it.po
index 25c9093b80b..d2a246b3fc4 100644
--- a/addons/website_portal/i18n/it.po
+++ b/addons/website_portal/i18n/it.po
@@ -120,7 +120,7 @@ msgstr "Inserisci qui il tuo contenuto."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/ja.po b/addons/website_portal/i18n/ja.po
index 297d32fc397..50de3375cb3 100644
--- a/addons/website_portal/i18n/ja.po
+++ b/addons/website_portal/i18n/ja.po
@@ -119,7 +119,7 @@ msgstr "ここにあなたのコンテンツを置きます。"
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/kab.po b/addons/website_portal/i18n/kab.po
index 9248cb70779..8509e4443d3 100644
--- a/addons/website_portal/i18n/kab.po
+++ b/addons/website_portal/i18n/kab.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
-# Belkacem Mohammed <belkacem77@gmail.com>, 2016
+# Muḥend Belqasem <belkacem77@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-11 13:04+0000\n"
 "PO-Revision-Date: 2017-01-11 13:04+0000\n"
-"Last-Translator: Belkacem Mohammed <belkacem77@gmail.com>, 2016\n"
+"Last-Translator: Muḥend Belqasem <belkacem77@gmail.com>, 2016\n"
 "Language-Team: Kabyle (https://www.transifex.com/odoo/teams/41243/kab/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/km.po b/addons/website_portal/i18n/km.po
index d8f81e6f0e1..573227ec28a 100644
--- a/addons/website_portal/i18n/km.po
+++ b/addons/website_portal/i18n/km.po
@@ -117,7 +117,7 @@ msgstr "សរសេរអត្ថបទនៅទីនេះ។"
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/lo.po b/addons/website_portal/i18n/lo.po
index d74f70d0dc8..af7ff6d1d37 100644
--- a/addons/website_portal/i18n/lo.po
+++ b/addons/website_portal/i18n/lo.po
@@ -112,7 +112,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/lt.po b/addons/website_portal/i18n/lt.po
index 92b807c3d24..4b5d2016fb8 100644
--- a/addons/website_portal/i18n/lt.po
+++ b/addons/website_portal/i18n/lt.po
@@ -117,7 +117,7 @@ msgstr "Įterpkite informaciją čia."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/lv.po b/addons/website_portal/i18n/lv.po
index 0ae2e22b242..d1afde5fe76 100644
--- a/addons/website_portal/i18n/lv.po
+++ b/addons/website_portal/i18n/lv.po
@@ -118,8 +118,8 @@ msgstr "Aizpildiet savu saturu šeit."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Pārdevējs"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/mn.po b/addons/website_portal/i18n/mn.po
index 5cbace68d99..f6b8da5cc63 100644
--- a/addons/website_portal/i18n/mn.po
+++ b/addons/website_portal/i18n/mn.po
@@ -120,8 +120,8 @@ msgstr "Агуулгаа энд оруулна уу."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Борлуулагч"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/my.po b/addons/website_portal/i18n/my.po
index 6f1a8f87675..6c1eeec7058 100644
--- a/addons/website_portal/i18n/my.po
+++ b/addons/website_portal/i18n/my.po
@@ -113,7 +113,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/nb.po b/addons/website_portal/i18n/nb.po
index 7add1710b34..4a72e358977 100644
--- a/addons/website_portal/i18n/nb.po
+++ b/addons/website_portal/i18n/nb.po
@@ -118,7 +118,7 @@ msgstr "Plasser ditt innhold her."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/nl.po b/addons/website_portal/i18n/nl.po
index b93e158f362..b56dcaedc91 100644
--- a/addons/website_portal/i18n/nl.po
+++ b/addons/website_portal/i18n/nl.po
@@ -7,14 +7,13 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Cas Vissers <casvissers@brahoo.nl>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-11 13:04+0000\n"
 "PO-Revision-Date: 2017-01-11 13:04+0000\n"
-"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2017\n"
+"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +120,7 @@ msgstr "Plaats uw inhoud hier."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr "Verkoper"
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/pl.po b/addons/website_portal/i18n/pl.po
index a8935fd3d52..47798ac8a27 100644
--- a/addons/website_portal/i18n/pl.po
+++ b/addons/website_portal/i18n/pl.po
@@ -117,8 +117,8 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "sprzedawca"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/pt.po b/addons/website_portal/i18n/pt.po
index 303d3d7f4eb..6115e57522a 100644
--- a/addons/website_portal/i18n/pt.po
+++ b/addons/website_portal/i18n/pt.po
@@ -121,8 +121,8 @@ msgstr "Coloque aqui o conteúdo."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Vendedor"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/pt_BR.po b/addons/website_portal/i18n/pt_BR.po
index baf4d9b70ed..e77966455a5 100644
--- a/addons/website_portal/i18n/pt_BR.po
+++ b/addons/website_portal/i18n/pt_BR.po
@@ -123,8 +123,8 @@ msgstr "Coloque o conteúdo aqui."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Vendedor"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/ro.po b/addons/website_portal/i18n/ro.po
index 2190ccdde40..10caa0c5d57 100644
--- a/addons/website_portal/i18n/ro.po
+++ b/addons/website_portal/i18n/ro.po
@@ -116,8 +116,8 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Agent vânzare"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/ru.po b/addons/website_portal/i18n/ru.po
index 5cf0e897a2b..d7acc8a9901 100644
--- a/addons/website_portal/i18n/ru.po
+++ b/addons/website_portal/i18n/ru.po
@@ -118,8 +118,8 @@ msgstr "Поместите ваш контен здесь."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Продавец"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/sk.po b/addons/website_portal/i18n/sk.po
index eea32a1d284..698149f7d86 100644
--- a/addons/website_portal/i18n/sk.po
+++ b/addons/website_portal/i18n/sk.po
@@ -117,8 +117,8 @@ msgstr "Sem vložte svoj obsah."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Predajca"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/sl.po b/addons/website_portal/i18n/sl.po
index 3f3185568c2..a587828ec7d 100644
--- a/addons/website_portal/i18n/sl.po
+++ b/addons/website_portal/i18n/sl.po
@@ -113,7 +113,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/sq.po b/addons/website_portal/i18n/sq.po
index f293816a4ca..00303adaddb 100644
--- a/addons/website_portal/i18n/sq.po
+++ b/addons/website_portal/i18n/sq.po
@@ -109,7 +109,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/sr.po b/addons/website_portal/i18n/sr.po
index 123b08f7a83..0b56d8d8843 100644
--- a/addons/website_portal/i18n/sr.po
+++ b/addons/website_portal/i18n/sr.po
@@ -112,7 +112,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/sv.po b/addons/website_portal/i18n/sv.po
index d2ea1c0555e..8a7ded0465f 100644
--- a/addons/website_portal/i18n/sv.po
+++ b/addons/website_portal/i18n/sv.po
@@ -114,7 +114,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/th.po b/addons/website_portal/i18n/th.po
index 941280ee6af..527f26cec80 100644
--- a/addons/website_portal/i18n/th.po
+++ b/addons/website_portal/i18n/th.po
@@ -115,7 +115,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/tr.po b/addons/website_portal/i18n/tr.po
index c0d539fa852..a90ca169066 100644
--- a/addons/website_portal/i18n/tr.po
+++ b/addons/website_portal/i18n/tr.po
@@ -124,8 +124,8 @@ msgstr "İçeriğinizi buraya yerleştirin."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
-msgstr "Satış Personeli"
+msgid "Salesman"
+msgstr ""
 
 #. module: website_portal
 #: code:addons/website_portal/controllers/main.py:120
diff --git a/addons/website_portal/i18n/uk.po b/addons/website_portal/i18n/uk.po
index a282b9277cf..70a4d84385c 100644
--- a/addons/website_portal/i18n/uk.po
+++ b/addons/website_portal/i18n/uk.po
@@ -117,7 +117,7 @@ msgstr "Розташуйте ваш вміст тут."
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/vi.po b/addons/website_portal/i18n/vi.po
index 7eaa6c837de..e7c59db243b 100644
--- a/addons/website_portal/i18n/vi.po
+++ b/addons/website_portal/i18n/vi.po
@@ -114,7 +114,7 @@ msgstr ""
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr ""
 
 #. module: website_portal
diff --git a/addons/website_portal/i18n/zh_CN.po b/addons/website_portal/i18n/zh_CN.po
index 881a58c40e2..770d8fb650f 100644
--- a/addons/website_portal/i18n/zh_CN.po
+++ b/addons/website_portal/i18n/zh_CN.po
@@ -116,7 +116,7 @@ msgstr "在这里放置你的内容"
 
 #. module: website_portal
 #: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesman"
 msgstr "销售员"
 
 #. module: website_portal
diff --git a/addons/website_project/i18n/da.po b/addons/website_project/i18n/da.po
index a1b329d8dab..90bd86f4627 100644
--- a/addons/website_project/i18n/da.po
+++ b/addons/website_project/i18n/da.po
@@ -5,13 +5,14 @@
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
 # Sanne Kristensen <sanne@vkdata.dk>, 2017
+# Ejner Sønniksen <ejner@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:57+0000\n"
 "PO-Revision-Date: 2016-09-07 08:57+0000\n"
-"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,12 +23,12 @@ msgstr ""
 #. module: website_project
 #: model:ir.ui.view,arch_db:website_project.my_task
 msgid "<strong>Assigned to</strong>"
-msgstr ""
+msgstr "<strong>Tildelt til</strong>"
 
 #. module: website_project
 #: model:ir.ui.view,arch_db:website_project.my_project
 msgid "<strong>Customer</strong>"
-msgstr ""
+msgstr "<strong>Kunde</strong>"
 
 #. module: website_project
 #: model:ir.ui.view,arch_db:website_project.my_task
diff --git a/addons/website_project_issue/i18n/da.po b/addons/website_project_issue/i18n/da.po
index 35a7c6e1989..7974541b28d 100644
--- a/addons/website_project_issue/i18n/da.po
+++ b/addons/website_project_issue/i18n/da.po
@@ -23,7 +23,7 @@ msgstr ""
 #. module: website_project_issue
 #: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
 msgid "<strong>Assigned to</strong>"
-msgstr ""
+msgstr "<strong>Tildelt til</strong>"
 
 #. module: website_project_issue
 #: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
diff --git a/addons/website_quote/i18n/da.po b/addons/website_quote/i18n/da.po
index 0b7da0c5ff0..c831d95f0c0 100644
--- a/addons/website_quote/i18n/da.po
+++ b/addons/website_quote/i18n/da.po
@@ -83,7 +83,7 @@ msgstr ""
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
 msgid "! You can"
-msgstr ""
+msgstr "! Du kan"
 
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.optional_products
@@ -1416,7 +1416,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:website_quote.action_sale_quotation_template
 #: model:ir.ui.menu,name:website_quote.menu_sale_quote_template
 msgid "Quotation Templates"
-msgstr ""
+msgstr "Tilbudsskabeloner"
 
 #. module: website_quote
 #: model:ir.model.fields,field_description:website_quote.field_sale_order_quote_viewed
diff --git a/addons/website_rating_project_issue/i18n/da.po b/addons/website_rating_project_issue/i18n/da.po
index 3c9fae0911d..7e8870f23cc 100644
--- a/addons/website_rating_project_issue/i18n/da.po
+++ b/addons/website_rating_project_issue/i18n/da.po
@@ -5,13 +5,14 @@
 # Translators:
 # Martin Trigaux <mat@odoo.com>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
+# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-07 08:58+0000\n"
 "PO-Revision-Date: 2016-09-07 08:58+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,12 +23,12 @@ msgstr ""
 #. module: website_rating_project_issue
 #: model:ir.ui.view,arch_db:website_rating_project_issue.index
 msgid "<i class=\"fa fa-arrow-circle-right \"/> See the feedbacks"
-msgstr ""
+msgstr "<i class=\"fa fa-arrow-circle-right \"/> Se feedbacks"
 
 #. module: website_rating_project_issue
 #: model:ir.ui.view,arch_db:website_rating_project_issue.index
 msgid "<i class=\"fa fa-calendar\"/> End date :"
-msgstr ""
+msgstr "<i class=\"fa fa-calendar\"/> Slutdato:"
 
 #. module: website_rating_project_issue
 #: model:ir.ui.view,arch_db:website_rating_project_issue.index
diff --git a/addons/website_rating_project_issue/i18n/ja.po b/addons/website_rating_project_issue/i18n/ja.po
index 25ca8b5d3b6..8b0a64d5466 100644
--- a/addons/website_rating_project_issue/i18n/ja.po
+++ b/addons/website_rating_project_issue/i18n/ja.po
@@ -28,12 +28,12 @@ msgstr "<i class=\"fa fa-arrow-circle-right \"/> フィードバックを参照"
 #. module: website_rating_project_issue
 #: model:ir.ui.view,arch_db:website_rating_project_issue.index
 msgid "<i class=\"fa fa-calendar\"/> End date :"
-msgstr "<i class=\"fa fa-calendar\"/> 終了日 ："
+msgstr "<i class=\"fa fa-calendar\"/> 終了日 :"
 
 #. module: website_rating_project_issue
 #: model:ir.ui.view,arch_db:website_rating_project_issue.index
 msgid "<i class=\"fa fa-envelope\"/> Email :"
-msgstr "<i class=\"fa fa-envelope\"/> Eメール ："
+msgstr "<i class=\"fa fa-envelope\"/> Eメール :"
 
 #. module: website_rating_project_issue
 #: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
diff --git a/addons/website_sale/i18n/es.po b/addons/website_sale/i18n/es.po
index c64ff2b7298..14429245e09 100644
--- a/addons/website_sale/i18n/es.po
+++ b/addons/website_sale/i18n/es.po
@@ -20,9 +20,9 @@
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
+# Gustavo Valverde <g.valverde02@gmail.com>, 2016
 # Miguel Orueta <mo@landoo.es>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
-# Gustavo Valverde <g.valverde02@gmail.com>, 2016
 # Jose Manuel <admin@jaboweb.com>, 2016
 # Alejandro Santana <alejandrosantana@anubia.es>, 2016
 # Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2016
@@ -2320,7 +2320,7 @@ msgstr "Equipo de ventas"
 #: model:ir.model.fields,field_description:website_sale.field_website_config_settings_salesperson_id
 #: model:ir.model.fields,field_description:website_sale.field_website_salesperson_id
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
diff --git a/addons/website_sale/i18n/hr.po b/addons/website_sale/i18n/hr.po
index 80929512100..8e352c0c9c4 100644
--- a/addons/website_sale/i18n/hr.po
+++ b/addons/website_sale/i18n/hr.po
@@ -241,6 +241,9 @@ msgid ""
 "                                <span class=\"visible-xs-inline\">Checkout</span>\n"
 "                                <span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
+"<span class=\"hidden-xs\">Završi kupovinu</span>\n"
+"                                <span class=\"visible-xs-inline\">Završi</span>\n"
+"                                <span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
diff --git a/addons/website_sale/i18n/ja.po b/addons/website_sale/i18n/ja.po
index b23b3174413..26a946287eb 100644
--- a/addons/website_sale/i18n/ja.po
+++ b/addons/website_sale/i18n/ja.po
@@ -1196,7 +1196,7 @@ msgstr "顧客セグメント"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Customers review:"
-msgstr "顧客レビュー："
+msgstr "顧客レビュー:"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery_dhl
@@ -1932,7 +1932,7 @@ msgstr "電話"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_planner
 msgid "Pictures gallery:"
-msgstr "写真ギャラリー："
+msgstr "写真ギャラリー:"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
diff --git a/addons/website_sale_delivery/i18n/hr.po b/addons/website_sale_delivery/i18n/hr.po
index dd91ccde426..3cb8e52eaa4 100644
--- a/addons/website_sale_delivery/i18n/hr.po
+++ b/addons/website_sale_delivery/i18n/hr.po
@@ -10,14 +10,14 @@
 # Đurđica Žarković <durdica.zarkovic@storm.hr>, 2016
 # Vladimir Olujić <olujic.vladimir@storm.hr>, 2016
 # Davor Bojkić <davor.bojkic@storm.hr>, 2016
-# Tina Milas <tina@uvid.hr>, 2017
+# Tina Milas <tina@uvid.hr>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-19 12:36+0000\n"
 "PO-Revision-Date: 2016-09-19 12:36+0000\n"
-"Last-Translator: Tina Milas <tina@uvid.hr>, 2017\n"
+"Last-Translator: Tina Milas <tina@uvid.hr>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -189,7 +189,7 @@ msgid ""
 "No shipping method is available for your current order and shipping address."
 " Please contact us for more information."
 msgstr ""
-"Nijdna metoda dostave nije definirana za vašu trenutnu narudžbu i adresu "
+"Nijedna metoda dostave nije definirana za vašu trenutnu narudžbu i adresu "
 "isporuke. Molimo kontaktirajte nas za više informacija."
 
 #. module: website_sale_delivery
diff --git a/addons/website_sale_options/i18n/hr.po b/addons/website_sale_options/i18n/hr.po
index cb212b8196e..147d96607a8 100644
--- a/addons/website_sale_options/i18n/hr.po
+++ b/addons/website_sale_options/i18n/hr.po
@@ -5,6 +5,7 @@
 # Translators:
 # Vladimir Olujić <olujic.vladimir@storm.hr>, 2016
 # Karolina Tonković <karolina.tonkovic@storm.hr>, 2016
+# Tina Milas <tina@uvid.hr>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
 # Bole <bole@dajmi5.com>, 2016
 # Davor Bojkić <davor.bojkic@storm.hr>, 2016
@@ -47,8 +48,8 @@ msgid ""
 "<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Proceed "
 "to checkout</span><span class=\"visible-xs-inline\">Checkout</span>"
 msgstr ""
-"<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Nastavi "
-"za provjeru</span><span class=\"visible-xs-inline\">Provjeri</span>"
+"<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Završi "
+"kupovinu</span><span class=\"visible-xs-inline\">Završi</span>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
diff --git a/addons/website_sale_options/i18n/zh_CN.po b/addons/website_sale_options/i18n/zh_CN.po
index 46225cbd963..2e95da5d130 100644
--- a/addons/website_sale_options/i18n/zh_CN.po
+++ b/addons/website_sale_options/i18n/zh_CN.po
@@ -79,7 +79,7 @@ msgstr "链接的订单明细"
 #: code:addons/website_sale_options/models/sale_order.py:46
 #, python-format
 msgid "Option for:"
-msgstr ""
+msgstr "选项:"
 
 #. module: website_sale_options
 #: code:addons/website_sale_options/models/sale_order.py:48
diff --git a/addons/website_twitter/i18n/da.po b/addons/website_twitter/i18n/da.po
index 6a7636cf047..554fad60821 100644
--- a/addons/website_twitter/i18n/da.po
+++ b/addons/website_twitter/i18n/da.po
@@ -30,7 +30,7 @@ msgstr ""
 #. module: website_twitter
 #: model:ir.ui.view,arch_db:website_twitter.view_website_config_settings
 msgid "<strong>Callback URL: </strong> leave it blank"
-msgstr ""
+msgstr "<strong>Callback URL: </strong> lad stå blank"
 
 #. module: website_twitter
 #: model:ir.ui.view,arch_db:website_twitter.view_website_config_settings
diff --git a/odoo/addons/base/i18n/da.po b/odoo/addons/base/i18n/da.po
index c63e717d35a..7f99fd5942d 100644
--- a/odoo/addons/base/i18n/da.po
+++ b/odoo/addons/base/i18n/da.po
@@ -10,18 +10,18 @@
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2016
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2016
 # Jesper Carstensen <jc@danodoo.dk>, 2016
+# Sanne Kristensen <sanne@vkdata.dk>, 2016
 # Jesper Carstensen <info@danodoo.dk>, 2016
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2016
 # Visti Kristensen <visti@vkdata.dk>, 2017
 # Ejner Sønniksen <ejner@vkdata.dk>, 2017
-# Sanne Kristensen <sanne@vkdata.dk>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2017\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5344,7 +5344,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr ""
+msgstr "Fortryd journalposter"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.module_form
@@ -6070,12 +6070,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_partner_category_form
 #: model:ir.ui.view,arch_db:base.view_partner_category_list
 msgid "Contact Tags"
-msgstr ""
+msgstr "Kontakt tags"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "Kontakt titler"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner_child_ids
@@ -6087,7 +6087,7 @@ msgstr "Adressebog"
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_partner_form
 msgid "Contacts & Addresses"
-msgstr ""
+msgstr "Kontakter & adresser"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_contacts
@@ -6801,6 +6801,14 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Kære Kunde\n"
+"\n"
+"Vores registreringer viser, at nogle betalinger på din konto stadig er ubetalte. Find venligst detaljer nedenfor.\n"
+"Hvis beløbet allerede er betalt, bedes du se bort fra denne meddelelse. Ellers kan du sende os det samlede beløb angivet nedenfor.\n"
+"Hvis du har spørgsmål vedrørende din konto, bedes du kontakte os\n"
+"\n"
+"Tak på forhånd for dit samarbejde\n"
+"Med venlig hilsen"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_debug
@@ -7228,7 +7236,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base.module_stock_dropshipping
 #: model:ir.module.module,summary:base.module_stock_dropshipping
 msgid "Drop Shipping"
-msgstr ""
+msgstr "Drop Shipping"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -7677,7 +7685,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
 msgid "Fed. States"
-msgstr ""
+msgstr "Føderale Stater"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_l10n_fr_fec
@@ -9493,7 +9501,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_res_partner_customer
 #: model:ir.model.fields,field_description:base.field_res_users_customer
 msgid "Is a Customer"
-msgstr ""
+msgstr "Er en kunde"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner_supplier
@@ -9669,7 +9677,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_stock_landed_costs
 msgid "Landed Costs"
-msgstr "Landed Costs"
+msgstr "Anskaffelsespriser"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_base_language_export_lang
@@ -10021,7 +10029,7 @@ msgstr "Launchpad"
 #. module: base
 #: model:ir.module.category,name:base.module_category_lead_automation
 msgid "Lead Automation"
-msgstr "Lead automatisering"
+msgstr "Kundeemne automatisering"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_project_issue
@@ -10107,7 +10115,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_link_tracker
 msgid "Link Tracker"
-msgstr ""
+msgstr "Link Tracker"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_server_link_field_id
@@ -12102,7 +12110,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_productivity
 #: model:ir.module.module,shortdesc:base.module_note
 msgid "Productivity"
-msgstr ""
+msgstr "Produktivitet"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product
@@ -12233,7 +12241,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_purchase
 msgid "Purchase Orders, Receipts, Vendor Bills"
-msgstr "Indkøbsordrer, Kvitteringer, Leverandør-regninger"
+msgstr "Indkøbsordrer, kvitteringer, leverandørfakturaer"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_requisition
@@ -12683,7 +12691,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base.field_wkf_instance_res_id
 #: model:ir.model.fields,field_description:base.field_wkf_triggers_res_id
 msgid "Resource ID"
-msgstr "Resource ID"
+msgstr "Ressource ID"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_attachment_res_model
@@ -12760,7 +12768,7 @@ msgstr ""
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_currency_rounding
 msgid "Rounding Factor"
-msgstr ""
+msgstr "Afrundingsfaktor"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_rule_form
@@ -13261,8 +13269,8 @@ msgid ""
 "Set the font into the report header, it will be used as default font in the "
 "RML reports of the user company"
 msgstr ""
-"Angiv fonten til sidehoved i rapporter. Den vil blive brugt som default font"
-" i RML rapporter i brugerens virksomhed"
+"Angiv fonten til sidehoved i rapporter. Den vil blive brugt som standard "
+"font i RML rapporter i brugerens virksomhed"
 
 #. module: base
 #: code:addons/base/res/res_users.py:524
diff --git a/odoo/addons/base/i18n/es.po b/odoo/addons/base/i18n/es.po
index ed4afc49978..996c4762110 100644
--- a/odoo/addons/base/i18n/es.po
+++ b/odoo/addons/base/i18n/es.po
@@ -14983,7 +14983,7 @@ msgstr "Gestión de Ventas y Almacén"
 #: model:ir.model.fields,field_description:base.field_res_users_user_id
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 msgid "Salesperson"
-msgstr "Comercial"
+msgstr "Vendedor"
 
 #. module: base
 #: model:res.country,name:base.ws
diff --git a/odoo/addons/base/i18n/hr.po b/odoo/addons/base/i18n/hr.po
index d8eaba0b93e..a3aa9452eee 100644
--- a/odoo/addons/base/i18n/hr.po
+++ b/odoo/addons/base/i18n/hr.po
@@ -16043,7 +16043,7 @@ msgstr "Naziv pogleda"
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_currency_form
 msgid "View Rates"
-msgstr "Pogledaj cijene"
+msgstr "Tečajevi"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_act_window_view_id
diff --git a/odoo/addons/base/i18n/sv.po b/odoo/addons/base/i18n/sv.po
index 6d694308c7d..fa693fb2976 100644
--- a/odoo/addons/base/i18n/sv.po
+++ b/odoo/addons/base/i18n/sv.po
@@ -19,13 +19,14 @@
 # Zou Haojun <haojunzou84@gmail.com>, 2016
 # deeman <da.jkpg@gmail.com>, 2016
 # Dick Nilsson <stesch99@gmail.com>, 2016
+# lynnliuying <lynn.liu1971@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-23 13:27+0000\n"
 "PO-Revision-Date: 2017-06-23 13:27+0000\n"
-"Last-Translator: Dick Nilsson <stesch99@gmail.com>, 2016\n"
+"Last-Translator: lynnliuying <lynn.liu1971@gmail.com>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15498,7 +15499,7 @@ msgstr "Leverantör"
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 msgid "Vendors"
-msgstr ""
+msgstr "leverantörer"
 
 #. module: base
 #: model:res.country,name:base.ve
diff --git a/odoo/addons/base/i18n/zh_CN.po b/odoo/addons/base/i18n/zh_CN.po
index 0c5dd371f19..6a689121bf5 100644
--- a/odoo/addons/base/i18n/zh_CN.po
+++ b/odoo/addons/base/i18n/zh_CN.po
@@ -2999,7 +2999,7 @@ msgstr ""
 "*计算找零金额总数\n"
 "*自动生成并确认拣货单\n"
 "*允许用户自动生成发票\n"
-"*退货的退款"
+"*退回退款"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_sheet

From 32078bba33396995996a022b4a4835afc7240e3a Mon Sep 17 00:00:00 2001
From: Odoo Translation Bot <c3p@odoo.com>
Date: Sun, 27 Aug 2017 07:14:46 +0200
Subject: [PATCH 058/119] [I18N] Update translation terms from Transifex

---
 addons/account/i18n/tr.po                     | 96 +++++++++----------
 addons/base_automation/i18n/zh_CN.po          |  2 +-
 addons/event_sale/i18n/nl.po                  |  1 +
 addons/google_drive/i18n/zh_CN.po             |  2 +-
 addons/hr_attendance/i18n/nl.po               |  2 +-
 addons/hr_attendance/i18n/zh_CN.po            |  4 +-
 addons/hr_expense/i18n/nl.po                  |  1 +
 addons/hr_timesheet/i18n/nl.po                |  2 +-
 addons/mass_mailing/i18n/nl.po                |  2 +-
 addons/mass_mailing/i18n/zh_CN.po             | 10 +-
 addons/payment_stripe/i18n/zh_CN.po           |  2 +-
 addons/point_of_sale/i18n/hu.po               |  2 +-
 addons/point_of_sale/i18n/nl.po               |  3 +
 addons/procurement/i18n/nl.po                 |  2 +-
 addons/project/i18n/nl.po                     |  2 +-
 addons/project/i18n/zh_CN.po                  |  4 +-
 addons/project_issue/i18n/nl.po               |  2 +-
 addons/purchase/i18n/zh_CN.po                 |  2 +-
 addons/rating_project/i18n/zh_CN.po           |  2 +-
 addons/resource/i18n/nl.po                    |  2 +-
 addons/sales_team/i18n/nl.po                  |  2 +
 addons/stock_account/i18n/nl.po               |  2 +-
 addons/web_editor/i18n/zh_CN.po               | 14 +--
 addons/website_blog/i18n/zh_CN.po             |  4 +-
 addons/website_crm/i18n/zh_CN.po              |  2 +-
 addons/website_crm_partner_assign/i18n/nl.po  |  2 +-
 .../website_crm_partner_assign/i18n/zh_CN.po  |  2 +-
 addons/website_event/i18n/zh_CN.po            |  2 +-
 addons/website_event_track/i18n/nl.po         |  2 +-
 addons/website_hr_recruitment/i18n/zh_CN.po   |  4 +-
 addons/website_sale/i18n/hr.po                |  3 +
 addons/website_sale_options/i18n/zh_CN.po     |  2 +-
 32 files changed, 98 insertions(+), 88 deletions(-)

diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 1a71289e540..63b187c6f2e 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -6358,27 +6358,27 @@ msgstr "Fatura Mesajı"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Cost of Revenue"
-msgstr "Eksi Maliyet Hasıla"
+msgstr "-Gelir Maliyeti"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Credit Card Accounts"
-msgstr "Eksi Kredi Kartı Hesapları"
+msgstr "-Kredi Kartı Hesapları"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Current Liabilities"
-msgstr "Eksi Geçici Yükümlülükler"
+msgstr "-Kısa Vadeli Borçlar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Expenses"
-msgstr "Eksi Giderleri"
+msgstr "-Giderler"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Minus Non-Current Liabilities"
-msgstr "Kısa Vadeli Yükümlülükler Eksi"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
@@ -6796,10 +6796,8 @@ msgid ""
 "                invoice by email and he can pay online and/or import it\n"
 "                in his own system."
 msgstr ""
-"Odoo'nun elektronik faturalaması, \\ n müşteri ödemelerinin koleksiyonunu "
-"kolaylaştırıp sabitlemenize olanak tanır. Müşteriniz \\ n faturayı "
-"e-postayla alır ve kendi sisteminizde çevrimiçi olarak ödeme yapabilir ve / "
-"veya içe aktarabilir."
+"Odoo'nun elektronik faturalaması müşteri ödemelerini de kolaylaştırır.\n"
+"Müşterileriniz faturayı e-posta ile alır ve online olarak ödeme yapabilir."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_invoice_confirm_view
@@ -6819,9 +6817,8 @@ msgid ""
 "Once installed, set 'Bank Feeds' to 'File Import' in bank account "
 "settings.This adds a button to import from the Accounting dashboard."
 msgstr ""
-"Yüklendikten sonra, banka hesabı ayarlarında 'Banka Feed'leri'ni' Dosya İçe "
-"Aktarın 'olarak ayarlayın. Böylece, Muhasebe kontrol panelinden içe "
-"aktarılması için bir düğme eklenir."
+"Yüklendikten sonra, banka hesabı ayarlarında Banka Hareketlerini \"Dosya İçe Aktar\" olarak ayarlayın.\n"
+"Böylece, Muhasebe panelinden banka hareketlerinin içe aktarılması için bir düğme eklenir."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -6829,8 +6826,8 @@ msgid ""
 "Once you have created your chart of accounts, you will need to update your "
 "account balances."
 msgstr ""
-"Hesap grafiğinizi oluşturduktan sonra hesap bakiyelerini güncellemeniz "
-"gerekecek."
+"Hesap planınızı oluşturduktan sonra hesapların açılış bakiyelerini "
+"güncellemeniz gerekecek."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -6839,9 +6836,8 @@ msgid ""
 "                        to access your statements from the Accounting Dashboard. \n"
 "                        The available methods for synchronization are as follows."
 msgstr ""
-"Banka hesaplarınız kaydedildikten sonra, Muhasebe Gösterge Tablosu'ndan "
-"ifadelerinize erişebilirsiniz \\ n. \\ N Mevcut senkronizasyon yöntemleri "
-"aşağıdaki gibidir."
+"Banka hesaplarınızı tanımladıktan sonra muhasebe panelinden banka hareketlerine erişebilirsiniz.\n"
+"Mevcut senkronizasyon yöntemleri aşağıdaki gibidir."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -6851,7 +6847,7 @@ msgstr "Firma bilgileriniz doğru olduğunda,"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "One bank statement for each bank account you hold."
-msgstr "Tuttuğunuz her banka hesabı için bir banka dekontu."
+msgstr "Tuttuğunuz her banka hesabı için bir banka hesap özeti."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_only_one_chart_template
@@ -6864,8 +6860,8 @@ msgstr "Yalnızca Bir Hesap Şablonu Mevcuttur"
 msgid ""
 "Only a draft payment can be posted. Trying to post a payment in state %s."
 msgstr ""
-"Yalnızca bir taslak ödeme kaydedilebilir. %s eyaletinde bir ödeme "
-"yayınlamaya çalışılıyor."
+"Yalnızca durumu taslak olan bir ödeme doğrulanabilir. İlgili kaydın durumu "
+":%s"
 
 #. module: account
 #: code:addons/account/models/chart_template.py:808
@@ -6920,7 +6916,7 @@ msgstr "Açılış Birim Numaraları"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 msgid "Operation Templates"
-msgstr "Çalışma Şablonları"
+msgstr "Operasyon Şablonları"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:994
@@ -6952,7 +6948,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template_nocreate
 msgid "Optional Create"
-msgstr "İsteğe bağlı Oluştur"
+msgstr "İsteğe Bağlı Oluştur"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_line_form2
@@ -6981,12 +6977,12 @@ msgstr "İlk Tutar"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_payment_id
 msgid "Originator Payment"
-msgstr "Orijinatör Ödemesi"
+msgstr "Üretici Ödemesi"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_tax_line_id
 msgid "Originator tax"
-msgstr "Başlatıcı vergisi"
+msgstr "Orijinatör Vergisi"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_other_income
@@ -7015,29 +7011,29 @@ msgstr "Giden"
 #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_output_categ_id
 #: model:ir.model.fields,field_description:account.field_res_company_property_stock_account_output_categ_id
 msgid "Output Account for Stock Valuation"
-msgstr "Stok Değerlemesi için Çıktı Hesabı"
+msgstr "Stok Değerlemesi İçin Çıkış Hesabı"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_outstanding_credits_debits_widget
 msgid "Outstanding Credits Debits Widget"
-msgstr "Üstün Krediler Borç Widgeti"
+msgstr "Açık Borç Alacak Widget'ı"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Outstanding Transactions"
-msgstr "Olağanüstü İşlemler"
+msgstr "Açık İşlemler"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:116
 #, python-format
 msgid "Outstanding credits"
-msgstr "Üstün krediler"
+msgstr "Tahsil Edilmeyen Alacaklar"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:119
 #, python-format
 msgid "Outstanding debits"
-msgstr "Ödenmeyen borçlar"
+msgstr "Ödenmeyen Borçlar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -7163,7 +7159,7 @@ msgstr "İş Ortağı Adı"
 #: model:ir.model.fields,field_description:account.field_account_payment_partner_type
 #: model:ir.model.fields,field_description:account.field_account_register_payments_partner_type
 msgid "Partner Type"
-msgstr "Ortak Türü"
+msgstr "İş Ortağı Türü"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_result_selection
@@ -7421,13 +7417,15 @@ msgstr "Tutar yüzdesi"
 #: selection:account.reconcile.model,amount_type:0
 #: selection:account.reconcile.model.template,amount_type:0
 msgid "Percentage of balance"
-msgstr "Denge yüzdesi"
+msgstr "Bakiye Yüzdesi"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:1496
 #, python-format
 msgid "Percentages for Payment Terms Line must be between 0 and 100."
-msgstr "Ödeme Şartları Çizgisi için Yüzdeler 0 ile 100 arasında olmalıdır."
+msgstr ""
+"Ödeme Koşulları Satırı yüzde (%) tanımı, 0 ile 100 arasında bir değer "
+"olmalıdır."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -7459,7 +7457,9 @@ msgstr "Banka Hesap Özetinde 'Yevmiye' alanının ayarlandığından emin olun"
 #: code:addons/account/wizard/pos_box.py:29
 #, python-format
 msgid "Please check that the field 'Transfer Account' is set on the company."
-msgstr "Lütfen 'Hesap Aktar' alanının şirkette ayarlandığını kontrol edin."
+msgstr ""
+"Lütfen 'Transfer Hesabı' alanının firma ayarlarında tanımlandığına emin "
+"olun."
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:829
@@ -7471,7 +7471,7 @@ msgstr "Lütfen birkaç fatura satırı oluşturun."
 #: code:addons/account/models/account_move.py:151
 #, python-format
 msgid "Please define a sequence for the refunds"
-msgstr "Lütfen geri ödemeler için bir sıra tanımlayın"
+msgstr "Lütfen iadeler için bir sıra tanımlayın"
 
 #. module: account
 #: code:addons/account/models/account_move.py:156
@@ -7488,7 +7488,7 @@ msgstr "Bu faturayla ilgili yevmiyeye lütfen bir sıra tanımlayın."
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Bank"
-msgstr "Artı Bankası"
+msgstr "+Banka"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
@@ -7498,17 +7498,17 @@ msgstr "+Duran Varlıklar"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Net Profit"
-msgstr "Artı Net Kâr"
+msgstr "+Net Kâr"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Non-Current Assets"
-msgstr "Artı Dönen Varlıklar"
+msgstr "+Dönen Varlıklar"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Other Income"
-msgstr "Artı Diğer Gelirler"
+msgstr "+Diğer Gelirler"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
@@ -7553,12 +7553,12 @@ msgstr "Onaylı Yevmiye Kalemleri"
 #: model:ir.model.fields,field_description:account.field_account_chart_template_bank_account_code_prefix
 #: model:ir.model.fields,field_description:account.field_res_company_bank_account_code_prefix
 msgid "Prefix of the bank accounts"
-msgstr "Banka hesaplarının öneki"
+msgstr "Banka hesaplarının ön eki"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_cash_account_code_prefix
 msgid "Prefix of the cash accounts"
-msgstr "Nakit hesapların öneki"
+msgstr "Nakit hesapların ön eki"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template_cash_account_code_prefix
@@ -8140,12 +8140,12 @@ msgstr "Gelirlerin Muhasebeleştirilmesi"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_date
 msgid "Reversal date"
-msgstr "Geri alma tarihi"
+msgstr "Ters Kayıt Tarihi"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
 msgid "Reverse Entry"
-msgstr "Tersine Giriş"
+msgstr "Ters Kayıt Girişi"
 
 #. module: account
 #: code:addons/account/wizard/account_move_reversal.py:20
@@ -8153,7 +8153,7 @@ msgstr "Tersine Giriş"
 #: model:ir.ui.view,arch_db:account.view_account_move_reversal
 #, python-format
 msgid "Reverse Moves"
-msgstr "Geri Hareketler"
+msgstr "Ters Kayıt Hareketleri"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -8163,12 +8163,12 @@ msgstr "Ters bakiye imi"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review Fiscal Positions"
-msgstr "Mali Durumları İnceleme"
+msgstr "Mali Koşulları Gözden Geçir"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review Terms"
-msgstr "Şartları Gözden Geçir"
+msgstr "Koşulları Gözden Geçiş"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -8178,7 +8178,7 @@ msgstr "Mevcut Vergilerin Gözden Geçirilmesi"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
 msgid "Review the Chart of Accounts"
-msgstr "Hesap Planını İnceleme"
+msgstr "Hesap Planını Gözden Geçir"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_planner
@@ -8389,12 +8389,12 @@ msgstr "İş Ortağı Seçin"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:241
 #, python-format
 msgid "Select a partner or choose a counterpart"
-msgstr "Bir ortak seçin veya bir muhatap seçin"
+msgstr "Bir iş ortağı veya kaşı hesap seçin"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment_term_line_value
 msgid "Select here the kind of valuation related to this payment terms line."
-msgstr "Burada, bu ödeme şartları satırı ile ilgili değerleme türünü seçin."
+msgstr "Burada, bu ödeme koşulları satırı ile ilgili değerleme türünü seçin."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax_template_use_cash_basis
diff --git a/addons/base_automation/i18n/zh_CN.po b/addons/base_automation/i18n/zh_CN.po
index 83e10628e79..afc541f43f7 100644
--- a/addons/base_automation/i18n/zh_CN.po
+++ b/addons/base_automation/i18n/zh_CN.po
@@ -89,7 +89,7 @@ msgstr "添加关注者"
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_is_assigned_to_admin
 msgid "Assigned to admin user"
-msgstr ""
+msgstr "指派给管理用户"
 
 #. module: base_automation
 #: model:ir.model,name:base_automation.model_base_automation
diff --git a/addons/event_sale/i18n/nl.po b/addons/event_sale/i18n/nl.po
index 1abede3c160..c87c5e27a5f 100644
--- a/addons/event_sale/i18n/nl.po
+++ b/addons/event_sale/i18n/nl.po
@@ -366,6 +366,7 @@ msgstr "Soort ticket"
 #, python-format
 msgid "Ticket should belong to either event category or event but not both"
 msgstr ""
+"Ticket moet toebehoren aan evenement categorie of evenement, maar niet beide"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_type_use_ticketing
diff --git a/addons/google_drive/i18n/zh_CN.po b/addons/google_drive/i18n/zh_CN.po
index 573171f3090..e0866380e8c 100644
--- a/addons/google_drive/i18n/zh_CN.po
+++ b/addons/google_drive/i18n/zh_CN.po
@@ -99,7 +99,7 @@ msgstr "至配置面板"
 #. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config_google_drive_client_id
 msgid "Google Client"
-msgstr ""
+msgstr "谷歌客户端"
 
 #. module: google_drive
 #: model:ir.ui.menu,name:google_drive.menu_google_drive_config
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index ae9e4c4bdec..e71ba8f4e30 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.po
@@ -496,7 +496,7 @@ msgstr "Beheer aanwezigheden"
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
 msgid "Manage leave allocations and requests"
-msgstr ""
+msgstr "Beheer verlof toewijzingen en verzoeken"
 
 #. module: hr_attendance
 #: model:res.groups,name:hr_attendance.group_hr_attendance_manager
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 83076c9bee6..3f0d87ec1ff 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -35,13 +35,13 @@ msgstr "\"签出\"时间不能早于\"签入\"时间。"
 #: code:addons/hr_attendance/models/hr_attendance.py:29
 #, python-format
 msgid "%(empl_name)s from %(check_in)s"
-msgstr ""
+msgstr "%(empl_name)s 来自%(check_in)s"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_attendance.py:34
 #, python-format
 msgid "%(empl_name)s from %(check_in)s to %(check_out)s"
-msgstr ""
+msgstr "%(empl_name)s 从%(check_in)s 到 %(check_out)s"
 
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index d2116cd842a..234331199aa 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -352,6 +352,7 @@ msgstr "Als werknemers zijn er"
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
 msgid "Ask your expert accountant what tax must be claimed to your customer"
 msgstr ""
+"Vraag uw expert boekhouder welke belasting geëist moet worden van uw klant"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_bank_journal_id
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index dee2ff069e7..12a85330b0d 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -313,7 +313,7 @@ msgstr "Aanbevolen apps"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
 msgid "Reimburse employee expenses and invoice customers"
-msgstr ""
+msgstr "Betaal werknemerskosten terug en factureer klanten"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_remaining_hours
diff --git a/addons/mass_mailing/i18n/nl.po b/addons/mass_mailing/i18n/nl.po
index adec92e3eb5..85589f6ae32 100644
--- a/addons/mass_mailing/i18n/nl.po
+++ b/addons/mass_mailing/i18n/nl.po
@@ -365,7 +365,7 @@ msgstr "Kies"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
 msgid "Choose among multiple email templates and styles"
-msgstr ""
+msgstr "Kies uit meerdere e-mailsjablonen en stijlen"
 
 #. module: mass_mailing
 #: model:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_lists
diff --git a/addons/mass_mailing/i18n/zh_CN.po b/addons/mass_mailing/i18n/zh_CN.po
index 8421450590d..4dcd50ff2d8 100644
--- a/addons/mass_mailing/i18n/zh_CN.po
+++ b/addons/mass_mailing/i18n/zh_CN.po
@@ -166,7 +166,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
 msgid "<small>Step 3:</small>"
-msgstr ""
+msgstr "<small>步骤3:</small>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
@@ -227,7 +227,7 @@ msgstr "A/B 测试百分比"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
 msgid "ALL DAY"
-msgstr ""
+msgstr "全天"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_active
@@ -518,7 +518,7 @@ msgstr "信息安全"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "DEFAULT"
-msgstr ""
+msgstr "默认"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_exception
@@ -671,7 +671,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
 msgid "Enjoy!"
-msgstr ""
+msgstr "享受!"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
@@ -1164,7 +1164,7 @@ msgstr "点击数"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
 msgid "OFF"
-msgstr ""
+msgstr "关闭"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
diff --git a/addons/payment_stripe/i18n/zh_CN.po b/addons/payment_stripe/i18n/zh_CN.po
index 1e1e23a5621..4c332b2fe36 100644
--- a/addons/payment_stripe/i18n/zh_CN.po
+++ b/addons/payment_stripe/i18n/zh_CN.po
@@ -46,7 +46,7 @@ msgstr "卡号"
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url
 msgid "Checkout Image URL"
-msgstr ""
+msgstr "检出图像URL"
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 40fa8990d55..90fcc431cdf 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -429,7 +429,7 @@ msgstr "Elérhető fizetési módok"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
 msgid "Available in POS"
-msgstr ""
+msgstr "Elérhető az Értékesítési pontban"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_product_product_available_in_pos
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index e808d735243..6c7c7e0ef05 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -323,6 +323,7 @@ msgstr "Een algemene korting toevoegen"
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
 msgid "Add table management, tips, bill printing &amp; split, etc."
 msgstr ""
+"Voeg tafelbeheer, fooien, rekeningen afdrukken &amp; splitsen, enz toe."
 
 #. module: point_of_sale
 #. openerp-web
@@ -374,6 +375,8 @@ msgid ""
 "Allows you to define a loyalty program in the point of sale, where the "
 "customers earn loyalty points and get rewards."
 msgstr ""
+"Staat u toe een loyaliteitsprogramma te definiëren voor de kassa, waar de "
+"klant loyaliteitspunten en beloningen kan verdienen."
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_amount
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index f58e70719a2..4e688390958 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -382,7 +382,7 @@ msgstr "Verwervingen: Verwervingen uitvoeren"
 #: model:ir.cron,cron_name:procurement.ir_cron_scheduler_action
 #: model:ir.cron,name:procurement.ir_cron_scheduler_action
 msgid "Procurement: run MRP scheduler"
-msgstr ""
+msgstr "Verwervingen: voer MRP planner uit"
 
 #. module: procurement
 #: model:ir.model.fields,field_description:procurement.field_procurement_group_procurement_ids
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 12a2947d320..fe185489093 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -3167,7 +3167,7 @@ msgstr "Referentie"
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_config_settings_view_form
 msgid "Reimburse employee expenses and invoice customers"
-msgstr ""
+msgstr "Betaal werknemers kosten terug en factureer klanten"
 
 #. module: project
 #. openerp-web
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 4e7124d65f4..8234a312107 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -145,12 +145,12 @@ msgstr "# 分配的天数"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_closing_days
 msgid "# Days to Close"
-msgstr ""
+msgstr "# 到关闭的天数"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_delay_endings_days
 msgid "# Days to Deadline"
-msgstr ""
+msgstr "# 到截止天数"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_res_partner_task_count
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index f4df476a8cf..af762e32cf1 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -628,7 +628,7 @@ msgstr "Project issues"
 #. module: project_issue
 #: model:ir.ui.view,arch_db:project_issue.project_config_settings_view_form_inherit_project_issue
 msgid "Provides timesheet support for the issues/bugs management in project."
-msgstr ""
+msgstr "Biedt urenstaten ondersteuning voor issue/bug beheer op project."
 
 #. module: project_issue
 #: model:ir.model.fields,field_description:project_issue.field_project_config_settings_module_rating_project_issue
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index a705c4efb5e..1bcc508f899 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -462,7 +462,7 @@ msgstr "开单数量"
 #: code:addons/purchase/models/purchase.py:578
 #, python-format
 msgid "Billed Quantity"
-msgstr ""
+msgstr "开单数量"
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_status
diff --git a/addons/rating_project/i18n/zh_CN.po b/addons/rating_project/i18n/zh_CN.po
index f7a6d1014be..253378f23d6 100644
--- a/addons/rating_project/i18n/zh_CN.po
+++ b/addons/rating_project/i18n/zh_CN.po
@@ -98,7 +98,7 @@ msgstr ""
 #. module: rating_project
 #: model:mail.template,subject:rating_project.rating_project_request_email_template
 msgid "${object.project_id.company_id.name}: Service Rating Request"
-msgstr ""
+msgstr "${object.project_id.company_id.name}: 服务点评请求"
 
 #. module: rating_project
 #: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_form
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index 7ec92fccdb0..34ad8bad3ca 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -524,7 +524,7 @@ msgstr "Werk detail"
 #. module: resource
 #: model:ir.ui.view,arch_db:resource.resource_calendar_form
 msgid "Work Resources"
-msgstr ""
+msgstr "Werk resources"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_hour_from
diff --git a/addons/sales_team/i18n/nl.po b/addons/sales_team/i18n/nl.po
index 73f72dc5b2f..227c97bbe56 100644
--- a/addons/sales_team/i18n/nl.po
+++ b/addons/sales_team/i18n/nl.po
@@ -542,6 +542,8 @@ msgid ""
 "Sales Channel the user is member of. Used to compute the members of a sales "
 "channel through the inverse one2many"
 msgstr ""
+"Verkoopkanaal waarvan de gebruiker lid is. Gebruikt om de leden te berekenen"
+" van een verkoopkanaal via het one2many veld"
 
 #. module: sales_team
 #: model:ir.actions.act_window,name:sales_team.crm_team_act
diff --git a/addons/stock_account/i18n/nl.po b/addons/stock_account/i18n/nl.po
index a7d79a4d4fd..f66e5cbaa42 100644
--- a/addons/stock_account/i18n/nl.po
+++ b/addons/stock_account/i18n/nl.po
@@ -383,7 +383,7 @@ msgstr "Permanent (geautomatiseerd)"
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_config_settings_group_stock_inventory_valuation
 msgid "Perpetual Valuation"
-msgstr ""
+msgstr "Permanente waarde"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
diff --git a/addons/web_editor/i18n/zh_CN.po b/addons/web_editor/i18n/zh_CN.po
index b0d5f94b8fd..884e700b1a6 100644
--- a/addons/web_editor/i18n/zh_CN.po
+++ b/addons/web_editor/i18n/zh_CN.po
@@ -46,7 +46,7 @@ msgstr "(油管, Vimeo, Dailymotion)"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "25% Black"
-msgstr ""
+msgstr "25% 黑"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -56,22 +56,22 @@ msgstr ""
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% Black"
-msgstr ""
+msgstr "50% 黑"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% White"
-msgstr ""
+msgstr "50% 白"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% Black"
-msgstr ""
+msgstr "75% 黑"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% White"
-msgstr ""
+msgstr "75% 白"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.snippets
@@ -185,7 +185,7 @@ msgstr "背景颜色"
 #: code:addons/web_editor/static/src/js/snippets.options.js:667
 #, python-format
 msgid "Background Image Sizing"
-msgstr ""
+msgstr "背景图像尺寸"
 
 #. module: web_editor
 #. openerp-web
@@ -378,7 +378,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Delta"
-msgstr ""
+msgstr "差异"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/website_blog/i18n/zh_CN.po b/addons/website_blog/i18n/zh_CN.po
index fd01c045374..35948492de1 100644
--- a/addons/website_blog/i18n/zh_CN.po
+++ b/addons/website_blog/i18n/zh_CN.po
@@ -87,7 +87,7 @@ msgstr ""
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "A new post"
-msgstr ""
+msgstr "新帖"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
@@ -298,7 +298,7 @@ msgstr "复制"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Filter Color"
-msgstr ""
+msgstr "过滤颜色"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
diff --git a/addons/website_crm/i18n/zh_CN.po b/addons/website_crm/i18n/zh_CN.po
index 577cc4c41c8..5798a9a4243 100644
--- a/addons/website_crm/i18n/zh_CN.po
+++ b/addons/website_crm/i18n/zh_CN.po
@@ -142,7 +142,7 @@ msgstr "感谢！"
 #: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:15
 #, python-format
 msgid "There is no recent lead."
-msgstr ""
+msgstr "没有最近的线索"
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_thanks
diff --git a/addons/website_crm_partner_assign/i18n/nl.po b/addons/website_crm_partner_assign/i18n/nl.po
index 1bc47d27c69..4b3dffceb70 100644
--- a/addons/website_crm_partner_assign/i18n/nl.po
+++ b/addons/website_crm_partner_assign/i18n/nl.po
@@ -344,7 +344,7 @@ msgstr "Aangemaakt op"
 #. module: website_crm_partner_assign
 #: model:ir.actions.server,name:website_crm_partner_assign.action_assign_salesman_according_assigned_partner
 msgid "Crm Assignation: Assign salesman of assigned partner"
-msgstr ""
+msgstr "CRM toewijzing: Wijs verkoper van toegewezen partner toe"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
diff --git a/addons/website_crm_partner_assign/i18n/zh_CN.po b/addons/website_crm_partner_assign/i18n/zh_CN.po
index d16bde9493b..72f72a670ab 100644
--- a/addons/website_crm_partner_assign/i18n/zh_CN.po
+++ b/addons/website_crm_partner_assign/i18n/zh_CN.po
@@ -141,7 +141,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "<span>at </span>"
-msgstr ""
+msgstr "<span>在</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
diff --git a/addons/website_event/i18n/zh_CN.po b/addons/website_event/i18n/zh_CN.po
index 0c6b079ce82..71d6ddad0db 100644
--- a/addons/website_event/i18n/zh_CN.po
+++ b/addons/website_event/i18n/zh_CN.po
@@ -111,7 +111,7 @@ msgstr "<strong>电话</strong> <span class=\"text-muted\">(可选)</span>"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
 msgid "<strong>Use this tag:</strong>"
-msgstr ""
+msgstr "<strong>使用此标签:</strong>"
 
 #. module: website_event
 #: code:addons/website_event/controllers/main.py:96
diff --git a/addons/website_event_track/i18n/nl.po b/addons/website_event_track/i18n/nl.po
index f0b139e2952..cef73a092ad 100644
--- a/addons/website_event_track/i18n/nl.po
+++ b/addons/website_event_track/i18n/nl.po
@@ -332,7 +332,7 @@ msgstr "Evenement locatie"
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor
 msgid "Event Sponsor"
-msgstr ""
+msgstr "Evenement sponsor"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor_type
diff --git a/addons/website_hr_recruitment/i18n/zh_CN.po b/addons/website_hr_recruitment/i18n/zh_CN.po
index 3d9ed7dd46a..cb1ae8e104d 100644
--- a/addons/website_hr_recruitment/i18n/zh_CN.po
+++ b/addons/website_hr_recruitment/i18n/zh_CN.po
@@ -134,7 +134,7 @@ msgstr "公司增长"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Company Maturity:"
-msgstr ""
+msgstr "公司成熟能力:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
@@ -303,7 +303,7 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Prime location"
-msgstr ""
+msgstr "主要地点"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
diff --git a/addons/website_sale/i18n/hr.po b/addons/website_sale/i18n/hr.po
index f6f63b2acda..b40905417d5 100644
--- a/addons/website_sale/i18n/hr.po
+++ b/addons/website_sale/i18n/hr.po
@@ -256,6 +256,9 @@ msgid ""
 "                                <span class=\"visible-xs-inline\">Checkout</span>\n"
 "                                <span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
+"<span class=\"hidden-xs\">Završi kupovinu</span>\n"
+"                                <span class=\"visible-xs-inline\">Završi</span>\n"
+"                                <span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
diff --git a/addons/website_sale_options/i18n/zh_CN.po b/addons/website_sale_options/i18n/zh_CN.po
index 3b0e31ad3cd..7c95ff146c2 100644
--- a/addons/website_sale_options/i18n/zh_CN.po
+++ b/addons/website_sale_options/i18n/zh_CN.po
@@ -71,7 +71,7 @@ msgstr "链接的订单明细"
 #: code:addons/website_sale_options/models/sale_order.py:46
 #, python-format
 msgid "Option for:"
-msgstr ""
+msgstr "选项:"
 
 #. module: website_sale_options
 #: code:addons/website_sale_options/models/sale_order.py:48

From b0d498c11dd46c608e29f16067ef64a922e3ffc1 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 25 Aug 2017 15:16:49 +0200
Subject: [PATCH 059/119] [FIX] stock: delivery slip UOM

1. Create a product A, set to stockable product, set its UOM and
   purchase UOM to Unit(s)
2. Create SO with A, but use a different UOM than Unit(s) (e.g. Dozen)
3. Validate, go to delivery, validate, and print the delivery slip

Ordered quantity shown on delivery slip is in SO UOM but listed as
product UOM.

opw-766914
---
 addons/stock/report/report_deliveryslip.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index fd6ced95628..615a1534492 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -111,7 +111,12 @@
                                     <span t-if="pack_operation.package_id">:</span>
                                     <span t-field="pack_operation.package_id"/>
                                     <span t-field="pack_operation.ordered_qty"/>
-                                    <span t-field="pack_operation.product_uom_id"/>
+                                    <t t-if="pack_operation.linked_move_operation_ids">
+                                        <span t-field="pack_operation.linked_move_operation_ids[0].move_id.product_uom"></span>
+                                    </t>
+                                    <t t-else="1">
+                                        <span t-field="pack_operation.product_uom_id"></span>
+                                    </t>
                                 </td>
                                 <td class="text-right" t-if="pack_operation.state == 'done'">
                                     <t t-if="pack_operation.ordered_qty != pack_operation.qty_done">

From 9e74756e3913a2dc2e82ec981c108964dfff6514 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 24 Aug 2017 15:31:17 +0200
Subject: [PATCH 060/119] [FIX] project: "Activate a sample project" doesn't
 work

Typo error.

opw:765673
---
 addons/project/views/project_views.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 118bb860b61..3e5d7cb22e6 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -307,9 +307,8 @@
         <record id="ir_actions_server_project_sample" model="ir.actions.server">
             <field name="name">Project: Activate Sample Project</field>
             <field name="model_id" ref="project.model_project_project"/>
-            <field name="code">
-action = model.activate_sample_project()
-            </field>
+            <field name="state">code</field>
+            <field name="code">action = model.activate_sample_project()</field>
         </record>
 
         <record id="open_view_project_all" model="ir.actions.act_window">

From 15cb84e0f77db350560aac9d32d947e919def128 Mon Sep 17 00:00:00 2001
From: Rawish Murari <rmu-odoo@users.noreply.github.com>
Date: Mon, 28 Aug 2017 15:16:08 +0530
Subject: [PATCH 061/119] [IMP] l10n_th : one tag per grid in tax reports

Make it easier to add taxes in odoo by using one tag per tax grid.

task: https://www.odoo.com/web#id=22696&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720
PR: #19103
---
 addons/l10n_th/__openerp__.py                 |   2 +-
 addons/l10n_th/account_data.xml               | 181 ++++++++++--------
 .../2.0/post-migrate_tags_on_taxes.py         |   6 +
 3 files changed, 105 insertions(+), 84 deletions(-)
 create mode 100644 addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py

diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 8b760d20fda..aa4557c9563 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Thailand - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'category': 'Localization',
     'description': """
 Chart of Accounts for Thailand.
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 6462d346d0e..917dbb4084a 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -254,75 +254,94 @@
 
 <!-- Account Tax Tags -->
 
-<record id="tag_input_vat_7" model="account.account.tag">
-    <field name="name">Input VAT 7%</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_output_7" model="account.account.tag">
-    <field name="name">Output VAT 7%</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_trans_1" model="account.account.tag">
-    <field name="name">Company Tax 1% (Transportation)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_advt_2" model="account.account.tag">
-    <field name="name">Company Tax 2% (Advertising)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_serv_3" model="account.account.tag">
-    <field name="name">Company Tax 3% (Service)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_comp_tax_rent_5" model="account.account.tag">
-    <field name="name">Company Tax 5% (Rental)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_trans_1" model="account.account.tag">
-    <field name="name">Personal Tax 1% (Transportation)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_advt_2" model="account.account.tag">
-    <field name="name">Personal Tax 2% (Advertising)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_serv_3" model="account.account.tag">
-    <field name="name">Personal Tax 3% (Service)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_pers_tax_rent_5" model="account.account.tag">
-    <field name="name">Personal Tax 5% (Rental)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_trans_1" model="account.account.tag">
-    <field name="name">Income Tax 1% (Transportation)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_advt_2" model="account.account.tag">
-    <field name="name">Income Tax 2% (Advertising)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_serv_3" model="account.account.tag">
-    <field name="name">Income Tax 3% (Service)</field>
-    <field name="applicability">taxes</field>
-</record>
-
-<record id="tag_income_tax_rent_5" model="account.account.tag">
-    <field name="name">Income Tax 5% (Rental)</field>
-    <field name="applicability">taxes</field>
-</record>
+    <record id="tag_th_01" model="account.account.tag">
+        <field name="name">Taxes to be paid</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_02" model="account.account.tag">
+        <field name="name">Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_03" model="account.account.tag">
+        <field name="name">Personal Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_04" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_05" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_06" model="account.account.tag">
+        <field name="name">Company Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_07" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_08" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_09" model="account.account.tag">
+        <field name="name">Value Added Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_10" model="account.account.tag">
+        <field name="name">Output VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+     <record id="tag_th_11" model="account.account.tag">
+        <field name="name">Input VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_12" model="account.account.tag">
+        <field name="name">Taxable amounts</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_13" model="account.account.tag">
+        <field name="name">Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_14" model="account.account.tag">
+        <field name="name">Personal Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_15" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_16" model="account.account.tag">
+        <field name="name">Personal Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_17" model="account.account.tag">
+        <field name="name">Company Withholding Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_18" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Service)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_19" model="account.account.tag">
+        <field name="name">Company Withholding Tax (Other)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_20" model="account.account.tag">
+        <field name="name">Value Added Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_21" model="account.account.tag">
+        <field name="name">Output VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_th_22" model="account.account.tag">
+        <field name="name">Input VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
 
 <!-- TAXES -->
 
@@ -334,7 +353,7 @@
     <field name="account_id" ref="a_input_vat"/>
     <field name="refund_account_id" ref="a_input_vat"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_input_vat_7')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_22'), ref('tag_th_11')])]"/>
 </record>
 
 <record id="tax_output_vat" model="account.tax.template">
@@ -345,7 +364,7 @@
     <field name="account_id" ref="a_output_vat"/>
     <field name="refund_account_id" ref="a_output_vat"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_output_7')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_21'), ref('tag_th_10')])]"/>
 </record>
 
 <record id="tax_wht_co_1" model="account.tax.template">
@@ -356,7 +375,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_trans_1')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_19'),ref('tag_th_08')])]"/>
 </record>
 
 <record id="tax_wht_co_2" model="account.tax.template">
@@ -367,7 +386,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_advt_2')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_19'),ref('tag_th_08')])]"/>
 </record>
 
 <record id="tax_wht_co_3" model="account.tax.template">
@@ -378,7 +397,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_serv_3')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_18'),ref('tag_th_07')])]"/>
 </record>
 
 <record id="tax_wht_co_5" model="account.tax.template">
@@ -389,7 +408,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_comp_tax_rent_5')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_19'),ref('tag_th_08')])]"/>
 </record>
 
 <record id="tax_wht_pers_1" model="account.tax.template">
@@ -400,7 +419,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_trans_1')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_05'),ref('tag_th_19')])]"/>
 </record>
 
 <record id="tax_wht_pers_2" model="account.tax.template">
@@ -411,7 +430,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_advt_2')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_05'),ref('tag_th_19')])]"/>
 </record>
 
 <record id="tax_wht_pers_3" model="account.tax.template">
@@ -422,7 +441,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_serv_3')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_15'),ref('tag_th_04')])]"/>
 </record>
 
 <record id="tax_wht_pers_5" model="account.tax.template">
@@ -433,7 +452,7 @@
     <field name="account_id" ref="a_wht"/>
     <field name="refund_account_id" ref="a_wht"/>
     <field name="type_tax_use">purchase</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_pers_tax_rent_5')])]"/>
+    <field name="tag_ids" eval="[(6,0,[ref('tag_th_05'),ref('tag_th_19')])]"/>
 </record>
 
 <record id="tax_wht_income_1" model="account.tax.template">
@@ -444,7 +463,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_trans_1')])]"/>
 </record>
 
 <record id="tax_wht_income_2" model="account.tax.template">
@@ -455,7 +473,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_advt_2')])]"/>
 </record>
 
 <record id="tax_wht_income_3" model="account.tax.template">
@@ -466,7 +483,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_serv_3')])]"/>
 </record>
 
 <record id="tax_wht_income_5" model="account.tax.template">
@@ -477,7 +493,6 @@
     <field name="account_id" ref="a_wht_income"/>
     <field name="refund_account_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
-    <field name="tag_ids" eval="[(6,0,[ref('tag_income_tax_rent_5')])]"/>
 </record>
 
 </odoo>
diff --git a/addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)

From c478e94450374176f0dcb97f1fa3d71b8d3dbd93 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 25 Aug 2017 16:07:39 +0200
Subject: [PATCH 062/119] [FIX] hr_expense: delete expense

A regular employee is allowed to delete an expense reported already
approved. This should not be possible, only an officer could do it.

Fixes #19044
opw-767549
---
 addons/hr_expense/security/ir_rule.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 61aba78d7ed..e86d91211d8 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -26,6 +26,26 @@
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
         </record>
+        <record id="hr_expense_report_prevent_unlink" model="ir.rule">
+            <field name="name">Expense Report Prevent Delete Employee</field>
+            <field name="model_id" ref="model_hr_expense_sheet"/>
+            <field name="domain_force">[('state', '=', 'submit')]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+        <record id="hr_expense_report_auth_unlink" model="ir.rule">
+            <field name="name">Expense Report Authorize Delete Officer</field>
+            <field name="model_id" ref="model_hr_expense_sheet"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('hr_expense.group_hr_expense_user'))]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
 
     </data>
 </odoo>

From b7a84cd997ad461de52230301588222ae5c8e423 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Fri, 25 Aug 2017 15:49:17 +0200
Subject: [PATCH 063/119] [FIX] mrp: production_id on move lines

When the move lines were created manually, there were no production_id
set on them. So we pass it through the context in the 'Register Lots' view.
---
 addons/mrp/views/stock_move_views.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/views/stock_move_views.xml b/addons/mrp/views/stock_move_views.xml
index 6dc5a9729d1..c9e7dc51941 100644
--- a/addons/mrp/views/stock_move_views.xml
+++ b/addons/mrp/views/stock_move_views.xml
@@ -28,9 +28,11 @@
                             <field name="workorder_id" invisible="1"/>
                             <field name="location_id" invisible="1"/>
                             <field name="location_dest_id" invisible="1"/>
+                            <field name="production_id" invisible="1"/>
+                            <field name="raw_material_production_id" invisible="1"/>
                         </group>
                     </group>
-                    <field name="active_move_line_ids" attrs="{'readonly': [('is_done', '=', True)]}" context="{'default_workorder_id': workorder_id, 'default_product_uom_id': product_uom, 'default_product_id': product_id,  'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
+                    <field name="active_move_line_ids" attrs="{'readonly': [('is_done', '=', True)]}" context="{'default_workorder_id': workorder_id, 'default_product_uom_id': product_uom, 'default_product_id': product_id,  'default_location_id': location_id, 'default_location_dest_id': location_dest_id, 'default_production_id': production_id or raw_material_production_id}">
                         <tree editable="bottom" decoration-success="product_qty==qty_done" decoration-danger="(product_qty &gt; 0) and (qty_done&gt;product_qty)">
                             <field name="lot_id" domain="[('product_id', '=', parent.product_id)]" context="{'default_product_id': parent.product_id}"/>
                             <field name="product_qty" invisible="not context.get('show_reserved') or context.get('serial') or context.get('state_done')" readonly="1"/>
@@ -41,6 +43,7 @@
                             <field name="location_id" invisible="1"/>
                             <field name="location_dest_id" invisible="1"/>
                             <field name="done_wo" invisible="1"/>
+                            <field name="production_id" invisible="1" />
                         </tree>
                     </field>
                     <footer class="oe_edit_only">

From b3b6267cf001b04ec0aae1573d47f16070803715 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Thu, 24 Aug 2017 14:15:55 +0200
Subject: [PATCH 064/119] [FIX] stock: add decoration muted on move cancel

---
 addons/stock/views/stock_picking_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 30ec38c8f79..6e0f20e6358 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -274,7 +274,7 @@
                         <page string="Operations">
                             <field name="id" invisible="1"/>
                             <field name="move_lines" attrs="{'readonly': [('state', 'in', ('cancel', 'done'))]}" context="{'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
-                                <tree decoration-danger="state != 'done' and quantity_done > reserved_availability" decoration-muted="scrapped == True" string="Stock Moves" editable="bottom">
+                                <tree decoration-danger="state != 'done' and quantity_done > reserved_availability" decoration-muted="scrapped == True or state == 'cancel'" string="Stock Moves" editable="bottom">
                                     <field name="name" invisible="1"/>
                                     <field name="date_expected" invisible="1"/>
                                     <field name="state" invisible="1" readonly="0"/>

From f32a79dd82b592c9419829db9e9cbaf4d268a967 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Thu, 24 Aug 2017 13:22:13 +0200
Subject: [PATCH 065/119] [FIX] web: limit amount of rows for excel export

Before this commit, when the amount of rows was above xls format threshold (>65535), the xlwt library threw an obscure Traceback to the user.

We now test the amount of rows before even calling the library, raising a more helpful message to the user

OPW 767319

closes #19035
---
 addons/web/controllers/main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3dc9d4526bc..636f37d293e 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -35,7 +35,7 @@ from openerp.tools import ustr
 from openerp.tools.misc import str2bool, xlwt
 from openerp import http
 from openerp.http import request, serialize_exception as _serialize_exception, content_disposition
-from openerp.exceptions import AccessError
+from openerp.exceptions import AccessError, UserError
 
 _logger = logging.getLogger(__name__)
 
@@ -1419,6 +1419,9 @@ class ExcelExport(ExportFormat, http.Controller):
         return base + '.xls'
 
     def from_data(self, fields, rows):
+        if len(rows) > 65535:
+            raise UserError(_('There are too many rows (%s rows, limit: 65535) to export as Excel 97-2003 (.xls) format. Consider splitting the export.') % len(rows))
+
         workbook = xlwt.Workbook()
         worksheet = workbook.add_sheet('Sheet 1')
 

From 5d3cbf4d7a2223afcfc8ed61457b8f6843e41c81 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 28 Aug 2017 14:06:23 +0200
Subject: [PATCH 066/119] [FIX] hr_contract: fix auto pending/auto close

Before this commit, create a contract which expire in 2 months.
The cron will check all contracts that have a date_end >= tomorrow.
All contract with a end_date will be close.

Now we check all contracts that have a end_date <= yesterday and close it
---
 addons/hr_contract/models/hr_contract.py     |  9 ++--
 addons/hr_contract/tests/__init__.py         |  4 ++
 addons/hr_contract/tests/test_auto_status.py | 54 ++++++++++++++++++++
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 addons/hr_contract/tests/__init__.py
 create mode 100644 addons/hr_contract/tests/test_auto_status.py

diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py
index 086d5dc94db..2e59cbfcf6a 100644
--- a/addons/hr_contract/models/hr_contract.py
+++ b/addons/hr_contract/models/hr_contract.py
@@ -104,8 +104,8 @@ class Contract(models.Model):
         soon_expired_contracts = self.search([
             ('state', '=', 'open'),
             '|',
-            ('date_end', '>=', fields.Date.to_string(date.today() + relativedelta(days=-7))),
-            ('visa_expire', '>=', fields.Date.to_string(date.today() + relativedelta(days=-60)))
+            ('date_end', '<=', fields.Date.to_string(date.today() + relativedelta(days=7))),
+            ('visa_expire', '<=', fields.Date.to_string(date.today() + relativedelta(days=60)))
         ])
         return soon_expired_contracts.write({
             'state': 'pending'
@@ -114,9 +114,10 @@ class Contract(models.Model):
     @api.model
     def update_to_close(self):
         expired_contracts = self.search([
+            ('state', '!=', 'close'),
             '|',
-            ('date_end', '>=', fields.Date.to_string(date.today() + relativedelta(days=1))),
-            ('visa_expire', '>=', fields.Date.to_string(date.today() + relativedelta(days=1)))
+            ('date_end', '<=', fields.Date.to_string(date.today() + relativedelta(days=-1))),
+            ('visa_expire', '<=', fields.Date.to_string(date.today() + relativedelta(days=-1)))
         ])
         return expired_contracts.write({
             'state': 'close'
diff --git a/addons/hr_contract/tests/__init__.py b/addons/hr_contract/tests/__init__.py
new file mode 100644
index 00000000000..6f1832811c2
--- /dev/null
+++ b/addons/hr_contract/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_auto_status
diff --git a/addons/hr_contract/tests/test_auto_status.py b/addons/hr_contract/tests/test_auto_status.py
new file mode 100644
index 00000000000..010524924d3
--- /dev/null
+++ b/addons/hr_contract/tests/test_auto_status.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from datetime import datetime
+from odoo.tests.common import TransactionCase
+from dateutil.relativedelta import relativedelta
+
+
+class TestHrContracts(TransactionCase):
+
+    def setUp(self):
+        super(TestHrContracts, self).setUp()
+        self.contracts = self.env['hr.contract'].with_context(tracking_disable=True)
+        self.employee = self.env.ref('hr.employee_root')
+        self.test_contract = dict(name='Test', wage=1, employee_id=self.employee.id, state='open')
+
+    def apply_cron(self):
+        self.env.ref('hr_contract.ir_cron_data_contract_update_to_pending').method_direct_trigger()
+        self.env.ref('hr_contract.ir_cron_data_contract_update_to_close').method_direct_trigger()
+
+    def test_contract_enddate(self):
+        self.test_contract.update(dict(date_end=datetime.now() + relativedelta(days=100)))
+        self.contract = self.contracts.create(self.test_contract)
+        self.apply_cron()
+        self.assertEquals(self.contract.state, 'open')
+
+        self.test_contract.update(dict(date_end=datetime.now() + relativedelta(days=5)))
+        self.contract.write(self.test_contract)
+        self.apply_cron()
+        self.assertEquals(self.contract.state, 'pending')
+
+        self.test_contract.update({
+            'date_start': datetime.now() + relativedelta(days=-50),
+            'date_end': datetime.now() + relativedelta(days=-1),
+            'state': 'pending',
+        })
+        self.contract.write(self.test_contract)
+        self.apply_cron()
+        self.assertEquals(self.contract.state, 'close')
+
+    def test_contract_pending_visa_expire(self):
+        self.employee.visa_expire = datetime.now() + relativedelta(days=30)
+        self.test_contract.update(dict(date_end=False))
+        self.contract = self.contracts.create(self.test_contract)
+        self.apply_cron()
+        self.assertEquals(self.contract.state, 'pending')
+
+        self.employee.visa_expire = datetime.now() + relativedelta(days=-5)
+        self.test_contract.update({
+            'date_start': datetime.now() + relativedelta(days=-50),
+            'state': 'pending',
+        })
+        self.contract.write(self.test_contract)
+        self.apply_cron()
+        self.assertEquals(self.contract.state, 'close')

From 361a518010960517ff554d2048625109dfdde81d Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 28 Aug 2017 11:06:39 +0200
Subject: [PATCH 067/119] [FIX] account: Automatic reconciliation button in
 manual reconciliation

Since 9.0, the button "Automatic reconciliation" is just used for the reconciliations
of bank statements. But the button appeared in manual reconciliation because the
qweb view "manual_reconciliation" extends "reconciliation".

The button must be invisible in this case because this feature is not implemented.

opw:767309
---
 addons/account/static/src/xml/account_reconciliation.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml
index fafcb833205..cf6ba37aae6 100644
--- a/addons/account/static/src/xml/account_reconciliation.xml
+++ b/addons/account/static/src/xml/account_reconciliation.xml
@@ -292,6 +292,9 @@
     </t>
 
     <t t-name="manual_reconciliation" t-extend="reconciliation">
+        <t t-jquery=".js_automatic_reconciliation">
+            $(this).addClass('hidden');
+        </t>
         <t t-jquery=".interface_options" t-operation="append">
             <table t-if="show_mode_selector" border="0" cellpadding="0" cellspacing="0" class="oe_form_group o_form_group"><tbody>
                 <tr class="oe_form_group_row o_form_group_row">

From 38c77a521087405d8b42f24c882f19ada0387821 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Mon, 28 Aug 2017 18:24:19 +0200
Subject: [PATCH 068/119] [FIX] point_of_sale: use correct variable name

Oversight of forward-port 657e3289032d8ce6466019a36f7abf1be49df5cc

Close #19112
---
 addons/point_of_sale/models/pos_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index abcd045eb20..1f7e0762e65 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -868,7 +868,7 @@ class PosOrderLine(models.Model):
             self._onchange_qty()
             self.tax_ids = self.product_id.taxes_id.filtered(lambda r: not self.company_id or r.company_id == self.company_id)
             fpos = self.order_id.fiscal_position_id
-            tax_ids_after_fiscal_position = fpos.map_tax(self.tax_ids, line.product_id, line.order_id.partner_id) if fpos else self.tax_ids
+            tax_ids_after_fiscal_position = fpos.map_tax(self.tax_ids, self.product_id, self.order_id.partner_id) if fpos else self.tax_ids
             self.price_unit = self.env['account.tax']._fix_tax_included_price(price, self.product_id.taxes_id, tax_ids_after_fiscal_position)
 
     @api.onchange('qty', 'discount', 'price_unit', 'tax_ids')

From 4542c145139fea6e3ce4d09f00379bff279afc5c Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 28 Aug 2017 18:04:20 +0200
Subject: [PATCH 069/119] [FIX] purchase: date rate

When creating an invoice from an PO, set the appropriate date during
currency conversion.

opw-767279
---
 addons/purchase/models/account_invoice.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index c140ada3bdd..0aed9c09c26 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -47,7 +47,7 @@ class AccountInvoice(models.Model):
             'uom_id': line.product_uom.id,
             'product_id': line.product_id.id,
             'account_id': invoice_line.with_context({'journal_id': self.journal_id.id, 'type': 'in_invoice'})._default_account(),
-            'price_unit': line.order_id.currency_id.compute(line.price_unit, self.currency_id, round=False),
+            'price_unit': line.order_id.currency_id.with_context(date=self.date_invoice).compute(line.price_unit, self.currency_id, round=False),
             'quantity': qty,
             'discount': 0.0,
             'account_analytic_id': line.account_analytic_id.id,
@@ -78,11 +78,11 @@ class AccountInvoice(models.Model):
         self.purchase_id = False
         return {}
 
-    @api.onchange('currency_id')
+    @api.onchange('currency_id', 'date_invoice')
     def _onchange_currency_id(self):
         if self.currency_id:
             for line in self.invoice_line_ids.filtered(lambda r: r.purchase_line_id):
-                line.price_unit = line.purchase_id.currency_id.compute(line.purchase_line_id.price_unit, self.currency_id, round=False)
+                line.price_unit = line.purchase_id.currency_id.with_context(date=self.date_invoice).compute(line.purchase_line_id.price_unit, self.currency_id, round=False)
 
     @api.onchange('invoice_line_ids')
     def _onchange_origin(self):

From ec5164510cf23c9ac648309c008e976fcbcc4711 Mon Sep 17 00:00:00 2001
From: Laurent Smet <las@openerp.com>
Date: Tue, 29 Aug 2017 08:47:11 +0200
Subject: [PATCH 070/119] [IMP] l10n_no: Create tags and assign them to taxes

task: https://www.odoo.com/web#id=22597&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720

PR: #19104
---
 addons/l10n_no/__openerp__.py                 |   2 +-
 addons/l10n_no/account_tax.xml                | 279 ++++++++++--------
 .../2.0/post-migrate_tags_on_taxes.py         |   7 +
 .../2.0/pre-set_tags_and_taxes_updatable.py   |   7 +
 4 files changed, 169 insertions(+), 126 deletions(-)
 create mode 100644 addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py
 create mode 100644 addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py

diff --git a/addons/l10n_no/__openerp__.py b/addons/l10n_no/__openerp__.py
index 28b05ec1bad..7ec28b9783d 100644
--- a/addons/l10n_no/__openerp__.py
+++ b/addons/l10n_no/__openerp__.py
@@ -3,7 +3,7 @@
 
 {
     "name" : "Norway - Accounting",
-    "version" : "1.1",
+    "version" : "2.0",
     "author" : "Rolv Råen",
     'category': 'Localization',
     "description": """This is the module to manage the accounting chart for Norway in Odoo.
diff --git a/addons/l10n_no/account_tax.xml b/addons/l10n_no/account_tax.xml
index 2336d769095..e70dd59e375 100644
--- a/addons/l10n_no/account_tax.xml
+++ b/addons/l10n_no/account_tax.xml
@@ -1,134 +1,163 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
-	<!-- Account Tags -->
+<odoo>
+    <data>
 
-	<record id="tax_tag_ut25" model="account.account.tag">
-		<field name="name">Utgående 25% mva</field>
-		<field name="applicability">taxes</field>
-	</record>
-	<record id="tax_tag_ut15" model="account.account.tag">
-		<field name="name">Utgående 15% mva</field>
-		<field name="applicability">taxes</field>
-	</record>
-	<record id="tax_tag_ut8" model="account.account.tag">
-		<field name="name">Utgående 10% mva</field>
-		<field name="applicability">taxes</field>
-	</record>
-	<record id="tax_tag_in25" model="account.account.tag">
-		<field name="name">Inngående 25% mva</field>
-		<field name="applicability">taxes</field>
-	</record>
-	<record id="tax_tag_in15" model="account.account.tag">
-		<field name="name">Inngående 15% mva</field>
-		<field name="applicability">taxes</field>
-	</record>
-	<record id="tax_tag_in8" model="account.account.tag">
-		<field name="name">Inngående 10% mva</field>
-		<field name="applicability">taxes</field>
-	</record>
+        <!-- Account Tags -->
+        <record id="tag_no_01" model="account.account.tag">
+            <field name="name">Sum avgiftsgrunnlag</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_02" model="account.account.tag">
+            <field name="name">Sum innkjøp</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_03" model="account.account.tag">
+            <field name="name">Ikke momspliktig omsetning</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_04" model="account.account.tag">
+            <field name="name">Grunnlag for utgående avgift, høy sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_05" model="account.account.tag">
+            <field name="name">Grunnlag for utgående avgift, mellom sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_06" model="account.account.tag">
+            <field name="name">Grunnlag for utgående avgift, lav sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_07" model="account.account.tag">
+            <field name="name">Grunnlag for inngående avgift, høy sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_08" model="account.account.tag">
+            <field name="name">Grunnlag for inngående avgift, mellom sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_09" model="account.account.tag">
+            <field name="name">Grunnlag for inngående avgift, lav sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_10" model="account.account.tag">
+            <field name="name">Netto beregnet avgift</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_11" model="account.account.tag">
+            <field name="name">Beregnet inngående avgift, høy sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_12" model="account.account.tag">
+            <field name="name">Beregnet inngående avgift, lav sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_13" model="account.account.tag">
+            <field name="name">Beregnet inngående avgift, mellom sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_14" model="account.account.tag">
+            <field name="name">Beregnet utgående avgift, høy sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_15" model="account.account.tag">
+            <field name="name">Beregnet utgående avgift, lav sats</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_no_16" model="account.account.tag">
+            <field name="name">Beregnet utgående avgift, mellom sats</field>
+            <field name="applicability">taxes</field>
+        </record>
 
-        <record id="tax_tag_in0" model="account.account.tag">
+
+        <record id="tax1" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">Utgående 25% mva</field>
+            <field name="description">Utgående 25% mva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="account_id" ref="chart2701"/>
+            <field name="refund_account_id" ref="chart2701"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_no_04'),ref('tag_no_14')])]"/>
+        </record>
+        <record id="tax2" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">Utgående 15% mva</field>
+            <field name="description">Utgående 15% mva</field>
+            <field name="amount">15</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="account_id" ref="chart2703"/>
+            <field name="refund_account_id" ref="chart2703"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_no_05'),ref('tag_no_16')])]"/>
+        </record>
+        <record id="tax3" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">Utgående 10% mva</field>
+            <field name="description">Utgående 10% mva</field>
+            <field name="amount">10</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="account_id" ref="chart2704"/>
+            <field name="refund_account_id" ref="chart2704"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_no_06'),ref('tag_no_15')])]"/>
+        </record>
+        <record id="tax4" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">Inngående 25% mva</field>
+            <field name="description">Inngående 25% mva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="account_id" ref="chart2711"/>
+            <field name="refund_account_id" ref="chart2711"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_no_07'),ref('tag_no_11')])]"/>
+        </record>
+        <record id="tax5" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">Inngående 15% mva</field>
+            <field name="description">Inngående 15% mva</field>
+            <field name="amount">15</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="account_id" ref="chart2713"/>
+            <field name="refund_account_id" ref="chart2713"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_no_08'),ref('tag_no_13')])]"/>
+        </record>
+        <record id="tax6" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">Inngående 10% mva</field>
+            <field name="description">Inngående 10% mva</field>
+            <field name="amount">10</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="account_id" ref="chart2714"/>
+            <field name="refund_account_id" ref="chart2714"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_no_09'),ref('tag_no_12')])]"/>
+        </record>
+
+        <record id="tax7" model="account.tax.template">
+                <field name="chart_template_id" ref="no_chart_template"/>
                 <field name="name">Inngående 0% mva</field>
-                <field name="applicability">taxes</field>
+                <field name="description">Inngående 0% mva</field>
+                <field name="amount">0</field>
+                <field name="amount_type">percent</field>
+                <field name="type_tax_use">purchase</field>
+                <field name="account_id" ref="chart2714"/>
+                <field name="refund_account_id" ref="chart2714"/>
         </record>
 
-        <record id="tax_tag_ut0" model="account.account.tag">
+        <record id="tax8" model="account.tax.template">
+                <field name="chart_template_id" ref="no_chart_template"/>
                 <field name="name">Utgående 0% mva</field>
-                <field name="applicability">taxes</field>
+                <field name="description">Utgående 0% mva</field>
+                <field name="amount">0</field>
+                <field name="amount_type">percent</field>
+                <field name="type_tax_use">sale</field>
+                <field name="account_id" ref="chart2704"/>
+                <field name="refund_account_id" ref="chart2704"/>
+                <field name="tag_ids" eval="[(6,0,[ref('tag_no_03')])]"/>
         </record>
 
-
-<record id="tax1" model="account.tax.template">
-	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Utgående 25% mva</field>
-	<field name="description">Utgående 25% mva</field>
-	<field name="amount">25</field>
-	<field name="amount_type">percent</field>
-	<field name="type_tax_use">sale</field>
-	<field name="account_id" ref="chart2701"/>
-	<field name="refund_account_id" ref="chart2701"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut25')])]"/>
-</record>
-<record id="tax2" model="account.tax.template">
-	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Utgående 15% mva</field>
-	<field name="description">Utgående 15% mva</field>
-	<field name="amount">15</field>
-	<field name="amount_type">percent</field>
-	<field name="type_tax_use">sale</field>
-	<field name="account_id" ref="chart2703"/>
-	<field name="refund_account_id" ref="chart2703"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut15')])]"/>
-</record>
-<record id="tax3" model="account.tax.template">
-	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Utgående 10% mva</field>
-	<field name="description">Utgående 10% mva</field>
-	<field name="amount">10</field>
-	<field name="amount_type">percent</field>
-	<field name="type_tax_use">sale</field>
-	<field name="account_id" ref="chart2704"/>
-	<field name="refund_account_id" ref="chart2704"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut8')])]"/>
-</record>
-<record id="tax4" model="account.tax.template">
-	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Inngående 25% mva</field>
-	<field name="description">Inngående 25% mva</field>
-	<field name="amount">25</field>
-	<field name="amount_type">percent</field>
-	<field name="type_tax_use">purchase</field>
-	<field name="account_id" ref="chart2711"/>
-	<field name="refund_account_id" ref="chart2711"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_in25')])]"/>
-</record>
-<record id="tax5" model="account.tax.template">
-	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Inngående 15% mva</field>
-	<field name="description">Inngående 15% mva</field>
-	<field name="amount">15</field>
-	<field name="amount_type">percent</field>
-	<field name="type_tax_use">purchase</field>
-	<field name="account_id" ref="chart2713"/>
-	<field name="refund_account_id" ref="chart2713"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_in15')])]"/>
-</record>
-<record id="tax6" model="account.tax.template">
-	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Inngående 10% mva</field>
-	<field name="description">Inngående 10% mva</field>
-	<field name="amount">10</field>
-	<field name="amount_type">percent</field>
-	<field name="type_tax_use">purchase</field>
-	<field name="account_id" ref="chart2714"/>
-	<field name="refund_account_id" ref="chart2714"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_in8')])]"/>
-</record>
-
-<record id="tax7" model="account.tax.template">
-        <field name="chart_template_id" ref="no_chart_template"/>
-        <field name="name">Inngående 0% mva</field>
-        <field name="description">Inngående 0% mva</field>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="account_id" ref="chart2714"/>
-        <field name="refund_account_id" ref="chart2714"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_in0')])]"/>
-</record>
-
-<record id="tax8" model="account.tax.template">
-        <field name="chart_template_id" ref="no_chart_template"/>
-        <field name="name">Utgående 0% mva</field>
-        <field name="description">Utgående 0% mva</field>
-        <field name="amount">0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_id" ref="chart2704"/>
-        <field name="refund_account_id" ref="chart2704"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut0')])]"/>
-</record>
-
-</data>
-</openerp>
+    </data>
+</odoo>
diff --git a/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..a37770d2c1c
--- /dev/null
+++ b/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,7 @@
+from openerp.modules.registry import RegistryManager
+
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..fa1694f229a
--- /dev/null
+++ b/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,7 @@
+from openerp.modules.registry import RegistryManager
+
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_no')

From e1cbaf7af7b1a52c6cb10a8f162bb10aa7016c95 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 28 Aug 2017 17:02:43 +0200
Subject: [PATCH 071/119] [FIX] account: manual reconciliation widget was
 inversing debit/credit

Also add a lost functionality, when coming from payment view, pass account_move_line id to the context so that it is directly opened as a proposition in the reconciliation widget. If a matching line is found for that payment, also propose the matching line.
---
 addons/account/models/account_move.py         | 52 +++++++++++++------
 addons/account/models/account_payment.py      |  9 +++-
 .../js/reconciliation/reconciliation_model.js |  7 +++
 .../static/tests/reconciliation_tests.js      |  4 +-
 4 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 44b40053052..e1650c9fae4 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -588,19 +588,40 @@ class AccountMoveLine(models.Model):
     @api.model
     def get_reconciliation_proposition(self, account_id, partner_id=False):
         """ Returns two lines whose amount are opposite """
+        
+        target_currency = (self.currency_id and self.amount_currency) and self.currency_id or self.company_id.currency_id
+        partner_id_condition = partner_id and 'AND a.partner_id = %(partner_id)s' or ''
 
+        rec_prop = self.env['account.move.line']
         # Get pairs
-        partner_id_condition = partner_id and 'AND a.partner_id = %(partner_id)s AND b.partner_id = %(partner_id)s' or ''
-        query = """
-                SELECT a.id, b.id
-                FROM account_move_line a, account_move_line b
-                WHERE a.amount_residual = -b.amount_residual
-                AND NOT a.reconciled AND NOT b.reconciled
-                AND a.account_id = %(account_id)s AND b.account_id = %(account_id)s
-                {partner_id_condition}
-                ORDER BY a.date desc
-                LIMIT 10
-            """.format(**locals())
+        move_line_id = self.env.context.get('move_line_id', False)
+        if move_line_id:
+            move_line = self.env['account.move.line'].browse(move_line_id)
+            amount = move_line.amount_residual;
+            rec_prop = move_line
+            query = """
+                    SELECT a.id, a.id FROM account_move_line a
+                    WHERE a.amount_residual = -%(amount)s
+                    AND NOT a.reconciled
+                    AND a.account_id = %(account_id)s
+                    AND a.id != %(move_line_id)s
+                    {partner_id_condition}
+                    ORDER BY a.date desc
+                    LIMIT 10
+                """.format(**locals())
+        else:
+            partner_id_condition = partner_id_condition and partner_id_condition+' AND b.partner_id = %(partner_id)s' or ''
+            query = """
+                    SELECT a.id, b.id
+                    FROM account_move_line a, account_move_line b
+                    WHERE a.amount_residual = -b.amount_residual
+                    AND NOT a.reconciled AND NOT b.reconciled
+                    AND a.account_id = %(account_id)s AND b.account_id = %(account_id)s
+                    {partner_id_condition}
+                    ORDER BY a.date desc
+                    LIMIT 10
+                """.format(**locals())
+
         self.env.cr.execute(query, locals())
         pairs = self.env.cr.fetchall()
 
@@ -609,11 +630,12 @@ class AccountMoveLine(models.Model):
         allowed_ids = set(self.env['account.move.line'].browse(all_pair_ids).ids)
         pairs = [pair for pair in pairs if pair[0] in allowed_ids and pair[1] in allowed_ids]
 
-        # Return lines formatted
         if len(pairs) > 0:
-            target_currency = (self.currency_id and self.amount_currency) and self.currency_id or self.company_id.currency_id
-            lines = self.browse(list(pairs[0]))
-            return lines.prepare_move_lines_for_reconciliation_widget(target_currency=target_currency)
+            rec_prop += self.browse(list(set(pairs[0])))
+
+        if len(rec_prop) > 0:
+            # Return lines formatted
+            return rec_prop.prepare_move_lines_for_reconciliation_widget(target_currency=target_currency)
         return []
 
     @api.model
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index f4ee2a4b4f1..605737b417b 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -231,11 +231,18 @@ class account_payment(models.Model):
 
     def open_payment_matching_screen(self):
         # Open reconciliation view for customers/suppliers
-        action_context = {'show_mode_selector': False, 'company_ids': [self.company_id.id], 'partner_ids': [self.partner_id.commercial_partner_id.id]}
+        move_line_id = False
+        for move_line in self.move_line_ids:
+            if move_line.account_id.reconcile:
+                move_line_id = move_line.id
+                break;
+        action_context = {'company_ids': [self.company_id.id], 'partner_ids': [self.partner_id.commercial_partner_id.id]}
         if self.partner_type == 'customer':
             action_context.update({'mode': 'customers'})
         elif self.partner_type == 'supplier':
             action_context.update({'mode': 'suppliers'})
+        if move_line_id:
+            action_context.update({'move_line_id': move_line_id})
         return {
             'type': 'ir.actions.client',
             'tag': 'manual_reconciliation_view',
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index 019e761f3d3..864037a65ef 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -1061,6 +1061,7 @@ var ManualModel = StatementModel.extend({
                             model: 'account.move.line',
                             method: 'get_data_for_manual_reconciliation',
                             args: args,
+                            context: context,
                         })
                         .then(function (result) {
                             var defs = _.map(result, self._formatLine.bind(self, context.mode));
@@ -1073,6 +1074,7 @@ var ManualModel = StatementModel.extend({
                             model: 'account.move.line',
                             method: 'get_data_for_manual_reconciliation',
                             args: ['account', self.account_ids],
+                            context: context,
                         })
                         .then(function (result) {
                             var defs = _.map(result, self._formatLine.bind(self, 'accounts'));
@@ -1091,6 +1093,7 @@ var ManualModel = StatementModel.extend({
                             model: 'account.move.line',
                             method: 'get_data_for_manual_reconciliation_widget',
                             args: [partner_ids, account_ids],
+                            context: context,
                         })
                         .then(function (result) {
                             var defs = _.map(result.accounts, self._formatLine.bind(self, 'accounts'));
@@ -1269,6 +1272,10 @@ var ManualModel = StatementModel.extend({
         this._super(line, props);
         if (props.length) {
             _.each(props, function (prop) {
+                var tmp_value = prop.debit || prop.credit;
+                prop.credit = prop.credit !== 0 ? 0 : tmp_value;
+                prop.debit = prop.debit !== 0 ? 0 : tmp_value;
+                prop.amount = -prop.amount;
                 prop.journal_id = self._formatNameGet(prop.journal_id || line.journal_id);
             });
         }
diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js
index d90ceb08d4c..cdf32c4010e 100644
--- a/addons/account/static/tests/reconciliation_tests.js
+++ b/addons/account/static/tests/reconciliation_tests.js
@@ -995,9 +995,9 @@ QUnit.module('account', {
             " Agrolait 101200 ",
             "should display the partner and the account code as title");
 
-        assert.strictEqual(clientAction.$('.o_reconciliation_line:first .match tr:first .cell_left').text(),
+        assert.strictEqual(clientAction.$('.o_reconciliation_line:first .match tr:first .cell_right').text(),
             "$ 11,000.00", "sould display the line in $");
-        assert.strictEqual(clientAction.$('.o_reconciliation_line:first .match tr:first .cell_left .o_multi_currency').data('content'),
+        assert.strictEqual(clientAction.$('.o_reconciliation_line:first .match tr:first .cell_right .o_multi_currency').data('content'),
             "10,222.00 €", "sould display the monetary information in €");
 
         assert.strictEqual(clientAction.$('.accounting_view:first .o_no_valid:visible').length, 1, "should display the skip button");

From f24c83efcc47b24ac8fc7a8add8d2ce39a89ebdf Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Mon, 28 Aug 2017 12:28:06 +0200
Subject: [PATCH 072/119] [FIX] web,mail: keep changes when scheduling an
 activity

The problem occurred in form view, in edit mode, when the user
did some changes in the form, and then clicked on 'Log or schedule
an activity'. When validating the activity, the fields mail_activity
and mail_thread were reloaded but all changes were discarded in the
process.

This rev. ensures to reload the requested field without discarding
the changes.
---
 addons/mail/static/src/js/chatter.js          |  5 +-
 addons/mail/static/tests/chatter_tests.js     | 59 ++++++++++++++++++-
 .../src/js/views/basic/basic_controller.js    |  5 +-
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index c799cf6a70a..f5a85948762 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -288,7 +288,10 @@ var Chatter = Widget.extend(chat_mixin, {
         if (this.fields.thread && event.data.thread) {
             fieldNames.push(this.fields.thread.name);
         }
-        this.trigger_up('reload', {fieldNames: fieldNames});
+        this.trigger_up('reload', {
+            fieldNames: fieldNames,
+            keepChanges: true,
+        });
     },
     _onScheduleActivity: function () {
         this.fields.activity.scheduleActivity(false);
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index f268851463d..760a6bcf6cd 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -13,7 +13,6 @@ var BasicComposer = Composers.BasicComposer;
 
 var createAsyncView = testUtils.createAsyncView;
 var createView = testUtils.createView;
-var createAsyncView = testUtils.createAsyncView;
 
 QUnit.module('mail', {}, function () {
 
@@ -496,7 +495,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
 });
 
 QUnit.test('form activity widget: schedule next activity', function (assert) {
-    assert.expect(4);
+    assert.expect(5);
     this.data.partner.records[0].activity_ids = [1];
     this.data.partner.records[0].activity_state = 'today';
     this.data['mail.activity'].records = [{
@@ -508,6 +507,7 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
         activity_type_id: 2,
     }];
 
+    var checkReadArgs = false;
     var form = createView({
         View: FormView,
         model: 'partner',
@@ -529,6 +529,10 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
                     "the feedback should be sent correctly");
                 return $.when();
             }
+            if (args.method === 'read' && checkReadArgs) {
+                assert.deepEqual(args.args[1], ['activity_ids', 'message_ids'],
+                    "should only read the mail fields");
+            }
             return this._super.apply(this, arguments);
         },
         intercepts: {
@@ -555,6 +559,8 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
                     view_type: "form",
                     views: [[false, "form"]],
                 }, "should do a do_action with correct parameters");
+                checkReadArgs = true; // should re-read the activities when closing the dialog
+                event.data.options.on_close();
             },
         },
     });
@@ -567,6 +573,55 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
     form.destroy();
 });
 
+QUnit.test('form activity widget: schedule activity does not discard changes', function (assert) {
+    assert.expect(1);
+
+    var form = createView({
+        View: FormView,
+        model: 'partner',
+        data: this.data,
+        arch: '<form string="Partners">' +
+                '<sheet>' +
+                    '<field name="foo"/>' +
+                '</sheet>' +
+                '<div class="oe_chatter">' +
+                    '<field name="activity_ids" widget="mail_activity"/>' +
+                '</div>' +
+            '</form>',
+        res_id: 2,
+        mockRPC: function (route, args) {
+            if (args.method === 'write') {
+                assert.deepEqual(args.args[1], {foo: 'new value'},
+                    "should correctly save the change");
+            }
+            return this._super.apply(this, arguments);
+        },
+        intercepts: {
+            get_bus: function (event) {
+                event.stopPropagation();
+                event.data.callback(new Bus());
+            },
+            do_action: function (event) {
+                event.data.options.on_close();
+            },
+        },
+        viewOptions: {
+            mode: 'edit',
+        },
+    });
+
+    // update value of foo field
+    form.$('.o_field_widget[name=foo]').val('new value').trigger('input');
+
+    // schedule an activity (this triggers a do_action)
+    form.$('.o_chatter_button_schedule_activity').click();
+
+    // save the record
+    form.$buttons.find('.o_form_button_save').click();
+
+    form.destroy();
+});
+
 QUnit.test('form activity widget: mark as done and remove', function (assert) {
     assert.expect(14);
 
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index cfdee6793dd..32570038987 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -546,7 +546,10 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
             this.model.reload(handle).then(this._confirmSave.bind(this, handle));
         } else {
             // no db_id given, so reload the main record
-            this.reload({fieldNames: data.fieldNames});
+            this.reload({
+                fieldNames: data.fieldNames,
+                keepChanges: data.keepChanges || false,
+            });
         }
     },
     /**

From d93726f9ac6d64a39cd95f35cf61a898e4cd2009 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Mon, 28 Aug 2017 16:14:31 +0200
Subject: [PATCH 073/119] [FIX] web,mail: only send fields in view for
 onchanges

The field 'display_name' is automatically added to the list of
fields to fetch when fetching a record. Before this rev., its
value was also sent alongside the fields in the view for onchange
RPCs. It shouldn't: only the fields in the view should be sent.

It produced a weird bug in the res.partner form view: open a
contact (company), add a sub-contact, save -> the display_name of
the contact was then '' (and 'Contacts' was displayed in the
breadcrumbs instead of the display_name of the opened contact).
This is because 'display_name' was sent to the onchange, which
returned '' as value (because of another bug python side). So as
it's value changed, when saving, the new display_name was sent to
the server (even if this field was actually readonly).

Before this rev., we also always fetched 'display_name' when
fetching list of records (read or search_read). This wasn't a bug
per se, but it might be a computed field, and it isn't necessary,
so we stop fetching it in that case if it isn't in the view (as
it was done in saas-15, before the new views).
---
 addons/mail/static/tests/chatter_tests.js     | 14 +--
 .../static/src/js/services/data_manager.js    |  5 --
 .../static/src/js/views/basic/basic_model.js  | 14 ++-
 .../tests/fields/relational_fields_tests.js   |  6 +-
 addons/web/static/tests/views/form_tests.js   | 90 ++++++++++++++++++-
 5 files changed, 110 insertions(+), 19 deletions(-)

diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index 760a6bcf6cd..b5d7feab56e 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -530,7 +530,7 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
                 return $.when();
             }
             if (args.method === 'read' && checkReadArgs) {
-                assert.deepEqual(args.args[1], ['activity_ids', 'message_ids'],
+                assert.deepEqual(args.args[1], ['activity_ids', 'message_ids', 'display_name'],
                     "should only read the mail fields");
             }
             return this._super.apply(this, arguments);
@@ -686,11 +686,11 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
                 if (nbReads === 1) { // first read
                     assert.strictEqual(args.args[1].length, 4, 'should read all fiels the first time');
                 } else if (nbReads === 2) { // second read: after the unlink
-                    assert.ok(_.isEqual(args.args[1], ['activity_ids']),
-                        'should only read the activities after an unlink');
+                    assert.ok(_.isEqual(args.args[1], ['activity_ids', 'display_name']),
+                        'should only read the activities (+ display_name) after an unlink');
                 } else { // third read: after marking an activity done
-                    assert.ok(_.isEqual(args.args[1], ['activity_ids', 'message_ids']),
-                        'should read the activities and messages after marking an activity done');
+                    assert.ok(_.isEqual(args.args[1], ['activity_ids', 'message_ids', 'display_name']),
+                        'should read the activities and messages (+ display_name) after marking an activity done');
                 }
             }
             return this._super.apply(this, arguments);
@@ -809,8 +809,8 @@ QUnit.test('followers widget: follow/unfollow, edit subtypes', function (assert)
                     assert.strictEqual(args.args[1].length, 3,
                         'should read "foo", "message_follower_ids" and "display_name"');
                 } else { // three next reads: only read 'message_follower_ids' field
-                    assert.ok(_.isEqual(args.args[1], ['message_follower_ids']),
-                        'should only read "message_follower_ids"');
+                    assert.deepEqual(args.args[1], ['message_follower_ids', 'display_name'],
+                        'should only read "message_follower_ids" and "display_name"');
                 }
             }
             return this._super.apply(this, arguments);
diff --git a/addons/web/static/src/js/services/data_manager.js b/addons/web/static/src/js/services/data_manager.js
index 999a9d8df01..77857ef2d31 100644
--- a/addons/web/static/src/js/services/data_manager.js
+++ b/addons/web/static/src/js/services/data_manager.js
@@ -398,11 +398,6 @@ return core.Class.extend({
      */
     _processFieldsView: function (viewInfo) {
         var viewFields = this._processFields(viewInfo.type, viewInfo.arch, viewInfo.fields);
-        // by default fetch display_name and id
-        if (!viewInfo.fields.display_name) {
-            viewInfo.fields.display_name = {type: 'char'};
-            viewFields.display_name = {};
-        }
         viewInfo.fieldsInfo = {};
         viewInfo.fieldsInfo[viewInfo.type] = viewFields;
         utils.deepFreeze(viewInfo.fields);
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index d54f609f002..aa0aab7aa64 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1629,8 +1629,8 @@ var BasicModel = AbstractModel.extend({
      */
     _fetchRecord: function (record, options) {
         var self = this;
-        var fieldNames = options && options.fieldNames ||
-                         _.uniq(record.getFieldNames().concat(['display_name']));
+        var fieldNames = options && options.fieldNames || record.getFieldNames();
+        fieldNames = _.uniq(fieldNames.concat(['display_name']));
         return this._rpc({
                 model: record.model,
                 method: 'read',
@@ -2337,6 +2337,16 @@ var BasicModel = AbstractModel.extend({
     _generateOnChangeData: function (record) {
         var commands = this._generateX2ManyCommands(record, {withReadonly: true});
         var data = _.extend(this.get(record.id, {raw: true}).data, commands);
+        // 'display_name' is automatically added to the list of fields to fetch,
+        // when fetching a record, even if it doesn't appear in the view. However,
+        // only the fields in the view must be passed to the onchange RPC, so we
+        // remove it from the data sent by RPC if it isn't in the view.
+        var hasDisplayName = _.some(record.fieldsInfo, function (fieldsInfo) {
+            return 'display_name' in fieldsInfo;
+        });
+        if (!hasDisplayName) {
+            delete data.display_name;
+        }
 
         // one2many records have a parentID
         if (record.parentID) {
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index a2504af38bb..92a24066408 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -2521,6 +2521,7 @@ QUnit.module('relational_fields', {
             arch:'<form string="Partners">' +
                     '<field name="p">' +
                         '<kanban create="0">' +
+                            '<field name="display_name"/>' +
                             '<templates>' +
                                 '<t t-name="kanban-box">' +
                                     '<div class="oe_kanban_global_click">' +
@@ -3499,7 +3500,7 @@ QUnit.module('relational_fields', {
                 rpcCount++;
                 if (args.method === 'write') {
                     assert.deepEqual(args.args[1].p, [[0, false, {
-                        display_name: false, int_field: 123, product_id: 41
+                        int_field: 123, product_id: 41
                     }]]);
                 }
                 return this._super(route, args);
@@ -3736,7 +3737,7 @@ QUnit.module('relational_fields', {
                 if (args.method === 'default_get') {
                     var expected = counter === 0 ?
                         [[4, 2, false]] :
-                        [[4, 2, false], [0, false, {display_name: false, turtle_foo: 'hammer'}]];
+                        [[4, 2, false], [0, false, {turtle_foo: 'hammer'}]];
                     assert.deepEqual(args.kwargs.context.turtles, expected,
                         "should have properly evaluated turtles key in context");
                     counter++;
@@ -5544,6 +5545,7 @@ QUnit.module('relational_fields', {
             arch:'<form string="Partners">' +
                     '<field name="timmy">' +
                         '<kanban create="0">' +
+                            '<field name="display_name"/>' +
                             '<templates>' +
                                 '<t t-name="kanban-box">' +
                                     '<div class="oe_kanban_global_click">' +
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 15147c22d1d..6bd2b4ca7b5 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -1134,7 +1134,7 @@ QUnit.module('Views', {
             mockRPC: function (route, args) {
                 if (args.method === "onchange") {
                     assert.deepEqual(args.args[3],
-                        {"foo": "1", "p": "", "p.bar": "", "p.display_name": "", "p.product_id": "", "timmy": "", "timmy.name": ""},
+                        {"foo": "1", "p": "", "p.bar": "", "p.product_id": "", "timmy": "", "timmy.name": ""},
                         "should send only the fields used in the views");
                 }
                 return this._super(route, args);
@@ -1282,7 +1282,6 @@ QUnit.module('Views', {
                 if (args.method === 'onchange') {
                     assert.deepEqual(args.args[3], {
                         p: '',
-                        'p.display_name': '',
                         'p.foo': '1'
                     }, "onchangeSpec should be correct (with sub fields)");
                 }
@@ -2827,6 +2826,92 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('display_name not sent for onchanges if not in view', function (assert) {
+        assert.expect(7);
+
+        this.data.partner.records[0].timmy = [12];
+        this.data.partner.onchanges = {
+            foo: function () {},
+        };
+        this.data.partner_type.onchanges = {
+            name: function () {},
+        };
+        var readInModal = false;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<group>' +
+                        '<field name="foo"/>' +
+                        '<field name="timmy">' +
+                            '<tree>' +
+                                '<field name="name"/>' +
+                            '</tree>' +
+                            '<form>' +
+                                '<field name="name"/>' +
+                                '<field name="color"/>' +
+                            '</form>' +
+                        '</field>' +
+                    '</group>' +
+                '</form>',
+            mockRPC: function (route, args) {
+                if (args.method === 'read' && args.model === 'partner') {
+                    assert.deepEqual(args.args[1], ['foo', 'timmy', 'display_name'],
+                        "should read display_name even if not in the view");
+                }
+                if (args.method === 'read' && args.model === 'partner_type') {
+                    if (!readInModal) {
+                        assert.deepEqual(args.args[1], ['name'],
+                            "should not read display_name for records in the list");
+                    } else {
+                        assert.deepEqual(args.args[1], ['name', 'color', 'display_name'],
+                            "should read display_name when opening the subrecord");
+                    }
+                }
+                if (args.method === 'onchange' && args.model === 'partner') {
+                    assert.deepEqual(args.args[1], {
+                        id: 1,
+                        foo: 'coucou',
+                        timmy: [[6, false, [12]]],
+                    }, "should only send the value of fields in the view (+ id)");
+                    assert.deepEqual(args.args[3], {
+                        foo: '1',
+                        timmy: '',
+                        'timmy.name': '1',
+                        'timmy.color': '',
+                    }, "only the fields in the view should be in the onchange spec");
+                }
+                if (args.method === 'onchange' && args.model === 'partner_type') {
+                    assert.deepEqual(args.args[1], {
+                        id: 12,
+                        name: 'new name',
+                        color: 2,
+                    }, "should only send the value of fields in the view (+ id)");
+                    assert.deepEqual(args.args[3], {
+                        name: '1',
+                        color: '',
+                    }, "only the fields in the view should be in the onchange spec");
+                }
+                return this._super.apply(this, arguments);
+            },
+            res_id: 1,
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        // trigger the onchange
+        form.$('.o_field_widget[name=foo]').val("coucou").trigger('input');
+
+        // open a subrecord and trigger an onchange
+        readInModal = true;
+        form.$('.o_data_row .o_data_cell:first').click();
+        $('.modal .o_field_widget[name=name]').val("new name").trigger('input');
+
+        form.destroy();
+    });
+
     QUnit.test('onchanges on date(time) fields', function (assert) {
         assert.expect(6);
 
@@ -3725,7 +3810,6 @@ QUnit.module('Views', {
                 if (args.method === 'create') {
                     var command = args.args[0].p;
                     assert.deepEqual(command, [[0, false, {
-                        display_name: false,
                         timmy: [[6, false, [12]]],
                     }]], "the default partner_type_id should be equal to 12");
                 }

From 5f37b8b3155311c654fc9031cc696cd5ab8b656d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 29 Aug 2017 10:50:16 +0200
Subject: [PATCH 074/119] Revert "[FIX] stock: delivery slip UOM"

Change unwanted in saas~17

This reverts commit b0d498c11dd46c608e29f16067ef64a922e3ffc1.
---
 addons/stock/report/report_deliveryslip.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index fc3e546e76e..46620401195 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -117,12 +117,7 @@
                                     <span t-if="pack_operation.package_id">:</span>
                                     <span t-field="pack_operation.package_id"/>
                                     <span t-field="pack_operation.ordered_qty"/>
-                                    <t t-if="pack_operation.linked_move_operation_ids">
-                                        <span t-field="pack_operation.linked_move_operation_ids[0].move_id.product_uom"></span>
-                                    </t>
-                                    <t t-else="1">
-                                        <span t-field="pack_operation.product_uom_id"></span>
-                                    </t>
+                                    <span t-field="pack_operation.product_uom_id"/>
                                 </td>
                                 <td class="text-right" t-if="pack_operation.state == 'done'">
                                     <t t-if="pack_operation.ordered_qty != pack_operation.qty_done">

From 5149e18ec704df151c03d3b1e35d5f04328b89d3 Mon Sep 17 00:00:00 2001
From: Khoi Nguyen <bng@odoo.com>
Date: Tue, 29 Aug 2017 10:59:25 +0200
Subject: [PATCH 075/119] [FIX] web: always display handle widget

Before this commit, a list containing a handle widget would only display
the handles associated with non-zero integer values. This is due to the
fact that unset fields are hidden in Odoo, while a field is by default
considered 'defined' if its value is truthy.

We override the isSet method for the handle widget to always return
true. This tells the handle widget that the associated integer value is
always defined, thereby ensuring that the handle will always be shown.
---
 .../web/static/src/js/fields/basic_fields.js   |  7 +++++++
 .../static/tests/fields/basic_fields_tests.js  | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index 6343fb7e80e..d9482156745 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -846,6 +846,13 @@ var HandleWidget = AbstractField.extend({
     tagName: 'span',
     description: "",
     supportedFieldTypes: ['integer'],
+
+    /*
+     * @override
+     */
+    isSet: function () {
+        return true;
+    },
 });
 
 var FieldEmail = InputField.extend({
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index f851ad60115..984fa156d9c 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -1578,6 +1578,24 @@ QUnit.module('basic_fields', {
         form.destroy();
     });
 
+    QUnit.test('handle widget with falsy values', function (assert) {
+        assert.expect(1);
+
+        var list = createView({
+            View: ListView,
+            model: 'partner',
+            data: this.data,
+            arch: '<tree>' +
+                    '<field name="sequence" widget="handle"/>' +
+                    '<field name="display_name"/>' +
+                '</tree>',
+        });
+
+        assert.strictEqual(list.$('.o_row_handle:visible').length, this.data.partner.records.length,
+            'there should be a visible handle for each record');
+        list.destroy();
+    });
+
 
     QUnit.module('FieldDate');
 

From ccfc4e7026e2ab03a2adda526f890ca810e0da70 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Tue, 29 Aug 2017 12:28:41 +0200
Subject: [PATCH 076/119] [FIX] mrp: optimize computation of field "#
 Manufacturing Orders"

---
 addons/mrp/product.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 41e6d0a9049..13f54e711ba 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -46,11 +46,12 @@ class product_template(osv.osv):
 
 class product_product(osv.osv):
     _inherit = "product.product"
+
     def _bom_orders_count(self, cr, uid, ids, field_name, arg, context=None):
         Production = self.pool('mrp.production')
-        res = {}
-        for product_id in ids:
-            res[product_id] = Production.search_count(cr,uid, [('product_id', '=', product_id)], context=context)
+        res = dict.fromkeys(ids, 0)
+        for g in Production.read_group(cr, uid, [('product_id', 'in', ids)], ['product_id'], ['product_id'], context=context):
+            res[g['partner_id'][0]] = g['partner_id_count']
         return res
 
     _columns = {

From 097a7e704747842b4e16a9b62617a56e3845e783 Mon Sep 17 00:00:00 2001
From: Rawish Murari <rmu-odoo@users.noreply.github.com>
Date: Tue, 29 Aug 2017 16:32:49 +0530
Subject: [PATCH 077/119] [IMP]  l10n_pl: created new tags and update taxes

task: https://www.odoo.com/web#id=22598&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720
PR: #19101
---
 addons/l10n_pl/__openerp__.py                 |   2 +-
 addons/l10n_pl/account_tax.xml                | 478 +++++++++---------
 .../2.0/post-migrate_tags_on_taxes.py         |   6 +
 .../2.0/pre-set_tags_and_taxes_updatable.py   |   6 +
 4 files changed, 259 insertions(+), 233 deletions(-)
 create mode 100644 addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py
 create mode 100644 addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py

diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index a48d60d82c9..c738e5bc1bb 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name' : 'Poland - Accounting',
-    'version' : '1.02',
+    'version' : '2.0',
     'author' : 'Grzegorz Grzelak (OpenGLOBE)',
     'website': 'http://www.openglobe.pl',
     'category': 'Localization',
diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/account_tax.xml
index d2805db6ed6..564d3cb9f21 100644
--- a/addons/l10n_pl/account_tax.xml
+++ b/addons/l10n_pl/account_tax.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data>
 
         <record id="action_client_l10n_pl_menu" model="ir.actions.client">
             <field name="name">Open Account Dashboard Menu</field>
@@ -11,193 +11,209 @@
             <field name="action_id" ref="action_client_l10n_pl_menu"/>
             <field name="state">open</field>
         </record>
+
     <!-- Account Tags -->
 
-        <record id="tax_Z23" model="account.account.tag">
-            <field name="name">Z23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V23" model="account.account.tag">
-            <field name="name">V23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z0" model="account.account.tag">
-            <field name="name">Z0</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZZW" model="account.account.tag">
-            <field name="name">ZZW</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLPS" model="account.account.tag">
-            <field name="name">VLPSale</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLPP" model="account.account.tag">
-            <field name="name">VLPPurchase</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VST" model="account.account.tag">
-            <field name="name">VST</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_zst" model="account.account.tag">
-            <field name="name">zst</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_udt" model="account.account.tag">
-            <field name="name">udt</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_unt" model="account.account.tag">
-            <field name="name">unt</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V0" model="account.account.tag">
-            <field name="name">V0</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNU" model="account.account.tag">
-            <field name="name">UNU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_EXT" model="account.account.tag">
-            <field name="name">EXT</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMT" model="account.account.tag">
-            <field name="name">IMT</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_EXU" model="account.account.tag">
-            <field name="name">EXU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMU" model="account.account.tag">
-            <field name="name">IMU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V22" model="account.account.tag">
-            <field name="name">V22</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_V8" model="account.account.tag">
-            <field name="name">V8</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_v7" model="account.account.tag">
-            <field name="name">v7</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_v5" model="account.account.tag">
-            <field name="name">v5</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_v3" model="account.account.tag">
-            <field name="name">v3</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VU23" model="account.account.tag">
-            <field name="name">VU23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VU22" model="account.account.tag">
-            <field name="name">VU22</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UDU" model="account.account.tag">
-            <field name="name">UDU</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VZW" model="account.account.tag">
-            <field name="name">VZW</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-1_sale" model="account.account.tag">
-            <field name="name">VLP-1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-1_purchase" model="account.account.tag">
-            <field name="name">VLP-1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-2_sale" model="account.account.tag">
-            <field name="name">VLP-2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_VLP-2_purchase" model="account.account.tag">
-            <field name="name">VLP-2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNT1" model="account.account.tag">
-            <field name="name">UNT1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZST1" model="account.account.tag">
-            <field name="name">ZST1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNT2" model="account.account.tag">
-            <field name="name">UNT2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZST2" model="account.account.tag">
-            <field name="name">ZST2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNU1" model="account.account.tag">
-            <field name="name">UNU1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMT1" model="account.account.tag">
-            <field name="name">IMT1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMU1" model="account.account.tag">
-            <field name="name">IMU1</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMT2" model="account.account.tag">
-            <field name="name">IMT2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_UNU2" model="account.account.tag">
-            <field name="name">UNU2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_IMU2" model="account.account.tag">
-            <field name="name">IMU2</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z22" model="account.account.tag">
-            <field name="name">Z22</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z8" model="account.account.tag">
-            <field name="name">Z8</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z7" model="account.account.tag">
-            <field name="name">Z7</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z5" model="account.account.tag">
-            <field name="name">Z5</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_Z3" model="account.account.tag">
-            <field name="name">Z3</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZU23" model="account.account.tag">
-            <field name="name">ZU23</field>
-            <field name="applicability">taxes</field>
-        </record>
-        <record id="tax_ZU22" model="account.account.tag">
-            <field name="name">ZU22</field>
-            <field name="applicability">taxes</field>
-        </record>
-
+    <record id="tag_pl_01" model="account.account.tag">
+        <field name="name">Podstawa - Razem C</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_02" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, zwolnione</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_03" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów/usług, poza kraj</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_04" model="account.account.tag">
+        <field name="name">Podstawa - W tym usługi art 100.1.4</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_05" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_06" model="account.account.tag">
+        <field name="name">Podstawa - W tym towary art 129</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_07" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 3% lub 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_08" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 7% lub 8%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_09" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów/usług, kraj, 22% lub 23%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_10" model="account.account.tag">
+        <field name="name">Podstawa - Wew-wspól dostawa towarów</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_11" model="account.account.tag">
+        <field name="name">Podstawa - Eksport towarów</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_12" model="account.account.tag">
+        <field name="name">Podstawa - Wewn-wspól. nabycie towarów</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_13" model="account.account.tag">
+        <field name="name">Podstawa - Import towarów art. 33a</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_14" model="account.account.tag">
+        <field name="name">Podstawa - Import usług</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_15" model="account.account.tag">
+        <field name="name">Podstawa - W tym nabycie wg art 28b</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_16" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów, podatnik nabywca</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_17" model="account.account.tag">
+        <field name="name">Podstawa - Dostawa towarów, podatnik nabywca bis</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_18" model="account.account.tag">
+        <field name="name">Podstawa - Razem D</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_19" model="account.account.tag">
+        <field name="name">Podstawa - Nabycie towarów i usług ś.trwałe</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_20" model="account.account.tag">
+        <field name="name">Podstawa - Nabycie towarów i usług pozostałych</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_21" model="account.account.tag">
+        <field name="name">Podstawa - Nabycie towarów i usług pozostałych bis</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_22" model="account.account.tag">
+        <field name="name">Podatek - Do przeniesienia</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_23" model="account.account.tag">
+        <field name="name">Podatek - Nadwyżka naliczonego nad należnym</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_24" model="account.account.tag">
+        <field name="name">Podatek - Do wpłaty do US</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_25" model="account.account.tag">
+        <field name="name">Podatek - Wydatek na kasy rejestrujące</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_26" model="account.account.tag">
+        <field name="name">Podatek - Objęty zaniechaniem poboru</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_27" model="account.account.tag">
+        <field name="name">Podatek - Razem C</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_28" model="account.account.tag">
+        <field name="name">Podatek - Dostawa towarów/usług, kraj, 3% lub 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_29" model="account.account.tag">
+        <field name="name">Podatek - Dostawa towarów/usług, kraj, 7% lub 8%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_30" model="account.account.tag">
+        <field name="name">Podatek - Dostawa towarów/usług, kraj, 22% lub 23%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_31" model="account.account.tag">
+        <field name="name">Podatek - Wewn-wspól. nabycie towarów</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_32" model="account.account.tag">
+        <field name="name">Podatek - Import towarów art. 33a</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_33" model="account.account.tag">
+        <field name="name">Podatek - Import usług</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_34" model="account.account.tag">
+        <field name="name">Podatek - W tym nabycie wg art 28b</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_35" model="account.account.tag">
+        <field name="name">Podatek - Dostawa towarów, podatnik nabywca</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_36" model="account.account.tag">
+        <field name="name">Podatek - Ze spisu z natury art 14.5</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_37" model="account.account.tag">
+        <field name="name">Podatek - Wew.wspól. nabycie środk. transp. termin</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_38" model="account.account.tag">
+        <field name="name">Podatek - Razem D</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_39" model="account.account.tag">
+        <field name="name">Podatek - Nadwyżka z poprzedniej deklaracji</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_40" model="account.account.tag">
+        <field name="name">Podatek - Naliczony ze spisu z natury, art.113</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_41" model="account.account.tag">
+        <field name="name">Podatek - Nabycie towarów i usług ś.trwałe</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_42" model="account.account.tag">
+        <field name="name">Podatek - Nabycie towarów i usług pozostałych</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_43" model="account.account.tag">
+        <field name="name">Podatek - Nabycie towarów i usług pozostałych bis</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_44" model="account.account.tag">
+        <field name="name">Podatek - Korekta naliczonego od nabycia ś.trwałych</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_45" model="account.account.tag">
+        <field name="name">Podatek - Korekta naliczonego od pozostałych nabyć</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_46" model="account.account.tag">
+        <field name="name">Podatek - Wydatek na kasy do zwrotu w tym okresie</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_47" model="account.account.tag">
+        <field name="name">Podatek - Do zwrotu</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_48" model="account.account.tag">
+        <field name="name">Podatek - Do zwrotu 25 dni</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_49" model="account.account.tag">
+        <field name="name">Podatek - Do zwrotu 60 dni</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_pl_50" model="account.account.tag">
+        <field name="name">Podatek - Do zwrotu 180 dni</field>
+        <field name="applicability">taxes</field>
+    </record>
 
 # VAT domestic sale
 
@@ -211,7 +227,7 @@
                 <field name="sequence" eval="0"/>
                 <field name="refund_account_id" ref="chart22030400"/>
                 <field name="account_id" ref="chart22030400"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_V23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
         <record id="vs_kraj_22" model="account.tax.template">
@@ -223,7 +239,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030100"/>
                 <field name="account_id" ref="chart22030100"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_V22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
         <record id="vs_kraj_8" model="account.tax.template">
@@ -235,7 +251,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030500"/>
                 <field name="account_id" ref="chart22030500"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_V8')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_08'), ref('l10n_pl.tag_pl_29')])]"/>
         </record>
 
         <record id="vs_kraj_7" model="account.tax.template">
@@ -247,7 +263,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030200"/>
                 <field name="account_id" ref="chart22030200"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_v7')])]"/>
+                <field name="tag_ids" eval="[ref('l10n_pl.tag_pl_08'), ref('l10n_pl.tag_pl_29')]"/>
         </record>
 
         <record id="vs_kraj_5" model="account.tax.template">
@@ -259,7 +275,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030600"/>
                 <field name="account_id" ref="chart22030600"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_v5')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_07'), ref('l10n_pl.tag_pl_28')])]"/>
         </record>
 
         <record id="vs_kraj_3" model="account.tax.template">
@@ -271,7 +287,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030300"/>
                 <field name="account_id" ref="chart22030300"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_v3')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_07'), ref('l10n_pl.tag_pl_28')])]"/>
         </record>
 
         <record id="vs_kraj_0" model="account.tax.template">
@@ -281,7 +297,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_V0')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_05')])]"/>
         </record>
 
         <record id="vs_kraj_zw" model="account.tax.template">
@@ -291,7 +307,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VZW')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_02')])]"/>
         </record>
 
         <record id="vs_kraj_usl_23" model="account.tax.template">
@@ -303,7 +319,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030400"/>
                 <field name="account_id" ref="chart22030400"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VU23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
         <record id="vs_kraj_usl_22" model="account.tax.template">
@@ -315,7 +331,7 @@
                 <field name="type_tax_use">sale</field>
                 <field name="refund_account_id" ref="chart22030100"/>
                 <field name="account_id" ref="chart22030100"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VU22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_09'), ref('l10n_pl.tag_pl_30')])]"/>
         </record>
 
 # VAT domestic purchase
@@ -330,7 +346,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020400"/>
                 <field name="account_id" ref="chart22020400"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_22" model="account.tax.template">
@@ -342,7 +358,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020100"/>
                 <field name="account_id" ref="chart22020100"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_8" model="account.tax.template">
@@ -354,7 +370,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020500"/>
                 <field name="account_id" ref="chart22020500"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z8')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_7" model="account.tax.template">
@@ -366,7 +382,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020200"/>
                 <field name="account_id" ref="chart22020200"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z7')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_5" model="account.tax.template">
@@ -378,7 +394,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020600"/>
                 <field name="account_id" ref="chart22020600"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z5')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_3" model="account.tax.template">
@@ -390,7 +406,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020300"/>
                 <field name="account_id" ref="chart22020300"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z3')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_0" model="account.tax.template">
@@ -400,7 +416,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">purchase</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_Z0')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_zw" model="account.tax.template">
@@ -410,7 +426,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">purchase</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_ZZW')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_usl_23" model="account.tax.template">
@@ -422,7 +438,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020400"/>
                 <field name="account_id" ref="chart22020400"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_ZU23')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
         <record id="vz_kraj_usl_22" model="account.tax.template">
@@ -434,7 +450,7 @@
                 <field name="type_tax_use">purchase</field>
                 <field name="refund_account_id" ref="chart22020100"/>
                 <field name="account_id" ref="chart22020100"/>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_ZU22')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42'), ref('l10n_pl.tag_pl_20')])]"/>
         </record>
 
 # Vehicle leasing
@@ -450,7 +466,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLP-1_sale')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_43')])]"/>
                 </record>
 
                 <record id="vp_leas_purchase_1" model="account.tax.template">
@@ -463,7 +479,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLP-1_purchase')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vp_leas_sale_2" model="account.tax.template">
@@ -476,7 +492,6 @@
                         <field name="refund_account_id" ref="chart76140000"/>
                         <field name="account_id" ref="chart76140000"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLP-2_sale')])]"/>
                 </record>
 
                 <record id="vp_leas_purchase_2" model="account.tax.template">
@@ -489,7 +504,6 @@
                         <field name="refund_account_id" ref="chart76140000"/>
                         <field name="account_id" ref="chart76140000"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLP-2_purchase')])]"/>
                 </record>
 
                 <record id="vp_leas_sale" model="account.tax.template">
@@ -501,7 +515,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">sale</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vp_leas_sale_1'), ref('vp_leas_sale_2')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLPS')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_21')])]"/>
                 </record>
 
                 <record id="vp_leas_purchase" model="account.tax.template">
@@ -513,7 +527,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">purchase</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vp_leas_purchase_1'), ref('vp_leas_purchase_2')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VLPP')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20')])]"/>
                 </record>
 
 # Steel trade
@@ -525,7 +539,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_VST')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_17')])]"/>
         </record>
 
                 <record id="vz_stal_podatek_naliczony" model="account.tax.template">
@@ -538,7 +552,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_ZST1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_stal_podatek_nalezny" model="account.tax.template">
@@ -551,7 +565,7 @@
                         <field name="refund_account_id" ref="chart22030400"/>
                         <field name="account_id" ref="chart22030400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_ZST2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_35')])]"/>
                 </record>
 
                 <record id="vz_stal" model="account.tax.template">
@@ -562,7 +576,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">purchase</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vz_stal_podatek_naliczony'), ref('vz_stal_podatek_nalezny')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_zst')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'), ref('l10n_pl.tag_pl_16')])]"/>
                 </record>
 
 # Eurpean Union
@@ -575,7 +589,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_udt')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_10')])]"/>
         </record>
 
                 <record id="vz_unia_podatek_naliczony" model="account.tax.template">
@@ -588,7 +602,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_UNT1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_unia_podatek_nalezny" model="account.tax.template">
@@ -601,7 +615,7 @@
                         <field name="refund_account_id" ref="chart22030400"/>
                         <field name="account_id" ref="chart22030400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_UNT2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_31')])]"/>
                 </record>
 
                 <record id="vz_unia" model="account.tax.template">
@@ -612,7 +626,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">purchase</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vz_unia_podatek_naliczony'), ref('vz_unia_podatek_nalezny')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_unt')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'), ref('l10n_pl.tag_pl_12')])]"/>
                 </record>
 
         <record id="vs_dostu" model="account.tax.template">
@@ -622,7 +636,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_UDU')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_04')])]"/>
         </record>
 
                 <record id="vz_nabu_podatek_naliczony" model="account.tax.template">
@@ -635,7 +649,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_UNU1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_nabu_2" model="account.tax.template">
@@ -648,7 +662,7 @@
                         <field name="refund_account_id" ref="chart22030400"/>
                         <field name="account_id" ref="chart22030400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_UNU2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_34')])]"/>
                 </record>
 
                 <record id="vz_nabu" model="account.tax.template">
@@ -659,7 +673,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">purchase</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vz_nabu_podatek_naliczony'), ref('vz_nabu_2')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_UNU')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_20'),ref('l10n_pl.tag_pl_15')])]"/>
                 </record>
 
 
@@ -673,7 +687,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_EXT')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_11')])]"/>
         </record>
 
                 <record id="vz_imp_tow_podatek_naliczony" model="account.tax.template">
@@ -686,7 +700,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_IMT1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_imp_tow_podatek_nalezny" model="account.tax.template">
@@ -699,7 +713,7 @@
                         <field name="refund_account_id" ref="chart22030400"/>
                         <field name="account_id" ref="chart22030400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_IMT2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_32')])]"/>
                 </record>
 
                 <record id="vz_imp_tow" model="account.tax.template">
@@ -710,7 +724,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">purchase</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vz_imp_tow_podatek_naliczony'), ref('vz_imp_tow_podatek_nalezny')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_IMT')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_13'), ref('l10n_pl.tag_pl_20')])]"/>
                 </record>
 
         <record id="vs_ekspu" model="account.tax.template">
@@ -720,7 +734,7 @@
                 <field name="amount">0</field>
                 <field name="amount_type">percent</field>
                 <field name="type_tax_use">sale</field>
-                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_EXU')])]"/>
+                <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_03')])]"/>
         </record>
 
                 <record id="vz_impu_podatek_naliczony" model="account.tax.template">
@@ -733,7 +747,7 @@
                         <field name="refund_account_id" ref="chart22020400"/>
                         <field name="account_id" ref="chart22020400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_IMU1')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_42')])]"/>
                 </record>
 
                 <record id="vz_impu_podatek_nalezny" model="account.tax.template">
@@ -746,7 +760,7 @@
                         <field name="refund_account_id" ref="chart22030400"/>
                         <field name="account_id" ref="chart22030400"/>
                         <field name="type_tax_use">none</field>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_IMU2')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_33')])]"/>
                 </record>
 
                 <record id="vz_impu" model="account.tax.template">
@@ -757,7 +771,7 @@
                         <field name="amount_type">group</field>
                         <field name="type_tax_use">purchase</field>
                         <field name="children_tax_ids" eval="[(6, 0, [ref('vz_impu_podatek_naliczony'), ref('vz_impu_podatek_nalezny')])]"/>
-                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tax_IMU')])]"/>
+                        <field name="tag_ids" eval="[(6,0,[ref('l10n_pl.tag_pl_14'), ref('l10n_pl.tag_pl_20')])]"/>
                 </record>
 
 
diff --git a/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..b587dd4a3b8
--- /dev/null
+++ b/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_pl')

From 6fcf82430912e01ca186fef2bfca2374083f969b Mon Sep 17 00:00:00 2001
From: Rawish Murari <rmu-odoo@users.noreply.github.com>
Date: Tue, 29 Aug 2017 16:39:23 +0530
Subject: [PATCH 078/119] [IMP] l10n_sg: create new tags and assign to taxes

task: https://www.odoo.com/web#id=22600&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720
PR: #19099
---
 addons/l10n_sg/__openerp__.py                 |   2 +-
 addons/l10n_sg/l10n_sg_chart_tax.xml          | 244 ++++++++++++------
 .../2.0/post-migrate_tags_on_taxes.py         |   6 +
 .../2.0/pre-set_tags_and_taxes_updatable.py   |   6 +
 4 files changed, 184 insertions(+), 74 deletions(-)
 create mode 100644 addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py
 create mode 100644 addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py

diff --git a/addons/l10n_sg/__openerp__.py b/addons/l10n_sg/__openerp__.py
index 6a5366c8e8a..55d16ecda57 100644
--- a/addons/l10n_sg/__openerp__.py
+++ b/addons/l10n_sg/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Singapore - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'author': 'Tech Receptives',
     'website': 'http://www.techreceptives.com',
     'category': 'Localization',
diff --git a/addons/l10n_sg/l10n_sg_chart_tax.xml b/addons/l10n_sg/l10n_sg_chart_tax.xml
index 9c241de0e4c..1ce6023c4f6 100644
--- a/addons/l10n_sg/l10n_sg_chart_tax.xml
+++ b/addons/l10n_sg/l10n_sg_chart_tax.xml
@@ -1,96 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
 
     <!-- Account Tags -->
-
-    <record id="tag_sg_sale_tax_es_0" model="account.account.tag">
-        <field name="name">Sales Tax 0% ES33</field>
+    <record id="tag_sg_01" model="account.account.tag">
+        <field name="name">Chart of Singapore</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_sale_tax_ds_7" model="account.account.tag">
-        <field name="name">Sales Tax 7% DS</field>
+    <record id="tag_sg_02" model="account.account.tag">
+        <field name="name">Tax Balance To Pay</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_sale_tax_esn_0" model="account.account.tag">
-        <field name="name">Sales Tax 0% ESN33</field>
+    <record id="tag_sg_03" model="account.account.tag">
+        <field name="name">Tax Received</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_sale_tax_os_0" model="account.account.tag">
-        <field name="name">Sales Tax 0% OS</field>
+    <record id="tag_sg_04" model="account.account.tag">
+        <field name="name">Tax Received @ 0%</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_sale_tax_zr_0" model="account.account.tag">
-        <field name="name">Sales Tax 0% ZR</field>
+    <record id="tag_sg_05" model="account.account.tag">
+        <field name="name">Tax Received @ 7% SR</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_sale_tax_sr_7" model="account.account.tag">
-        <field name="name">Sales Tax 7% SR</field>
+    <record id="tag_sg_06" model="account.account.tag">
+        <field name="name">Tax Received @ 7% DS</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_txn33_7" model="account.account.tag">
-        <field name="name">Purchase Tax 7% TX-N33</field>
+    <record id="tag_sg_07" model="account.account.tag">
+        <field name="name">Tax Paid</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_txe33_7" model="account.account.tag">
-        <field name="name">Purchase Tax 7% TX-E33</field>
+    <record id="tag_sg_08" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% TX7</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_bl_7" model="account.account.tag">
-        <field name="name">Purchase Tax 7% BL</field>
+    <record id="tag_sg_09" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% TX-N33</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_im_7" model="account.account.tag">
-        <field name="name">Purchase Tax 7% IM</field>
+    <record id="tag_sg_10" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% TX-E33</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_txre_7" model="account.account.tag">
-        <field name="name">Purchase Tax 7% TX-RE</field>
+    <record id="tag_sg_11" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% BL</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_me_0" model="account.account.tag">
-        <field name="name">Purchase Tax 0% ME</field>
+    <record id="tag_sg_12" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% IM</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_nr_0" model="account.account.tag">
-        <field name="name">Purchase Tax 0% NR</field>
+    <record id="tag_sg_13" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% TX-RE</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_zp_0" model="account.account.tag">
-        <field name="name">Purchase Tax 0% ZP</field>
+    <record id="tag_sg_14" model="account.account.tag">
+        <field name="name">Tax Paid @ 0% ME</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_op_0" model="account.account.tag">
-        <field name="name">Purchase Tax 0% OP</field>
+    <record id="tag_sg_15" model="account.account.tag">
+        <field name="name">Tax Paid @ 0% NR</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_ep_0" model="account.account.tag">
-        <field name="name">Purchase Tax 0% EP</field>
+    <record id="tag_sg_16" model="account.account.tag">
+        <field name="name">Tax Paid @ 0% ZP</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_mes_0" model="account.account.tag">
-        <field name="name">Purchase Tax MES</field>
+    <record id="tag_sg_17" model="account.account.tag">
+        <field name="name">MES Purchase Tax</field>
         <field name="applicability">taxes</field>
     </record>
-
-    <record id="tag_sg_purchase_tax_tx7_7" model="account.account.tag">
-        <field name="name">Purchase Tax 7% TX7</field>
+    <record id="tag_sg_18" model="account.account.tag">
+        <field name="name">Out of Scope Taxes</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_19" model="account.account.tag">
+        <field name="name">Out of Scope Purchase Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_20" model="account.account.tag">
+        <field name="name">Out of Scope Sales Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_21" model="account.account.tag">
+        <field name="name">Exempted Taxes</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_22" model="account.account.tag">
+        <field name="name">Exempted Purchase Tax</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_23" model="account.account.tag">
+        <field name="name">Exempted Sales Tax ES33</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_24" model="account.account.tag">
+        <field name="name">Exempted Sales Tax ESN33</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_25" model="account.account.tag">
+        <field name="name">Tax Bases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_26" model="account.account.tag">
+        <field name="name">Base of Taxed Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_27" model="account.account.tag">
+        <field name="name">Sales 7% Standard</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_28" model="account.account.tag">
+        <field name="name">Sales 7% Standard SR</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_29" model="account.account.tag">
+        <field name="name">Sales 7% Standard DS</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_30" model="account.account.tag">
+        <field name="name">Sales 0% Standard</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_31" model="account.account.tag">
+        <field name="name">Sales Exempted</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_32" model="account.account.tag">
+        <field name="name">Sales Exempted ES33</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_33" model="account.account.tag">
+        <field name="name">Sales Exempted ESN33</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_34" model="account.account.tag">
+        <field name="name">Base of Taxed Purchases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_35" model="account.account.tag">
+        <field name="name">Purchase 7% Standard TX7</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_36" model="account.account.tag">
+        <field name="name">Purchase 7% Standard TX-N33</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_37" model="account.account.tag">
+        <field name="name">Purchase 7% Standard TX-E33</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_38" model="account.account.tag">
+        <field name="name">Purchase 7% Standard BL</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_39" model="account.account.tag">
+        <field name="name">Purchase 7% Standard IM</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_40" model="account.account.tag">
+        <field name="name">Purchase 7% Standard TX-RE</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_41" model="account.account.tag">
+        <field name="name">Purchase 0% Standard ME</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_42" model="account.account.tag">
+        <field name="name">Purchase 0% Standard NR</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_43" model="account.account.tag">
+        <field name="name">Purchase 0% Standard ZP</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_44" model="account.account.tag">
+        <field name="name">Purchase Imports Under MES</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_45" model="account.account.tag">
+        <field name="name">Purchase Exempted</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_46" model="account.account.tag">
+        <field name="name">Purchase Out Of Scope</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_47" model="account.account.tag">
+        <field name="name">Sales Out Of Scope</field>
         <field name="applicability">taxes</field>
     </record>
 
@@ -106,7 +204,7 @@
         <field name="account_id" ref="account_account_791"/>
         <field name="refund_account_id" ref="account_account_791"/>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_es_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_23'),ref('tag_sg_32')])]"/>
     </record>
 
     <record id="sg_sale_tax_ds_7" model="account.tax.template">
@@ -119,7 +217,7 @@
         <field name="account_id" ref="account_account_792"/>
         <field name="refund_account_id" ref="account_account_792"/>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_ds_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_06'), ref('tag_sg_29')])]"/>
     </record>
 
     <record id="sg_sale_tax_esn_0" model="account.tax.template">
@@ -132,7 +230,7 @@
         <field name="account_id" ref="account_account_793"/>
         <field name="refund_account_id" ref="account_account_793"/>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_esn_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_24'),ref('tag_sg_33')])]"/>
     </record>
 
     <record id="sg_sale_tax_os_0" model="account.tax.template">
@@ -145,7 +243,7 @@
         <field name="account_id" ref="account_account_794"/>
         <field name="refund_account_id" ref="account_account_794"/>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_os_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_20'),ref('tag_sg_47')])]"/>
     </record>
 
     <record id="sg_sale_tax_zr_0" model="account.tax.template">
@@ -158,7 +256,7 @@
         <field name="account_id" ref="account_account_795"/>
         <field name="refund_account_id" ref="account_account_795"/>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_zr_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_04'), ref('tag_sg_30')])]"/>
     </record>
 
     <record id="sg_sale_tax_sr_7" model="account.tax.template">
@@ -171,7 +269,7 @@
         <field name="account_id" ref="account_account_796"/>
         <field name="refund_account_id" ref="account_account_796"/>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_sr_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_05'),ref('tag_sg_28')])]"/>
     </record>
 
     <!-- Purchases Tax -->
@@ -186,7 +284,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_txn33_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_09'), ref('tag_sg_36')])]"/>
     </record>
 
     <record id="sg_purchase_tax_txe33_7" model="account.tax.template">
@@ -199,7 +297,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_txe33_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_10'),ref('tag_sg_37')])]"/>
     </record>
 
     <record id="sg_purchase_tax_bl_7" model="account.tax.template">
@@ -212,7 +310,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_bl_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_11'),ref('tag_sg_38')])]"/>
     </record>
 
     <record id="sg_purchase_tax_im_7" model="account.tax.template">
@@ -225,7 +323,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_im_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_12'),ref('tag_sg_39')])]"/>
     </record>
 
     <record id="sg_purchase_tax_txre_7" model="account.tax.template">
@@ -238,7 +336,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_txre_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_13'),ref('tag_sg_40')])]"/>
     </record>
 
     <record id="sg_purchase_tax_me_0" model="account.tax.template">
@@ -251,7 +349,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_me_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_14'),ref('tag_sg_41')])]"/>
     </record>
 
     <record id="sg_purchase_tax_nr_0" model="account.tax.template">
@@ -264,7 +362,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_nr_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_15'),ref('tag_sg_42')])]"/>
     </record>
 
     <record id="sg_purchase_tax_zp_0" model="account.tax.template">
@@ -277,7 +375,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_zp_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_16'),ref('tag_sg_43')])]"/>
     </record>
 
     <record id="sg_purchase_tax_op_0" model="account.tax.template">
@@ -290,7 +388,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_op_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_19'),ref('tag_sg_46')])]"/>
     </record>
 
     <record id="sg_purchase_tax_ep_0" model="account.tax.template">
@@ -303,7 +401,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_ep_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_22'),ref('tag_sg_45')])]"/>
     </record>
 
     <record id="sg_purchase_tax_mes_0" model="account.tax.template">
@@ -316,7 +414,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_mes_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_17'),ref('tag_sg_44')])]"/>
     </record>
 
     <record id="sg_purchase_tax_tx7_7" model="account.tax.template">
@@ -329,7 +427,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
-        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_tx7_7')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_08'),ref('tag_sg_35')])]"/>
     </record>
 
     </data>
diff --git a/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..8d963dbac16
--- /dev/null
+++ b/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_sg')

From c5bf53682e159343ee0c707f6d7f2da972d6add2 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 29 Aug 2017 11:57:33 +0200
Subject: [PATCH 079/119] [FIX] web: prevent 'load' event from being handled
 twice

In grouped list view, when a pager is clicked inside a group, a
'load' event is triggered to reload the data with the new offset.
The event is handled by the list's controller.

However, when the list is in the modal, the event must be stop
propagated by the controller of the modal, so that it doesn't go
up to the controller of the view displayed behind the modal. It
happens for example by reproducing the following steps:
  - go to Lunch
  - add a line
  - search more products
  - group by vendor in the modal
  - unfold a group
  - click on the pager (the group must contain more than 80 records)

Before this rev., it crashed because the controller of the form
view tried to handle the event.
---
 .../src/js/views/field_manager_mixin.js       |  1 +
 .../tests/fields/relational_fields_tests.js   | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/addons/web/static/src/js/views/field_manager_mixin.js b/addons/web/static/src/js/views/field_manager_mixin.js
index 1ee7bf4a501..aaf7e4a5859 100644
--- a/addons/web/static/src/js/views/field_manager_mixin.js
+++ b/addons/web/static/src/js/views/field_manager_mixin.js
@@ -120,6 +120,7 @@ var FieldManagerMixin = {
      */
     _onLoad: function (event) {
         var self = this;
+        event.stopPropagation(); // prevent other field managers from handling this request
         var data = event.data;
         if (!data.on_success) { return; }
         var params = {};
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 92a24066408..e211d120fe2 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -6885,6 +6885,71 @@ QUnit.module('relational_fields', {
         list.destroy();
     });
 
+    QUnit.test('search more in many2one: group and use the pager', function (assert) {
+        assert.expect(2);
+
+        this.data.partner.records.push({
+            id: 5,
+            display_name: "Partner 4",
+        }, {
+            id: 6,
+            display_name: "Partner 5",
+        }, {
+            id: 7,
+            display_name: "Partner 6",
+        }, {
+            id: 8,
+            display_name: "Partner 7",
+        }, {
+            id: 9,
+            display_name: "Partner 8",
+        }, {
+            id: 10,
+            display_name: "Partner 9",
+        });
+
+        this.data.partner.fields.datetime.searchable = true;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<sheet>' +
+                        '<group>' +
+                            '<field name="trululu"/>' +
+                        '</group>' +
+                    '</sheet>' +
+                '</form>',
+
+            res_id: 1,
+            archs: {
+                'partner,false,list': '<tree limit="7"><field name="display_name"/></tree>',
+                'partner,false,search': '<search><group>' +
+                       '    <filter name="bar" string="Bar" context="{\'group_by\': \'bar\'}"/>' +
+                        '</group></search>',
+            },
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        var $dropdown = form.$('.o_field_many2one input').autocomplete('widget');
+        form.$('.o_field_many2one input').click();
+        $dropdown.find('.o_m2o_dropdown_option:contains(Search)').mouseenter().click();  // Open Search More
+
+        $('.modal .o_searchview_more').click();  // Magnifying class for more filters
+        $('.modal .o_search_options .o_group_by_menu a:contains(Bar)').click(); // group by 'Bar'
+
+        $('.modal .o_group_header:first').click();
+        assert.strictEqual($('.modal tbody:nth(1) .o_data_row').length, 7,
+            "should display 7 records in the first page");
+        $('.modal .o_group_header:first .o_pager_next').click();
+        assert.strictEqual($('.modal tbody:nth(1) .o_data_row').length, 1,
+            "should display 1 record in the second page");
+
+        form.destroy();
+    });
+
     QUnit.test('field many2many_tags keeps focus when being edited', function (assert) {
         assert.expect(7);
 

From e8b5d8414028065f55e96a224fd16916da2ae11f Mon Sep 17 00:00:00 2001
From: Rawish Murari <rmu-odoo@users.noreply.github.com>
Date: Tue, 29 Aug 2017 16:55:58 +0530
Subject: [PATCH 080/119] [IMP] l10n_lu: created new tags and assign to taxes

task: https://www.odoo.com/web#id=22558&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720
PR: #19102
---
 addons/l10n_lu/__openerp__.py                 |    2 +-
 addons/l10n_lu/account.account.tag.csv        | 1006 ++++++++++-------
 addons/l10n_lu/account.tax.template-2015.csv  |  814 ++++++-------
 .../2.0/post-migrate_tags_on_taxes.py         |    6 +
 4 files changed, 1014 insertions(+), 814 deletions(-)
 create mode 100644 addons/l10n_lu/migrations/2.0/post-migrate_tags_on_taxes.py

diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index a90a93acbad..60e65493b7e 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -7,7 +7,7 @@
 
 {
     'name': 'Luxembourg - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
diff --git a/addons/l10n_lu/account.account.tag.csv b/addons/l10n_lu/account.account.tag.csv
index e0200291232..93c9c280973 100644
--- a/addons/l10n_lu/account.account.tag.csv
+++ b/addons/l10n_lu/account.account.tag.csv
@@ -1,407 +1,601 @@
 id,name,applicability
-tag_AB_EC_0,AB-EC-0,taxes
-tag_AB_EC_12_n,AB-EC-12-n,taxes
-tag_AB_EC_12_p,AB-EC-12-p,taxes
-tag_AB_EC_12,AB-EC-12,taxes
-tag_AB_EC_14_n,AB-EC-14-n,taxes
-tag_AB_EC_14_p,AB-EC-14-p,taxes
-tag_AB_EC_14,AB-EC-14,taxes
-tag_AB_EC_15_n,AB-EC-15-n,taxes
-tag_AB_EC_15_p,AB-EC-15-p,taxes
-tag_AB_EC_15,AB-EC-15,taxes
-tag_AB_EC_17_n,AB-EC-17-n,taxes
-tag_AB_EC_17_p,AB-EC-17-p,taxes
-tag_AB_EC_17,AB-EC-17,taxes
-tag_AB_EC_3_n,AB-EC-3-n,taxes
-tag_AB_EC_3_p,AB-EC-3-p,taxes
-tag_AB_EC_3,AB-EC-3,taxes
-tag_AB_EC_6_n,AB-EC-6-n,taxes
-tag_AB_EC_6_p,AB-EC-6-p,taxes
-tag_AB_EC_6,AB-EC-6,taxes
-tag_AB_EC_8_n,AB-EC-8-n,taxes
-tag_AB_EC_8_p,AB-EC-8-p,taxes
-tag_AB_EC_8,AB-EC-8,taxes
-tag_AB_ECP_0,AB-ECP-0,taxes
-tag_AB_ECP_12_n,AB-ECP-12-n,taxes
-tag_AB_ECP_12_p,AB-ECP-12-p,taxes
-tag_AB_ECP_12,AB-ECP-12,taxes
-tag_AB_ECP_14_n,AB-ECP-14-n,taxes
-tag_AB_ECP_14_p,AB-ECP-14-p,taxes
-tag_AB_ECP_14,AB-ECP-14,taxes
-tag_AB_ECP_15_n,AB-ECP-15-n,taxes
-tag_AB_ECP_15_p,AB-ECP-15-p,taxes
-tag_AB_ECP_15,AB-ECP-15,taxes
-tag_AB_ECP_17_n,AB-ECP-17-n,taxes
-tag_AB_ECP_17_p,AB-ECP-17-p,taxes
-tag_AB_ECP_17,AB-ECP-17,taxes
-tag_AB_ECP_3_n,AB-ECP-3-n,taxes
-tag_AB_ECP_3_p,AB-ECP-3-p,taxes
-tag_AB_ECP_3,AB-ECP-3,taxes
-tag_AB_ECP_6_n,AB-ECP-6-n,taxes
-tag_AB_ECP_6_p,AB-ECP-6-p,taxes
-tag_AB_ECP_6,AB-ECP-6,taxes
-tag_AB_ECP_8_n,AB-ECP-8-n,taxes
-tag_AB_ECP_8_p,AB-ECP-8-p,taxes
-tag_AB_ECP_8,AB-ECP-8,taxes
-tag_AB_IC_0,AB-IC-0,taxes
-tag_AB_IC_12_n,AB-IC-12-n,taxes
-tag_AB_IC_12_p,AB-IC-12-p,taxes
-tag_AB_IC_12,AB-IC-12,taxes
-tag_AB_IC_14_n,AB-IC-14-n,taxes
-tag_AB_IC_14_p,AB-IC-14-p,taxes
-tag_AB_IC_14,AB-IC-14,taxes
-tag_AB_IC_15_n,AB-IC-15-n,taxes
-tag_AB_IC_15_p,AB-IC-15-p,taxes
-tag_AB_IC_15,AB-IC-15,taxes
-tag_AB_IC_17_n,AB-IC-17-n,taxes
-tag_AB_IC_17_p,AB-IC-17-p,taxes
-tag_AB_IC_17,AB-IC-17,taxes
-tag_AB_IC_3_n,AB-IC-3-n,taxes
-tag_AB_IC_3_p,AB-IC-3-p,taxes
-tag_AB_IC_3,AB-IC-3,taxes
-tag_AB_IC_6_n,AB-IC-6-n,taxes
-tag_AB_IC_6_p,AB-IC-6-p,taxes
-tag_AB_IC_6,AB-IC-6,taxes
-tag_AB_IC_8_n,AB-IC-8-n,taxes
-tag_AB_IC_8_p,AB-IC-8-p,taxes
-tag_AB_IC_8,AB-IC-8,taxes
-tag_AB_PA_0,AB-PA-0,taxes
-tag_AB_PA_12,AB-PA-12,taxes
-tag_AB_PA_14,AB-PA-14,taxes
-tag_AB_PA_15,AB-PA-15,taxes
-tag_AB_PA_17,AB-PA-17,taxes
-tag_AB_PA_3,AB-PA-3,taxes
-tag_AB_PA_6,AB-PA-6,taxes
-tag_AB_PA_8,AB-PA-8,taxes
-tag_AP_EC_0,AP-EC-0,taxes
-tag_AP_EC_12_n,AP-EC-12-n,taxes
-tag_AP_EC_12_p,AP-EC-12-p,taxes
-tag_AP_EC_12,AP-EC-12,taxes
-tag_AP_EC_14_n,AP-EC-14-n,taxes
-tag_AP_EC_14_p,AP-EC-14-p,taxes
-tag_AP_EC_14,AP-EC-14,taxes
-tag_AP_EC_15_n,AP-EC-15-n,taxes
-tag_AP_EC_15_p,AP-EC-15-p,taxes
-tag_AP_EC_15,AP-EC-15,taxes
-tag_AP_EC_17_n,AP-EC-17-n,taxes
-tag_AP_EC_17_p,AP-EC-17-p,taxes
-tag_AP_EC_17,AP-EC-17,taxes
-tag_AP_EC_3_n,AP-EC-3-n,taxes
-tag_AP_EC_3_p,AP-EC-3-p,taxes
-tag_AP_EC_3,AP-EC-3,taxes
-tag_AP_EC_6_n,AP-EC-6-n,taxes
-tag_AP_EC_6_p,AP-EC-6-p,taxes
-tag_AP_EC_6,AP-EC-6,taxes
-tag_AP_EC_8_n,AP-EC-8-n,taxes
-tag_AP_EC_8_p,AP-EC-8-p,taxes
-tag_AP_EC_8,AP-EC-8,taxes
-tag_AP_IC_0,AP-IC-0,taxes
-tag_AP_IC_12_n,AP-IC-12-n,taxes
-tag_AP_IC_12_p,AP-IC-12-p,taxes
-tag_AP_IC_12,AP-IC-12,taxes
-tag_AP_IC_14_n,AP-IC-14-n,taxes
-tag_AP_IC_14_p,AP-IC-14-p,taxes
-tag_AP_IC_14,AP-IC-14,taxes
-tag_AP_IC_15_n,AP-IC-15-n,taxes
-tag_AP_IC_15_p,AP-IC-15-p,taxes
-tag_AP_IC_15,AP-IC-15,taxes
-tag_AP_IC_17_n,AP-IC-17-n,taxes
-tag_AP_IC_17_p,AP-IC-17-p,taxes
-tag_AP_IC_17,AP-IC-17,taxes
-tag_AP_IC_3_n,AP-IC-3-n,taxes
-tag_AP_IC_3_p,AP-IC-3-p,taxes
-tag_AP_IC_3,AP-IC-3,taxes
-tag_AP_IC_6_n,AP-IC-6-n,taxes
-tag_AP_IC_6_p,AP-IC-6-p,taxes
-tag_AP_IC_6,AP-IC-6,taxes
-tag_AP_IC_8_n,AP-IC-8-n,taxes
-tag_AP_IC_8_p,AP-IC-8-p,taxes
-tag_AP_IC_8,AP-IC-8,taxes
-tag_AP_PA_0,AP-PA-0,taxes
-tag_AP_PA_12,AP-PA-12,taxes
-tag_AP_PA_14,AP-PA-14,taxes
-tag_AP_PA_15,AP-PA-15,taxes
-tag_AP_PA_17,AP-PA-17,taxes
-tag_AP_PA_3,AP-PA-3,taxes
-tag_AP_PA_6,AP-PA-6,taxes
-tag_AP_PA_8,AP-PA-8,taxes
-tag_FB_EC_0,FB-EC-0,taxes
-tag_FB_EC_12_n,FB-EC-12-n,taxes
-tag_FB_EC_12_p,FB-EC-12-p,taxes
-tag_FB_EC_12,FB-EC-12,taxes
-tag_FB_EC_14_n,FB-EC-14-n,taxes
-tag_FB_EC_14_p,FB-EC-14-p,taxes
-tag_FB_EC_14,FB-EC-14,taxes
-tag_FB_EC_15_n,FB-EC-15-n,taxes
-tag_FB_EC_15_p,FB-EC-15-p,taxes
-tag_FB_EC_15,FB-EC-15,taxes
-tag_FB_EC_17_n,FB-EC-17-n,taxes
-tag_FB_EC_17_p,FB-EC-17-p,taxes
-tag_FB_EC_17,FB-EC-17,taxes
-tag_FB_EC_3_n,FB-EC-3-n,taxes
-tag_FB_EC_3_p,FB-EC-3-p,taxes
-tag_FB_EC_3,FB-EC-3,taxes
-tag_FB_EC_6_n,FB-EC-6-n,taxes
-tag_FB_EC_6_p,FB-EC-6-p,taxes
-tag_FB_EC_6,FB-EC-6,taxes
-tag_FB_EC_8_n,FB-EC-8-n,taxes
-tag_FB_EC_8_p,FB-EC-8-p,taxes
-tag_FB_EC_8,FB-EC-8,taxes
-tag_FB_ECP_0,FB-ECP-0,taxes
-tag_FB_ECP_12_n,FB-ECP-12-n,taxes
-tag_FB_ECP_12_p,FB-ECP-12-p,taxes
-tag_FB_ECP_12,FB-ECP-12,taxes
-tag_FB_ECP_14_n,FB-ECP-14-n,taxes
-tag_FB_ECP_14_p,FB-ECP-14-p,taxes
-tag_FB_ECP_14,FB-ECP-14,taxes
-tag_FB_ECP_15_n,FB-ECP-15-n,taxes
-tag_FB_ECP_15_p,FB-ECP-15-p,taxes
-tag_FB_ECP_15,FB-ECP-15,taxes
-tag_FB_ECP_17_n,FB-ECP-17-n,taxes
-tag_FB_ECP_17_p,FB-ECP-17-p,taxes
-tag_FB_ECP_17,FB-ECP-17,taxes
-tag_FB_ECP_3_n,FB-ECP-3-n,taxes
-tag_FB_ECP_3_p,FB-ECP-3-p,taxes
-tag_FB_ECP_3,FB-ECP-3,taxes
-tag_FB_ECP_6_n,FB-ECP-6-n,taxes
-tag_FB_ECP_6_p,FB-ECP-6-p,taxes
-tag_FB_ECP_6,FB-ECP-6,taxes
-tag_FB_ECP_8_n,FB-ECP-8-n,taxes
-tag_FB_ECP_8_p,FB-ECP-8-p,taxes
-tag_FB_ECP_8,FB-ECP-8,taxes
-tag_FB_IC_0,FB-IC-0,taxes
-tag_FB_IC_12_n,FB-IC-12-n,taxes
-tag_FB_IC_12_p,FB-IC-12-p,taxes
-tag_FB_IC_12,FB-IC-12,taxes
-tag_FB_IC_14_n,FB-IC-14-n,taxes
-tag_FB_IC_14_p,FB-IC-14-p,taxes
-tag_FB_IC_14,FB-IC-14,taxes
-tag_FB_IC_15_n,FB-IC-15-n,taxes
-tag_FB_IC_15_p,FB-IC-15-p,taxes
-tag_FB_IC_15,FB-IC-15,taxes
-tag_FB_IC_17_n,FB-IC-17-n,taxes
-tag_FB_IC_17_p,FB-IC-17-p,taxes
-tag_FB_IC_17,FB-IC-17,taxes
-tag_FB_IC_3_n,FB-IC-3-n,taxes
-tag_FB_IC_3_p,FB-IC-3-p,taxes
-tag_FB_IC_3,FB-IC-3,taxes
-tag_FB_IC_6_n,FB-IC-6-n,taxes
-tag_FB_IC_6_p,FB-IC-6-p,taxes
-tag_FB_IC_6,FB-IC-6,taxes
-tag_FB_IC_8_n,FB-IC-8-n,taxes
-tag_FB_IC_8_p,FB-IC-8-p,taxes
-tag_FB_IC_8,FB-IC-8,taxes
-tag_FB_PA_0,FB-PA-0,taxes
-tag_FB_PA_12,FB-PA-12,taxes
-tag_FB_PA_14,FB-PA-14,taxes
-tag_FB_PA_15,FB-PA-15,taxes
-tag_FB_PA_17,FB-PA-17,taxes
-tag_FB_PA_3,FB-PA-3,taxes
-tag_FB_PA_6,FB-PA-6,taxes
-tag_FB_PA_8,FB-PA-8,taxes
-tag_FP_EC_0,FP-EC-0,taxes
-tag_FP_EC_12_n,FP-EC-12-n,taxes
-tag_FP_EC_12_p,FP-EC-12-p,taxes
-tag_FP_EC_12,FP-EC-12,taxes
-tag_FP_EC_14_n,FP-EC-14-n,taxes
-tag_FP_EC_14_p,FP-EC-14-p,taxes
-tag_FP_EC_14,FP-EC-14,taxes
-tag_FP_EC_15_n,FP-EC-15-n,taxes
-tag_FP_EC_15_p,FP-EC-15-p,taxes
-tag_FP_EC_15,FP-EC-15,taxes
-tag_FP_EC_17_n,FP-EC-17-n,taxes
-tag_FP_EC_17_p,FP-EC-17-p,taxes
-tag_FP_EC_17,FP-EC-17,taxes
-tag_FP_EC_3_n,FP-EC-3-n,taxes
-tag_FP_EC_3_p,FP-EC-3-p,taxes
-tag_FP_EC_3,FP-EC-3,taxes
-tag_FP_EC_6_n,FP-EC-6-n,taxes
-tag_FP_EC_6_p,FP-EC-6-p,taxes
-tag_FP_EC_6,FP-EC-6,taxes
-tag_FP_EC_8_n,FP-EC-8-n,taxes
-tag_FP_EC_8_p,FP-EC-8-p,taxes
-tag_FP_EC_8,FP-EC-8,taxes
-tag_FP_IC_0,FP-IC-0,taxes
-tag_FP_IC_12_n,FP-IC-12-n,taxes
-tag_FP_IC_12_p,FP-IC-12-p,taxes
-tag_FP_IC_12,FP-IC-12,taxes
-tag_FP_IC_14_n,FP-IC-14-n,taxes
-tag_FP_IC_14_p,FP-IC-14-p,taxes
-tag_FP_IC_14,FP-IC-14,taxes
-tag_FP_IC_15_n,FP-IC-15-n,taxes
-tag_FP_IC_15_p,FP-IC-15-p,taxes
-tag_FP_IC_15,FP-IC-15,taxes
-tag_FP_IC_17_n,FP-IC-17-n,taxes
-tag_FP_IC_17_p,FP-IC-17-p,taxes
-tag_FP_IC_17,FP-IC-17,taxes
-tag_FP_IC_3_n,FP-IC-3-n,taxes
-tag_FP_IC_3_p,FP-IC-3-p,taxes
-tag_FP_IC_3,FP-IC-3,taxes
-tag_FP_IC_6_n,FP-IC-6-n,taxes
-tag_FP_IC_6_p,FP-IC-6-p,taxes
-tag_FP_IC_6,FP-IC-6,taxes
-tag_FP_IC_8_n,FP-IC-8-n,taxes
-tag_FP_IC_8_p,FP-IC-8-p,taxes
-tag_FP_IC_8,FP-IC-8,taxes
-tag_FP_PA_0,FP-PA-0,taxes
-tag_FP_PA_12,FP-PA-12,taxes
-tag_FP_PA_14,FP-PA-14,taxes
-tag_FP_PA_15,FP-PA-15,taxes
-tag_FP_PA_17,FP-PA-17,taxes
-tag_FP_PA_3,FP-PA-3,taxes
-tag_FP_PA_6,FP-PA-6,taxes
-tag_FP_PA_8,FP-PA-8,taxes
-tag_IB_EC_0,IB-EC-0,taxes
-tag_IB_EC_12_n,IB-EC-12-n,taxes
-tag_IB_EC_12_p,IB-EC-12-p,taxes
-tag_IB_EC_12,IB-EC-12,taxes
-tag_IB_EC_14_n,IB-EC-14-n,taxes
-tag_IB_EC_14_p,IB-EC-14-p,taxes
-tag_IB_EC_14,IB-EC-14,taxes
-tag_IB_EC_15_n,IB-EC-15-n,taxes
-tag_IB_EC_15_p,IB-EC-15-p,taxes
-tag_IB_EC_15,IB-EC-15,taxes
-tag_IB_EC_17_n,IB-EC-17-n,taxes
-tag_IB_EC_17_p,IB-EC-17-p,taxes
-tag_IB_EC_17,IB-EC-17,taxes
-tag_IB_EC_3_n,IB-EC-3-n,taxes
-tag_IB_EC_3_p,IB-EC-3-p,taxes
-tag_IB_EC_3,IB-EC-3,taxes
-tag_IB_EC_6_n,IB-EC-6-n,taxes
-tag_IB_EC_6_p,IB-EC-6-p,taxes
-tag_IB_EC_6,IB-EC-6,taxes
-tag_IB_EC_8_n,IB-EC-8-n,taxes
-tag_IB_EC_8_p,IB-EC-8-p,taxes
-tag_IB_EC_8,IB-EC-8,taxes
-tag_IB_ECP_0,IB-ECP-0,taxes
-tag_IB_ECP_12_n,IB-ECP-12-n,taxes
-tag_IB_ECP_12_p,IB-ECP-12-p,taxes
-tag_IB_ECP_12,IB-ECP-12,taxes
-tag_IB_ECP_14_n,IB-ECP-14-n,taxes
-tag_IB_ECP_14_p,IB-ECP-14-p,taxes
-tag_IB_ECP_14,IB-ECP-14,taxes
-tag_IB_ECP_15_n,IB-ECP-15-n,taxes
-tag_IB_ECP_15_p,IB-ECP-15-p,taxes
-tag_IB_ECP_15,IB-ECP-15,taxes
-tag_IB_ECP_17_n,IB-ECP-17-n,taxes
-tag_IB_ECP_17_p,IB-ECP-17-p,taxes
-tag_IB_ECP_17,IB-ECP-17,taxes
-tag_IB_ECP_3_n,IB-ECP-3-n,taxes
-tag_IB_ECP_3_p,IB-ECP-3-p,taxes
-tag_IB_ECP_3,IB-ECP-3,taxes
-tag_IB_ECP_6_n,IB-ECP-6-n,taxes
-tag_IB_ECP_6_p,IB-ECP-6-p,taxes
-tag_IB_ECP_6,IB-ECP-6,taxes
-tag_IB_ECP_8_n,IB-ECP-8-n,taxes
-tag_IB_ECP_8_p,IB-ECP-8-p,taxes
-tag_IB_ECP_8,IB-ECP-8,taxes
-tag_IB_IC_0,IB-IC-0,taxes
-tag_IB_IC_12_n,IB-IC-12-n,taxes
-tag_IB_IC_12_p,IB-IC-12-p,taxes
-tag_IB_IC_12,IB-IC-12,taxes
-tag_IB_IC_14_n,IB-IC-14-n,taxes
-tag_IB_IC_14_p,IB-IC-14-p,taxes
-tag_IB_IC_14,IB-IC-14,taxes
-tag_IB_IC_15_n,IB-IC-15-n,taxes
-tag_IB_IC_15_p,IB-IC-15-p,taxes
-tag_IB_IC_15,IB-IC-15,taxes
-tag_IB_IC_17_n,IB-IC-17-n,taxes
-tag_IB_IC_17_p,IB-IC-17-p,taxes
-tag_IB_IC_17,IB-IC-17,taxes
-tag_IB_IC_3_n,IB-IC-3-n,taxes
-tag_IB_IC_3_p,IB-IC-3-p,taxes
-tag_IB_IC_3,IB-IC-3,taxes
-tag_IB_IC_6_n,IB-IC-6-n,taxes
-tag_IB_IC_6_p,IB-IC-6-p,taxes
-tag_IB_IC_6,IB-IC-6,taxes
-tag_IB_IC_8_n,IB-IC-8-n,taxes
-tag_IB_IC_8_p,IB-IC-8-p,taxes
-tag_IB_IC_8,IB-IC-8,taxes
-tag_IB_PA_0,IB-PA-0,taxes
-tag_IB_PA_12,IB-PA-12,taxes
-tag_IB_PA_14,IB-PA-14,taxes
-tag_IB_PA_15,IB-PA-15,taxes
-tag_IB_PA_17,IB-PA-17,taxes
-tag_IB_PA_3,IB-PA-3,taxes
-tag_IB_PA_6,IB-PA-6,taxes
-tag_IB_PA_8,IB-PA-8,taxes
-tag_IP_EC_0,IP-EC-0,taxes
-tag_IP_EC_12_n,IP-EC-12-n,taxes
-tag_IP_EC_12_p,IP-EC-12-p,taxes
-tag_IP_EC_12,IP-EC-12,taxes
-tag_IP_EC_14_n,IP-EC-14-n,taxes
-tag_IP_EC_14_p,IP-EC-14-p,taxes
-tag_IP_EC_14,IP-EC-14,taxes
-tag_IP_EC_15_n,IP-EC-15-n,taxes
-tag_IP_EC_15_p,IP-EC-15-p,taxes
-tag_IP_EC_15,IP-EC-15,taxes
-tag_IP_EC_17_n,IP-EC-17-n,taxes
-tag_IP_EC_17_p,IP-EC-17-p,taxes
-tag_IP_EC_17,IP-EC-17,taxes
-tag_IP_EC_3_n,IP-EC-3-n,taxes
-tag_IP_EC_3_p,IP-EC-3-p,taxes
-tag_IP_EC_3,IP-EC-3,taxes
-tag_IP_EC_6_n,IP-EC-6-n,taxes
-tag_IP_EC_6_p,IP-EC-6-p,taxes
-tag_IP_EC_6,IP-EC-6,taxes
-tag_IP_EC_8_n,IP-EC-8-n,taxes
-tag_IP_EC_8_p,IP-EC-8-p,taxes
-tag_IP_EC_8,IP-EC-8,taxes
-tag_IP_IC_0,IP-IC-0,taxes
-tag_IP_IC_12_n,IP-IC-12-n,taxes
-tag_IP_IC_12_p,IP-IC-12-p,taxes
-tag_IP_IC_12,IP-IC-12,taxes
-tag_IP_IC_14_n,IP-IC-14-n,taxes
-tag_IP_IC_14_p,IP-IC-14-p,taxes
-tag_IP_IC_14,IP-IC-14,taxes
-tag_IP_IC_15_n,IP-IC-15-n,taxes
-tag_IP_IC_15_p,IP-IC-15-p,taxes
-tag_IP_IC_15,IP-IC-15,taxes
-tag_IP_IC_17_n,IP-IC-17-n,taxes
-tag_IP_IC_17_p,IP-IC-17-p,taxes
-tag_IP_IC_17,IP-IC-17,taxes
-tag_IP_IC_3_n,IP-IC-3-n,taxes
-tag_IP_IC_3_p,IP-IC-3-p,taxes
-tag_IP_IC_3,IP-IC-3,taxes
-tag_IP_IC_6_n,IP-IC-6-n,taxes
-tag_IP_IC_6_p,IP-IC-6-p,taxes
-tag_IP_IC_6,IP-IC-6,taxes
-tag_IP_IC_8_n,IP-IC-8-n,taxes
-tag_IP_IC_8_p,IP-IC-8-p,taxes
-tag_IP_IC_8,IP-IC-8,taxes
-tag_IP_PA_0,IP-PA-0,taxes
-tag_IP_PA_12,IP-PA-12,taxes
-tag_IP_PA_14,IP-PA-14,taxes
-tag_IP_PA_15,IP-PA-15,taxes
-tag_IP_PA_17,IP-PA-17,taxes
-tag_IP_PA_3,IP-PA-3,taxes
-tag_IP_PA_6,IP-PA-6,taxes
-tag_IP_PA_8,IP-PA-8,taxes
-tag_V_ART_43_60b,V-ART-43_60b,taxes
-tag_V_ART_44_56q,V-ART-44_56q,taxes
-tag_VB_EC_0,VB-EC-0,taxes
-tag_VB_EC_Tab,VB-EC-Tab,taxes
-tag_VB_IC_0,VB-IC-0,taxes
-tag_VB_IC_Tab,VB-IC-Tab,taxes
-tag_VB_PA_0,VB-PA-0,taxes
-tag_VB_PA_12,VB-PA-12,taxes
-tag_VB_PA_14,VB-PA-14,taxes
-tag_VB_PA_15,VB-PA-15,taxes
-tag_VB_PA_17,VB-PA-17,taxes
-tag_VB_PA_3,VB-PA-3,taxes
-tag_VB_PA_6,VB-PA-6,taxes
-tag_VB_PA_8,VB-PA-8,taxes
-tag_VB_PA_Tab,VB-PA-Tab,taxes
-tag_VB_TR_0,VB-TR-0,taxes
-tag_VP_EC_0,VP-EC-0,taxes
-tag_VP_IC_0,VP-IC-0,taxes
-tag_VP_IC_EX,VP-IC-EX,taxes
-tag_VP_PA_0,VP-PA-0,taxes
-tag_VP_PA_12,VP-PA-12,taxes
-tag_VP_PA_14,VP-PA-14,taxes
-tag_VP_PA_15,VP-PA-15,taxes
-tag_VP_PA_17,VP-PA-17,taxes
-tag_VP_PA_3,VP-PA-3,taxes
-tag_VP_PA_6,VP-PA-6,taxes
-tag_VP_PA_8,VP-PA-8,taxes
-tag_VP_PA_SANS,VP-PA-SANS,taxes
+tag_lu_01,II. AUTRES BASES,taxes
+tag_lu_02,II.B. Acquisitions intracommunautaires de biens – base,taxes
+tag_lu_03,II.B. base 15%,taxes
+tag_lu_04,Base - Achat Biens 15% - Intracommunautaire (+),taxes
+tag_lu_05,Base - Frais Biens 15% - Intracommunautaire (+),taxes
+tag_lu_06,Base - Investissement Biens 15% - Intracommunautaire (+),taxes
+tag_lu_07,II.B. base 6%,taxes
+tag_lu_08,Base - Achat Biens 6% - Intracommunautaire (+),taxes
+tag_lu_09,Base - Frais Biens 6% - Intracommunautaire (+),taxes
+tag_lu_10,Base - Investissement Biens 6% - Intracommunautaire (+),taxes
+tag_lu_11,II.B. base 3%,taxes
+tag_lu_12,Base - Achat Biens 3% - Intracommunautaire (+),taxes
+tag_lu_13,Base - Frais Biens 3% - Intracommunautaire (+),taxes
+tag_lu_14,Base - Investissement Biens 3% - Intracommunautaire (+),taxes
+tag_lu_15,II.B. base 12%,taxes
+tag_lu_16,Base - Achat Biens 12% - Intracommunautaire (+),taxes
+tag_lu_17,Base - Frais Biens 12% - Intracommunautaire (+),taxes
+tag_lu_18,Base - Investissement Biens 12% - Intracommunautaire (+),taxes
+tag_lu_19,II.B. base exonérée,taxes
+tag_lu_20,Base - Achat Biens Exonéré - Intracommunautaire,taxes
+tag_lu_21,Base - Frais Biens Exonéré - Intracommunautaire,taxes
+tag_lu_22,Base - Investissement Biens Exonéré - Intracommunautaire,taxes
+tag_lu_23,II.B. base 17%,taxes
+tag_lu_24,Base - Achat Biens 17% - Intracommunautaire (+),taxes
+tag_lu_25,Base - Frais Biens 17% - Intracommunautaire (+),taxes
+tag_lu_26,Base - Investissement Biens 17% - Intracommunautaire (+),taxes
+tag_lu_27,II.B. base 14%,taxes
+tag_lu_28,Base - Achat Biens 14% - Intracommunautaire (+),taxes
+tag_lu_29,Base - Frais Biens 14% - Intracommunautaire (+),taxes
+tag_lu_30,Base - Investissement Biens 14% - Intracommunautaire (+),taxes
+tag_lu_31,II.B. base 8%,taxes
+tag_lu_32,Base - Achat Biens 8% - Intracommunautaire (+),taxes
+tag_lu_33,Base - Frais Biens 8% - Intracommunautaire (+),taxes
+tag_lu_34,Base - Investissement Biens 8% - Intracommunautaire (+),taxes
+tag_lu_35,II.D. Importations de biens – base,taxes
+tag_lu_36,II.D.1. base 15%,taxes
+tag_lu_37,Base - Achat Biens 15% - Extracommunautaire (+),taxes
+tag_lu_38,Base - Frais Biens 15% - Extracommunautaire (+),taxes
+tag_lu_39,Base - Investissement Biens 15% - Extracommunautaire (+),taxes
+tag_lu_40,II.D.1. base 6%,taxes
+tag_lu_41,Base - Achat Biens 6% - Extracommunautaire (+),taxes
+tag_lu_42,Base - Frais Biens 6% - Extracommunautaire (+),taxes
+tag_lu_43,Base - Investissement Biens 6% - Extracommunautaire (+),taxes
+tag_lu_44,II.D.1. base 3%,taxes
+tag_lu_45,Base - Achat Biens 3% - Extracommunautaire (+),taxes
+tag_lu_46,Base - Frais Biens 3% - Extracommunautaire (+),taxes
+tag_lu_47,Base - Investissement Biens 3% - Extracommunautaire (+),taxes
+tag_lu_48,II.D.1. base 12%,taxes
+tag_lu_49,Base - Achat Biens 12% - Extracommunautaire (+),taxes
+tag_lu_50,Base - Frais Biens 12% - Extracommunautaire (+),taxes
+tag_lu_51,Base - Investissement Biens 12% - Extracommunautaire (+),taxes
+tag_lu_52,II.D.2.. base 15%,taxes
+tag_lu_53,Base - Achat Biens 15% - Extracommunautaire fin privées (+),taxes
+tag_lu_54,Base - Frais Biens 15% - Extracommunautaire fin privées (+),taxes
+tag_lu_55,Base - Investissement Biens 15% - Extracommunautaire fin privées (+),taxes
+tag_lu_56,II.D.2.. base 6%,taxes
+tag_lu_57,Base - Achat Biens 6% - Extracommunautaire fin privées (+),taxes
+tag_lu_58,Base - Frais Biens 6% - Extracommunautaire fin privées (+),taxes
+tag_lu_59,Base - Investissement Biens 6% - Extracommunautaire fin privées (+),taxes
+tag_lu_60,II.D.2.. base 3%,taxes
+tag_lu_61,Base - Achat Biens 3% - Extracommunautaire fin privées (+),taxes
+tag_lu_62,Base - Frais Biens 3% - Extracommunautaire fin privées (+),taxes
+tag_lu_63,Base - Investissement Biens 3% - Extracommunautaire fin privées (+),taxes
+tag_lu_64,II.D.2.. base 12%,taxes
+tag_lu_65,Base - Achat Biens 12% - Extracommunautaire fin privées (+),taxes
+tag_lu_66,Base - Frais Biens 12% - Extracommunautaire fin privées (+),taxes
+tag_lu_67,Base - Investissement Biens 12% - Extracommunautaire fin privées (+),taxes
+tag_lu_68,II.D.1. base exonérée,taxes
+tag_lu_69,Base - Achat Biens Exonéré - Extracommunautaire,taxes
+tag_lu_70,Base - Frais Biens Exonéré - Extracommunautaire,taxes
+tag_lu_71,Base - Investissement Biens Exonéré - Extracommunautaire,taxes
+tag_lu_72,II.D.2.. base exonérée,taxes
+tag_lu_73,Base - Achat Biens Exonéré - Extracommunautaire fin privées,taxes
+tag_lu_74,Base - Frais Biens Exonéré - Extracommunautaire fin privées,taxes
+tag_lu_75,Base - Investissement Biens Exonéré - Extracommunautaire fin privées,taxes
+tag_lu_76,II.D.1. base 17%,taxes
+tag_lu_77,Base - Achat Biens 17% - Extracommunautaire (+),taxes
+tag_lu_78,Base - Frais Biens 17% - Extracommunautaire (+),taxes
+tag_lu_79,Base - Investissement Biens 17% - Extracommunautaire (+),taxes
+tag_lu_80,II.D.1. base 14%,taxes
+tag_lu_81,Base - Achat Biens 14% - Extracommunautaire (+),taxes
+tag_lu_82,Base - Frais Biens 14% - Extracommunautaire (+),taxes
+tag_lu_83,Base - Investissement Biens 14% - Extracommunautaire (+),taxes
+tag_lu_84,II.D.1. base 8%,taxes
+tag_lu_85,Base - Achat Biens 8% - Extracommunautaire (+),taxes
+tag_lu_86,Base - Frais Biens 8% - Extracommunautaire (+),taxes
+tag_lu_87,Base - Investissement Biens 8% - Extracommunautaire (+),taxes
+tag_lu_88,II.D.2.. base 17%,taxes
+tag_lu_89,Base - Achat Biens 17% - Extracommunautaire fin privées (+),taxes
+tag_lu_90,Base - Frais Biens 17% - Extracommunautaire fin privées (+),taxes
+tag_lu_91,Base - Investissement Biens 17% - Extracommunautaire fin privées (+),taxes
+tag_lu_92,II.D.2.. base 14%,taxes
+tag_lu_93,Base - Achat Biens 14% - Extracommunautaire fin privées (+),taxes
+tag_lu_94,Base - Frais Biens 14% - Extracommunautaire fin privées (+),taxes
+tag_lu_95,Base - Investissement Biens 14% - Extracommunautaire fin privées (+),taxes
+tag_lu_96,II.D.2.. base 8%,taxes
+tag_lu_97,Base - Achat Biens 8% - Extracommunautaire fin privées (+),taxes
+tag_lu_98,Base - Frais Biens 8% - Extracommunautaire fin privées (+),taxes
+tag_lu_99,Base - Investissement Biens 8% - Extracommunautaire fin privées (+),taxes
+tag_lu_100,II.C. Acquisitions effectuées dans le cadre d'opérations triangulaires – base,taxes
+tag_lu_101,II.E. Prestations de services à déclarer par le preneur redevable de la taxe – base,taxes
+tag_lu_102,II.E.1. base,taxes
+tag_lu_103,II.E.1.a) base 15%,taxes
+tag_lu_104,Base - Achat Prestations 15% - Intracommunautaire (+),taxes
+tag_lu_105,Base - Frais Prestations 15% - Intracommunautaire (+),taxes
+tag_lu_106,Base - Investissement Prestations 15% - Intracommunautaire (+),taxes
+tag_lu_107,II.E.1.a) base 6%,taxes
+tag_lu_108,Base - Achat Prestations 6% - Intracommunautaire (+),taxes
+tag_lu_109,Base - Frais Prestations 6% - Intracommunautaire (+),taxes
+tag_lu_110,Base - Investissement Prestations 6% - Intracommunautaire (+),taxes
+tag_lu_111,II.E.1.a) base 3%,taxes
+tag_lu_112,Base - Achat Prestations 3% - Intracommunautaire (+),taxes
+tag_lu_113,Base - Frais Prestations 3% - Intracommunautaire (+),taxes
+tag_lu_114,Base - Investissement Prestations 3% - Intracommunautaire (+),taxes
+tag_lu_115,II.E.1.a) base 12%,taxes
+tag_lu_116,Base - Achat Prestations 12% - Intracommunautaire (+),taxes
+tag_lu_117,Base - Frais Prestations 12% - Intracommunautaire (+),taxes
+tag_lu_118,Base - Investissement Prestations 12% - Intracommunautaire (+),taxes
+tag_lu_119,II.E.1.b) exonérées,taxes
+tag_lu_120,Base - Achat Prestations Exonérées - Intracommunautaire,taxes
+tag_lu_121,Base - Frais Prestations Exonérées - Intracommunautaire,taxes
+tag_lu_122,Base - Investissement Prestations Exonérées - Intracommunautaire,taxes
+tag_lu_123,II.E.1.a) base 17%,taxes
+tag_lu_124,Base - Achat Prestations 17% - Intracommunautaire (+),taxes
+tag_lu_125,Base - Frais Prestations 17% - Intracommunautaire (+),taxes
+tag_lu_126,Base - Investissement Prestations 17% - Intracommunautaire (+),taxes
+tag_lu_127,II.E.1.a) base 14%,taxes
+tag_lu_128,Base - Achat Prestations 14% - Intracommunautaire (+),taxes
+tag_lu_129,Base - Frais Prestations 14% - Intracommunautaire (+),taxes
+tag_lu_130,Base - Investissement Prestations 14% - Intracommunautaire (+),taxes
+tag_lu_131,II.E.1.a) base 8%,taxes
+tag_lu_132,Base - Achat Prestations 8% - Intracommunautaire (+),taxes
+tag_lu_133,Base - Frais Prestations 8% - Intracommunautaire (+),taxes
+tag_lu_134,Base - Investissement Prestations 8% - Intracommunautaire (+),taxes
+tag_lu_135,II.E.2. base,taxes
+tag_lu_136,II.E.2. base 15%,taxes
+tag_lu_137,Base - Achat Prestations 15% - Extracommunautaire (+),taxes
+tag_lu_138,Base - Frais Prestations 15% - Extracommunautaire (+),taxes
+tag_lu_139,Base - Investissement Prestations 15% - Extracommunautaire (+),taxes
+tag_lu_140,II.E.2. base 6%,taxes
+tag_lu_141,Base - Achat Prestations 6% - Extracommunautaire (+),taxes
+tag_lu_142,Base - Frais Prestations 6% - Extracommunautaire (+),taxes
+tag_lu_143,Base - Investissement Prestations 6% - Extracommunautaire (+),taxes
+tag_lu_144,II.E.2. base 3%,taxes
+tag_lu_145,Base - Achat Prestations 3% - Extracommunautaire (+),taxes
+tag_lu_146,Base - Frais Prestations 3% - Extracommunautaire (+),taxes
+tag_lu_147,Base - Investissement Prestations 3% - Extracommunautaire (+),taxes
+tag_lu_148,II.E.2. base 12%,taxes
+tag_lu_149,Base - Achat Prestations 12% - Extracommunautaire (+),taxes
+tag_lu_150,Base - Frais Prestations 12% - Extracommunautaire (+),taxes
+tag_lu_151,Base - Investissement Prestations 12% - Extracommunautaire (+),taxes
+tag_lu_152,II.E.2. exonérées,taxes
+tag_lu_153,Base - Achat Prestations Exonérées - Extracommunautaire,taxes
+tag_lu_154,Base - Frais Prestations Exonérées - Extracommunautaire,taxes
+tag_lu_155,Base - Investissement Prestations Exonérées - Extracommunautaire,taxes
+tag_lu_156,II.E.2. base 17%,taxes
+tag_lu_157,Base - Achat Prestations 17% - Extracommunautaire (+),taxes
+tag_lu_158,Base - Frais Prestations 17% - Extracommunautaire (+),taxes
+tag_lu_159,Base - Investissement Prestations 17% - Extracommunautaire (+),taxes
+tag_lu_160,II.E.2. base 14%,taxes
+tag_lu_161,Base - Achat Prestations 14% - Extracommunautaire (+),taxes
+tag_lu_162,Base - Frais Prestations 14% - Extracommunautaire (+),taxes
+tag_lu_163,Base - Investissement Prestations 14% - Extracommunautaire (+),taxes
+tag_lu_164,II.E.2. base 8%,taxes
+tag_lu_165,Base - Achat Prestations 8% - Extracommunautaire (+),taxes
+tag_lu_166,Base - Frais Prestations 8% - Extracommunautaire (+),taxes
+tag_lu_167,Base - Investissement Prestations 8% - Extracommunautaire (+),taxes
+tag_lu_168,I.-II. CALCUL DU CHIFFRE D'AFFAIRE IMPOSABLE,taxes
+tag_lu_169,I.A. Chiffre d'affaires global,taxes
+tag_lu_170,I.B. Exonérations et montants déductibles,taxes
+tag_lu_171,I.B.2. Exportations (art.43/1/a et b),taxes
+tag_lu_172,Base - Vente Biens - Extracommunautaire,taxes
+tag_lu_173,I.B.3. Autres exonérations (art.43 et 60bis),taxes
+tag_lu_174,Base - Vente - Autres Exonérations (Article 43 et 60 bis),taxes
+tag_lu_175,I.B.4. Autres exonérations (art.44 et 56quater),taxes
+tag_lu_176,Base - Vente - Autres Exonérations (Article 44 et 56 quarter),taxes
+tag_lu_177,I.B.5. Tabacs fabriqués,taxes
+tag_lu_178,Base - Vente Biens Tabacs - Extracommunautaire,taxes
+tag_lu_179,Base - Vente Biens Tabacs - Intracommunautaire,taxes
+tag_lu_180,Base - Vente Biens Tabacs - Pays,taxes
+tag_lu_181,I.B.6.a) Livraisons subséquentes à des acquisitions intracommunautaires dans
+le cadre d'opérations triangulaires, lorsque le destinataire identifié à la TVA dans l'Etat membre de destination des biens y est le redevable de la taxe (4),taxes
+tag_lu_182,Base - Vente Biens – Triangulaire Intracommunautaire,taxes
+tag_lu_183,I.B.6.d) Autres opérations réalisées (imposables) à l'étranger,taxes
+tag_lu_184,Base - Vente Prestations - Extracommunautaire,taxes
+tag_lu_185,I.B.6.c) Opérations réalisées dans le cadre du régime particulier de l'article 56sexies,taxes
+tag_lu_186,I.B.7. Opérations à l'intérieur du pays pour lesquelles le preneur est le redevable,taxes
+tag_lu_187,I.B.6.b)1)  Prestations de services à des identifiés à la TVA dans un autre
+Etat membre non exonérées dans l'Etat membre du preneur redevable (art.17/1/b) (5),taxes
+tag_lu_188,Base - Vente Prestations - Intracommunautaire,taxes
+tag_lu_189,I.B.6.b)2)  Prestations de services à des identifiés à la TVA dans un autre
+Etat membre exonérées dans l'Etat membre du preneur (art.17/1/b),taxes
+tag_lu_190,Base - Vente Prestations - Intracommunautaire exonérées dans l'état membre,taxes
+tag_lu_191,I.B.1. Livraisons intracommunautaires de biens à des personnes identifiées à la TVA dans unautre Etat membre (art.43/1/d e et f) (3),taxes
+tag_lu_192,Base - Vente Biens - Intracommunautaire,taxes
+tag_lu_193,I.C. Chiffre d'affaires imposable,taxes
+tag_lu_194,II.A. Ventilation du chiffre d'affaires imposable – base,taxes
+tag_lu_195,II.A. base 15%,taxes
+tag_lu_196,Base - Vente Biens 15% - Pays,taxes
+tag_lu_197,Base - Vente Prestations 15% - Pays,taxes
+tag_lu_198,II.A. base 6%,taxes
+tag_lu_199,Base - Vente Biens 6% - Pays,taxes
+tag_lu_200,Base - Vente Prestations 6% - Pays,taxes
+tag_lu_201,II.A. base 3%,taxes
+tag_lu_202,Base - Vente Biens 3% - Pays,taxes
+tag_lu_203,Base - Vente Prestations 3% - Pays,taxes
+tag_lu_204,II.A. base 12%,taxes
+tag_lu_205,Base - Vente Biens 12% - Pays,taxes
+tag_lu_206,Base - Vente Prestations 12% - Pays,taxes
+tag_lu_207,II.A. base 0%,taxes
+tag_lu_208,Base - Vente Biens 0% - Pays,taxes
+tag_lu_209,Base - Vente Prestations 0% - Pays,taxes
+tag_lu_210,II.A. base 17%,taxes
+tag_lu_211,Base - Vente Biens 17% - Pays,taxes
+tag_lu_212,Base - Vente Prestations 17% - Pays,taxes
+tag_lu_213,II.A. base 14%,taxes
+tag_lu_214,Base - Vente Biens 14% - Pays,taxes
+tag_lu_215,Base - Vente Prestations 14% - Pays,taxes
+tag_lu_216,II.A. base 8%,taxes
+tag_lu_217,Base - Vente Biens 8% - Pays,taxes
+tag_lu_218,Base - Vente Prestations 8% - Pays,taxes
+tag_lu_219,Codes non assignés,taxes
+tag_lu_220,Base - Achat Biens 0% - Pays,taxes
+tag_lu_221,Base - Achat Biens 12% - Pays,taxes
+tag_lu_222,Base - Achat Biens 14% - Pays,taxes
+tag_lu_223,Base - Achat Biens 15% - Pays,taxes
+tag_lu_224,Base - Achat Biens 17% - Pays,taxes
+tag_lu_225,Base - Achat Biens 3% - Pays,taxes
+tag_lu_226,Base - Achat Biens 6% - Pays,taxes
+tag_lu_227,Base - Achat Biens 8% - Pays,taxes
+tag_lu_228,Base - Achat Prestations 0% - Pays,taxes
+tag_lu_229,Base - Achat Prestations 12% - Pays,taxes
+tag_lu_230,Base - Achat Prestations 14% - Pays,taxes
+tag_lu_231,Base - Achat Prestations 15% - Pays,taxes
+tag_lu_232,Base - Achat Prestations 17% - Pays,taxes
+tag_lu_233,Base - Achat Prestations 3% - Pays,taxes
+tag_lu_234,Base - Achat Prestations 6% - Pays,taxes
+tag_lu_235,Base - Achat Prestations 8% - Pays,taxes
+tag_lu_236,Base - Frais Biens 0% - Pays,taxes
+tag_lu_237,Base - Frais Biens 12% - Pays,taxes
+tag_lu_238,Base - Frais Biens 14% - Pays,taxes
+tag_lu_239,Base - Frais Biens 15% - Pays,taxes
+tag_lu_240,Base - Frais Biens 17% - Pays,taxes
+tag_lu_241,Base - Frais Biens 3% - Pays,taxes
+tag_lu_242,Base - Frais Biens 6% - Pays,taxes
+tag_lu_243,Base - Frais Biens 8% - Pays,taxes
+tag_lu_244,Base - Frais Prestations 0% - Pays,taxes
+tag_lu_245,Base - Frais Prestations 12% - Pays,taxes
+tag_lu_246,Base - Frais Prestations 14% - Pays,taxes
+tag_lu_247,Base - Frais Prestations 15% - Pays,taxes
+tag_lu_248,Base - Frais Prestations 17% - Pays,taxes
+tag_lu_249,Base - Frais Prestations 3% - Pays,taxes
+tag_lu_250,Base - Frais Prestations 6% - Pays,taxes
+tag_lu_251,Base - Frais Prestations 8% - Pays,taxes
+tag_lu_252,Base - Investissement Biens 0% - Pays,taxes
+tag_lu_253,Base - Investissement Biens 12% - Pays,taxes
+tag_lu_254,Base - Investissement Biens 14% - Pays,taxes
+tag_lu_255,Base - Investissement Biens 15% - Pays,taxes
+tag_lu_256,Base - Investissement Biens 17% - Pays,taxes
+tag_lu_257,Base - Investissement Biens 3% - Pays,taxes
+tag_lu_258,Base - Investissement Biens 6% - Pays,taxes
+tag_lu_259,Base - Investissement Biens 8% - Pays,taxes
+tag_lu_260,Base - Investissement Prestations 0% - Pays,taxes
+tag_lu_261,Base - Investissement Prestations 12% - Pays,taxes
+tag_lu_262,Base - Investissement Prestations 14% - Pays,taxes
+tag_lu_263,Base - Investissement Prestations 15% - Pays,taxes
+tag_lu_264,Base - Investissement Prestations 17% - Pays,taxes
+tag_lu_265,Base - Investissement Prestations 3% - Pays,taxes
+tag_lu_266,Base - Investissement Prestations 6% - Pays,taxes
+tag_lu_267,Base - Investissement Prestations 8% - Pays,taxes
+tag_lu_268,II.-III.-IV. CALCUL DE LA TAXE,taxes
+tag_lu_269,IV.C. Excédent,taxes
+tag_lu_270,IV.A. Total de la taxe en aval,taxes
+tag_lu_271,II.H. Total de la taxe en aval,taxes
+tag_lu_272,II.A. Ventilation du chiffre d'affaires imposable – taxe,taxes
+tag_lu_273,II.A. taxe 15%,taxes
+tag_lu_274,Taxe - Vente Biens 15% - Pays,taxes
+tag_lu_275,Taxe - Vente Prestations 15% - Pays,taxes
+tag_lu_276,II.A. taxe 6%,taxes
+tag_lu_277,Taxe - Vente Biens 6% - Pays,taxes
+tag_lu_278,Taxe - Vente Prestations 6% - Pays,taxes
+tag_lu_279,II.A. taxe 3%,taxes
+tag_lu_280,Taxe - Vente Biens 3% - Pays,taxes
+tag_lu_281,Taxe - Vente Prestations 3% - Pays,taxes
+tag_lu_282,II.A. taxe 12%,taxes
+tag_lu_283,Taxe - Vente Biens 12% - Pays,taxes
+tag_lu_284,Taxe - Vente Prestations 12% - Pays,taxes
+tag_lu_285,II.A. taxe 0%,taxes
+tag_lu_286,II.A. taxe 17%,taxes
+tag_lu_287,Taxe - Vente Biens 17% - Pays,taxes
+tag_lu_288,Taxe - Vente Prestations 17% - Pays,taxes
+tag_lu_289,II.A. taxe 14%,taxes
+tag_lu_290,Taxe - Vente Biens 14% - Pays,taxes
+tag_lu_291,Taxe - Vente Prestations 14% - Pays,taxes
+tag_lu_292,II.A. taxe 8%,taxes
+tag_lu_293,Taxe - Vente Biens 8% - Pays,taxes
+tag_lu_294,Taxe - Vente Prestations 8% - Pays,taxes
+tag_lu_295,II.B. Acquisitions intracommunautaires de biens – taxe,taxes
+tag_lu_296,II.B. taxe 15%,taxes
+tag_lu_297,Taxe - Achat Biens 15% - Intracommunautaire (+),taxes
+tag_lu_298,Taxe - Frais Biens 15% - Intracommunautaire (+),taxes
+tag_lu_299,Taxe - Investissement Biens 15% - Intracommunautaire (+),taxes
+tag_lu_300,II.B. taxe 6%,taxes
+tag_lu_301,Taxe - Achat Biens 6% - Intracommunautaire (+),taxes
+tag_lu_302,Taxe - Frais Biens 6% - Intracommunautaire (+),taxes
+tag_lu_303,Taxe - Investissement Biens 6% - Intracommunautaire (+),taxes
+tag_lu_304,II.B. taxe 3%,taxes
+tag_lu_305,Taxe - Achat Biens 3% - Intracommunautaire (+),taxes
+tag_lu_306,Taxe - Frais Biens 3% - Intracommunautaire (+),taxes
+tag_lu_307,Taxe - Investissement Biens 3% - Intracommunautaire (+),taxes
+tag_lu_308,II.B. taxe 12%,taxes
+tag_lu_309,Taxe - Achat Biens 12% - Intracommunautaire (+),taxes
+tag_lu_310,Taxe - Frais Biens 12% - Intracommunautaire (+),taxes
+tag_lu_311,Taxe - Investissement Biens 12% - Intracommunautaire (+),taxes
+tag_lu_312,II.B. taxe 17%,taxes
+tag_lu_313,Taxe - Achat Biens 17% - Intracommunautaire (+),taxes
+tag_lu_314,Taxe - Frais Biens 17% - Intracommunautaire (+),taxes
+tag_lu_315,Taxe - Investissement Biens 17% - Intracommunautaire (+),taxes
+tag_lu_316,II.B. taxe 14%,taxes
+tag_lu_317,Taxe - Achat Biens 14% - Intracommunautaire (+),taxes
+tag_lu_318,Taxe - Frais Biens 14% - Intracommunautaire (+),taxes
+tag_lu_319,Taxe - Investissement Biens 14% - Intracommunautaire (+),taxes
+tag_lu_320,II.B. taxe 8%,taxes
+tag_lu_321,Taxe - Achat Biens 8% - Intracommunautaire (+),taxes
+tag_lu_322,Taxe - Frais Biens 8% - Intracommunautaire (+),taxes
+tag_lu_323,Taxe - Investissement Biens 8% - Intracommunautaire (+),taxes
+tag_lu_324,II.D. Importations de biens – taxe,taxes
+tag_lu_325,II.D.1. taxe 15%,taxes
+tag_lu_326,Taxe - Achat Biens 15% - Extracommunautaire (+),taxes
+tag_lu_327,Taxe - Frais Biens 15% - Extracommunautaire (+),taxes
+tag_lu_328,Taxe - Investissement Biens 15% - Extracommunautaire (+),taxes
+tag_lu_329,II.D.1. taxe 6%,taxes
+tag_lu_330,Taxe - Achat Biens 6% - Extracommunautaire (+),taxes
+tag_lu_331,Taxe - Frais Biens 6% - Extracommunautaire (+),taxes
+tag_lu_332,Taxe - Investissement Biens 6% - Extracommunautaire (+),taxes
+tag_lu_333,II.D.1. taxe 3%,taxes
+tag_lu_334,Taxe - Achat Biens 3% - Extracommunautaire (+),taxes
+tag_lu_335,Taxe - Frais Biens 3% - Extracommunautaire (+),taxes
+tag_lu_336,Taxe - Investissement Biens 3% - Extracommunautaire (+),taxes
+tag_lu_337,II.D.1. taxe 12%,taxes
+tag_lu_338,Taxe - Achat Biens 12% - Extracommunautaire (+),taxes
+tag_lu_339,Taxe - Frais Biens 12% - Extracommunautaire (+),taxes
+tag_lu_340,Taxe - Investissement Biens 12% - Extracommunautaire (+),taxes
+tag_lu_341,II.D.2.. taxe 15%,taxes
+tag_lu_342,Taxe - Achat Biens 15% - Extracommunautaire fin privées (+),taxes
+tag_lu_343,Taxe - Frais Biens 15% - Extracommunautaire fin privées (+),taxes
+tag_lu_344,Taxe - Investissement Biens 15% - Extracommunautaire fin privées (+),taxes
+tag_lu_345,II.D.2.. taxe 6%,taxes
+tag_lu_346,Taxe - Achat Biens 6% - Extracommunautaire fin privées (+),taxes
+tag_lu_347,Taxe - Frais Biens 6% - Extracommunautaire fin privées (+),taxes
+tag_lu_348,Taxe - Investissement Biens 6% - Extracommunautaire fin privées (+),taxes
+tag_lu_349,II.D.2.. taxe 3%,taxes
+tag_lu_350,Taxe - Achat Biens 3% - Extracommunautaire fin privées (+),taxes
+tag_lu_351,Taxe - Frais Biens 3% - Extracommunautaire fin privées (+),taxes
+tag_lu_352,Taxe - Investissement Biens 3% - Extracommunautaire fin privées (+),taxes
+tag_lu_353,II.D.2.. taxe 12%,taxes
+tag_lu_354,Taxe - Achat Biens 12% - Extracommunautaire fin privées (+),taxes
+tag_lu_355,Taxe - Frais Biens 12% - Extracommunautaire fin privées (+),taxes
+tag_lu_356,Taxe - Investissement Biens 12% - Extracommunautaire fin privées (+),taxes
+tag_lu_357,II.D.1. taxe 17%,taxes
+tag_lu_358,Taxe - Achat Biens 17% - Extracommunautaire (+),taxes
+tag_lu_359,Taxe - Frais Biens 17% - Extracommunautaire (+),taxes
+tag_lu_360,Taxe - Investissement Biens 17% - Extracommunautaire (+),taxes
+tag_lu_361,II.D.1. taxe 14%,taxes
+tag_lu_362,Taxe - Achat Biens 14% - Extracommunautaire (+),taxes
+tag_lu_363,Taxe - Frais Biens 14% - Extracommunautaire (+),taxes
+tag_lu_364,Taxe - Investissement Biens 14% - Extracommunautaire (+),taxes
+tag_lu_365,II.D.1. taxe 8%,taxes
+tag_lu_366,Taxe - Achat Biens 8% - Extracommunautaire (+),taxes
+tag_lu_367,Taxe - Frais Biens 8% - Extracommunautaire (+),taxes
+tag_lu_368,Taxe - Investissement Biens 8% - Extracommunautaire (+),taxes
+tag_lu_369,II.D.2.. taxe 17%,taxes
+tag_lu_370,Taxe - Achat Biens 17% - Extracommunautaire fin privées (+),taxes
+tag_lu_371,Taxe - Frais Biens 17% - Extracommunautaire fin privées (+),taxes
+tag_lu_372,Taxe - Investissement Biens 17% - Extracommunautaire fin privées (+),taxes
+tag_lu_373,II.D.2.. taxe 14%,taxes
+tag_lu_374,Taxe - Achat Biens 14% - Extracommunautaire fin privées (+),taxes
+tag_lu_375,Taxe - Frais Biens 14% - Extracommunautaire fin privées (+),taxes
+tag_lu_376,Taxe - Investissement Biens 14% - Extracommunautaire fin privées (+),taxes
+tag_lu_377,II.D.2.. taxe 8%,taxes
+tag_lu_378,Taxe - Achat Biens 8% - Extracommunautaire fin privées (+),taxes
+tag_lu_379,Taxe - Frais Biens 8% - Extracommunautaire fin privées (+),taxes
+tag_lu_380,Taxe - Investissement Biens 8% - Extracommunautaire fin privées (+),taxes
+tag_lu_381,II.E. Prestations de services à déclarer par le preneur redevable de la taxe– base,taxes
+tag_lu_382,II.E.1.a) taxe,taxes
+tag_lu_383,II.E.1.a) taxe 15%,taxes
+tag_lu_384,Taxe - Achat Prestations 15% - Intracommunautaire (+),taxes
+tag_lu_385,Taxe - Frais Prestations 15% - Intracommunautaire (+),taxes
+tag_lu_386,Taxe - Investissement Prestations 15% - Intracommunautaire (+),taxes
+tag_lu_387,II.E.1.a) taxe 6%,taxes
+tag_lu_388,Taxe - Achat Prestations 6% - Intracommunautaire (+),taxes
+tag_lu_389,Taxe - Frais Prestations 6% - Intracommunautaire (+),taxes
+tag_lu_390,Taxe - Investissement Prestations 6% - Intracommunautaire (+),taxes
+tag_lu_391,II.E.1.a) taxe 3%,taxes
+tag_lu_392,Taxe - Achat Prestations 3% - Intracommunautaire (+),taxes
+tag_lu_393,Taxe - Frais Prestations 3% - Intracommunautaire (+),taxes
+tag_lu_394,Taxe - Investissement Prestations 3% - Intracommunautaire (+),taxes
+tag_lu_395,II.E.1.a) taxe 12%,taxes
+tag_lu_396,Taxe - Achat Prestations 12% - Intracommunautaire (+),taxes
+tag_lu_397,Taxe - Frais Prestations 12% - Intracommunautaire (+),taxes
+tag_lu_398,Taxe - Investissement Prestations 12% - Intracommunautaire (+),taxes
+tag_lu_399,II.E.1.a) taxe 17%,taxes
+tag_lu_400,Taxe - Achat Prestations 17% - Intracommunautaire (+),taxes
+tag_lu_401,Taxe - Frais Prestations 17% - Intracommunautaire (+),taxes
+tag_lu_402,Taxe - Investissement Prestations 17% - Intracommunautaire (+),taxes
+tag_lu_403,II.E.1.a) taxe 14%,taxes
+tag_lu_404,Taxe - Achat Prestations 14% - Intracommunautaire (+),taxes
+tag_lu_405,Taxe - Frais Prestations 14% - Intracommunautaire (+),taxes
+tag_lu_406,Taxe - Investissement Prestations 14% - Intracommunautaire (+),taxes
+tag_lu_407,II.E.1.a) taxe 8%,taxes
+tag_lu_408,Taxe - Achat Prestations 8% - Intracommunautaire (+),taxes
+tag_lu_409,Taxe - Frais Prestations 8% - Intracommunautaire (+),taxes
+tag_lu_410,Taxe - Investissement Prestations 8% - Intracommunautaire (+),taxes
+tag_lu_411,II.E.2. taxe,taxes
+tag_lu_412,II.E.2. taxe 15%,taxes
+tag_lu_413,Taxe - Achat Prestations 15% - Extracommunautaire (+),taxes
+tag_lu_414,Taxe - Frais Prestations 15% - Extracommunautaire (+),taxes
+tag_lu_415,Taxe - Investissement Prestations 15% - Extracommunautaire (+),taxes
+tag_lu_416,II.E.2. taxe 6%,taxes
+tag_lu_417,Taxe - Achat Prestations 6% - Extracommunautaire (+),taxes
+tag_lu_418,Taxe - Frais Prestations 6% - Extracommunautaire (+),taxes
+tag_lu_419,Taxe - Investissement Prestations 6% - Extracommunautaire (+),taxes
+tag_lu_420,II.E.2. taxe 3%,taxes
+tag_lu_421,Taxe - Achat Prestations 3% - Extracommunautaire (+),taxes
+tag_lu_422,Taxe - Frais Prestations 3% - Extracommunautaire (+),taxes
+tag_lu_423,Taxe - Investissement Prestations 3% - Extracommunautaire (+),taxes
+tag_lu_424,II.E.2. taxe 12%,taxes
+tag_lu_425,Taxe - Achat Prestations 12% - Extracommunautaire (+),taxes
+tag_lu_426,Taxe - Frais Prestations 12% - Extracommunautaire (+),taxes
+tag_lu_427,Taxe - Investissement Prestations 12% - Extracommunautaire (+),taxes
+tag_lu_428,II.E.2. taxe 17%,taxes
+tag_lu_429,Taxe - Achat Prestations 17% - Extracommunautaire (+),taxes
+tag_lu_430,Taxe - Frais Prestations 17% - Extracommunautaire (+),taxes
+tag_lu_431,Taxe - Investissement Prestations 17% - Extracommunautaire (+),taxes
+tag_lu_432,II.E.2. taxe 14%,taxes
+tag_lu_433,Taxe - Achat Prestations 14% - Extracommunautaire (+),taxes
+tag_lu_434,Taxe - Frais Prestations 14% - Extracommunautaire (+),taxes
+tag_lu_435,Taxe - Investissement Prestations 14% - Extracommunautaire (+),taxes
+tag_lu_436,II.E.2. taxe 8%,taxes
+tag_lu_437,Taxe - Achat Prestations 8% - Extracommunautaire (+),taxes
+tag_lu_438,Taxe - Frais Prestations 8% - Extracommunautaire (+),taxes
+tag_lu_439,Taxe - Investissement Prestations 8% - Extracommunautaire (+),taxes
+tag_lu_440,IV.A. Total de la taxe en amont déductible,taxes
+tag_lu_441,III.C. Total de la taxe en amont déductible,taxes
+tag_lu_442,III.A. Total de la taxe en amont,taxes
+tag_lu_443,III.A.4. Affectations de biens (art.48/1/d),taxes
+tag_lu_444,III.A.6. Taxe acquittée comme caution solidaire,taxes
+tag_lu_445,III.A.7. Taxe régularisée - régime particulier suspensif (art.60bis/9 al. 2),taxes
+tag_lu_446,III.A.1. Achats de biens et de services à l'intérieur du pays (art.48/1/a),taxes
+tag_lu_447,Taxe - Achat Biens 12% - Pays,taxes
+tag_lu_448,Taxe - Achat Biens 14% - Pays,taxes
+tag_lu_449,Taxe - Achat Biens 15% - Pays,taxes
+tag_lu_450,Taxe - Achat Biens 17% - Pays,taxes
+tag_lu_451,Taxe - Achat Biens 3% - Pays,taxes
+tag_lu_452,Taxe - Achat Biens 6% - Pays,taxes
+tag_lu_453,Taxe - Achat Biens 8% - Pays,taxes
+tag_lu_454,Taxe - Achat Prestations 12% - Pays,taxes
+tag_lu_456,Taxe - Achat Prestations 14% - Pays,taxes
+tag_lu_457,Taxe - Achat Prestations 15% - Pays,taxes
+tag_lu_458,Taxe - Achat Prestations 17% - Pays,taxes
+tag_lu_459,Taxe - Achat Prestations 3% - Pays,taxes
+tag_lu_460,Taxe - Achat Prestations 6% - Pays,taxes
+tag_lu_461,Taxe - Achat Prestations 8% - Pays,taxes
+tag_lu_462,Taxe - Frais Biens 12% - Pays,taxes
+tag_lu_463,Taxe - Frais Biens 14% - Pays,taxes
+tag_lu_464,Taxe - Frais Biens 15% - Pays,taxes
+tag_lu_465,Taxe - Frais Biens 17% - Pays,taxes
+tag_lu_466,Taxe - Frais Biens 3% - Pays,taxes
+tag_lu_467,Taxe - Frais Biens 6% - Pays,taxes
+tag_lu_468,Taxe - Frais Biens 8% - Pays,taxes
+tag_lu_469,Taxe - Frais Prestations 12% - Pays,taxes
+tag_lu_470,Taxe - Frais Prestations 14% - Pays,taxes
+tag_lu_471,Taxe - Frais Prestations 15% - Pays,taxes
+tag_lu_472,Taxe - Frais Prestations 17% - Pays,taxes
+tag_lu_473,Taxe - Frais Prestations 3% - Pays,taxes
+tag_lu_474,Taxe - Frais Prestations 6% - Pays,taxes
+tag_lu_475,Taxe - Frais Prestations 8% - Pays,taxes
+tag_lu_476,Taxe - Investissement Biens 12% - Pays,taxes
+tag_lu_477,Taxe - Investissement Biens 14% - Pays,taxes
+tag_lu_478,Taxe - Investissement Biens 15% - Pays,taxes
+tag_lu_479,Taxe - Investissement Biens 17% - Pays,taxes
+tag_lu_480,Taxe - Investissement Biens 3% - Pays,taxes
+tag_lu_481,Taxe - Investissement Biens 6% - Pays,taxes
+tag_lu_482,Taxe - Investissement Biens 8% - Pays,taxes
+tag_lu_483,Taxe - Investissement Prestations 12% - Pays,taxes
+tag_lu_484,Taxe - Investissement Prestations 14% - Pays,taxes
+tag_lu_485,Taxe - Investissement Prestations 15% - Pays,taxes
+tag_lu_486,Taxe - Investissement Prestations 17% - Pays,taxes
+tag_lu_487,Taxe - Investissement Prestations 3% - Pays,taxes
+tag_lu_488,Taxe - Investissement Prestations 6% - Pays,taxes
+tag_lu_489,Taxe - Investissement Prestations 8% - Pays,taxes
+tag_lu_490,III.A.2. Acquisitions intracommunautaires de biens (art.48/1/b),taxes
+tag_lu_491,Taxe - Achat Biens 12% - Intracommunautaire (-),taxes
+tag_lu_492,Taxe - Achat Biens 14% - Intracommunautaire (-),taxes
+tag_lu_493,Taxe - Achat Biens 15% - Intracommunautaire (-),taxes
+tag_lu_494,Taxe - Achat Biens 17% - Intracommunautaire (-),taxes
+tag_lu_495,Taxe - Achat Biens 3% - Intracommunautaire (-),taxes
+tag_lu_496,Taxe - Achat Biens 6% - Intracommunautaire (-),taxes
+tag_lu_497,Taxe - Achat Biens 8% - Intracommunautaire (-),taxes
+tag_lu_498,Taxe - Frais Biens 12% - Intracommunautaire (-),taxes
+tag_lu_499,Taxe - Frais Biens 14% - Intracommunautaire (-),taxes
+tag_lu_500,Taxe - Frais Biens 15% - Intracommunautaire (-),taxes
+tag_lu_501,Taxe - Frais Biens 17% - Intracommunautaire (-),taxes
+tag_lu_502,Taxe - Frais Biens 3% - Intracommunautaire (-),taxes
+tag_lu_503,Taxe - Frais Biens 6% - Intracommunautaire (-),taxes
+tag_lu_504,Taxe - Frais Biens 8% - Intracommunautaire (-),taxes
+tag_lu_505,Taxe - Investissement Biens 12% - Intracommunautaire (-),taxes
+tag_lu_506,Taxe - Investissement Biens 14% - Intracommunautaire (-),taxes
+tag_lu_507,Taxe - Investissement Biens 15% - Intracommunautaire (-),taxes
+tag_lu_508,Taxe - Investissement Biens 17% - Intracommunautaire (-),taxes
+tag_lu_509,Taxe - Investissement Biens 3% - Intracommunautaire (-),taxes
+tag_lu_510,Taxe - Investissement Biens 6% - Intracommunautaire (-),taxes
+tag_lu_511,Taxe - Investissement Biens 8% - Intracommunautaire (-),taxes
+tag_lu_512,III.A.3. Importations de biens (taxe déclarée ou payée) (art.48/1/c),taxes
+tag_lu_513,Taxe - Achat Biens 12% - Extracommunautaire (-),taxes
+tag_lu_514,Taxe - Achat Biens 14% - Extracommunautaire (-),taxes
+tag_lu_515,Taxe - Achat Biens 15% - Extracommunautaire (-),taxes
+tag_lu_516,Taxe - Achat Biens 17% - Extracommunautaire (-),taxes
+tag_lu_517,Taxe - Achat Biens 3% - Extracommunautaire (-),taxes
+tag_lu_518,Taxe - Achat Biens 6% - Extracommunautaire (-),taxes
+tag_lu_519,Taxe - Achat Biens 8% - Extracommunautaire (-),taxes
+tag_lu_520,Taxe - Achat Biens 12% - Extracommunautaire fin privées (-),taxes
+tag_lu_521,Taxe - Achat Biens 14% - Extracommunautaire fin privées (-),taxes
+tag_lu_522,Taxe - Achat Biens 15% - Extracommunautaire fin privées (-),taxes
+tag_lu_523,Taxe - Achat Biens 17% - Extracommunautaire fin privées (-),taxes
+tag_lu_524,Taxe - Achat Biens 3% - Extracommunautaire fin privées (-),taxes
+tag_lu_525,Taxe - Achat Biens 6% - Extracommunautaire fin privées (-),taxes
+tag_lu_526,Taxe - Achat Biens 8% - Extracommunautaire fin privées (-),taxes
+tag_lu_527,Taxe - Frais Biens 12% - Extracommunautaire (-),taxes
+tag_lu_528,Taxe - Frais Biens 14% - Extracommunautaire (-),taxes
+tag_lu_529,Taxe - Frais Biens 15% - Extracommunautaire (-),taxes
+tag_lu_530,Taxe - Frais Biens 17% - Extracommunautaire (-),taxes
+tag_lu_531,Taxe - Frais Biens 3% - Extracommunautaire (-),taxes
+tag_lu_532,Taxe - Frais Biens 6% - Extracommunautaire (-),taxes
+tag_lu_533,Taxe - Frais Biens 8% - Extracommunautaire (-),taxes
+tag_lu_534,Taxe - Frais Biens 12% - Extracommunautaire fin privées (-),taxes
+tag_lu_535,Taxe - Frais Biens 14% - Extracommunautaire fin privées (-),taxes
+tag_lu_536,Taxe - Frais Biens 15% - Extracommunautaire fin privées (-),taxes
+tag_lu_537,Taxe - Frais Biens 17% - Extracommunautaire fin privées (-),taxes
+tag_lu_538,Taxe - Frais Biens 3% - Extracommunautaire fin privées (-),taxes
+tag_lu_539,Taxe - Frais Biens 6% - Extracommunautaire fin privées (-),taxes
+tag_lu_540,Taxe - Frais Biens 8% - Extracommunautaire fin privées (-),taxes
+tag_lu_541,Taxe - Investissement Biens 12% - Extracommunautaire (-),taxes
+tag_lu_542,Taxe - Investissement Biens 14% - Extracommunautaire (-),taxes
+tag_lu_543,Taxe - Investissement Biens 15% - Extracommunautaire (-),taxes
+tag_lu_544,Taxe - Investissement Biens 17% - Extracommunautaire (-),taxes
+tag_lu_545,Taxe - Investissement Biens 3% - Extracommunautaire (-),taxes
+tag_lu_546,Taxe - Investissement Biens 6% - Extracommunautaire (-),taxes
+tag_lu_547,Taxe - Investissement Biens 8% - Extracommunautaire (-),taxes
+tag_lu_548,Taxe - Investissement Biens 12% - Extracommunautaire fin privées (-),taxes
+tag_lu_549,Taxe - Investissement Biens 14% - Extracommunautaire fin privées (-),taxes
+tag_lu_550,Taxe - Investissement Biens 15% - Extracommunautaire fin privées (-),taxes
+tag_lu_551,Taxe - Investissement Biens 17% - Extracommunautaire fin privées (-),taxes
+tag_lu_552,Taxe - Investissement Biens 3% - Extracommunautaire fin privées (-),taxes
+tag_lu_553,Taxe - Investissement Biens 6% - Extracommunautaire fin privées (-),taxes
+tag_lu_554,Taxe - Investissement Biens 8% - Extracommunautaire fin privées (-),taxes
+tag_lu_555,III.A.5. Taxe déclarée comme débiteur (voir points II.E et F),taxes
+tag_lu_556,Taxe - Achat Prestations 12% - Extracommunautaire (-),taxes
+tag_lu_557,Taxe - Achat Prestations 14% - Extracommunautaire (-),taxes
+tag_lu_558,Taxe - Achat Prestations 15% - Extracommunautaire (-),taxes
+tag_lu_559,Taxe - Achat Prestations 17% - Extracommunautaire (-),taxes
+tag_lu_560,Taxe - Achat Prestations 3% - Extracommunautaire (-),taxes
+tag_lu_561,Taxe - Achat Prestations 6% - Extracommunautaire (-),taxes
+tag_lu_562,Taxe - Achat Prestations 8% - Extracommunautaire (-),taxes
+tag_lu_563,Taxe - Achat Prestations 12% - Intracommunautaire (-),taxes
+tag_lu_564,Taxe - Achat Prestations 14% - Intracommunautaire (-),taxes
+tag_lu_565,Taxe - Achat Prestations 15% - Intracommunautaire (-),taxes
+tag_lu_566,Taxe - Achat Prestations 17% - Intracommunautaire (-),taxes
+tag_lu_567,Taxe - Achat Prestations 3% - Intracommunautaire (-),taxes
+tag_lu_568,Taxe - Achat Prestations 6% - Intracommunautaire (-),taxes
+tag_lu_569,Taxe - Achat Prestations 8% - Intracommunautaire (-),taxes
+tag_lu_570,Taxe - Frais Prestations 12% - Extracommunautaire (-),taxes
+tag_lu_571,Taxe - Frais Prestations 14% - Extracommunautaire (-),taxes
+tag_lu_572,Taxe - Frais Prestations 15% - Extracommunautaire (-),taxes
+tag_lu_573,Taxe - Frais Prestations 17% - Extracommunautaire (-),taxes
+tag_lu_574,Taxe - Frais Prestations 3% - Extracommunautaire (-),taxes
+tag_lu_575,Taxe - Frais Prestations 6% - Extracommunautaire (-),taxes
+tag_lu_576,Taxe - Frais Prestations 8% - Extracommunautaire (-),taxes
+tag_lu_577,Taxe - Frais Prestations 12% - Intracommunautaire (-),taxes
+tag_lu_578,Taxe - Frais Prestations 14% - Intracommunautaire (-),taxes
+tag_lu_579,Taxe - Frais Prestations 15% - Intracommunautaire (-),taxes
+tag_lu_580,Taxe - Frais Prestations 17% - Intracommunautaire (-),taxes
+tag_lu_581,Taxe - Frais Prestations 3% - Intracommunautaire (-),taxes
+tag_lu_582,Taxe - Frais Prestations 6% - Intracommunautaire (-),taxes
+tag_lu_583,Taxe - Frais Prestations 8% - Intracommunautaire (-),taxes
+tag_lu_584,Taxe - Investissement Prestations 12% - Extracommunautaire (-),taxes
+tag_lu_585,Taxe - Investissement Prestations 14% - Extracommunautaire (-),taxes
+tag_lu_586,Taxe - Investissement Prestations 15% - Extracommunautaire (-),taxes
+tag_lu_587,Taxe - Investissement Prestations 17% - Extracommunautaire (-),taxes
+tag_lu_588,Taxe - Investissement Prestations 3% - Extracommunautaire (-),taxes
+tag_lu_589,Taxe - Investissement Prestations 6% - Extracommunautaire (-),taxes
+tag_lu_590,Taxe - Investissement Prestations 8% - Extracommunautaire (-),taxes
+tag_lu_591,Taxe - Investissement Prestations 12% - Intracommunautaire (-),taxes
+tag_lu_592,Taxe - Investissement Prestations 14% - Intracommunautaire (-),taxes
+tag_lu_593,Taxe - Investissement Prestations 15% - Intracommunautaire (-),taxes
+tag_lu_594,Taxe - Investissement Prestations 17% - Intracommunautaire (-),taxes
+tag_lu_595,Taxe - Investissement Prestations 3% - Intracommunautaire (-),taxes
+tag_lu_596,Taxe - Investissement Prestations 6% - Intracommunautaire (-),taxes
+tag_lu_597,Taxe - Investissement Prestations 8% - Intracommunautaire (-),taxes
+tag_lu_598,Base - Sans Taxe,taxes
\ No newline at end of file
diff --git a/addons/l10n_lu/account.tax.template-2015.csv b/addons/l10n_lu/account.tax.template-2015.csv
index 9d614d72e34..704a943502e 100644
--- a/addons/l10n_lu/account.tax.template-2015.csv
+++ b/addons/l10n_lu/account.tax.template-2015.csv
@@ -1,408 +1,408 @@
 id,name,description,type_tax_use,amount_type,amount,account_id:id,refund_account_id:id,chart_template_id:id,sequence,"children_tax_ids:id",tag_ids:id
-lu_2011_tax_AB-EC-0,Achat Biens Exonéré - Extracommunautaire,AB-EC-0,purchase,percent,0,,,lu_2011_chart_1,101,,tag_AB_EC_0
-lu_2011_tax_AB-EC-12-n,Achat Biens 12% - Extracommunautaire (-),AB-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1103,,tag_AB_EC_12_n
-lu_2011_tax_AB-EC-12-p,Achat Biens 12% - Extracommunautaire (+),AB-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1104,,tag_AB_EC_12_p
-lu_2011_tax_AB-EC-12,Achat Biens 12% - Extracommunautaire,AB-EC-12,purchase,group,1,,,lu_2011_chart_1,102,"lu_2011_tax_AB-EC-12-n,lu_2011_tax_AB-EC-12-p",tag_AB_EC_12
-lu_2015_tax_AB-EC-14-n,Achat Biens 14% - Extracommunautaire (-),AB-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1106,,tag_AB_EC_14_n
-lu_2015_tax_AB-EC-14-p,Achat Biens 14% - Extracommunautaire (+),AB-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1107,,tag_AB_EC_14_p
-lu_2015_tax_AB-EC-14,Achat Biens 14% - Extracommunautaire,AB-EC-14,purchase,group,1,,,lu_2011_chart_1,105,"lu_2015_tax_AB-EC-14-n,lu_2015_tax_AB-EC-14-p",tag_AB_EC_14
-lu_2011_tax_AB-EC-15-n,Achat Biens 15% - Extracommunautaire (-),AB-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1109,,tag_AB_EC_15_n
-lu_2011_tax_AB-EC-15-p,Achat Biens 15% - Extracommunautaire (+),AB-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1110,,tag_AB_EC_15_p
-lu_2011_tax_AB-EC-15,Achat Biens 15% - Extracommunautaire,AB-EC-15,purchase,group,100,,,lu_2011_chart_1,108,"lu_2011_tax_AB-EC-15-n,lu_2011_tax_AB-EC-15-p",tag_AB_EC_15
-lu_2015_tax_AB-EC-17-n,Achat Biens 17% - Extracommunautaire (-),AB-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1112,,tag_AB_EC_17_n
-lu_2015_tax_AB-EC-17-p,Achat Biens 17% - Extracommunautaire (+),AB-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1113,,tag_AB_EC_17_p
-lu_2015_tax_AB-EC-17,Achat Biens 17% - Extracommunautaire,AB-EC-17,purchase,group,100,,,lu_2011_chart_1,111,"lu_2015_tax_AB-EC-17-n,lu_2015_tax_AB-EC-17-p",tag_AB_EC_17
-lu_2011_tax_AB-EC-3-n,Achat Biens 3% - Extracommunautaire (-),AB-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1115,,tag_AB_EC_3_n
-lu_2011_tax_AB-EC-3-p,Achat Biens 3% - Extracommunautaire (+),AB-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1116,,tag_AB_EC_3_p
-lu_2011_tax_AB-EC-3,Achat Biens 3% - Extracommunautaire,AB-EC-3,purchase,group,100,,,lu_2011_chart_1,114,"lu_2011_tax_AB-EC-3-n,lu_2011_tax_AB-EC-3-p",tag_AB_EC_3
-lu_2011_tax_AB-EC-6-n,Achat Biens 6% - Extracommunautaire (-),AB-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1118,,tag_AB_EC_6_n
-lu_2011_tax_AB-EC-6-p,Achat Biens 6% - Extracommunautaire (+),AB-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1119,,tag_AB_EC_6_p
-lu_2011_tax_AB-EC-6,Achat Biens 6% - Extracommunautaire,AB-EC-6,purchase,group,100,,,lu_2011_chart_1,117,"lu_2011_tax_AB-EC-6-n,lu_2011_tax_AB-EC-6-p",tag_AB_EC_6
-lu_2015_tax_AB-EC-8-n,Achat Biens 8% - Extracommunautaire (-),AB-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1121,,tag_AB_EC_8_n
-lu_2015_tax_AB-EC-8-p,Achat Biens 8% - Extracommunautaire (+),AB-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1122,,tag_AB_EC_8_p
-lu_2015_tax_AB-EC-8,Achat Biens 8% - Extracommunautaire,AB-EC-8,purchase,group,100,,,lu_2011_chart_1,120,"lu_2015_tax_AB-EC-8-n,lu_2015_tax_AB-EC-8-p",tag_AB_EC_8
-lu_2015_tax_AB-ECP-0,Achat Biens Exonéré - Extracommunautaire fin privées,AB-ECP-0,purchase,percent,0,,,lu_2011_chart_1,123,,tag_AB_ECP_0
-lu_2015_tax_AB-ECP-12-n,Achat Biens 12% - Extracommunautaire fin privées (-),AB-ECP-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1125,,tag_AB_ECP_12_n
-lu_2015_tax_AB-ECP-12-p,Achat Biens 12% - Extracommunautaire fin privées (+),AB-ECP-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1126,,tag_AB_ECP_12_p
-lu_2015_tax_AB-ECP-12,Achat Biens 12% - Extracommunautaire fin privées,AB-ECP-12,purchase,group,100,,,lu_2011_chart_1,124,"lu_2015_tax_AB-ECP-12-n,lu_2015_tax_AB-ECP-12-p",tag_AB_ECP_12
-lu_2015_tax_AB-ECP-14-n,Achat Biens 14% - Extracommunautaire fin privées (-),AB-ECP-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1128,,tag_AB_ECP_14_n
-lu_2015_tax_AB-ECP-14-p,Achat Biens 14% - Extracommunautaire fin privées (+),AB-ECP-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1129,,tag_AB_ECP_14_p
-lu_2015_tax_AB-ECP-14,Achat Biens 14% - Extracommunautaire fin privées,AB-ECP-14,purchase,group,100,,,lu_2011_chart_1,127,"lu_2015_tax_AB-ECP-14-n,lu_2015_tax_AB-ECP-14-p",tag_AB_ECP_14
-lu_2015_tax_AB-ECP-15-n,Achat Biens 15% - Extracommunautaire fin privées (-),AB-ECP-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1131,,tag_AB_ECP_15_n
-lu_2015_tax_AB-ECP-15-p,Achat Biens 15% - Extracommunautaire fin privées (+),AB-ECP-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1132,,tag_AB_ECP_15_p
-lu_2015_tax_AB-ECP-15,Achat Biens 15% - Extracommunautaire fin privées,AB-ECP-15,purchase,group,100,,,lu_2011_chart_1,130,"lu_2015_tax_AB-ECP-15-n,lu_2015_tax_AB-ECP-15-p",tag_AB_ECP_15
-lu_2015_tax_AB-ECP-17-n,Achat Biens 17% - Extracommunautaire fin privées (-),AB-ECP-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1134,,tag_AB_ECP_17_n
-lu_2015_tax_AB-ECP-17-p,Achat Biens 17% - Extracommunautaire fin privées (+),AB-ECP-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1135,,tag_AB_ECP_17_p
-lu_2015_tax_AB-ECP-17,Achat Biens 17% - Extracommunautaire fin privées,AB-ECP-17,purchase,group,100,,,lu_2011_chart_1,133,"lu_2015_tax_AB-ECP-17-n,lu_2015_tax_AB-ECP-17-p",tag_AB_ECP_17
-lu_2015_tax_AB-ECP-3-n,Achat Biens 3% - Extracommunautaire fin privées (-),AB-ECP-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1137,,tag_AB_ECP_3_n
-lu_2015_tax_AB-ECP-3-p,Achat Biens 3% - Extracommunautaire fin privées (+),AB-ECP-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1138,,tag_AB_ECP_3_p
-lu_2015_tax_AB-ECP-3,Achat Biens 3% - Extracommunautaire fin privées,AB-ECP-3,purchase,group,100,,,lu_2011_chart_1,136,"lu_2015_tax_AB-ECP-3-n,lu_2015_tax_AB-ECP-3-p",tag_AB_ECP_3
-lu_2015_tax_AB-ECP-6-n,Achat Biens 6% - Extracommunautaire fin privées (-),AB-ECP-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1140,,tag_AB_ECP_6_n
-lu_2015_tax_AB-ECP-6-p,Achat Biens 6% - Extracommunautaire fin privées (+),AB-ECP-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1141,,tag_AB_ECP_6_p
-lu_2015_tax_AB-ECP-6,Achat Biens 6% - Extracommunautaire fin privées,AB-ECP-6,purchase,group,100,,,lu_2011_chart_1,139,"lu_2015_tax_AB-ECP-6-n,lu_2015_tax_AB-ECP-6-p",tag_AB_ECP_6
-lu_2015_tax_AB-ECP-8-n,Achat Biens 8% - Extracommunautaire fin privées (-),AB-ECP-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1143,,tag_AB_ECP_8_n
-lu_2015_tax_AB-ECP-8-p,Achat Biens 8% - Extracommunautaire fin privées (+),AB-ECP-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1144,,tag_AB_ECP_8_p
-lu_2015_tax_AB-ECP-8,Achat Biens 8% - Extracommunautaire fin privées,AB-ECP-8,purchase,group,100,,,lu_2011_chart_1,142,"lu_2015_tax_AB-ECP-8-n,lu_2015_tax_AB-ECP-8-p",tag_AB_ECP_8
-lu_2011_tax_AB-IC-0,Achat Biens Exonéré - Intracommunautaire,AB-IC-0,purchase,percent,0,,,lu_2011_chart_1,145,,tag_AB_IC_0
-lu_2011_tax_AB-IC-12-n,Achat Biens 12% - Intracommunautaire (-),AB-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1147,,tag_AB_IC_12_n
-lu_2011_tax_AB-IC-12-p,Achat Biens 12% - Intracommunautaire (+),AB-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1148,,tag_AB_IC_12_p
-lu_2011_tax_AB-IC-12,Achat Biens 12% - Intracommunautaire,AB-IC-12,purchase,group,100,,,lu_2011_chart_1,146,"lu_2011_tax_AB-IC-12-n,lu_2011_tax_AB-IC-12-p",tag_AB_IC_12
-lu_2015_tax_AB-IC-14-n,Achat Biens 14% - Intracommunautaire (-),AB-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1150,,tag_AB_IC_14_n
-lu_2015_tax_AB-IC-14-p,Achat Biens 14% - Intracommunautaire (+),AB-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1151,,tag_AB_IC_14_p
-lu_2015_tax_AB-IC-14,Achat Biens 14% - Intracommunautaire,AB-IC-14,purchase,group,100,,,lu_2011_chart_1,149,"lu_2015_tax_AB-IC-14-n,lu_2015_tax_AB-IC-14-p",tag_AB_IC_14
-lu_2011_tax_AB-IC-15-n,Achat Biens 15% - Intracommunautaire (-),AB-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1153,,tag_AB_IC_15_n
-lu_2011_tax_AB-IC-15-p,Achat Biens 15% - Intracommunautaire (+),AB-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1154,,tag_AB_IC_15_p
-lu_2011_tax_AB-IC-15,Achat Biens 15% - Intracommunautaire,AB-IC-15,purchase,group,100,,,lu_2011_chart_1,152,"lu_2011_tax_AB-IC-15-n,lu_2011_tax_AB-IC-15-p",tag_AB_IC_15
-lu_2015_tax_AB-IC-17-n,Achat Biens 17% - Intracommunautaire (-),AB-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1156,,tag_AB_IC_17_n
-lu_2015_tax_AB-IC-17-p,Achat Biens 17% - Intracommunautaire (+),AB-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1157,,tag_AB_IC_17_p
-lu_2015_tax_AB-IC-17,Achat Biens 17% - Intracommunautaire,AB-IC-17,purchase,group,100,,,lu_2011_chart_1,155,"lu_2015_tax_AB-IC-17-n,lu_2015_tax_AB-IC-17-p",tag_AB_IC_17
-lu_2011_tax_AB-IC-3-n,Achat Biens 3% - Intracommunautaire (-),AB-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1159,,tag_AB_IC_3_n
-lu_2011_tax_AB-IC-3-p,Achat Biens 3% - Intracommunautaire (+),AB-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1160,,tag_AB_IC_3_p
-lu_2011_tax_AB-IC-3,Achat Biens 3% - Intracommunautaire,AB-IC-3,purchase,group,100,,,lu_2011_chart_1,158,"lu_2011_tax_AB-IC-3-n,lu_2011_tax_AB-IC-3-p",tag_AB_IC_3
-lu_2011_tax_AB-IC-6-n,Achat Biens 6% - Intracommunautaire (-),AB-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1162,,tag_AB_IC_6_n
-lu_2011_tax_AB-IC-6-p,Achat Biens 6% - Intracommunautaire (+),AB-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1163,,tag_AB_IC_6_p
-lu_2011_tax_AB-IC-6,Achat Biens 6% - Intracommunautaire,AB-IC-6,purchase,group,100,,,lu_2011_chart_1,161,"lu_2011_tax_AB-IC-6-n,lu_2011_tax_AB-IC-6-p",tag_AB_IC_6
-lu_2015_tax_AB-IC-8-n,Achat Biens 8% - Intracommunautaire (-),AB-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1165,,tag_AB_IC_8_n
-lu_2015_tax_AB-IC-8-p,Achat Biens 8% - Intracommunautaire (+),AB-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1166,,tag_AB_IC_8_p
-lu_2015_tax_AB-IC-8,Achat Biens 8% - Intracommunautaire,AB-IC-8,purchase,group,100,,,lu_2011_chart_1,164,"lu_2015_tax_AB-IC-8-n,lu_2015_tax_AB-IC-8-p",tag_AB_IC_8
-lu_2011_tax_AB-PA-0,Achat Biens 0% - Pays,AB-PA-0,purchase,percent,0,,,lu_2011_chart_1,167,,tag_AB_PA_0
-lu_2011_tax_AB-PA-12,Achat Biens 12% - Pays,AB-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,168,,tag_AB_PA_12
-lu_2015_tax_AB-PA-14,Achat Biens 14% - Pays,AB-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,169,,tag_AB_PA_14
-lu_2011_tax_AB-PA-15,Achat Biens 15% - Pays,AB-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,170,,tag_AB_PA_15
-lu_2015_tax_AB-PA-17,Achat Biens 17% - Pays,AB-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,171,,tag_AB_PA_17
-lu_2011_tax_AB-PA-3,Achat Biens 3% - Pays,AB-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,172,,tag_AB_PA_3
-lu_2011_tax_AB-PA-6,Achat Biens 6% - Pays,AB-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,173,,tag_AB_PA_6
-lu_2015_tax_AB-PA-8,Achat Biens 8% - Pays,AB-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,174,,tag_AB_PA_8
-lu_2011_tax_AP-EC-0,Achat Prestations Exonérées - Extracommunautaire,AP-EC-0,purchase,percent,0,,,lu_2011_chart_1,175,,tag_AP_EC_0
-lu_2011_tax_AP-EC-12-n,Achat Prestations 12% - Extracommunautaire (-),AP-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1177,,tag_AP_EC_12_n
-lu_2011_tax_AP-EC-12-p,Achat Prestations 12% - Extracommunautaire (+),AP-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1178,,tag_AP_EC_12_p
-lu_2011_tax_AP-EC-12,Achat Prestations 12% - Extracommunautaire,AP-EC-12,purchase,group,100,,,lu_2011_chart_1,176,"lu_2011_tax_AP-EC-12-n,lu_2011_tax_AP-EC-12-p",tag_AP_EC_12
-lu_2015_tax_AP-EC-14-n,Achat Prestations 14% - Extracommunautaire (-),AP-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1180,,tag_AP_EC_14_n
-lu_2015_tax_AP-EC-14-p,Achat Prestations 14% - Extracommunautaire (+),AP-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1181,,tag_AP_EC_14_p
-lu_2015_tax_AP-EC-14,Achat Prestations 14% - Extracommunautaire,AP-EC-14,purchase,group,100,,,lu_2011_chart_1,179,"lu_2015_tax_AP-EC-14-n,lu_2015_tax_AP-EC-14-p",tag_AP_EC_14
-lu_2011_tax_AP-EC-15-n,Achat Prestations 15% - Extracommunautaire (-),AP-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1183,,tag_AP_EC_15_n
-lu_2011_tax_AP-EC-15-p,Achat Prestations 15% - Extracommunautaire (+),AP-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1184,,tag_AP_EC_15_p
-lu_2011_tax_AP-EC-15,Achat Prestations 15% - Extracommunautaire,AP-EC-15,purchase,group,100,,,lu_2011_chart_1,182,"lu_2011_tax_AP-EC-15-n,lu_2011_tax_AP-EC-15-p",tag_AP_EC_15
-lu_2015_tax_AP-EC-17-n,Achat Prestations 17% - Extracommunautaire (-),AP-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1186,,tag_AP_EC_17_n
-lu_2015_tax_AP-EC-17-p,Achat Prestations 17% - Extracommunautaire (+),AP-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1187,,tag_AP_EC_17_p
-lu_2015_tax_AP-EC-17,Achat Prestations 17% - Extracommunautaire,AP-EC-17,purchase,group,100,,,lu_2011_chart_1,185,"lu_2015_tax_AP-EC-17-n,lu_2015_tax_AP-EC-17-p",tag_AP_EC_17
-lu_2011_tax_AP-EC-3-n,Achat Prestations 3% - Extracommunautaire (-),AP-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1189,,tag_AP_EC_3_n
-lu_2011_tax_AP-EC-3-p,Achat Prestations 3% - Extracommunautaire (+),AP-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1190,,tag_AP_EC_3_p
-lu_2011_tax_AP-EC-3,Achat Prestations 3% - Extracommunautaire,AP-EC-3,purchase,group,100,,,lu_2011_chart_1,188,"lu_2011_tax_AP-EC-3-n,lu_2011_tax_AP-EC-3-p",tag_AP_EC_3
-lu_2011_tax_AP-EC-6-n,Achat Prestations 6% - Extracommunautaire (-),AP-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1192,,tag_AP_EC_6_n
-lu_2011_tax_AP-EC-6-p,Achat Prestations 6% - Extracommunautaire (+),AP-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1193,,tag_AP_EC_6_p
-lu_2011_tax_AP-EC-6,Achat Prestations 6% - Extracommunautaire,AP-EC-6,purchase,group,100,,,lu_2011_chart_1,191,"lu_2011_tax_AP-EC-6-n,lu_2011_tax_AP-EC-6-p",tag_AP_EC_6
-lu_2015_tax_AP-EC-8-n,Achat Prestations 8% - Extracommunautaire (-),AP-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1195,,tag_AP_EC_8_n
-lu_2015_tax_AP-EC-8-p,Achat Prestations 8% - Extracommunautaire (+),AP-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1196,,tag_AP_EC_8_p
-lu_2015_tax_AP-EC-8,Achat Prestations 8% - Extracommunautaire,AP-EC-8,purchase,group,100,,,lu_2011_chart_1,194,"lu_2015_tax_AP-EC-8-n,lu_2015_tax_AP-EC-8-p",tag_AP_EC_8
-lu_2011_tax_AP-IC-0,Achat Prestations Exonérées - Intracommunautaire,AP-IC-0,purchase,percent,0,,,lu_2011_chart_1,197,,tag_AP_IC_0
-lu_2011_tax_AP-IC-12-n,Achat Prestations 12% - Intracommunautaire (-),AP-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1199,,tag_AP_IC_12_n
-lu_2011_tax_AP-IC-12-p,Achat Prestations 12% - Intracommunautaire (+),AP-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1200,,tag_AP_IC_12_p
-lu_2011_tax_AP-IC-12,Achat Prestations 12% - Intracommunautaire,AP-IC-12,purchase,group,100,,,lu_2011_chart_1,198,"lu_2011_tax_AP-IC-12-n,lu_2011_tax_AP-IC-12-p",tag_AP_IC_12
-lu_2015_tax_AP-IC-14-n,Achat Prestations 14% - Intracommunautaire (-),AP-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1202,,tag_AP_IC_14_n
-lu_2015_tax_AP-IC-14-p,Achat Prestations 14% - Intracommunautaire (+),AP-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1203,,tag_AP_IC_14_p
-lu_2015_tax_AP-IC-14,Achat Prestations 14% - Intracommunautaire,AP-IC-14,purchase,group,100,,,lu_2011_chart_1,201,"lu_2015_tax_AP-IC-14-n,lu_2015_tax_AP-IC-14-p",tag_AP_IC_14
-lu_2011_tax_AP-IC-15-n,Achat Prestations 15% - Intracommunautaire (-),AP-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1205,,tag_AP_IC_15_n
-lu_2011_tax_AP-IC-15-p,Achat Prestations 15% - Intracommunautaire (+),AP-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1206,,tag_AP_IC_15_p
-lu_2011_tax_AP-IC-15,Achat Prestations 15% - Intracommunautaire,AP-IC-15,purchase,group,100,,,lu_2011_chart_1,204,"lu_2011_tax_AP-IC-15-n,lu_2011_tax_AP-IC-15-p",tag_AP_IC_15
-lu_2015_tax_AP-IC-17-n,Achat Prestations 17% - Intracommunautaire (-),AP-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1208,,tag_AP_IC_17_n
-lu_2015_tax_AP-IC-17-p,Achat Prestations 17% - Intracommunautaire (+),AP-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1209,,tag_AP_IC_17_p
-lu_2015_tax_AP-IC-17,Achat Prestations 17% - Intracommunautaire,AP-IC-17,purchase,group,100,,,lu_2011_chart_1,207,"lu_2015_tax_AP-IC-17-n,lu_2015_tax_AP-IC-17-p",tag_AP_IC_17
-lu_2011_tax_AP-IC-3-n,Achat Prestations 3% - Intracommunautaire (-),AP-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1211,,tag_AP_IC_3_n
-lu_2011_tax_AP-IC-3-p,Achat Prestations 3% - Intracommunautaire (+),AP-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1212,,tag_AP_IC_3_p
-lu_2011_tax_AP-IC-3,Achat Prestations 3% - Intracommunautaire,AP-IC-3,purchase,group,100,,,lu_2011_chart_1,210,"lu_2011_tax_AP-IC-3-n,lu_2011_tax_AP-IC-3-p",tag_AP_IC_3
-lu_2011_tax_AP-IC-6-n,Achat Prestations 6% - Intracommunautaire (-),AP-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1214,,tag_AP_IC_6_n
-lu_2011_tax_AP-IC-6-p,Achat Prestations 6% - Intracommunautaire (+),AP-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1215,,tag_AP_IC_6_p
-lu_2011_tax_AP-IC-6,Achat Prestations 6% - Intracommunautaire,AP-IC-6,purchase,group,100,,,lu_2011_chart_1,213,"lu_2011_tax_AP-IC-6-n,lu_2011_tax_AP-IC-6-p",tag_AP_IC_6
-lu_2015_tax_AP-IC-8-n,Achat Prestations 8% - Intracommunautaire (-),AP-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1217,,tag_AP_IC_8_n
-lu_2015_tax_AP-IC-8-p,Achat Prestations 8% - Intracommunautaire (+),AP-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1218,,tag_AP_IC_8_p
-lu_2015_tax_AP-IC-8,Achat Prestations 8% - Intracommunautaire,AP-IC-8,purchase,group,100,,,lu_2011_chart_1,216,"lu_2015_tax_AP-IC-8-n,lu_2015_tax_AP-IC-8-p",tag_AP_IC_8
-lu_2011_tax_AP-PA-0,Achat Prestations 0% - Pays,AP-PA-0,purchase,percent,0,,,lu_2011_chart_1,219,,tag_AP_PA_0
-lu_2011_tax_AP-PA-12,Achat Prestations 12% - Pays,AP-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,220,,tag_AP_PA_12
-lu_2015_tax_AP-PA-14,Achat Prestations 14% - Pays,AP-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,221,,tag_AP_PA_14
-lu_2011_tax_AP-PA-15,Achat Prestations 15% - Pays,AP-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,222,,tag_AP_PA_15
-lu_2015_tax_AP-PA-17,Achat Prestations 17% - Pays,AP-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,223,,tag_AP_PA_17
-lu_2011_tax_AP-PA-3,Achat Prestations 3% - Pays,AP-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,224,,tag_AP_PA_3
-lu_2011_tax_AP-PA-6,Achat Prestations 6% - Pays,AP-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,225,,tag_AP_PA_6
-lu_2015_tax_AP-PA-8,Achat Prestations 8% - Pays,AP-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,226,,tag_AP_PA_8
-lu_2011_tax_FB-EC-0,Frais Biens Exonéré - Extracommunautaire,FB-EC-0,purchase,percent,0,,,lu_2011_chart_1,227,,tag_FB_EC_0
-lu_2011_tax_FB-EC-12-n,Frais Biens 12% - Extracommunautaire (-),FB-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1229,,tag_FB_EC_12_n
-lu_2011_tax_FB-EC-12-p,Frais Biens 12% - Extracommunautaire (+),FB-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1230,,tag_FB_EC_12_p
-lu_2011_tax_FB-EC-12,Frais Biens 12% - Extracommunautaire,FB-EC-12,purchase,group,100,,,lu_2011_chart_1,228,"lu_2011_tax_FB-EC-12-n,lu_2011_tax_FB-EC-12-p",tag_FB_EC_12
-lu_2015_tax_FB-EC-14-n,Frais Biens 14% - Extracommunautaire (-),FB-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1232,,tag_FB_EC_14_n
-lu_2015_tax_FB-EC-14-p,Frais Biens 14% - Extracommunautaire (+),FB-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1233,,tag_FB_EC_14_p
-lu_2015_tax_FB-EC-14,Frais Biens 14% - Extracommunautaire,FB-EC-14,purchase,group,100,,,lu_2011_chart_1,231,"lu_2015_tax_FB-EC-14-n,lu_2015_tax_FB-EC-14-p",tag_FB_EC_14
-lu_2011_tax_FB-EC-15-n,Frais Biens 15% - Extracommunautaire (-),FB-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1235,,tag_FB_EC_15_n
-lu_2011_tax_FB-EC-15-p,Frais Biens 15% - Extracommunautaire (+),FB-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1236,,tag_FB_EC_15_p
-lu_2011_tax_FB-EC-15,Frais Biens 15% - Extracommunautaire,FB-EC-15,purchase,group,100,,,lu_2011_chart_1,234,"lu_2011_tax_FB-EC-15-n,lu_2011_tax_FB-EC-15-p",tag_FB_EC_15
-lu_2015_tax_FB-EC-17-n,Frais Biens 17% - Extracommunautaire (-),FB-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1238,,tag_FB_EC_17_n
-lu_2015_tax_FB-EC-17-p,Frais Biens 17% - Extracommunautaire (+),FB-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1239,,tag_FB_EC_17_p
-lu_2015_tax_FB-EC-17,Frais Biens 17% - Extracommunautaire,FB-EC-17,purchase,group,100,,,lu_2011_chart_1,237,"lu_2015_tax_FB-EC-17-n,lu_2015_tax_FB-EC-17-p",tag_FB_EC_17
-lu_2011_tax_FB-EC-3-n,Frais Biens 3% - Extracommunautaire (-),FB-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1241,,tag_FB_EC_3_n
-lu_2011_tax_FB-EC-3-p,Frais Biens 3% - Extracommunautaire (+),FB-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1242,,tag_FB_EC_3_p
-lu_2011_tax_FB-EC-3,Frais Biens 3% - Extracommunautaire,FB-EC-3,purchase,group,100,,,lu_2011_chart_1,240,"lu_2011_tax_FB-EC-3-n,lu_2011_tax_FB-EC-3-p",tag_FB_EC_3
-lu_2011_tax_FB-EC-6-n,Frais Biens 6% - Extracommunautaire (-),FB-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1244,,tag_FB_EC_6_n
-lu_2011_tax_FB-EC-6-p,Frais Biens 6% - Extracommunautaire (+),FB-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1245,,tag_FB_EC_6_p
-lu_2011_tax_FB-EC-6,Frais Biens 6% - Extracommunautaire,FB-EC-6,purchase,group,100,,,lu_2011_chart_1,243,"lu_2011_tax_FB-EC-6-n,lu_2011_tax_FB-EC-6-p",tag_FB_EC_6
-lu_2015_tax_FB-EC-8-n,Frais Biens 8% - Extracommunautaire (-),FB-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1247,,tag_FB_EC_8_n
-lu_2015_tax_FB-EC-8-p,Frais Biens 8% - Extracommunautaire (+),FB-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1248,,tag_FB_EC_8_p
-lu_2015_tax_FB-EC-8,Frais Biens 8% - Extracommunautaire,FB-EC-8,purchase,group,100,,,lu_2011_chart_1,246,"lu_2015_tax_FB-EC-8-n,lu_2015_tax_FB-EC-8-p",tag_FB_EC_8
-lu_2015_tax_FB-ECP-0,Frais Biens Exonéré - Extracommunautaire fin privées,FB-ECP-0,purchase,percent,0,,,lu_2011_chart_1,249,,tag_FB_ECP_0
-lu_2015_tax_FB-ECP-12-n,Frais Biens 12% - Extracommunautaire fin privées (-),FB-ECP-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1251,,tag_FB_ECP_12_n
-lu_2015_tax_FB-ECP-12-p,Frais Biens 12% - Extracommunautaire fin privées (+),FB-ECP-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1252,,tag_FB_ECP_12_p
-lu_2015_tax_FB-ECP-12,Frais Biens 12% - Extracommunautaire fin privées,FB-ECP-12,purchase,group,100,,,lu_2011_chart_1,250,"lu_2015_tax_FB-ECP-12-n,lu_2015_tax_FB-ECP-12-p",tag_FB_ECP_12
-lu_2015_tax_FB-ECP-14-n,Frais Biens 14% - Extracommunautaire fin privées (-),FB-ECP-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1254,,tag_FB_ECP_14_n
-lu_2015_tax_FB-ECP-14-p,Frais Biens 14% - Extracommunautaire fin privées (+),FB-ECP-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1255,,tag_FB_ECP_14_p
-lu_2015_tax_FB-ECP-14,Frais Biens 14% - Extracommunautaire fin privées,FB-ECP-14,purchase,group,100,,,lu_2011_chart_1,253,"lu_2015_tax_FB-ECP-14-n,lu_2015_tax_FB-ECP-14-p",tag_FB_ECP_14
-lu_2015_tax_FB-ECP-15-n,Frais Biens 15% - Extracommunautaire fin privées (-),FB-ECP-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1257,,tag_FB_ECP_15_n
-lu_2015_tax_FB-ECP-15-p,Frais Biens 15% - Extracommunautaire fin privées (+),FB-ECP-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1258,,tag_FB_ECP_15_p
-lu_2015_tax_FB-ECP-15,Frais Biens 15% - Extracommunautaire fin privées,FB-ECP-15,purchase,group,100,,,lu_2011_chart_1,256,"lu_2015_tax_FB-ECP-15-n,lu_2015_tax_FB-ECP-15-p",tag_FB_ECP_15
-lu_2015_tax_FB-ECP-17-n,Frais Biens 17% - Extracommunautaire fin privées (-),FB-ECP-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1260,,tag_FB_ECP_17_n
-lu_2015_tax_FB-ECP-17-p,Frais Biens 17% - Extracommunautaire fin privées (+),FB-ECP-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1261,,tag_FB_ECP_17_p
-lu_2015_tax_FB-ECP-17,Frais Biens 17% - Extracommunautaire fin privées,FB-ECP-17,purchase,group,100,,,lu_2011_chart_1,259,"lu_2015_tax_FB-ECP-17-n,lu_2015_tax_FB-ECP-17-p",tag_FB_ECP_17
-lu_2015_tax_FB-ECP-3-n,Frais Biens 3% - Extracommunautaire fin privées (-),FB-ECP-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1263,,tag_FB_ECP_3_n
-lu_2015_tax_FB-ECP-3-p,Frais Biens 3% - Extracommunautaire fin privées (+),FB-ECP-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1264,,tag_FB_ECP_3_p
-lu_2015_tax_FB-ECP-3,Frais Biens 3% - Extracommunautaire fin privées,FB-ECP-3,purchase,group,100,,,lu_2011_chart_1,262,"lu_2015_tax_FB-ECP-3-n,lu_2015_tax_FB-ECP-3-p",tag_FB_ECP_3
-lu_2015_tax_FB-ECP-6-n,Frais Biens 6% - Extracommunautaire fin privées (-),FB-ECP-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1266,,tag_FB_ECP_6_n
-lu_2015_tax_FB-ECP-6-p,Frais Biens 6% - Extracommunautaire fin privées (+),FB-ECP-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1267,,tag_FB_ECP_6_p
-lu_2015_tax_FB-ECP-6,Frais Biens 6% - Extracommunautaire fin privées,FB-ECP-6,purchase,group,100,,,lu_2011_chart_1,265,"lu_2015_tax_FB-ECP-6-n,lu_2015_tax_FB-ECP-6-p",tag_FB_ECP_6
-lu_2015_tax_FB-ECP-8-n,Frais Biens 8% - Extracommunautaire fin privées (-),FB-ECP-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1269,,tag_FB_ECP_8_n
-lu_2015_tax_FB-ECP-8-p,Frais Biens 8% - Extracommunautaire fin privées (+),FB-ECP-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1270,,tag_FB_ECP_8_p
-lu_2015_tax_FB-ECP-8,Frais Biens 8% - Extracommunautaire fin privées,FB-ECP-8,purchase,group,100,,,lu_2011_chart_1,268,"lu_2015_tax_FB-ECP-8-n,lu_2015_tax_FB-ECP-8-p",tag_FB_ECP_8
-lu_2011_tax_FB-IC-0,Frais Biens Exonéré - Intracommunautaire,FB-IC-0,purchase,percent,0,,,lu_2011_chart_1,271,,tag_FB_IC_0
-lu_2011_tax_FB-IC-12-n,Frais Biens 12% - Intracommunautaire (-),FB-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1273,,tag_FB_IC_12_n
-lu_2011_tax_FB-IC-12-p,Frais Biens 12% - Intracommunautaire (+),FB-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1274,,tag_FB_IC_12_p
-lu_2011_tax_FB-IC-12,Frais Biens 12% - Intracommunautaire,FB-IC-12,purchase,group,100,,,lu_2011_chart_1,272,"lu_2011_tax_FB-IC-12-n,lu_2011_tax_FB-IC-12-p",tag_FB_IC_12
-lu_2015_tax_FB-IC-14-n,Frais Biens 14% - Intracommunautaire (-),FB-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1276,,tag_FB_IC_14_n
-lu_2015_tax_FB-IC-14-p,Frais Biens 14% - Intracommunautaire (+),FB-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1277,,tag_FB_IC_14_p
-lu_2015_tax_FB-IC-14,Frais Biens 14% - Intracommunautaire,FB-IC-14,purchase,group,100,,,lu_2011_chart_1,275,"lu_2015_tax_FB-IC-14-n,lu_2015_tax_FB-IC-14-p",tag_FB_IC_14
-lu_2011_tax_FB-IC-15-n,Frais Biens 15% - Intracommunautaire (-),FB-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1279,,tag_FB_IC_15_n
-lu_2011_tax_FB-IC-15-p,Frais Biens 15% - Intracommunautaire (+),FB-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1280,,tag_FB_IC_15_p
-lu_2011_tax_FB-IC-15,Frais Biens 15% - Intracommunautaire,FB-IC-15,purchase,group,100,,,lu_2011_chart_1,278,"lu_2011_tax_FB-IC-15-n,lu_2011_tax_FB-IC-15-p",tag_FB_IC_15
-lu_2015_tax_FB-IC-17-n,Frais Biens 17% - Intracommunautaire (-),FB-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1282,,tag_FB_IC_17_n
-lu_2015_tax_FB-IC-17-p,Frais Biens 17% - Intracommunautaire (+),FB-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1283,,tag_FB_IC_17_p
-lu_2015_tax_FB-IC-17,Frais Biens 17% - Intracommunautaire,FB-IC-17,purchase,group,100,,,lu_2011_chart_1,281,"lu_2015_tax_FB-IC-17-n,lu_2015_tax_FB-IC-17-p",tag_FB_IC_17
-lu_2011_tax_FB-IC-3-n,Frais Biens 3% - Intracommunautaire (-),FB-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1285,,tag_FB_IC_3_n
-lu_2011_tax_FB-IC-3-p,Frais Biens 3% - Intracommunautaire (+),FB-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1286,,tag_FB_IC_3_p
-lu_2011_tax_FB-IC-3,Frais Biens 3% - Intracommunautaire,FB-IC-3,purchase,group,100,,,lu_2011_chart_1,284,"lu_2011_tax_FB-IC-3-n,lu_2011_tax_FB-IC-3-p",tag_FB_IC_3
-lu_2011_tax_FB-IC-6-n,Frais Biens 6% - Intracommunautaire (-),FB-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1288,,tag_FB_IC_6_n
-lu_2011_tax_FB-IC-6-p,Frais Biens 6% - Intracommunautaire (+),FB-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1289,,tag_FB_IC_6_p
-lu_2011_tax_FB-IC-6,Frais Biens 6% - Intracommunautaire,FB-IC-6,purchase,group,100,,,lu_2011_chart_1,287,"lu_2011_tax_FB-IC-6-n,lu_2011_tax_FB-IC-6-p",tag_FB_IC_6
-lu_2015_tax_FB-IC-8-n,Frais Biens 8% - Intracommunautaire (-),FB-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1291,,tag_FB_IC_8_n
-lu_2015_tax_FB-IC-8-p,Frais Biens 8% - Intracommunautaire (+),FB-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1292,,tag_FB_IC_8_p
-lu_2015_tax_FB-IC-8,Frais Biens 8% - Intracommunautaire,FB-IC-8,purchase,group,100,,,lu_2011_chart_1,290,"lu_2015_tax_FB-IC-8-n,lu_2015_tax_FB-IC-8-p",tag_FB_IC_8
-lu_2011_tax_FB-PA-0,Frais Biens 0% - Pays,FB-PA-0,purchase,percent,0,,,lu_2011_chart_1,293,,tag_FB_PA_0
-lu_2011_tax_FB-PA-12,Frais Biens 12% - Pays,FB-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,294,,tag_FB_PA_12
-lu_2015_tax_FB-PA-14,Frais Biens 14% - Pays,FB-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,295,,tag_FB_PA_14
-lu_2011_tax_FB-PA-15,Frais Biens 15% - Pays,FB-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,296,,tag_FB_PA_15
-lu_2015_tax_FB-PA-17,Frais Biens 17% - Pays,FB-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,297,,tag_FB_PA_17
-lu_2011_tax_FB-PA-3,Frais Biens 3% - Pays,FB-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,298,,tag_FB_PA_3
-lu_2011_tax_FB-PA-6,Frais Biens 6% - Pays,FB-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,299,,tag_FB_PA_6
-lu_2015_tax_FB-PA-8,Frais Biens 8% - Pays,FB-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,300,,tag_FB_PA_8
-lu_2011_tax_FP-EC-0,Frais Prestations Exonérées - Extracommunautaire,FP-EC-0,purchase,percent,0,,,lu_2011_chart_1,301,,tag_FP_EC_0
-lu_2011_tax_FP-EC-12-n,Frais Prestations 12% - Extracommunautaire (-),FP-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1303,,tag_FP_EC_12_n
-lu_2011_tax_FP-EC-12-p,Frais Prestations 12% - Extracommunautaire (+),FP-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1304,,tag_FP_EC_12_p
-lu_2011_tax_FP-EC-12,Frais Prestations 12% - Extracommunautaire,FP-EC-12,purchase,group,100,,,lu_2011_chart_1,302,"lu_2011_tax_FP-EC-12-n,lu_2011_tax_FP-EC-12-p",tag_FP_EC_12
-lu_2015_tax_FP-EC-14-n,Frais Prestations 14% - Extracommunautaire (-),FP-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1306,,tag_FP_EC_14_n
-lu_2015_tax_FP-EC-14-p,Frais Prestations 14% - Extracommunautaire (+),FP-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1307,,tag_FP_EC_14_p
-lu_2015_tax_FP-EC-14,Frais Prestations 14% - Extracommunautaire,FP-EC-14,purchase,group,100,,,lu_2011_chart_1,305,"lu_2015_tax_FP-EC-14-n,lu_2015_tax_FP-EC-14-p",tag_FP_EC_14
-lu_2011_tax_FP-EC-15-n,Frais Prestations 15% - Extracommunautaire (-),FP-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1309,,tag_FP_EC_15_n
-lu_2011_tax_FP-EC-15-p,Frais Prestations 15% - Extracommunautaire (+),FP-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1310,,tag_FP_EC_15_p
-lu_2011_tax_FP-EC-15,Frais Prestations 15% - Extracommunautaire,FP-EC-15,purchase,group,100,,,lu_2011_chart_1,308,"lu_2011_tax_FP-EC-15-n,lu_2011_tax_FP-EC-15-p",tag_FP_EC_15
-lu_2015_tax_FP-EC-17-n,Frais Prestations 17% - Extracommunautaire (-),FP-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1312,,tag_FP_EC_17_n
-lu_2015_tax_FP-EC-17-p,Frais Prestations 17% - Extracommunautaire (+),FP-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1313,,tag_FP_EC_17_p
-lu_2015_tax_FP-EC-17,Frais Prestations 17% - Extracommunautaire,FP-EC-17,purchase,group,100,,,lu_2011_chart_1,311,"lu_2015_tax_FP-EC-17-n,lu_2015_tax_FP-EC-17-p",tag_FP_EC_17
-lu_2011_tax_FP-EC-3-n,Frais Prestations 3% - Extracommunautaire (-),FP-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1315,,tag_FP_EC_3_n
-lu_2011_tax_FP-EC-3-p,Frais Prestations 3% - Extracommunautaire (+),FP-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1316,,tag_FP_EC_3_p
-lu_2011_tax_FP-EC-3,Frais Prestations 3% - Extracommunautaire,FP-EC-3,purchase,group,100,,,lu_2011_chart_1,314,"lu_2011_tax_FP-EC-3-n,lu_2011_tax_FP-EC-3-p",tag_FP_EC_3
-lu_2011_tax_FP-EC-6-n,Frais Prestations 6% - Extracommunautaire (-),FP-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1318,,tag_FP_EC_6_n
-lu_2011_tax_FP-EC-6-p,Frais Prestations 6% - Extracommunautaire (+),FP-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1319,,tag_FP_EC_6_p
-lu_2011_tax_FP-EC-6,Frais Prestations 6% - Extracommunautaire,FP-EC-6,purchase,group,100,,,lu_2011_chart_1,317,"lu_2011_tax_FP-EC-6-n,lu_2011_tax_FP-EC-6-p",tag_FP_EC_6
-lu_2015_tax_FP-EC-8-n,Frais Prestations 8% - Extracommunautaire (-),FP-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1321,,tag_FP_EC_8_n
-lu_2015_tax_FP-EC-8-p,Frais Prestations 8% - Extracommunautaire (+),FP-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1322,,tag_FP_EC_8_p
-lu_2015_tax_FP-EC-8,Frais Prestations 8% - Extracommunautaire,FP-EC-8,purchase,group,100,,,lu_2011_chart_1,320,"lu_2015_tax_FP-EC-8-n,lu_2015_tax_FP-EC-8-p",tag_FP_EC_8
-lu_2011_tax_FP-IC-0,Frais Prestations Exonérées - Intracommunautaire,FP-IC-0,purchase,percent,0,,,lu_2011_chart_1,323,,tag_FP_IC_0
-lu_2011_tax_FP-IC-12-n,Frais Prestations 12% - Intracommunautaire (-),FP-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1325,,tag_FP_IC_12_n
-lu_2011_tax_FP-IC-12-p,Frais Prestations 12% - Intracommunautaire (+),FP-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1326,,tag_FP_IC_12_p
-lu_2011_tax_FP-IC-12,Frais Prestations 12% - Intracommunautaire,FP-IC-12,purchase,group,100,,,lu_2011_chart_1,324,"lu_2011_tax_FP-IC-12-n,lu_2011_tax_FP-IC-12-p",tag_FP_IC_12
-lu_2015_tax_FP-IC-14-n,Frais Prestations 14% - Intracommunautaire (-),FP-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1328,,tag_FP_IC_14_n
-lu_2015_tax_FP-IC-14-p,Frais Prestations 14% - Intracommunautaire (+),FP-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1329,,tag_FP_IC_14_p
-lu_2015_tax_FP-IC-14,Frais Prestations 14% - Intracommunautaire,FP-IC-14,purchase,group,100,,,lu_2011_chart_1,327,"lu_2015_tax_FP-IC-14-n,lu_2015_tax_FP-IC-14-p",tag_FP_IC_14
-lu_2011_tax_FP-IC-15-n,Frais Prestations 15% - Intracommunautaire (-),FP-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1331,,tag_FP_IC_15_n
-lu_2011_tax_FP-IC-15-p,Frais Prestations 15% - Intracommunautaire (+),FP-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1332,,tag_FP_IC_15_p
-lu_2011_tax_FP-IC-15,Frais Prestations 15% - Intracommunautaire,FP-IC-15,purchase,group,100,,,lu_2011_chart_1,330,"lu_2011_tax_FP-IC-15-n,lu_2011_tax_FP-IC-15-p",tag_FP_IC_15
-lu_2015_tax_FP-IC-17-n,Frais Prestations 17% - Intracommunautaire (-),FP-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1334,,tag_FP_IC_17_n
-lu_2015_tax_FP-IC-17-p,Frais Prestations 17% - Intracommunautaire (+),FP-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1335,,tag_FP_IC_17_p
-lu_2015_tax_FP-IC-17,Frais Prestations 17% - Intracommunautaire,FP-IC-17,purchase,group,100,,,lu_2011_chart_1,333,"lu_2015_tax_FP-IC-17-n,lu_2015_tax_FP-IC-17-p",tag_FP_IC_17
-lu_2011_tax_FP-IC-3-n,Frais Prestations 3% - Intracommunautaire (-),FP-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1337,,tag_FP_IC_3_n
-lu_2011_tax_FP-IC-3-p,Frais Prestations 3% - Intracommunautaire (+),FP-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1338,,tag_FP_IC_3_p
-lu_2011_tax_FP-IC-3,Frais Prestations 3% - Intracommunautaire,FP-IC-3,purchase,group,100,,,lu_2011_chart_1,336,"lu_2011_tax_FP-IC-3-n,lu_2011_tax_FP-IC-3-p",tag_FP_IC_3
-lu_2011_tax_FP-IC-6-n,Frais Prestations 6% - Intracommunautaire (-),FP-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1340,,tag_FP_IC_6_n
-lu_2011_tax_FP-IC-6-p,Frais Prestations 6% - Intracommunautaire (+),FP-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1341,,tag_FP_IC_6_p
-lu_2011_tax_FP-IC-6,Frais Prestations 6% - Intracommunautaire,FP-IC-6,purchase,group,100,,,lu_2011_chart_1,339,"lu_2011_tax_FP-IC-6-n,lu_2011_tax_FP-IC-6-p",tag_FP_IC_6
-lu_2015_tax_FP-IC-8-n,Frais Prestations 8% - Intracommunautaire (-),FP-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1343,,tag_FP_IC_8_n
-lu_2015_tax_FP-IC-8-p,Frais Prestations 8% - Intracommunautaire (+),FP-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1344,,tag_FP_IC_8_p
-lu_2015_tax_FP-IC-8,Frais Prestations 8% - Intracommunautaire,FP-IC-8,purchase,group,100,,,lu_2011_chart_1,342,"lu_2015_tax_FP-IC-8-n,lu_2015_tax_FP-IC-8-p",tag_FP_IC_8
-lu_2011_tax_FP-PA-0,Frais Prestations 0% - Pays,FP-PA-0,purchase,percent,0,,,lu_2011_chart_1,345,,tag_FP_PA_0
-lu_2011_tax_FP-PA-12,Frais Prestations 12% - Pays,FP-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,346,,tag_FP_PA_12
-lu_2015_tax_FP-PA-14,Frais Prestations 14% - Pays,FP-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,347,,tag_FP_PA_14
-lu_2011_tax_FP-PA-15,Frais Prestations 15% - Pays,FP-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,348,,tag_FP_PA_15
-lu_2015_tax_FP-PA-17,Frais Prestations 17% - Pays,FP-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,349,,tag_FP_PA_17
-lu_2011_tax_FP-PA-3,Frais Prestations 3% - Pays,FP-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,350,,tag_FP_PA_3
-lu_2011_tax_FP-PA-6,Frais Prestations 6% - Pays,FP-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,351,,tag_FP_PA_6
-lu_2015_tax_FP-PA-8,Frais Prestations 8% - Pays,FP-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,352,,tag_FP_PA_8
-lu_2011_tax_IB-EC-0,Investissement Biens Exonéré - Extracommunautaire,IB-EC-0,purchase,percent,0,,,lu_2011_chart_1,353,,tag_IB_EC_0
-lu_2011_tax_IB-EC-12-n,Investissement Biens 12% - Extracommunautaire (-),IB-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1355,,tag_IB_EC_12_n
-lu_2011_tax_IB-EC-12-p,Investissement Biens 12% - Extracommunautaire (+),IB-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1356,,tag_IB_EC_12_p
-lu_2011_tax_IB-EC-12,Investissement Biens 12% - Extracommunautaire,IB-EC-12,purchase,group,100,,,lu_2011_chart_1,354,"lu_2011_tax_IB-EC-12-n,lu_2011_tax_IB-EC-12-p",tag_IB_EC_12
-lu_2015_tax_IB-EC-14-n,Investissement Biens 14% - Extracommunautaire (-),IB-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1358,,tag_IB_EC_14_n
-lu_2015_tax_IB-EC-14-p,Investissement Biens 14% - Extracommunautaire (+),IB-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1359,,tag_IB_EC_14_p
-lu_2015_tax_IB-EC-14,Investissement Biens 14% - Extracommunautaire,IB-EC-14,purchase,group,100,,,lu_2011_chart_1,357,"lu_2015_tax_IB-EC-14-n,lu_2015_tax_IB-EC-14-p",tag_IB_EC_14
-lu_2011_tax_IB-EC-15-n,Investissement Biens 15% - Extracommunautaire (-),IB-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1361,,tag_IB_EC_15_n
-lu_2011_tax_IB-EC-15-p,Investissement Biens 15% - Extracommunautaire (+),IB-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1362,,tag_IB_EC_15_p
-lu_2011_tax_IB-EC-15,Investissement Biens 15% - Extracommunautaire,IB-EC-15,purchase,group,100,,,lu_2011_chart_1,360,"lu_2011_tax_IB-EC-15-n,lu_2011_tax_IB-EC-15-p",tag_IB_EC_15
-lu_2015_tax_IB-EC-17-n,Investissement Biens 17% - Extracommunautaire (-),IB-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1364,,tag_IB_EC_17_n
-lu_2015_tax_IB-EC-17-p,Investissement Biens 17% - Extracommunautaire (+),IB-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1365,,tag_IB_EC_17_p
-lu_2015_tax_IB-EC-17,Investissement Biens 17% - Extracommunautaire,IB-EC-17,purchase,group,100,,,lu_2011_chart_1,363,"lu_2015_tax_IB-EC-17-n,lu_2015_tax_IB-EC-17-p",tag_IB_EC_17
-lu_2011_tax_IB-EC-3-n,Investissement Biens 3% - Extracommunautaire (-),IB-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1367,,tag_IB_EC_3_n
-lu_2011_tax_IB-EC-3-p,Investissement Biens 3% - Extracommunautaire (+),IB-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1368,,tag_IB_EC_3_p
-lu_2011_tax_IB-EC-3,Investissement Biens 3% - Extracommunautaire,IB-EC-3,purchase,group,100,,,lu_2011_chart_1,366,"lu_2011_tax_IB-EC-3-n,lu_2011_tax_IB-EC-3-p",tag_IB_EC_3
-lu_2011_tax_IB-EC-6-n,Investissement Biens 6% - Extracommunautaire (-),IB-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1370,,tag_IB_EC_6_n
-lu_2011_tax_IB-EC-6-p,Investissement Biens 6% - Extracommunautaire (+),IB-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1371,,tag_IB_EC_6_p
-lu_2011_tax_IB-EC-6,Investissement Biens 6% - Extracommunautaire,IB-EC-6,purchase,group,100,,,lu_2011_chart_1,369,"lu_2011_tax_IB-EC-6-n,lu_2011_tax_IB-EC-6-p",tag_IB_EC_6
-lu_2015_tax_IB-EC-8-n,Investissement Biens 8% - Extracommunautaire (-),IB-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1373,,tag_IB_EC_8_n
-lu_2015_tax_IB-EC-8-p,Investissement Biens 8% - Extracommunautaire (+),IB-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1374,,tag_IB_EC_8_p
-lu_2015_tax_IB-EC-8,Investissement Biens 8% - Extracommunautaire,IB-EC-8,purchase,group,100,,,lu_2011_chart_1,372,"lu_2015_tax_IB-EC-8-n,lu_2015_tax_IB-EC-8-p",tag_IB_EC_8
-lu_2015_tax_IB-ECP-0,Investissement Biens Exonéré - Extracommunautaire fin privées,IB-ECP-0,purchase,percent,0,,,lu_2011_chart_1,375,,tag_IB_ECP_0
-lu_2015_tax_IB-ECP-12-n,Investissement Biens 12% - Extracommunautaire fin privées (-),IB-ECP-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1377,,tag_IB_ECP_12_n
-lu_2015_tax_IB-ECP-12-p,Investissement Biens 12% - Extracommunautaire fin privées (+),IB-ECP-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1378,,tag_IB_ECP_12_p
-lu_2015_tax_IB-ECP-12,Investissement Biens 12% - Extracommunautaire fin privées,IB-ECP-12,purchase,group,100,,,lu_2011_chart_1,376,"lu_2015_tax_IB-ECP-12-n,lu_2015_tax_IB-ECP-12-p",tag_IB_ECP_12
-lu_2015_tax_IB-ECP-14-n,Investissement Biens 14% - Extracommunautaire fin privées (-),IB-ECP-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1380,,tag_IB_ECP_14_n
-lu_2015_tax_IB-ECP-14-p,Investissement Biens 14% - Extracommunautaire fin privées (+),IB-ECP-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1381,,tag_IB_ECP_14_p
-lu_2015_tax_IB-ECP-14,Investissement Biens 14% - Extracommunautaire fin privées,IB-ECP-14,purchase,group,100,,,lu_2011_chart_1,379,"lu_2015_tax_IB-ECP-14-n,lu_2015_tax_IB-ECP-14-p",tag_IB_ECP_14
-lu_2015_tax_IB-ECP-15-n,Investissement Biens 15% - Extracommunautaire fin privées (-),IB-ECP-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1383,,tag_IB_ECP_15_n
-lu_2015_tax_IB-ECP-15-p,Investissement Biens 15% - Extracommunautaire fin privées (+),IB-ECP-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1384,,tag_IB_ECP_15_p
-lu_2015_tax_IB-ECP-15,Investissement Biens 15% - Extracommunautaire fin privées,IB-ECP-15,purchase,group,100,,,lu_2011_chart_1,382,"lu_2015_tax_IB-ECP-15-n,lu_2015_tax_IB-ECP-15-p",tag_IB_ECP_15
-lu_2015_tax_IB-ECP-17-n,Investissement Biens 17% - Extracommunautaire fin privées (-),IB-ECP-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1386,,tag_IB_ECP_17_n
-lu_2015_tax_IB-ECP-17-p,Investissement Biens 17% - Extracommunautaire fin privées (+),IB-ECP-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1387,,tag_IB_ECP_17_p
-lu_2015_tax_IB-ECP-17,Investissement Biens 17% - Extracommunautaire fin privées,IB-ECP-17,purchase,group,100,,,lu_2011_chart_1,385,"lu_2015_tax_IB-ECP-17-n,lu_2015_tax_IB-ECP-17-p",tag_IB_ECP_17
-lu_2015_tax_IB-ECP-3-n,Investissement Biens 3% - Extracommunautaire fin privées (-),IB-ECP-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1389,,tag_IB_ECP_3_n
-lu_2015_tax_IB-ECP-3-p,Investissement Biens 3% - Extracommunautaire fin privées (+),IB-ECP-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1390,,tag_IB_ECP_3_p
-lu_2015_tax_IB-ECP-3,Investissement Biens 3% - Extracommunautaire fin privées,IB-ECP-3,purchase,group,100,,,lu_2011_chart_1,388,"lu_2015_tax_IB-ECP-3-n,lu_2015_tax_IB-ECP-3-p",tag_IB_ECP_3
-lu_2015_tax_IB-ECP-6-n,Investissement Biens 6% - Extracommunautaire fin privées (-),IB-ECP-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1392,,tag_IB_ECP_6_n
-lu_2015_tax_IB-ECP-6-p,Investissement Biens 6% - Extracommunautaire fin privées (+),IB-ECP-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1393,,tag_IB_ECP_6_p
-lu_2015_tax_IB-ECP-6,Investissement Biens 6% - Extracommunautaire fin privées,IB-ECP-6,purchase,group,100,,,lu_2011_chart_1,391,"lu_2015_tax_IB-ECP-6-n,lu_2015_tax_IB-ECP-6-p",tag_IB_ECP_6
-lu_2015_tax_IB-ECP-8-n,Investissement Biens 8% - Extracommunautaire fin privées (-),IB-ECP-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1395,,tag_IB_ECP_8_n
-lu_2015_tax_IB-ECP-8-p,Investissement Biens 8% - Extracommunautaire fin privées (+),IB-ECP-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1396,,tag_IB_ECP_8_p
-lu_2015_tax_IB-ECP-8,Investissement Biens 8% - Extracommunautaire fin privées,IB-ECP-8,purchase,group,100,,,lu_2011_chart_1,394,"lu_2015_tax_IB-ECP-8-n,lu_2015_tax_IB-ECP-8-p",tag_IB_ECP_8
-lu_2011_tax_IB-IC-0,Investissement Biens Exonéré - Intracommunautaire,IB-IC-0,purchase,percent,0,,,lu_2011_chart_1,397,,tag_IB_IC_0
-lu_2011_tax_IB-IC-12-n,Investissement Biens 12% - Intracommunautaire (-),IB-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1399,,tag_IB_IC_12_n
-lu_2011_tax_IB-IC-12-p,Investissement Biens 12% - Intracommunautaire (+),IB-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1400,,tag_IB_IC_12_p
-lu_2011_tax_IB-IC-12,Investissement Biens 12% - Intracommunautaire,IB-IC-12,purchase,group,100,,,lu_2011_chart_1,398,"lu_2011_tax_IB-IC-12-n,lu_2011_tax_IB-IC-12-p",tag_IB_IC_12
-lu_2015_tax_IB-IC-14-n,Investissement Biens 14% - Intracommunautaire (-),IB-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1402,,tag_IB_IC_14_n
-lu_2015_tax_IB-IC-14-p,Investissement Biens 14% - Intracommunautaire (+),IB-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1403,,tag_IB_IC_14_p
-lu_2015_tax_IB-IC-14,Investissement Biens 14% - Intracommunautaire,IB-IC-14,purchase,group,100,,,lu_2011_chart_1,401,"lu_2015_tax_IB-IC-14-n,lu_2015_tax_IB-IC-14-p",tag_IB_IC_14
-lu_2011_tax_IB-IC-15-n,Investissement Biens 15% - Intracommunautaire (-),IB-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1405,,tag_IB_IC_15_n
-lu_2011_tax_IB-IC-15-p,Investissement Biens 15% - Intracommunautaire (+),IB-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1406,,tag_IB_IC_15_p
-lu_2011_tax_IB-IC-15,Investissement Biens 15% - Intracommunautaire,IB-IC-15,purchase,group,100,,,lu_2011_chart_1,404,"lu_2011_tax_IB-IC-15-n,lu_2011_tax_IB-IC-15-p",tag_IB_IC_15
-lu_2015_tax_IB-IC-17-n,Investissement Biens 17% - Intracommunautaire (-),IB-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1408,,tag_IB_IC_17_n
-lu_2015_tax_IB-IC-17-p,Investissement Biens 17% - Intracommunautaire (+),IB-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1409,,tag_IB_IC_17_p
-lu_2015_tax_IB-IC-17,Investissement Biens 17% - Intracommunautaire,IB-IC-17,purchase,group,100,,,lu_2011_chart_1,407,"lu_2015_tax_IB-IC-17-n,lu_2015_tax_IB-IC-17-p",tag_IB_IC_17
-lu_2011_tax_IB-IC-3-n,Investissement Biens 3% - Intracommunautaire (-),IB-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1411,,tag_IB_IC_3_n
-lu_2011_tax_IB-IC-3-p,Investissement Biens 3% - Intracommunautaire (+),IB-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1412,,tag_IB_IC_3_p
-lu_2011_tax_IB-IC-3,Investissement Biens 3% - Intracommunautaire,IB-IC-3,purchase,group,100,,,lu_2011_chart_1,410,"lu_2011_tax_IB-IC-3-n,lu_2011_tax_IB-IC-3-p",tag_IB_IC_3
-lu_2011_tax_IB-IC-6-n,Investissement Biens 6% - Intracommunautaire (-),IB-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1414,,tag_IB_IC_6_n
-lu_2011_tax_IB-IC-6-p,Investissement Biens 6% - Intracommunautaire (+),IB-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1415,,tag_IB_IC_6_p
-lu_2011_tax_IB-IC-6,Investissement Biens 6% - Intracommunautaire,IB-IC-6,purchase,group,100,,,lu_2011_chart_1,413,"lu_2011_tax_IB-IC-6-n,lu_2011_tax_IB-IC-6-p",tag_IB_IC_6
-lu_2015_tax_IB-IC-8-n,Investissement Biens 8% - Intracommunautaire (-),IB-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1417,,tag_IB_IC_8_n
-lu_2015_tax_IB-IC-8-p,Investissement Biens 8% - Intracommunautaire (+),IB-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1418,,tag_IB_IC_8_p
-lu_2015_tax_IB-IC-8,Investissement Biens 8% - Intracommunautaire,IB-IC-8,purchase,group,100,,,lu_2011_chart_1,416,"lu_2015_tax_IB-IC-8-n,lu_2015_tax_IB-IC-8-p",tag_IB_IC_8
-lu_2011_tax_IB-PA-0,Investissement Biens 0% - Pays,IB-PA-0,purchase,percent,0,,,lu_2011_chart_1,419,,tag_IB_PA_0
-lu_2011_tax_IB-PA-12,Investissement Biens 12% - Pays,IB-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,420,,tag_IB_PA_12
-lu_2015_tax_IB-PA-14,Investissement Biens 14% - Pays,IB-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,421,,tag_IB_PA_14
-lu_2011_tax_IB-PA-15,Investissement Biens 15% - Pays,IB-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,422,,tag_IB_PA_15
-lu_2015_tax_IB-PA-17,Investissement Biens 17% - Pays,IB-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,423,,tag_IB_PA_17
-lu_2011_tax_IB-PA-3,Investissement Biens 3% - Pays,IB-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,424,,tag_IB_PA_3
-lu_2011_tax_IB-PA-6,Investissement Biens 6% - Pays,IB-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,425,,tag_IB_PA_6
-lu_2015_tax_IB-PA-8,Investissement Biens 8% - Pays,IB-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,426,,tag_IB_PA_8
-lu_2011_tax_IP-EC-0,Investissement Prestations Exonérées - Extracommunautaire,IP-EC-0,purchase,percent,0,,,lu_2011_chart_1,427,,tag_IP_EC_0
-lu_2011_tax_IP-EC-12-n,Investissement Prestations 12% - Extracommunautaire (-),IP-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1429,,tag_IP_EC_12_n
-lu_2011_tax_IP-EC-12-p,Investissement Prestations 12% - Extracommunautaire (+),IP-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1430,,tag_IP_EC_12_p
-lu_2011_tax_IP-EC-12,Investissement Prestations 12% - Extracommunautaire,IP-EC-12,purchase,group,100,,,lu_2011_chart_1,428,"lu_2011_tax_IP-EC-12-n,lu_2011_tax_IP-EC-12-p",tag_IP_EC_12
-lu_2015_tax_IP-EC-14-n,Investissement Prestations 14% - Extracommunautaire (-),IP-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1432,,tag_IP_EC_14_n
-lu_2015_tax_IP-EC-14-p,Investissement Prestations 14% - Extracommunautaire (+),IP-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1433,,tag_IP_EC_14_p
-lu_2015_tax_IP-EC-14,Investissement Prestations 14% - Extracommunautaire,IP-EC-14,purchase,group,100,,,lu_2011_chart_1,431,"lu_2015_tax_IP-EC-14-n,lu_2015_tax_IP-EC-14-p",tag_IP_EC_14
-lu_2011_tax_IP-EC-15-n,Investissement Prestations 15% - Extracommunautaire (-),IP-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1435,,tag_IP_EC_15_n
-lu_2011_tax_IP-EC-15-p,Investissement Prestations 15% - Extracommunautaire (+),IP-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1436,,tag_IP_EC_15_p
-lu_2011_tax_IP-EC-15,Investissement Prestations 15% - Extracommunautaire,IP-EC-15,purchase,group,100,,,lu_2011_chart_1,434,"lu_2011_tax_IP-EC-15-n,lu_2011_tax_IP-EC-15-p",tag_IP_EC_15
-lu_2015_tax_IP-EC-17-n,Investissement Prestations 17% - Extracommunautaire (-),IP-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1438,,tag_IP_EC_17_n
-lu_2015_tax_IP-EC-17-p,Investissement Prestations 17% - Extracommunautaire (+),IP-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1439,,tag_IP_EC_17_p
-lu_2015_tax_IP-EC-17,Investissement Prestations 17% - Extracommunautaire,IP-EC-17,purchase,group,100,,,lu_2011_chart_1,437,"lu_2015_tax_IP-EC-17-n,lu_2015_tax_IP-EC-17-p",tag_IP_EC_17
-lu_2011_tax_IP-EC-3-n,Investissement Prestations 3% - Extracommunautaire (-),IP-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1441,,tag_IP_EC_3_n
-lu_2011_tax_IP-EC-3-p,Investissement Prestations 3% - Extracommunautaire (+),IP-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1442,,tag_IP_EC_3_p
-lu_2011_tax_IP-EC-3,Investissement Prestations 3% - Extracommunautaire,IP-EC-3,purchase,group,100,,,lu_2011_chart_1,440,"lu_2011_tax_IP-EC-3-n,lu_2011_tax_IP-EC-3-p",tag_IP_EC_3
-lu_2011_tax_IP-EC-6-n,Investissement Prestations 6% - Extracommunautaire (-),IP-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1444,,tag_IP_EC_6_n
-lu_2011_tax_IP-EC-6-p,Investissement Prestations 6% - Extracommunautaire (+),IP-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1445,,tag_IP_EC_6_p
-lu_2011_tax_IP-EC-6,Investissement Prestations 6% - Extracommunautaire,IP-EC-6,purchase,group,100,,,lu_2011_chart_1,443,"lu_2011_tax_IP-EC-6-n,lu_2011_tax_IP-EC-6-p",tag_IP_EC_6
-lu_2015_tax_IP-EC-8-n,Investissement Prestations 8% - Extracommunautaire (-),IP-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1447,,tag_IP_EC_8_n
-lu_2015_tax_IP-EC-8-p,Investissement Prestations 8% - Extracommunautaire (+),IP-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1448,,tag_IP_EC_8_p
-lu_2015_tax_IP-EC-8,Investissement Prestations 8% - Extracommunautaire,IP-EC-8,purchase,group,100,,,lu_2011_chart_1,446,"lu_2015_tax_IP-EC-8-n,lu_2015_tax_IP-EC-8-p",tag_IP_EC_8
-lu_2011_tax_IP-IC-0,Investissement Prestations Exonérées - Intracommunautaire,IP-IC-0,purchase,percent,0,,,lu_2011_chart_1,449,,tag_IP_IC_0
-lu_2011_tax_IP-IC-12-n,Investissement Prestations 12% - Intracommunautaire (-),IP-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1451,,tag_IP_IC_12_n
-lu_2011_tax_IP-IC-12-p,Investissement Prestations 12% - Intracommunautaire (+),IP-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1452,,tag_IP_IC_12_p
-lu_2011_tax_IP-IC-12,Investissement Prestations 12% - Intracommunautaire,IP-IC-12,purchase,group,100,,,lu_2011_chart_1,450,"lu_2011_tax_IP-IC-12-n,lu_2011_tax_IP-IC-12-p",tag_IP_IC_12
-lu_2015_tax_IP-IC-14-n,Investissement Prestations 14% - Intracommunautaire (-),IP-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1454,,tag_IP_IC_14_n
-lu_2015_tax_IP-IC-14-p,Investissement Prestations 14% - Intracommunautaire (+),IP-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1455,,tag_IP_IC_14_p
-lu_2015_tax_IP-IC-14,Investissement Prestations 14% - Intracommunautaire,IP-IC-14,purchase,group,100,,,lu_2011_chart_1,453,"lu_2015_tax_IP-IC-14-n,lu_2015_tax_IP-IC-14-p",tag_IP_IC_14
-lu_2011_tax_IP-IC-15-n,Investissement Prestations 15% - Intracommunautaire (-),IP-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1457,,tag_IP_IC_15_n
-lu_2011_tax_IP-IC-15-p,Investissement Prestations 15% - Intracommunautaire (+),IP-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1458,,tag_IP_IC_15_p
-lu_2011_tax_IP-IC-15,Investissement Prestations 15% - Intracommunautaire,IP-IC-15,purchase,group,100,,,lu_2011_chart_1,456,"lu_2011_tax_IP-IC-15-n,lu_2011_tax_IP-IC-15-p",tag_IP_IC_15
-lu_2015_tax_IP-IC-17-n,Investissement Prestations 17% - Intracommunautaire (-),IP-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1460,,tag_IP_IC_17_n
-lu_2015_tax_IP-IC-17-p,Investissement Prestations 17% - Intracommunautaire (+),IP-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1461,,tag_IP_IC_17_p
-lu_2015_tax_IP-IC-17,Investissement Prestations 17% - Intracommunautaire,IP-IC-17,purchase,group,100,,,lu_2011_chart_1,459,"lu_2015_tax_IP-IC-17-n,lu_2015_tax_IP-IC-17-p",tag_IP_IC_17
-lu_2011_tax_IP-IC-3-n,Investissement Prestations 3% - Intracommunautaire (-),IP-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1463,,tag_IP_IC_3_n
-lu_2011_tax_IP-IC-3-p,Investissement Prestations 3% - Intracommunautaire (+),IP-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1464,,tag_IP_IC_3_p
-lu_2011_tax_IP-IC-3,Investissement Prestations 3% - Intracommunautaire,IP-IC-3,purchase,group,100,,,lu_2011_chart_1,462,"lu_2011_tax_IP-IC-3-n,lu_2011_tax_IP-IC-3-p",tag_IP_IC_3
-lu_2011_tax_IP-IC-6-n,Investissement Prestations 6% - Intracommunautaire (-),IP-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1466,,tag_IP_IC_6_n
-lu_2011_tax_IP-IC-6-p,Investissement Prestations 6% - Intracommunautaire (+),IP-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1467,,tag_IP_IC_6_p
-lu_2011_tax_IP-IC-6,Investissement Prestations 6% - Intracommunautaire,IP-IC-6,purchase,group,100,,,lu_2011_chart_1,465,"lu_2011_tax_IP-IC-6-n,lu_2011_tax_IP-IC-6-p",tag_IP_IC_6
-lu_2015_tax_IP-IC-8-n,Investissement Prestations 8% - Intracommunautaire (-),IP-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1469,,tag_IP_IC_8_n
-lu_2015_tax_IP-IC-8-p,Investissement Prestations 8% - Intracommunautaire (+),IP-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1470,,tag_IP_IC_8_p
-lu_2015_tax_IP-IC-8,Investissement Prestations 8% - Intracommunautaire,IP-IC-8,purchase,group,100,,,lu_2011_chart_1,468,"lu_2015_tax_IP-IC-8-n,lu_2015_tax_IP-IC-8-p",tag_IP_IC_8
-lu_2011_tax_IP-PA-0,Investissement Prestations 0% - Pays,IP-PA-0,purchase,percent,0,,,lu_2011_chart_1,471,,tag_IP_PA_0
-lu_2011_tax_IP-PA-12,Investissement Prestations 12% - Pays,IP-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,472,,tag_IP_PA_12
-lu_2015_tax_IP-PA-14,Investissement Prestations 14% - Pays,IP-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,473,,tag_IP_PA_14
-lu_2011_tax_IP-PA-15,Investissement Prestations 15% - Pays,IP-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,474,,tag_IP_PA_15
-lu_2015_tax_IP-PA-17,Investissement Prestations 17% - Pays,IP-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,475,,tag_IP_PA_17
-lu_2011_tax_IP-PA-3,Investissement Prestations 3% - Pays,IP-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,476,,tag_IP_PA_3
-lu_2011_tax_IP-PA-6,Investissement Prestations 6% - Pays,IP-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,477,,tag_IP_PA_6
-lu_2015_tax_IP-PA-8,Investissement Prestations 8% - Pays,IP-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,478,,tag_IP_PA_8
-lu_2015_tax_V-ART-43_60b,Vente - Autres Exonérations (Article 43 et 60 bis),V-ART-43_60b,sale,percent,0,,,lu_2011_chart_1,479,,tag_V_ART_43_60b
-lu_2015_tax_V-ART-44_56q,Vente - Autres Exonérations (Article 44 et 56 quarter),V-ART-44_56q,sale,percent,0,,,lu_2011_chart_1,480,,tag_V_ART_44_56q
-lu_2011_tax_VB-EC-0,Vente Biens - Extracommunautaire,VB-EC-0,sale,percent,0,,,lu_2011_chart_1,481,,tag_VB_EC_0
-lu_2011_tax_VB-EC-Tab,Vente Biens Tabacs - Extracommunautaire,VB-EC-Tab,sale,percent,0,,,lu_2011_chart_1,482,,tag_VB_EC_Tab
-lu_2011_tax_VB-IC-0,Vente Biens - Intracommunautaire,VB-IC-0,sale,percent,0,,,lu_2011_chart_1,483,,tag_VB_IC_0
-lu_2011_tax_VB-IC-Tab,Vente Biens Tabacs - Intracommunautaire,VB-IC-Tab,sale,percent,0,,,lu_2011_chart_1,484,,tag_VB_IC_Tab
-lu_2011_tax_VB-PA-0,Vente Biens 0% - Pays,VB-PA-0,sale,percent,0,,,lu_2011_chart_1,485,,tag_VB_PA_0
-lu_2011_tax_VB-PA-12,Vente Biens 12% - Pays,VB-PA-12,sale,percent,12,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,486,,tag_VB_PA_12
-lu_2015_tax_VB-PA-14,Vente Biens 14% - Pays,VB-PA-14,sale,percent,14,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,487,,tag_VB_PA_14
-lu_2011_tax_VB-PA-15,Vente Biens 15% - Pays,VB-PA-15,sale,percent,15,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,488,,tag_VB_PA_15
-lu_2015_tax_VB-PA-17,Vente Biens 17% - Pays,VB-PA-17,sale,percent,17,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,489,,tag_VB_PA_17
-lu_2011_tax_VB-PA-3,Vente Biens 3% - Pays,VB-PA-3,sale,percent,3,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,490,,tag_VB_PA_3
-lu_2011_tax_VB-PA-6,Vente Biens 6% - Pays,VB-PA-6,sale,percent,6,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,491,,tag_VB_PA_6
-lu_2015_tax_VB-PA-8,Vente Biens 8% - Pays,VB-PA-8,sale,percent,8,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,492,,tag_VB_PA_8
-lu_2011_tax_VB-PA-Tab,Vente Biens Tabacs - Pays,VB-PA-Tab,sale,percent,0,,,lu_2011_chart_1,493,,tag_VB_PA_Tab
-lu_2015_tax_VB-TR-0,Vente Biens – Triangulaire Intracommunautaire,VB-TR-0,sale,percent,0,,,lu_2011_chart_1,494,,tag_VB_TR_0
-lu_2011_tax_VP-EC-0,Vente Prestations - Extracommunautaire,VP-EC-0,sale,percent,0,,,lu_2011_chart_1,495,,tag_VP_EC_0
-lu_2011_tax_VP-IC-0,Vente Prestations - Intracommunautaire,VP-IC-0,sale,percent,0,,,lu_2011_chart_1,496,,tag_VP_IC_0
-lu_2011_tax_VP-IC-EX,'Vente Prestations - Intracommunautaire exonérées dans l''état membre',VP-IC-EX,sale,percent,0,,,lu_2011_chart_1,497,,tag_VP_IC_EX
-lu_2011_tax_VP-PA-0,Vente Prestations 0% - Pays,VP-PA-0,sale,percent,0,,,lu_2011_chart_1,498,,tag_VP_PA_0
-lu_2011_tax_VP-PA-12,Vente Prestations 12% - Pays,VP-PA-12,sale,percent,12,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,499,,tag_VP_PA_12
-lu_2015_tax_VP-PA-14,Vente Prestations 14% - Pays,VP-PA-14,sale,percent,14,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,500,,tag_VP_PA_14
-lu_2011_tax_VP-PA-15,Vente Prestations 15% - Pays,VP-PA-15,sale,percent,15,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,501,,tag_VP_PA_15
-lu_2015_tax_VP-PA-17,Vente Prestations 17% - Pays,VP-PA-17,sale,percent,17,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,502,,tag_VP_PA_17
-lu_2011_tax_VP-PA-3,Vente Prestations 3% - Pays,VP-PA-3,sale,percent,3,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,503,,tag_VP_PA_3
-lu_2011_tax_VP-PA-6,Vente Prestations 6% - Pays,VP-PA-6,sale,percent,6,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,504,,tag_VP_PA_6
-lu_2015_tax_VP-PA-8,Vente Prestations 8% - Pays,VP-PA-8,sale,percent,8,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,505,,tag_VP_PA_8
-lu_2015_tax_SANS,Sans Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_VP_PA_SANS
-lu_2015_tax_SANS,Sans Taxes,SANS,sale,percent,0,,,lu_2011_chart_1,507,,tag_VP_PA_SANS
\ No newline at end of file
+lu_2011_tax_AB-EC-0,Achat Biens Exonéré - Extracommunautaire,AB-EC-0,purchase,percent,0,,,lu_2011_chart_1,101,,tag_lu_69
+lu_2011_tax_AB-EC-12-n,Achat Biens 12% - Extracommunautaire (-),AB-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1103,,tag_lu_513
+lu_2011_tax_AB-EC-12-p,Achat Biens 12% - Extracommunautaire (+),AB-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1104,,tag_lu_338
+lu_2011_tax_AB-EC-12,Achat Biens 12% - Extracommunautaire,AB-EC-12,purchase,group,1,,,lu_2011_chart_1,102,"lu_2011_tax_AB-EC-12-n,lu_2011_tax_AB-EC-12-p",tag_lu_49
+lu_2015_tax_AB-EC-14-n,Achat Biens 14% - Extracommunautaire (-),AB-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1106,,tag_lu_514
+lu_2015_tax_AB-EC-14-p,Achat Biens 14% - Extracommunautaire (+),AB-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1107,,tag_lu_362
+lu_2015_tax_AB-EC-14,Achat Biens 14% - Extracommunautaire,AB-EC-14,purchase,group,1,,,lu_2011_chart_1,105,"lu_2015_tax_AB-EC-14-n,lu_2015_tax_AB-EC-14-p",tag_lu_81
+lu_2011_tax_AB-EC-15-n,Achat Biens 15% - Extracommunautaire (-),AB-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1109,,tag_lu_515
+lu_2011_tax_AB-EC-15-p,Achat Biens 15% - Extracommunautaire (+),AB-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1110,,tag_lu_326
+lu_2011_tax_AB-EC-15,Achat Biens 15% - Extracommunautaire,AB-EC-15,purchase,group,100,,,lu_2011_chart_1,108,"lu_2011_tax_AB-EC-15-n,lu_2011_tax_AB-EC-15-p",tag_lu_37
+lu_2015_tax_AB-EC-17-n,Achat Biens 17% - Extracommunautaire (-),AB-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1112,,tag_lu_516
+lu_2015_tax_AB-EC-17-p,Achat Biens 17% - Extracommunautaire (+),AB-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1113,,tag_lu_358
+lu_2015_tax_AB-EC-17,Achat Biens 17% - Extracommunautaire,AB-EC-17,purchase,group,100,,,lu_2011_chart_1,111,"lu_2015_tax_AB-EC-17-n,lu_2015_tax_AB-EC-17-p",tag_lu_77
+lu_2011_tax_AB-EC-3-n,Achat Biens 3% - Extracommunautaire (-),AB-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1115,,tag_lu_517
+lu_2011_tax_AB-EC-3-p,Achat Biens 3% - Extracommunautaire (+),AB-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1116,,tag_lu_334
+lu_2011_tax_AB-EC-3,Achat Biens 3% - Extracommunautaire,AB-EC-3,purchase,group,100,,,lu_2011_chart_1,114,"lu_2011_tax_AB-EC-3-n,lu_2011_tax_AB-EC-3-p",tag_lu_45
+lu_2011_tax_AB-EC-6-n,Achat Biens 6% - Extracommunautaire (-),AB-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1118,,tag_lu_518
+lu_2011_tax_AB-EC-6-p,Achat Biens 6% - Extracommunautaire (+),AB-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1119,,tag_lu_330
+lu_2011_tax_AB-EC-6,Achat Biens 6% - Extracommunautaire,AB-EC-6,purchase,group,100,,,lu_2011_chart_1,117,"lu_2011_tax_AB-EC-6-n,lu_2011_tax_AB-EC-6-p",tag_lu_41
+lu_2015_tax_AB-EC-8-n,Achat Biens 8% - Extracommunautaire (-),AB-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1121,,tag_lu_519
+lu_2015_tax_AB-EC-8-p,Achat Biens 8% - Extracommunautaire (+),AB-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1122,,tag_lu_366
+lu_2015_tax_AB-EC-8,Achat Biens 8% - Extracommunautaire,AB-EC-8,purchase,group,100,,,lu_2011_chart_1,120,"lu_2015_tax_AB-EC-8-n,lu_2015_tax_AB-EC-8-p",tag_lu_85
+lu_2015_tax_AB-ECP-0,Achat Biens Exonéré - Extracommunautaire fin privées,AB-ECP-0,purchase,percent,0,,,lu_2011_chart_1,123,,tag_lu_73
+lu_2015_tax_AB-ECP-12-n,Achat Biens 12% - Extracommunautaire fin privées (-),AB-ECP-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1125,,tag_lu_520
+lu_2015_tax_AB-ECP-12-p,Achat Biens 12% - Extracommunautaire fin privées (+),AB-ECP-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1126,,tag_lu_354
+lu_2015_tax_AB-ECP-12,Achat Biens 12% - Extracommunautaire fin privées,AB-ECP-12,purchase,group,100,,,lu_2011_chart_1,124,"lu_2015_tax_AB-ECP-12-n,lu_2015_tax_AB-ECP-12-p",tag_lu_65
+lu_2015_tax_AB-ECP-14-n,Achat Biens 14% - Extracommunautaire fin privées (-),AB-ECP-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1128,,tag_lu_521
+lu_2015_tax_AB-ECP-14-p,Achat Biens 14% - Extracommunautaire fin privées (+),AB-ECP-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1129,,tag_lu_374
+lu_2015_tax_AB-ECP-14,Achat Biens 14% - Extracommunautaire fin privées,AB-ECP-14,purchase,group,100,,,lu_2011_chart_1,127,"lu_2015_tax_AB-ECP-14-n,lu_2015_tax_AB-ECP-14-p",tag_lu_93
+lu_2015_tax_AB-ECP-15-n,Achat Biens 15% - Extracommunautaire fin privées (-),AB-ECP-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1131,,tag_lu_522
+lu_2015_tax_AB-ECP-15-p,Achat Biens 15% - Extracommunautaire fin privées (+),AB-ECP-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1132,,tag_lu_342
+lu_2015_tax_AB-ECP-15,Achat Biens 15% - Extracommunautaire fin privées,AB-ECP-15,purchase,group,100,,,lu_2011_chart_1,130,"lu_2015_tax_AB-ECP-15-n,lu_2015_tax_AB-ECP-15-p",tag_lu_53
+lu_2015_tax_AB-ECP-17-n,Achat Biens 17% - Extracommunautaire fin privées (-),AB-ECP-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1134,,tag_lu_523
+lu_2015_tax_AB-ECP-17-p,Achat Biens 17% - Extracommunautaire fin privées (+),AB-ECP-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1135,,tag_lu_370
+lu_2015_tax_AB-ECP-17,Achat Biens 17% - Extracommunautaire fin privées,AB-ECP-17,purchase,group,100,,,lu_2011_chart_1,133,"lu_2015_tax_AB-ECP-17-n,lu_2015_tax_AB-ECP-17-p",tag_lu_89
+lu_2015_tax_AB-ECP-3-n,Achat Biens 3% - Extracommunautaire fin privées (-),AB-ECP-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1137,,tag_lu_524
+lu_2015_tax_AB-ECP-3-p,Achat Biens 3% - Extracommunautaire fin privées (+),AB-ECP-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1138,,tag_lu_350
+lu_2015_tax_AB-ECP-3,Achat Biens 3% - Extracommunautaire fin privées,AB-ECP-3,purchase,group,100,,,lu_2011_chart_1,136,"lu_2015_tax_AB-ECP-3-n,lu_2015_tax_AB-ECP-3-p",tag_lu_61
+lu_2015_tax_AB-ECP-6-n,Achat Biens 6% - Extracommunautaire fin privées (-),AB-ECP-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1140,,tag_lu_525
+lu_2015_tax_AB-ECP-6-p,Achat Biens 6% - Extracommunautaire fin privées (+),AB-ECP-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1141,,tag_lu_346
+lu_2015_tax_AB-ECP-6,Achat Biens 6% - Extracommunautaire fin privées,AB-ECP-6,purchase,group,100,,,lu_2011_chart_1,139,"lu_2015_tax_AB-ECP-6-n,lu_2015_tax_AB-ECP-6-p",tag_lu_57
+lu_2015_tax_AB-ECP-8-n,Achat Biens 8% - Extracommunautaire fin privées (-),AB-ECP-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1143,,tag_lu_526
+lu_2015_tax_AB-ECP-8-p,Achat Biens 8% - Extracommunautaire fin privées (+),AB-ECP-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1144,,tag_lu_378
+lu_2015_tax_AB-ECP-8,Achat Biens 8% - Extracommunautaire fin privées,AB-ECP-8,purchase,group,100,,,lu_2011_chart_1,142,"lu_2015_tax_AB-ECP-8-n,lu_2015_tax_AB-ECP-8-p",tag_lu_97
+lu_2011_tax_AB-IC-0,Achat Biens Exonéré - Intracommunautaire,AB-IC-0,purchase,percent,0,,,lu_2011_chart_1,145,,tag_lu_20
+lu_2011_tax_AB-IC-12-n,Achat Biens 12% - Intracommunautaire (-),AB-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1147,,tag_lu_491
+lu_2011_tax_AB-IC-12-p,Achat Biens 12% - Intracommunautaire (+),AB-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1148,,tag_lu_309
+lu_2011_tax_AB-IC-12,Achat Biens 12% - Intracommunautaire,AB-IC-12,purchase,group,100,,,lu_2011_chart_1,146,"lu_2011_tax_AB-IC-12-n,lu_2011_tax_AB-IC-12-p",tag_lu_16
+lu_2015_tax_AB-IC-14-n,Achat Biens 14% - Intracommunautaire (-),AB-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1150,,tag_lu_492
+lu_2015_tax_AB-IC-14-p,Achat Biens 14% - Intracommunautaire (+),AB-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1151,,tag_lu_317
+lu_2015_tax_AB-IC-14,Achat Biens 14% - Intracommunautaire,AB-IC-14,purchase,group,100,,,lu_2011_chart_1,149,"lu_2015_tax_AB-IC-14-n,lu_2015_tax_AB-IC-14-p",tag_lu_28
+lu_2011_tax_AB-IC-15-n,Achat Biens 15% - Intracommunautaire (-),AB-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1153,,tag_lu_493
+lu_2011_tax_AB-IC-15-p,Achat Biens 15% - Intracommunautaire (+),AB-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1154,,tag_lu_297
+lu_2011_tax_AB-IC-15,Achat Biens 15% - Intracommunautaire,AB-IC-15,purchase,group,100,,,lu_2011_chart_1,152,"lu_2011_tax_AB-IC-15-n,lu_2011_tax_AB-IC-15-p",tag_lu_04
+lu_2015_tax_AB-IC-17-n,Achat Biens 17% - Intracommunautaire (-),AB-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1156,,tag_lu_494
+lu_2015_tax_AB-IC-17-p,Achat Biens 17% - Intracommunautaire (+),AB-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1157,,tag_lu_313
+lu_2015_tax_AB-IC-17,Achat Biens 17% - Intracommunautaire,AB-IC-17,purchase,group,100,,,lu_2011_chart_1,155,"lu_2015_tax_AB-IC-17-n,lu_2015_tax_AB-IC-17-p",tag_lu_24
+lu_2011_tax_AB-IC-3-n,Achat Biens 3% - Intracommunautaire (-),AB-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1159,,tag_lu_495
+lu_2011_tax_AB-IC-3-p,Achat Biens 3% - Intracommunautaire (+),AB-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1160,,tag_lu_305
+lu_2011_tax_AB-IC-3,Achat Biens 3% - Intracommunautaire,AB-IC-3,purchase,group,100,,,lu_2011_chart_1,158,"lu_2011_tax_AB-IC-3-n,lu_2011_tax_AB-IC-3-p",tag_lu_12
+lu_2011_tax_AB-IC-6-n,Achat Biens 6% - Intracommunautaire (-),AB-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1162,,tag_lu_496
+lu_2011_tax_AB-IC-6-p,Achat Biens 6% - Intracommunautaire (+),AB-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1163,,tag_lu_301
+lu_2011_tax_AB-IC-6,Achat Biens 6% - Intracommunautaire,AB-IC-6,purchase,group,100,,,lu_2011_chart_1,161,"lu_2011_tax_AB-IC-6-n,lu_2011_tax_AB-IC-6-p",tag_lu_08
+lu_2015_tax_AB-IC-8-n,Achat Biens 8% - Intracommunautaire (-),AB-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1165,,tag_lu_497
+lu_2015_tax_AB-IC-8-p,Achat Biens 8% - Intracommunautaire (+),AB-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1166,,tag_lu_321
+lu_2015_tax_AB-IC-8,Achat Biens 8% - Intracommunautaire,AB-IC-8,purchase,group,100,,,lu_2011_chart_1,164,"lu_2015_tax_AB-IC-8-n,lu_2015_tax_AB-IC-8-p",tag_lu_32
+lu_2011_tax_AB-PA-0,Achat Biens 0% - Pays,AB-PA-0,purchase,percent,0,,,lu_2011_chart_1,167,,tag_lu_220
+lu_2011_tax_AB-PA-12,Achat Biens 12% - Pays,AB-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,168,,"tag_lu_221,tag_lu_447"
+lu_2015_tax_AB-PA-14,Achat Biens 14% - Pays,AB-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,169,,"tag_lu_222,tag_lu_448"
+lu_2011_tax_AB-PA-15,Achat Biens 15% - Pays,AB-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,170,,"tag_lu_223,tag_lu_449"
+lu_2015_tax_AB-PA-17,Achat Biens 17% - Pays,AB-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,171,,"tag_lu_224,tag_lu_450"
+lu_2011_tax_AB-PA-3,Achat Biens 3% - Pays,AB-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,172,,"tag_lu_225,tag_lu_451"
+lu_2011_tax_AB-PA-6,Achat Biens 6% - Pays,AB-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,173,,"tag_lu_226,tag_lu_452"
+lu_2015_tax_AB-PA-8,Achat Biens 8% - Pays,AB-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,174,,"tag_lu_453,tag_lu_227"
+lu_2011_tax_AP-EC-0,Achat Prestations Exonérées - Extracommunautaire,AP-EC-0,purchase,percent,0,,,lu_2011_chart_1,175,,tag_lu_153
+lu_2011_tax_AP-EC-12-n,Achat Prestations 12% - Extracommunautaire (-),AP-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1177,,tag_lu_556
+lu_2011_tax_AP-EC-12-p,Achat Prestations 12% - Extracommunautaire (+),AP-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1178,,tag_lu_425
+lu_2011_tax_AP-EC-12,Achat Prestations 12% - Extracommunautaire,AP-EC-12,purchase,group,100,,,lu_2011_chart_1,176,"lu_2011_tax_AP-EC-12-n,lu_2011_tax_AP-EC-12-p",tag_lu_149
+lu_2015_tax_AP-EC-14-n,Achat Prestations 14% - Extracommunautaire (-),AP-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1180,,tag_lu_557
+lu_2015_tax_AP-EC-14-p,Achat Prestations 14% - Extracommunautaire (+),AP-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1181,,tag_lu_433
+lu_2015_tax_AP-EC-14,Achat Prestations 14% - Extracommunautaire,AP-EC-14,purchase,group,100,,,lu_2011_chart_1,179,"lu_2015_tax_AP-EC-14-n,lu_2015_tax_AP-EC-14-p",tag_lu_161
+lu_2011_tax_AP-EC-15-n,Achat Prestations 15% - Extracommunautaire (-),AP-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1183,,tag_lu_558
+lu_2011_tax_AP-EC-15-p,Achat Prestations 15% - Extracommunautaire (+),AP-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1184,,tag_lu_413
+lu_2011_tax_AP-EC-15,Achat Prestations 15% - Extracommunautaire,AP-EC-15,purchase,group,100,,,lu_2011_chart_1,182,"lu_2011_tax_AP-EC-15-n,lu_2011_tax_AP-EC-15-p",tag_lu_137
+lu_2015_tax_AP-EC-17-n,Achat Prestations 17% - Extracommunautaire (-),AP-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1186,,tag_lu_559
+lu_2015_tax_AP-EC-17-p,Achat Prestations 17% - Extracommunautaire (+),AP-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1187,,tag_lu_429
+lu_2015_tax_AP-EC-17,Achat Prestations 17% - Extracommunautaire,AP-EC-17,purchase,group,100,,,lu_2011_chart_1,185,"lu_2015_tax_AP-EC-17-n,lu_2015_tax_AP-EC-17-p",tag_lu_157
+lu_2011_tax_AP-EC-3-n,Achat Prestations 3% - Extracommunautaire (-),AP-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1189,,tag_lu_560
+lu_2011_tax_AP-EC-3-p,Achat Prestations 3% - Extracommunautaire (+),AP-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1190,,tag_lu_421
+lu_2011_tax_AP-EC-3,Achat Prestations 3% - Extracommunautaire,AP-EC-3,purchase,group,100,,,lu_2011_chart_1,188,"lu_2011_tax_AP-EC-3-n,lu_2011_tax_AP-EC-3-p",tag_lu_145
+lu_2011_tax_AP-EC-6-n,Achat Prestations 6% - Extracommunautaire (-),AP-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1192,,tag_lu_561
+lu_2011_tax_AP-EC-6-p,Achat Prestations 6% - Extracommunautaire (+),AP-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1193,,tag_lu_417
+lu_2011_tax_AP-EC-6,Achat Prestations 6% - Extracommunautaire,AP-EC-6,purchase,group,100,,,lu_2011_chart_1,191,"lu_2011_tax_AP-EC-6-n,lu_2011_tax_AP-EC-6-p",tag_lu_141
+lu_2015_tax_AP-EC-8-n,Achat Prestations 8% - Extracommunautaire (-),AP-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1195,,tag_lu_562
+lu_2015_tax_AP-EC-8-p,Achat Prestations 8% - Extracommunautaire (+),AP-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1196,,tag_lu_437
+lu_2015_tax_AP-EC-8,Achat Prestations 8% - Extracommunautaire,AP-EC-8,purchase,group,100,,,lu_2011_chart_1,194,"lu_2015_tax_AP-EC-8-n,lu_2015_tax_AP-EC-8-p",tag_lu_165
+lu_2011_tax_AP-IC-0,Achat Prestations Exonérées - Intracommunautaire,AP-IC-0,purchase,percent,0,,,lu_2011_chart_1,197,,tag_lu_120
+lu_2011_tax_AP-IC-12-n,Achat Prestations 12% - Intracommunautaire (-),AP-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1199,,tag_lu_563
+lu_2011_tax_AP-IC-12-p,Achat Prestations 12% - Intracommunautaire (+),AP-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1200,,tag_lu_396
+lu_2011_tax_AP-IC-12,Achat Prestations 12% - Intracommunautaire,AP-IC-12,purchase,group,100,,,lu_2011_chart_1,198,"lu_2011_tax_AP-IC-12-n,lu_2011_tax_AP-IC-12-p",tag_lu_116
+lu_2015_tax_AP-IC-14-n,Achat Prestations 14% - Intracommunautaire (-),AP-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1202,,tag_lu_564
+lu_2015_tax_AP-IC-14-p,Achat Prestations 14% - Intracommunautaire (+),AP-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1203,,tag_lu_404
+lu_2015_tax_AP-IC-14,Achat Prestations 14% - Intracommunautaire,AP-IC-14,purchase,group,100,,,lu_2011_chart_1,201,"lu_2015_tax_AP-IC-14-n,lu_2015_tax_AP-IC-14-p",tag_lu_128
+lu_2011_tax_AP-IC-15-n,Achat Prestations 15% - Intracommunautaire (-),AP-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1205,,tag_lu_565
+lu_2011_tax_AP-IC-15-p,Achat Prestations 15% - Intracommunautaire (+),AP-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1206,,tag_lu_384
+lu_2011_tax_AP-IC-15,Achat Prestations 15% - Intracommunautaire,AP-IC-15,purchase,group,100,,,lu_2011_chart_1,204,"lu_2011_tax_AP-IC-15-n,lu_2011_tax_AP-IC-15-p",tag_lu_104
+lu_2015_tax_AP-IC-17-n,Achat Prestations 17% - Intracommunautaire (-),AP-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1208,,tag_lu_566
+lu_2015_tax_AP-IC-17-p,Achat Prestations 17% - Intracommunautaire (+),AP-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1209,,tag_lu_400
+lu_2015_tax_AP-IC-17,Achat Prestations 17% - Intracommunautaire,AP-IC-17,purchase,group,100,,,lu_2011_chart_1,207,"lu_2015_tax_AP-IC-17-n,lu_2015_tax_AP-IC-17-p",tag_lu_124
+lu_2011_tax_AP-IC-3-n,Achat Prestations 3% - Intracommunautaire (-),AP-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1211,,tag_lu_567
+lu_2011_tax_AP-IC-3-p,Achat Prestations 3% - Intracommunautaire (+),AP-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1212,,tag_lu_392
+lu_2011_tax_AP-IC-3,Achat Prestations 3% - Intracommunautaire,AP-IC-3,purchase,group,100,,,lu_2011_chart_1,210,"lu_2011_tax_AP-IC-3-n,lu_2011_tax_AP-IC-3-p",tag_lu_112
+lu_2011_tax_AP-IC-6-n,Achat Prestations 6% - Intracommunautaire (-),AP-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1214,,tag_lu_568
+lu_2011_tax_AP-IC-6-p,Achat Prestations 6% - Intracommunautaire (+),AP-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1215,,tag_lu_388
+lu_2011_tax_AP-IC-6,Achat Prestations 6% - Intracommunautaire,AP-IC-6,purchase,group,100,,,lu_2011_chart_1,213,"lu_2011_tax_AP-IC-6-n,lu_2011_tax_AP-IC-6-p",tag_lu_108
+lu_2015_tax_AP-IC-8-n,Achat Prestations 8% - Intracommunautaire (-),AP-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1217,,tag_lu_569
+lu_2015_tax_AP-IC-8-p,Achat Prestations 8% - Intracommunautaire (+),AP-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1218,,tag_lu_408
+lu_2015_tax_AP-IC-8,Achat Prestations 8% - Intracommunautaire,AP-IC-8,purchase,group,100,,,lu_2011_chart_1,216,"lu_2015_tax_AP-IC-8-n,lu_2015_tax_AP-IC-8-p",tag_lu_132
+lu_2011_tax_AP-PA-0,Achat Prestations 0% - Pays,AP-PA-0,purchase,percent,0,,,lu_2011_chart_1,219,,tag_lu_228
+lu_2011_tax_AP-PA-12,Achat Prestations 12% - Pays,AP-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,220,,"tag_lu_454,tag_lu_229"
+lu_2015_tax_AP-PA-14,Achat Prestations 14% - Pays,AP-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,221,,"tag_lu_456,tag_lu_230"
+lu_2011_tax_AP-PA-15,Achat Prestations 15% - Pays,AP-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,222,,"tag_lu_457,tag_lu_231"
+lu_2015_tax_AP-PA-17,Achat Prestations 17% - Pays,AP-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,223,,"tag_lu_458,tag_lu_232"
+lu_2011_tax_AP-PA-3,Achat Prestations 3% - Pays,AP-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,224,,"tag_lu_233,tag_lu_459"
+lu_2011_tax_AP-PA-6,Achat Prestations 6% - Pays,AP-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,225,,"tag_lu_460,tag_lu_234"
+lu_2015_tax_AP-PA-8,Achat Prestations 8% - Pays,AP-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,226,,"tag_lu_235,tag_lu_461"
+lu_2011_tax_FB-EC-0,Frais Biens Exonéré - Extracommunautaire,FB-EC-0,purchase,percent,0,,,lu_2011_chart_1,227,,tag_lu_70
+lu_2011_tax_FB-EC-12-n,Frais Biens 12% - Extracommunautaire (-),FB-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1229,,tag_lu_527
+lu_2011_tax_FB-EC-12-p,Frais Biens 12% - Extracommunautaire (+),FB-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1230,,tag_lu_339
+lu_2011_tax_FB-EC-12,Frais Biens 12% - Extracommunautaire,FB-EC-12,purchase,group,100,,,lu_2011_chart_1,228,"lu_2011_tax_FB-EC-12-n,lu_2011_tax_FB-EC-12-p",tag_lu_50
+lu_2015_tax_FB-EC-14-n,Frais Biens 14% - Extracommunautaire (-),FB-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1232,,tag_lu_528
+lu_2015_tax_FB-EC-14-p,Frais Biens 14% - Extracommunautaire (+),FB-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1233,,tag_lu_363
+lu_2015_tax_FB-EC-14,Frais Biens 14% - Extracommunautaire,FB-EC-14,purchase,group,100,,,lu_2011_chart_1,231,"lu_2015_tax_FB-EC-14-n,lu_2015_tax_FB-EC-14-p",tag_lu_82
+lu_2011_tax_FB-EC-15-n,Frais Biens 15% - Extracommunautaire (-),FB-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1235,,tag_lu_529
+lu_2011_tax_FB-EC-15-p,Frais Biens 15% - Extracommunautaire (+),FB-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1236,,tag_lu_327
+lu_2011_tax_FB-EC-15,Frais Biens 15% - Extracommunautaire,FB-EC-15,purchase,group,100,,,lu_2011_chart_1,234,"lu_2011_tax_FB-EC-15-n,lu_2011_tax_FB-EC-15-p",tag_lu_38
+lu_2015_tax_FB-EC-17-n,Frais Biens 17% - Extracommunautaire (-),FB-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1238,,tag_lu_530
+lu_2015_tax_FB-EC-17-p,Frais Biens 17% - Extracommunautaire (+),FB-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1239,,tag_lu_359
+lu_2015_tax_FB-EC-17,Frais Biens 17% - Extracommunautaire,FB-EC-17,purchase,group,100,,,lu_2011_chart_1,237,"lu_2015_tax_FB-EC-17-n,lu_2015_tax_FB-EC-17-p",tag_lu_78
+lu_2011_tax_FB-EC-3-n,Frais Biens 3% - Extracommunautaire (-),FB-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1241,,tag_lu_531
+lu_2011_tax_FB-EC-3-p,Frais Biens 3% - Extracommunautaire (+),FB-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1242,,tag_lu_335
+lu_2011_tax_FB-EC-3,Frais Biens 3% - Extracommunautaire,FB-EC-3,purchase,group,100,,,lu_2011_chart_1,240,"lu_2011_tax_FB-EC-3-n,lu_2011_tax_FB-EC-3-p",tag_lu_46
+lu_2011_tax_FB-EC-6-n,Frais Biens 6% - Extracommunautaire (-),FB-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1244,,tag_lu_532
+lu_2011_tax_FB-EC-6-p,Frais Biens 6% - Extracommunautaire (+),FB-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1245,,tag_lu_331
+lu_2011_tax_FB-EC-6,Frais Biens 6% - Extracommunautaire,FB-EC-6,purchase,group,100,,,lu_2011_chart_1,243,"lu_2011_tax_FB-EC-6-n,lu_2011_tax_FB-EC-6-p",tag_lu_42
+lu_2015_tax_FB-EC-8-n,Frais Biens 8% - Extracommunautaire (-),FB-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1247,,tag_lu_533
+lu_2015_tax_FB-EC-8-p,Frais Biens 8% - Extracommunautaire (+),FB-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1248,,tag_lu_367
+lu_2015_tax_FB-EC-8,Frais Biens 8% - Extracommunautaire,FB-EC-8,purchase,group,100,,,lu_2011_chart_1,246,"lu_2015_tax_FB-EC-8-n,lu_2015_tax_FB-EC-8-p",tag_lu_86
+lu_2015_tax_FB-ECP-0,Frais Biens Exonéré - Extracommunautaire fin privées,FB-ECP-0,purchase,percent,0,,,lu_2011_chart_1,249,,tag_lu_74
+lu_2015_tax_FB-ECP-12-n,Frais Biens 12% - Extracommunautaire fin privées (-),FB-ECP-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1251,,tag_lu_534
+lu_2015_tax_FB-ECP-12-p,Frais Biens 12% - Extracommunautaire fin privées (+),FB-ECP-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1252,,tag_lu_355
+lu_2015_tax_FB-ECP-12,Frais Biens 12% - Extracommunautaire fin privées,FB-ECP-12,purchase,group,100,,,lu_2011_chart_1,250,"lu_2015_tax_FB-ECP-12-n,lu_2015_tax_FB-ECP-12-p",tag_lu_66
+lu_2015_tax_FB-ECP-14-n,Frais Biens 14% - Extracommunautaire fin privées (-),FB-ECP-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1254,,tag_lu_535
+lu_2015_tax_FB-ECP-14-p,Frais Biens 14% - Extracommunautaire fin privées (+),FB-ECP-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1255,,tag_lu_375
+lu_2015_tax_FB-ECP-14,Frais Biens 14% - Extracommunautaire fin privées,FB-ECP-14,purchase,group,100,,,lu_2011_chart_1,253,"lu_2015_tax_FB-ECP-14-n,lu_2015_tax_FB-ECP-14-p",tag_lu_94
+lu_2015_tax_FB-ECP-15-n,Frais Biens 15% - Extracommunautaire fin privées (-),FB-ECP-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1257,,tag_lu_536
+lu_2015_tax_FB-ECP-15-p,Frais Biens 15% - Extracommunautaire fin privées (+),FB-ECP-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1258,,tag_lu_343
+lu_2015_tax_FB-ECP-15,Frais Biens 15% - Extracommunautaire fin privées,FB-ECP-15,purchase,group,100,,,lu_2011_chart_1,256,"lu_2015_tax_FB-ECP-15-n,lu_2015_tax_FB-ECP-15-p",tag_lu_54
+lu_2015_tax_FB-ECP-17-n,Frais Biens 17% - Extracommunautaire fin privées (-),FB-ECP-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1260,,tag_lu_537
+lu_2015_tax_FB-ECP-17-p,Frais Biens 17% - Extracommunautaire fin privées (+),FB-ECP-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1261,,tag_lu_371
+lu_2015_tax_FB-ECP-17,Frais Biens 17% - Extracommunautaire fin privées,FB-ECP-17,purchase,group,100,,,lu_2011_chart_1,259,"lu_2015_tax_FB-ECP-17-n,lu_2015_tax_FB-ECP-17-p",tag_lu_90
+lu_2015_tax_FB-ECP-3-n,Frais Biens 3% - Extracommunautaire fin privées (-),FB-ECP-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1263,,tag_lu_538
+lu_2015_tax_FB-ECP-3-p,Frais Biens 3% - Extracommunautaire fin privées (+),FB-ECP-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1264,,tag_lu_351
+lu_2015_tax_FB-ECP-3,Frais Biens 3% - Extracommunautaire fin privées,FB-ECP-3,purchase,group,100,,,lu_2011_chart_1,262,"lu_2015_tax_FB-ECP-3-n,lu_2015_tax_FB-ECP-3-p",tag_lu_62
+lu_2015_tax_FB-ECP-6-n,Frais Biens 6% - Extracommunautaire fin privées (-),FB-ECP-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1266,,tag_lu_539
+lu_2015_tax_FB-ECP-6-p,Frais Biens 6% - Extracommunautaire fin privées (+),FB-ECP-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1267,,tag_lu_347
+lu_2015_tax_FB-ECP-6,Frais Biens 6% - Extracommunautaire fin privées,FB-ECP-6,purchase,group,100,,,lu_2011_chart_1,265,"lu_2015_tax_FB-ECP-6-n,lu_2015_tax_FB-ECP-6-p",tag_lu_58
+lu_2015_tax_FB-ECP-8-n,Frais Biens 8% - Extracommunautaire fin privées (-),FB-ECP-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1269,,tag_lu_540
+lu_2015_tax_FB-ECP-8-p,Frais Biens 8% - Extracommunautaire fin privées (+),FB-ECP-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1270,,tag_lu_379
+lu_2015_tax_FB-ECP-8,Frais Biens 8% - Extracommunautaire fin privées,FB-ECP-8,purchase,group,100,,,lu_2011_chart_1,268,"lu_2015_tax_FB-ECP-8-n,lu_2015_tax_FB-ECP-8-p",tag_lu_98
+lu_2011_tax_FB-IC-0,Frais Biens Exonéré - Intracommunautaire,FB-IC-0,purchase,percent,0,,,lu_2011_chart_1,271,,tag_lu_21
+lu_2011_tax_FB-IC-12-n,Frais Biens 12% - Intracommunautaire (-),FB-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1273,,tag_lu_498
+lu_2011_tax_FB-IC-12-p,Frais Biens 12% - Intracommunautaire (+),FB-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1274,,tag_lu_310
+lu_2011_tax_FB-IC-12,Frais Biens 12% - Intracommunautaire,FB-IC-12,purchase,group,100,,,lu_2011_chart_1,272,"lu_2011_tax_FB-IC-12-n,lu_2011_tax_FB-IC-12-p",tag_lu_17
+lu_2015_tax_FB-IC-14-n,Frais Biens 14% - Intracommunautaire (-),FB-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1276,,tag_lu_499
+lu_2015_tax_FB-IC-14-p,Frais Biens 14% - Intracommunautaire (+),FB-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1277,,tag_lu_318
+lu_2015_tax_FB-IC-14,Frais Biens 14% - Intracommunautaire,FB-IC-14,purchase,group,100,,,lu_2011_chart_1,275,"lu_2015_tax_FB-IC-14-n,lu_2015_tax_FB-IC-14-p",tag_lu_29
+lu_2011_tax_FB-IC-15-n,Frais Biens 15% - Intracommunautaire (-),FB-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1279,,tag_lu_500
+lu_2011_tax_FB-IC-15-p,Frais Biens 15% - Intracommunautaire (+),FB-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1280,,tag_lu_298
+lu_2011_tax_FB-IC-15,Frais Biens 15% - Intracommunautaire,FB-IC-15,purchase,group,100,,,lu_2011_chart_1,278,"lu_2011_tax_FB-IC-15-n,lu_2011_tax_FB-IC-15-p",tag_lu_05
+lu_2015_tax_FB-IC-17-n,Frais Biens 17% - Intracommunautaire (-),FB-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1282,,tag_lu_501
+lu_2015_tax_FB-IC-17-p,Frais Biens 17% - Intracommunautaire (+),FB-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1283,,tag_lu_314
+lu_2015_tax_FB-IC-17,Frais Biens 17% - Intracommunautaire,FB-IC-17,purchase,group,100,,,lu_2011_chart_1,281,"lu_2015_tax_FB-IC-17-n,lu_2015_tax_FB-IC-17-p",tag_lu_25
+lu_2011_tax_FB-IC-3-n,Frais Biens 3% - Intracommunautaire (-),FB-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1285,,tag_lu_502
+lu_2011_tax_FB-IC-3-p,Frais Biens 3% - Intracommunautaire (+),FB-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1286,,tag_lu_306
+lu_2011_tax_FB-IC-3,Frais Biens 3% - Intracommunautaire,FB-IC-3,purchase,group,100,,,lu_2011_chart_1,284,"lu_2011_tax_FB-IC-3-n,lu_2011_tax_FB-IC-3-p",tag_lu_13
+lu_2011_tax_FB-IC-6-n,Frais Biens 6% - Intracommunautaire (-),FB-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1288,,tag_lu_503
+lu_2011_tax_FB-IC-6-p,Frais Biens 6% - Intracommunautaire (+),FB-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1289,,tag_lu_302
+lu_2011_tax_FB-IC-6,Frais Biens 6% - Intracommunautaire,FB-IC-6,purchase,group,100,,,lu_2011_chart_1,287,"lu_2011_tax_FB-IC-6-n,lu_2011_tax_FB-IC-6-p",tag_lu_09
+lu_2015_tax_FB-IC-8-n,Frais Biens 8% - Intracommunautaire (-),FB-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1291,,tag_lu_504
+lu_2015_tax_FB-IC-8-p,Frais Biens 8% - Intracommunautaire (+),FB-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1292,,tag_lu_322
+lu_2015_tax_FB-IC-8,Frais Biens 8% - Intracommunautaire,FB-IC-8,purchase,group,100,,,lu_2011_chart_1,290,"lu_2015_tax_FB-IC-8-n,lu_2015_tax_FB-IC-8-p",tag_lu_33
+lu_2011_tax_FB-PA-0,Frais Biens 0% - Pays,FB-PA-0,purchase,percent,0,,,lu_2011_chart_1,293,,tag_lu_236
+lu_2011_tax_FB-PA-12,Frais Biens 12% - Pays,FB-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,294,,"tag_lu_237,tag_lu_462"
+lu_2015_tax_FB-PA-14,Frais Biens 14% - Pays,FB-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,295,,"tag_lu_463,tag_lu_238"
+lu_2011_tax_FB-PA-15,Frais Biens 15% - Pays,FB-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,296,,"tag_lu_239,tag_lu_464"
+lu_2015_tax_FB-PA-17,Frais Biens 17% - Pays,FB-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,297,,"tag_lu_240,tag_lu_465"
+lu_2011_tax_FB-PA-3,Frais Biens 3% - Pays,FB-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,298,,"tag_lu_241,tag_lu_466"
+lu_2011_tax_FB-PA-6,Frais Biens 6% - Pays,FB-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,299,,"tag_lu_242,tag_lu_467"
+lu_2015_tax_FB-PA-8,Frais Biens 8% - Pays,FB-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,300,,"tag_lu_468,tag_lu_243"
+lu_2011_tax_FP-EC-0,Frais Prestations Exonérées - Extracommunautaire,FP-EC-0,purchase,percent,0,,,lu_2011_chart_1,301,,tag_lu_154
+lu_2011_tax_FP-EC-12-n,Frais Prestations 12% - Extracommunautaire (-),FP-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1303,,tag_lu_570
+lu_2011_tax_FP-EC-12-p,Frais Prestations 12% - Extracommunautaire (+),FP-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1304,,tag_lu_426
+lu_2011_tax_FP-EC-12,Frais Prestations 12% - Extracommunautaire,FP-EC-12,purchase,group,100,,,lu_2011_chart_1,302,"lu_2011_tax_FP-EC-12-n,lu_2011_tax_FP-EC-12-p",tag_lu_150
+lu_2015_tax_FP-EC-14-n,Frais Prestations 14% - Extracommunautaire (-),FP-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1306,,tag_lu_571
+lu_2015_tax_FP-EC-14-p,Frais Prestations 14% - Extracommunautaire (+),FP-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1307,,tag_lu_434
+lu_2015_tax_FP-EC-14,Frais Prestations 14% - Extracommunautaire,FP-EC-14,purchase,group,100,,,lu_2011_chart_1,305,"lu_2015_tax_FP-EC-14-n,lu_2015_tax_FP-EC-14-p",tag_lu_162
+lu_2011_tax_FP-EC-15-n,Frais Prestations 15% - Extracommunautaire (-),FP-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1309,,tag_lu_572
+lu_2011_tax_FP-EC-15-p,Frais Prestations 15% - Extracommunautaire (+),FP-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1310,,tag_lu_414
+lu_2011_tax_FP-EC-15,Frais Prestations 15% - Extracommunautaire,FP-EC-15,purchase,group,100,,,lu_2011_chart_1,308,"lu_2011_tax_FP-EC-15-n,lu_2011_tax_FP-EC-15-p",tag_lu_138
+lu_2015_tax_FP-EC-17-n,Frais Prestations 17% - Extracommunautaire (-),FP-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1312,,tag_lu_573
+lu_2015_tax_FP-EC-17-p,Frais Prestations 17% - Extracommunautaire (+),FP-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1313,,tag_lu_430
+lu_2015_tax_FP-EC-17,Frais Prestations 17% - Extracommunautaire,FP-EC-17,purchase,group,100,,,lu_2011_chart_1,311,"lu_2015_tax_FP-EC-17-n,lu_2015_tax_FP-EC-17-p",tag_lu_158
+lu_2011_tax_FP-EC-3-n,Frais Prestations 3% - Extracommunautaire (-),FP-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1315,,tag_lu_574
+lu_2011_tax_FP-EC-3-p,Frais Prestations 3% - Extracommunautaire (+),FP-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1316,,tag_lu_422
+lu_2011_tax_FP-EC-3,Frais Prestations 3% - Extracommunautaire,FP-EC-3,purchase,group,100,,,lu_2011_chart_1,314,"lu_2011_tax_FP-EC-3-n,lu_2011_tax_FP-EC-3-p",tag_lu_146
+lu_2011_tax_FP-EC-6-n,Frais Prestations 6% - Extracommunautaire (-),FP-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1318,,tag_lu_575
+lu_2011_tax_FP-EC-6-p,Frais Prestations 6% - Extracommunautaire (+),FP-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1319,,tag_lu_418
+lu_2011_tax_FP-EC-6,Frais Prestations 6% - Extracommunautaire,FP-EC-6,purchase,group,100,,,lu_2011_chart_1,317,"lu_2011_tax_FP-EC-6-n,lu_2011_tax_FP-EC-6-p",tag_lu_142
+lu_2015_tax_FP-EC-8-n,Frais Prestations 8% - Extracommunautaire (-),FP-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1321,,tag_lu_576
+lu_2015_tax_FP-EC-8-p,Frais Prestations 8% - Extracommunautaire (+),FP-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1322,,tag_lu_438
+lu_2015_tax_FP-EC-8,Frais Prestations 8% - Extracommunautaire,FP-EC-8,purchase,group,100,,,lu_2011_chart_1,320,"lu_2015_tax_FP-EC-8-n,lu_2015_tax_FP-EC-8-p",tag_lu_166
+lu_2011_tax_FP-IC-0,Frais Prestations Exonérées - Intracommunautaire,FP-IC-0,purchase,percent,0,,,lu_2011_chart_1,323,,tag_lu_121
+lu_2011_tax_FP-IC-12-n,Frais Prestations 12% - Intracommunautaire (-),FP-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1325,,tag_lu_577
+lu_2011_tax_FP-IC-12-p,Frais Prestations 12% - Intracommunautaire (+),FP-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1326,,tag_lu_397
+lu_2011_tax_FP-IC-12,Frais Prestations 12% - Intracommunautaire,FP-IC-12,purchase,group,100,,,lu_2011_chart_1,324,"lu_2011_tax_FP-IC-12-n,lu_2011_tax_FP-IC-12-p",tag_lu_117
+lu_2015_tax_FP-IC-14-n,Frais Prestations 14% - Intracommunautaire (-),FP-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1328,,tag_lu_578
+lu_2015_tax_FP-IC-14-p,Frais Prestations 14% - Intracommunautaire (+),FP-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1329,,tag_lu_405
+lu_2015_tax_FP-IC-14,Frais Prestations 14% - Intracommunautaire,FP-IC-14,purchase,group,100,,,lu_2011_chart_1,327,"lu_2015_tax_FP-IC-14-n,lu_2015_tax_FP-IC-14-p",tag_lu_129
+lu_2011_tax_FP-IC-15-n,Frais Prestations 15% - Intracommunautaire (-),FP-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1331,,tag_lu_579
+lu_2011_tax_FP-IC-15-p,Frais Prestations 15% - Intracommunautaire (+),FP-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1332,,tag_lu_385
+lu_2011_tax_FP-IC-15,Frais Prestations 15% - Intracommunautaire,FP-IC-15,purchase,group,100,,,lu_2011_chart_1,330,"lu_2011_tax_FP-IC-15-n,lu_2011_tax_FP-IC-15-p",tag_lu_105
+lu_2015_tax_FP-IC-17-n,Frais Prestations 17% - Intracommunautaire (-),FP-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1334,,tag_lu_580
+lu_2015_tax_FP-IC-17-p,Frais Prestations 17% - Intracommunautaire (+),FP-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1335,,tag_lu_401
+lu_2015_tax_FP-IC-17,Frais Prestations 17% - Intracommunautaire,FP-IC-17,purchase,group,100,,,lu_2011_chart_1,333,"lu_2015_tax_FP-IC-17-n,lu_2015_tax_FP-IC-17-p",tag_lu_125
+lu_2011_tax_FP-IC-3-n,Frais Prestations 3% - Intracommunautaire (-),FP-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1337,,tag_lu_581
+lu_2011_tax_FP-IC-3-p,Frais Prestations 3% - Intracommunautaire (+),FP-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1338,,tag_lu_393
+lu_2011_tax_FP-IC-3,Frais Prestations 3% - Intracommunautaire,FP-IC-3,purchase,group,100,,,lu_2011_chart_1,336,"lu_2011_tax_FP-IC-3-n,lu_2011_tax_FP-IC-3-p",tag_lu_113
+lu_2011_tax_FP-IC-6-n,Frais Prestations 6% - Intracommunautaire (-),FP-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1340,,tag_lu_582
+lu_2011_tax_FP-IC-6-p,Frais Prestations 6% - Intracommunautaire (+),FP-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1341,,tag_lu_389
+lu_2011_tax_FP-IC-6,Frais Prestations 6% - Intracommunautaire,FP-IC-6,purchase,group,100,,,lu_2011_chart_1,339,"lu_2011_tax_FP-IC-6-n,lu_2011_tax_FP-IC-6-p",tag_lu_109
+lu_2015_tax_FP-IC-8-n,Frais Prestations 8% - Intracommunautaire (-),FP-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1343,,tag_lu_583
+lu_2015_tax_FP-IC-8-p,Frais Prestations 8% - Intracommunautaire (+),FP-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1344,,tag_lu_409
+lu_2015_tax_FP-IC-8,Frais Prestations 8% - Intracommunautaire,FP-IC-8,purchase,group,100,,,lu_2011_chart_1,342,"lu_2015_tax_FP-IC-8-n,lu_2015_tax_FP-IC-8-p",tag_lu_133
+lu_2011_tax_FP-PA-0,Frais Prestations 0% - Pays,FP-PA-0,purchase,percent,0,,,lu_2011_chart_1,345,,tag_lu_244
+lu_2011_tax_FP-PA-12,Frais Prestations 12% - Pays,FP-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,346,,"tag_lu_469,tag_lu_245"
+lu_2015_tax_FP-PA-14,Frais Prestations 14% - Pays,FP-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,347,,"tag_lu_470,tag_lu_246"
+lu_2011_tax_FP-PA-15,Frais Prestations 15% - Pays,FP-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,348,,"tag_lu_247,tag_lu_471"
+lu_2015_tax_FP-PA-17,Frais Prestations 17% - Pays,FP-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,349,,"tag_lu_248,tag_lu_472"
+lu_2011_tax_FP-PA-3,Frais Prestations 3% - Pays,FP-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,350,,"tag_lu_473,tag_lu_249"
+lu_2011_tax_FP-PA-6,Frais Prestations 6% - Pays,FP-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,351,,"tag_lu_474,tag_lu_250"
+lu_2015_tax_FP-PA-8,Frais Prestations 8% - Pays,FP-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,352,,"tag_lu_475,tag_lu_251"
+lu_2011_tax_IB-EC-0,Investissement Biens Exonéré - Extracommunautaire,IB-EC-0,purchase,percent,0,,,lu_2011_chart_1,353,,tag_lu_71
+lu_2011_tax_IB-EC-12-n,Investissement Biens 12% - Extracommunautaire (-),IB-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1355,,tag_lu_541
+lu_2011_tax_IB-EC-12-p,Investissement Biens 12% - Extracommunautaire (+),IB-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1356,,tag_lu_340
+lu_2011_tax_IB-EC-12,Investissement Biens 12% - Extracommunautaire,IB-EC-12,purchase,group,100,,,lu_2011_chart_1,354,"lu_2011_tax_IB-EC-12-n,lu_2011_tax_IB-EC-12-p",tag_lu_51
+lu_2015_tax_IB-EC-14-n,Investissement Biens 14% - Extracommunautaire (-),IB-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1358,,tag_lu_542
+lu_2015_tax_IB-EC-14-p,Investissement Biens 14% - Extracommunautaire (+),IB-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1359,,tag_lu_364
+lu_2015_tax_IB-EC-14,Investissement Biens 14% - Extracommunautaire,IB-EC-14,purchase,group,100,,,lu_2011_chart_1,357,"lu_2015_tax_IB-EC-14-n,lu_2015_tax_IB-EC-14-p",tag_lu_83
+lu_2011_tax_IB-EC-15-n,Investissement Biens 15% - Extracommunautaire (-),IB-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1361,,tag_lu_543
+lu_2011_tax_IB-EC-15-p,Investissement Biens 15% - Extracommunautaire (+),IB-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1362,,tag_lu_328
+lu_2011_tax_IB-EC-15,Investissement Biens 15% - Extracommunautaire,IB-EC-15,purchase,group,100,,,lu_2011_chart_1,360,"lu_2011_tax_IB-EC-15-n,lu_2011_tax_IB-EC-15-p",tag_lu_39
+lu_2015_tax_IB-EC-17-n,Investissement Biens 17% - Extracommunautaire (-),IB-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1364,,tag_lu_544
+lu_2015_tax_IB-EC-17-p,Investissement Biens 17% - Extracommunautaire (+),IB-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1365,,tag_lu_360
+lu_2015_tax_IB-EC-17,Investissement Biens 17% - Extracommunautaire,IB-EC-17,purchase,group,100,,,lu_2011_chart_1,363,"lu_2015_tax_IB-EC-17-n,lu_2015_tax_IB-EC-17-p",tag_lu_79
+lu_2011_tax_IB-EC-3-n,Investissement Biens 3% - Extracommunautaire (-),IB-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1367,,tag_lu_545
+lu_2011_tax_IB-EC-3-p,Investissement Biens 3% - Extracommunautaire (+),IB-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1368,,tag_lu_336
+lu_2011_tax_IB-EC-3,Investissement Biens 3% - Extracommunautaire,IB-EC-3,purchase,group,100,,,lu_2011_chart_1,366,"lu_2011_tax_IB-EC-3-n,lu_2011_tax_IB-EC-3-p",tag_lu_47
+lu_2011_tax_IB-EC-6-n,Investissement Biens 6% - Extracommunautaire (-),IB-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1370,,tag_lu_546
+lu_2011_tax_IB-EC-6-p,Investissement Biens 6% - Extracommunautaire (+),IB-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1371,,tag_lu_332
+lu_2011_tax_IB-EC-6,Investissement Biens 6% - Extracommunautaire,IB-EC-6,purchase,group,100,,,lu_2011_chart_1,369,"lu_2011_tax_IB-EC-6-n,lu_2011_tax_IB-EC-6-p",tag_lu_43
+lu_2015_tax_IB-EC-8-n,Investissement Biens 8% - Extracommunautaire (-),IB-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1373,,tag_lu_547
+lu_2015_tax_IB-EC-8-p,Investissement Biens 8% - Extracommunautaire (+),IB-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1374,,tag_lu_368
+lu_2015_tax_IB-EC-8,Investissement Biens 8% - Extracommunautaire,IB-EC-8,purchase,group,100,,,lu_2011_chart_1,372,"lu_2015_tax_IB-EC-8-n,lu_2015_tax_IB-EC-8-p",tag_lu_87
+lu_2015_tax_IB-ECP-0,Investissement Biens Exonéré - Extracommunautaire fin privées,IB-ECP-0,purchase,percent,0,,,lu_2011_chart_1,375,,tag_lu_75
+lu_2015_tax_IB-ECP-12-n,Investissement Biens 12% - Extracommunautaire fin privées (-),IB-ECP-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1377,,tag_lu_548
+lu_2015_tax_IB-ECP-12-p,Investissement Biens 12% - Extracommunautaire fin privées (+),IB-ECP-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1378,,tag_lu_356
+lu_2015_tax_IB-ECP-12,Investissement Biens 12% - Extracommunautaire fin privées,IB-ECP-12,purchase,group,100,,,lu_2011_chart_1,376,"lu_2015_tax_IB-ECP-12-n,lu_2015_tax_IB-ECP-12-p",tag_lu_67
+lu_2015_tax_IB-ECP-14-n,Investissement Biens 14% - Extracommunautaire fin privées (-),IB-ECP-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1380,,tag_lu_549
+lu_2015_tax_IB-ECP-14-p,Investissement Biens 14% - Extracommunautaire fin privées (+),IB-ECP-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1381,,tag_lu_376
+lu_2015_tax_IB-ECP-14,Investissement Biens 14% - Extracommunautaire fin privées,IB-ECP-14,purchase,group,100,,,lu_2011_chart_1,379,"lu_2015_tax_IB-ECP-14-n,lu_2015_tax_IB-ECP-14-p",tag_lu_95
+lu_2015_tax_IB-ECP-15-n,Investissement Biens 15% - Extracommunautaire fin privées (-),IB-ECP-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1383,,tag_lu_550
+lu_2015_tax_IB-ECP-15-p,Investissement Biens 15% - Extracommunautaire fin privées (+),IB-ECP-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1384,,tag_lu_344
+lu_2015_tax_IB-ECP-15,Investissement Biens 15% - Extracommunautaire fin privées,IB-ECP-15,purchase,group,100,,,lu_2011_chart_1,382,"lu_2015_tax_IB-ECP-15-n,lu_2015_tax_IB-ECP-15-p",tag_lu_55
+lu_2015_tax_IB-ECP-17-n,Investissement Biens 17% - Extracommunautaire fin privées (-),IB-ECP-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1386,,tag_lu_551
+lu_2015_tax_IB-ECP-17-p,Investissement Biens 17% - Extracommunautaire fin privées (+),IB-ECP-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1387,,tag_lu_372
+lu_2015_tax_IB-ECP-17,Investissement Biens 17% - Extracommunautaire fin privées,IB-ECP-17,purchase,group,100,,,lu_2011_chart_1,385,"lu_2015_tax_IB-ECP-17-n,lu_2015_tax_IB-ECP-17-p",tag_lu_91
+lu_2015_tax_IB-ECP-3-n,Investissement Biens 3% - Extracommunautaire fin privées (-),IB-ECP-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1389,,tag_lu_552
+lu_2015_tax_IB-ECP-3-p,Investissement Biens 3% - Extracommunautaire fin privées (+),IB-ECP-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1390,,tag_lu_352
+lu_2015_tax_IB-ECP-3,Investissement Biens 3% - Extracommunautaire fin privées,IB-ECP-3,purchase,group,100,,,lu_2011_chart_1,388,"lu_2015_tax_IB-ECP-3-n,lu_2015_tax_IB-ECP-3-p",tag_lu_63
+lu_2015_tax_IB-ECP-6-n,Investissement Biens 6% - Extracommunautaire fin privées (-),IB-ECP-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1392,,tag_lu_553
+lu_2015_tax_IB-ECP-6-p,Investissement Biens 6% - Extracommunautaire fin privées (+),IB-ECP-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1393,,tag_lu_348
+lu_2015_tax_IB-ECP-6,Investissement Biens 6% - Extracommunautaire fin privées,IB-ECP-6,purchase,group,100,,,lu_2011_chart_1,391,"lu_2015_tax_IB-ECP-6-n,lu_2015_tax_IB-ECP-6-p",tag_lu_59
+lu_2015_tax_IB-ECP-8-n,Investissement Biens 8% - Extracommunautaire fin privées (-),IB-ECP-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1395,,tag_lu_554
+lu_2015_tax_IB-ECP-8-p,Investissement Biens 8% - Extracommunautaire fin privées (+),IB-ECP-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1396,,tag_lu_380
+lu_2015_tax_IB-ECP-8,Investissement Biens 8% - Extracommunautaire fin privées,IB-ECP-8,purchase,group,100,,,lu_2011_chart_1,394,"lu_2015_tax_IB-ECP-8-n,lu_2015_tax_IB-ECP-8-p",tag_lu_99
+lu_2011_tax_IB-IC-0,Investissement Biens Exonéré - Intracommunautaire,IB-IC-0,purchase,percent,0,,,lu_2011_chart_1,397,,tag_lu_22
+lu_2011_tax_IB-IC-12-n,Investissement Biens 12% - Intracommunautaire (-),IB-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1399,,tag_lu_505
+lu_2011_tax_IB-IC-12-p,Investissement Biens 12% - Intracommunautaire (+),IB-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1400,,tag_lu_311
+lu_2011_tax_IB-IC-12,Investissement Biens 12% - Intracommunautaire,IB-IC-12,purchase,group,100,,,lu_2011_chart_1,398,"lu_2011_tax_IB-IC-12-n,lu_2011_tax_IB-IC-12-p",tag_lu_18
+lu_2015_tax_IB-IC-14-n,Investissement Biens 14% - Intracommunautaire (-),IB-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1402,,tag_lu_506
+lu_2015_tax_IB-IC-14-p,Investissement Biens 14% - Intracommunautaire (+),IB-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1403,,tag_lu_319
+lu_2015_tax_IB-IC-14,Investissement Biens 14% - Intracommunautaire,IB-IC-14,purchase,group,100,,,lu_2011_chart_1,401,"lu_2015_tax_IB-IC-14-n,lu_2015_tax_IB-IC-14-p",tag_lu_30
+lu_2011_tax_IB-IC-15-n,Investissement Biens 15% - Intracommunautaire (-),IB-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1405,,tag_lu_507
+lu_2011_tax_IB-IC-15-p,Investissement Biens 15% - Intracommunautaire (+),IB-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1406,,tag_lu_299
+lu_2011_tax_IB-IC-15,Investissement Biens 15% - Intracommunautaire,IB-IC-15,purchase,group,100,,,lu_2011_chart_1,404,"lu_2011_tax_IB-IC-15-n,lu_2011_tax_IB-IC-15-p",tag_lu_06
+lu_2015_tax_IB-IC-17-n,Investissement Biens 17% - Intracommunautaire (-),IB-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1408,,tag_lu_508
+lu_2015_tax_IB-IC-17-p,Investissement Biens 17% - Intracommunautaire (+),IB-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1409,,tag_lu_315
+lu_2015_tax_IB-IC-17,Investissement Biens 17% - Intracommunautaire,IB-IC-17,purchase,group,100,,,lu_2011_chart_1,407,"lu_2015_tax_IB-IC-17-n,lu_2015_tax_IB-IC-17-p",tag_lu_26
+lu_2011_tax_IB-IC-3-n,Investissement Biens 3% - Intracommunautaire (-),IB-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1411,,tag_lu_509
+lu_2011_tax_IB-IC-3-p,Investissement Biens 3% - Intracommunautaire (+),IB-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1412,,tag_lu_307
+lu_2011_tax_IB-IC-3,Investissement Biens 3% - Intracommunautaire,IB-IC-3,purchase,group,100,,,lu_2011_chart_1,410,"lu_2011_tax_IB-IC-3-n,lu_2011_tax_IB-IC-3-p",tag_lu_14
+lu_2011_tax_IB-IC-6-n,Investissement Biens 6% - Intracommunautaire (-),IB-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1414,,tag_lu_510
+lu_2011_tax_IB-IC-6-p,Investissement Biens 6% - Intracommunautaire (+),IB-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1415,,tag_lu_303
+lu_2011_tax_IB-IC-6,Investissement Biens 6% - Intracommunautaire,IB-IC-6,purchase,group,100,,,lu_2011_chart_1,413,"lu_2011_tax_IB-IC-6-n,lu_2011_tax_IB-IC-6-p",tag_lu_10
+lu_2015_tax_IB-IC-8-n,Investissement Biens 8% - Intracommunautaire (-),IB-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1417,,tag_lu_511
+lu_2015_tax_IB-IC-8-p,Investissement Biens 8% - Intracommunautaire (+),IB-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1418,,tag_lu_323
+lu_2015_tax_IB-IC-8,Investissement Biens 8% - Intracommunautaire,IB-IC-8,purchase,group,100,,,lu_2011_chart_1,416,"lu_2015_tax_IB-IC-8-n,lu_2015_tax_IB-IC-8-p",tag_lu_34
+lu_2011_tax_IB-PA-0,Investissement Biens 0% - Pays,IB-PA-0,purchase,percent,0,,,lu_2011_chart_1,419,,tag_lu_252
+lu_2011_tax_IB-PA-12,Investissement Biens 12% - Pays,IB-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,420,,"tag_lu_476,tag_lu_253"
+lu_2015_tax_IB-PA-14,Investissement Biens 14% - Pays,IB-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,421,,"tag_lu_477,tag_lu_254"
+lu_2011_tax_IB-PA-15,Investissement Biens 15% - Pays,IB-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,422,,"tag_lu_255,tag_lu_478"
+lu_2015_tax_IB-PA-17,Investissement Biens 17% - Pays,IB-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,423,,"tag_lu_479,tag_lu_256"
+lu_2011_tax_IB-PA-3,Investissement Biens 3% - Pays,IB-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,424,,"tag_lu_480,tag_lu_257"
+lu_2011_tax_IB-PA-6,Investissement Biens 6% - Pays,IB-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,425,,"tag_lu_481,tag_lu_258"
+lu_2015_tax_IB-PA-8,Investissement Biens 8% - Pays,IB-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,426,,"tag_lu_482,tag_lu_259"
+lu_2011_tax_IP-EC-0,Investissement Prestations Exonérées - Extracommunautaire,IP-EC-0,purchase,percent,0,,,lu_2011_chart_1,427,,tag_lu_155
+lu_2011_tax_IP-EC-12-n,Investissement Prestations 12% - Extracommunautaire (-),IP-EC-12-n,none,percent,-12,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1429,,tag_lu_584
+lu_2011_tax_IP-EC-12-p,Investissement Prestations 12% - Extracommunautaire (+),IP-EC-12-p,none,percent,12,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1430,,tag_lu_427
+lu_2011_tax_IP-EC-12,Investissement Prestations 12% - Extracommunautaire,IP-EC-12,purchase,group,100,,,lu_2011_chart_1,428,"lu_2011_tax_IP-EC-12-n,lu_2011_tax_IP-EC-12-p",tag_lu_151
+lu_2015_tax_IP-EC-14-n,Investissement Prestations 14% - Extracommunautaire (-),IP-EC-14-n,none,percent,-14,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1432,,tag_lu_585
+lu_2015_tax_IP-EC-14-p,Investissement Prestations 14% - Extracommunautaire (+),IP-EC-14-p,none,percent,14,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1433,,tag_lu_435
+lu_2015_tax_IP-EC-14,Investissement Prestations 14% - Extracommunautaire,IP-EC-14,purchase,group,100,,,lu_2011_chart_1,431,"lu_2015_tax_IP-EC-14-n,lu_2015_tax_IP-EC-14-p",tag_lu_163
+lu_2011_tax_IP-EC-15-n,Investissement Prestations 15% - Extracommunautaire (-),IP-EC-15-n,none,percent,-15,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1435,,tag_lu_586
+lu_2011_tax_IP-EC-15-p,Investissement Prestations 15% - Extracommunautaire (+),IP-EC-15-p,none,percent,15,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1436,,tag_lu_415
+lu_2011_tax_IP-EC-15,Investissement Prestations 15% - Extracommunautaire,IP-EC-15,purchase,group,100,,,lu_2011_chart_1,434,"lu_2011_tax_IP-EC-15-n,lu_2011_tax_IP-EC-15-p",tag_lu_139
+lu_2015_tax_IP-EC-17-n,Investissement Prestations 17% - Extracommunautaire (-),IP-EC-17-n,none,percent,-17,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1438,,tag_lu_587
+lu_2015_tax_IP-EC-17-p,Investissement Prestations 17% - Extracommunautaire (+),IP-EC-17-p,none,percent,17,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1439,,tag_lu_431
+lu_2015_tax_IP-EC-17,Investissement Prestations 17% - Extracommunautaire,IP-EC-17,purchase,group,100,,,lu_2011_chart_1,437,"lu_2015_tax_IP-EC-17-n,lu_2015_tax_IP-EC-17-p",tag_lu_159
+lu_2011_tax_IP-EC-3-n,Investissement Prestations 3% - Extracommunautaire (-),IP-EC-3-n,none,percent,-3,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1441,,tag_lu_588
+lu_2011_tax_IP-EC-3-p,Investissement Prestations 3% - Extracommunautaire (+),IP-EC-3-p,none,percent,3,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1442,,tag_lu_423
+lu_2011_tax_IP-EC-3,Investissement Prestations 3% - Extracommunautaire,IP-EC-3,purchase,group,100,,,lu_2011_chart_1,440,"lu_2011_tax_IP-EC-3-n,lu_2011_tax_IP-EC-3-p",tag_lu_147
+lu_2011_tax_IP-EC-6-n,Investissement Prestations 6% - Extracommunautaire (-),IP-EC-6-n,none,percent,-6,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1444,,tag_lu_589
+lu_2011_tax_IP-EC-6-p,Investissement Prestations 6% - Extracommunautaire (+),IP-EC-6-p,none,percent,6,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1445,,tag_lu_419
+lu_2011_tax_IP-EC-6,Investissement Prestations 6% - Extracommunautaire,IP-EC-6,purchase,group,100,,,lu_2011_chart_1,443,"lu_2011_tax_IP-EC-6-n,lu_2011_tax_IP-EC-6-p",tag_lu_143
+lu_2015_tax_IP-EC-8-n,Investissement Prestations 8% - Extracommunautaire (-),IP-EC-8-n,none,percent,-8,lu_2011_account_4614113,lu_2011_account_4614113,lu_2011_chart_1,1447,,tag_lu_590
+lu_2015_tax_IP-EC-8-p,Investissement Prestations 8% - Extracommunautaire (+),IP-EC-8-p,none,percent,8,lu_2011_account_4216113,lu_2011_account_4216113,lu_2011_chart_1,1448,,tag_lu_439
+lu_2015_tax_IP-EC-8,Investissement Prestations 8% - Extracommunautaire,IP-EC-8,purchase,group,100,,,lu_2011_chart_1,446,"lu_2015_tax_IP-EC-8-n,lu_2015_tax_IP-EC-8-p",tag_lu_167
+lu_2011_tax_IP-IC-0,Investissement Prestations Exonérées - Intracommunautaire,IP-IC-0,purchase,percent,0,,,lu_2011_chart_1,449,,tag_lu_122
+lu_2011_tax_IP-IC-12-n,Investissement Prestations 12% - Intracommunautaire (-),IP-IC-12-n,none,percent,-12,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1451,,tag_lu_591
+lu_2011_tax_IP-IC-12-p,Investissement Prestations 12% - Intracommunautaire (+),IP-IC-12-p,none,percent,12,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1452,,tag_lu_398
+lu_2011_tax_IP-IC-12,Investissement Prestations 12% - Intracommunautaire,IP-IC-12,purchase,group,100,,,lu_2011_chart_1,450,"lu_2011_tax_IP-IC-12-n,lu_2011_tax_IP-IC-12-p",tag_lu_118
+lu_2015_tax_IP-IC-14-n,Investissement Prestations 14% - Intracommunautaire (-),IP-IC-14-n,none,percent,-14,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1454,,tag_lu_592
+lu_2015_tax_IP-IC-14-p,Investissement Prestations 14% - Intracommunautaire (+),IP-IC-14-p,none,percent,14,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1455,,tag_lu_406
+lu_2015_tax_IP-IC-14,Investissement Prestations 14% - Intracommunautaire,IP-IC-14,purchase,group,100,,,lu_2011_chart_1,453,"lu_2015_tax_IP-IC-14-n,lu_2015_tax_IP-IC-14-p",tag_lu_130
+lu_2011_tax_IP-IC-15-n,Investissement Prestations 15% - Intracommunautaire (-),IP-IC-15-n,none,percent,-15,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1457,,tag_lu_593
+lu_2011_tax_IP-IC-15-p,Investissement Prestations 15% - Intracommunautaire (+),IP-IC-15-p,none,percent,15,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1458,,tag_lu_386
+lu_2011_tax_IP-IC-15,Investissement Prestations 15% - Intracommunautaire,IP-IC-15,purchase,group,100,,,lu_2011_chart_1,456,"lu_2011_tax_IP-IC-15-n,lu_2011_tax_IP-IC-15-p",tag_lu_106
+lu_2015_tax_IP-IC-17-n,Investissement Prestations 17% - Intracommunautaire (-),IP-IC-17-n,none,percent,-17,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1460,,tag_lu_594
+lu_2015_tax_IP-IC-17-p,Investissement Prestations 17% - Intracommunautaire (+),IP-IC-17-p,none,percent,17,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1461,,tag_lu_402
+lu_2015_tax_IP-IC-17,Investissement Prestations 17% - Intracommunautaire,IP-IC-17,purchase,group,100,,,lu_2011_chart_1,459,"lu_2015_tax_IP-IC-17-n,lu_2015_tax_IP-IC-17-p",tag_lu_126
+lu_2011_tax_IP-IC-3-n,Investissement Prestations 3% - Intracommunautaire (-),IP-IC-3-n,none,percent,-3,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1463,,tag_lu_595
+lu_2011_tax_IP-IC-3-p,Investissement Prestations 3% - Intracommunautaire (+),IP-IC-3-p,none,percent,3,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1464,,tag_lu_394
+lu_2011_tax_IP-IC-3,Investissement Prestations 3% - Intracommunautaire,IP-IC-3,purchase,group,100,,,lu_2011_chart_1,462,"lu_2011_tax_IP-IC-3-n,lu_2011_tax_IP-IC-3-p",tag_lu_114
+lu_2011_tax_IP-IC-6-n,Investissement Prestations 6% - Intracommunautaire (-),IP-IC-6-n,none,percent,-6,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1466,,tag_lu_596
+lu_2011_tax_IP-IC-6-p,Investissement Prestations 6% - Intracommunautaire (+),IP-IC-6-p,none,percent,6,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1467,,tag_lu_390
+lu_2011_tax_IP-IC-6,Investissement Prestations 6% - Intracommunautaire,IP-IC-6,purchase,group,100,,,lu_2011_chart_1,465,"lu_2011_tax_IP-IC-6-n,lu_2011_tax_IP-IC-6-p",tag_lu_110
+lu_2015_tax_IP-IC-8-n,Investissement Prestations 8% - Intracommunautaire (-),IP-IC-8-n,none,percent,-8,lu_2011_account_4614112,lu_2011_account_4614112,lu_2011_chart_1,1469,,tag_lu_597
+lu_2015_tax_IP-IC-8-p,Investissement Prestations 8% - Intracommunautaire (+),IP-IC-8-p,none,percent,8,lu_2011_account_4216112,lu_2011_account_4216112,lu_2011_chart_1,1470,,tag_lu_410
+lu_2015_tax_IP-IC-8,Investissement Prestations 8% - Intracommunautaire,IP-IC-8,purchase,group,100,,,lu_2011_chart_1,468,"lu_2015_tax_IP-IC-8-n,lu_2015_tax_IP-IC-8-p",tag_lu_134
+lu_2011_tax_IP-PA-0,Investissement Prestations 0% - Pays,IP-PA-0,purchase,percent,0,,,lu_2011_chart_1,471,,tag_lu_260
+lu_2011_tax_IP-PA-12,Investissement Prestations 12% - Pays,IP-PA-12,purchase,percent,12,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,472,,"tag_lu_483,tag_lu_261"
+lu_2015_tax_IP-PA-14,Investissement Prestations 14% - Pays,IP-PA-14,purchase,percent,14,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,473,,"tag_lu_484,tag_lu_262"
+lu_2011_tax_IP-PA-15,Investissement Prestations 15% - Pays,IP-PA-15,purchase,percent,15,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,474,,"tag_lu_485,tag_lu_263"
+lu_2015_tax_IP-PA-17,Investissement Prestations 17% - Pays,IP-PA-17,purchase,percent,17,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,475,,"tag_lu_486,tag_lu_264"
+lu_2011_tax_IP-PA-3,Investissement Prestations 3% - Pays,IP-PA-3,purchase,percent,3,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,476,,"tag_lu_265,tag_lu_487"
+lu_2011_tax_IP-PA-6,Investissement Prestations 6% - Pays,IP-PA-6,purchase,percent,6,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,477,,"tag_lu_488,tag_lu_266"
+lu_2015_tax_IP-PA-8,Investissement Prestations 8% - Pays,IP-PA-8,purchase,percent,8,lu_2011_account_4216111,lu_2011_account_4216111,lu_2011_chart_1,478,,"tag_lu_489,tag_lu_267"
+lu_2015_tax_V-ART-43_60b,Vente - Autres Exonérations (Article 43 et 60 bis),V-ART-43_60b,sale,percent,0,,,lu_2011_chart_1,479,,tag_lu_174
+lu_2015_tax_V-ART-44_56q,Vente - Autres Exonérations (Article 44 et 56 quarter),V-ART-44_56q,sale,percent,0,,,lu_2011_chart_1,480,,tag_lu_176
+lu_2011_tax_VB-EC-0,Vente Biens - Extracommunautaire,VB-EC-0,sale,percent,0,,,lu_2011_chart_1,481,,tag_lu_172
+lu_2011_tax_VB-EC-Tab,Vente Biens Tabacs - Extracommunautaire,VB-EC-Tab,sale,percent,0,,,lu_2011_chart_1,482,,tag_lu_178
+lu_2011_tax_VB-IC-0,Vente Biens - Intracommunautaire,VB-IC-0,sale,percent,0,,,lu_2011_chart_1,483,,tag_lu_192
+lu_2011_tax_VB-IC-Tab,Vente Biens Tabacs - Intracommunautaire,VB-IC-Tab,sale,percent,0,,,lu_2011_chart_1,484,,tag_lu_179
+lu_2011_tax_VB-PA-0,Vente Biens 0% - Pays,VB-PA-0,sale,percent,0,,,lu_2011_chart_1,485,,tag_lu_208
+lu_2011_tax_VB-PA-12,Vente Biens 12% - Pays,VB-PA-12,sale,percent,12,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,486,,"tag_lu_283,tag_lu_205"
+lu_2015_tax_VB-PA-14,Vente Biens 14% - Pays,VB-PA-14,sale,percent,14,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,487,,"tag_lu_290,tag_lu_214"
+lu_2011_tax_VB-PA-15,Vente Biens 15% - Pays,VB-PA-15,sale,percent,15,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,488,,"tag_lu_274,tag_lu_196"
+lu_2015_tax_VB-PA-17,Vente Biens 17% - Pays,VB-PA-17,sale,percent,17,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,489,,"tag_lu_287,tag_lu_211"
+lu_2011_tax_VB-PA-3,Vente Biens 3% - Pays,VB-PA-3,sale,percent,3,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,490,,"tag_lu_202,tag_lu_280"
+lu_2011_tax_VB-PA-6,Vente Biens 6% - Pays,VB-PA-6,sale,percent,6,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,491,,"tag_lu_277,tag_lu_199"
+lu_2015_tax_VB-PA-8,Vente Biens 8% - Pays,VB-PA-8,sale,percent,8,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,492,,"tag_lu_293,tag_lu_217"
+lu_2011_tax_VB-PA-Tab,Vente Biens Tabacs - Pays,VB-PA-Tab,sale,percent,0,,,lu_2011_chart_1,493,,tag_lu_180
+lu_2015_tax_VB-TR-0,Vente Biens – Triangulaire Intracommunautaire,VB-TR-0,sale,percent,0,,,lu_2011_chart_1,494,,tag_lu_182
+lu_2011_tax_VP-EC-0,Vente Prestations - Extracommunautaire,VP-EC-0,sale,percent,0,,,lu_2011_chart_1,495,,tag_lu_184
+lu_2011_tax_VP-IC-0,Vente Prestations - Intracommunautaire,VP-IC-0,sale,percent,0,,,lu_2011_chart_1,496,,tag_lu_188
+lu_2011_tax_VP-IC-EX,'Vente Prestations - Intracommunautaire exonérées dans l''état membre',VP-IC-EX,sale,percent,0,,,lu_2011_chart_1,497,,tag_lu_190
+lu_2011_tax_VP-PA-0,Vente Prestations 0% - Pays,VP-PA-0,sale,percent,0,,,lu_2011_chart_1,498,,tag_lu_209
+lu_2011_tax_VP-PA-12,Vente Prestations 12% - Pays,VP-PA-12,sale,percent,12,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,499,,"tag_lu_284,tag_lu_206"
+lu_2015_tax_VP-PA-14,Vente Prestations 14% - Pays,VP-PA-14,sale,percent,14,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,500,,"tag_lu_291,tag_lu_215"
+lu_2011_tax_VP-PA-15,Vente Prestations 15% - Pays,VP-PA-15,sale,percent,15,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,501,,"tag_lu_275,tag_lu_197"
+lu_2015_tax_VP-PA-17,Vente Prestations 17% - Pays,VP-PA-17,sale,percent,17,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,502,,"tag_lu_288,tag_lu_212"
+lu_2011_tax_VP-PA-3,Vente Prestations 3% - Pays,VP-PA-3,sale,percent,3,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,503,,"tag_lu_281,tag_lu_203"
+lu_2011_tax_VP-PA-6,Vente Prestations 6% - Pays,VP-PA-6,sale,percent,6,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,504,,"tag_lu_200,tag_lu_278"
+lu_2015_tax_VP-PA-8,Vente Prestations 8% - Pays,VP-PA-8,sale,percent,8,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,505,,"tag_lu_294,tag_lu_218"
+lu_2015_tax_SANS,Sans Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_lu_598
+lu_2015_tax_SANS,Sans Taxes,SANS,sale,percent,0,,,lu_2011_chart_1,507,,tag_lu_598
\ No newline at end of file
diff --git a/addons/l10n_lu/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_lu/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_lu/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)

From e55aa95f2a55a0e01fd6f1adc7a988c542efa3de Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 28 Aug 2017 16:36:20 +0200
Subject: [PATCH 081/119] [FIX] website_sale: very slow shop grid and product
 view

The problem is present because there are more than 1000 variants for each
product. For display, the price of each product is recalculated (instead
of looking only at the last product)

opw-766897
---
 addons/website_sale/models/product.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index d3e1c6b893a..1b017ff67d1 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -141,11 +141,13 @@ class ProductTemplate(models.Model):
     website_public_price = fields.Float('Website public price', compute='_website_price', digits=dp.get_precision('Product Price'))
 
     def _website_price(self):
-        self.mapped('product_variant_id')
-
-        for p in self:
-            p.website_price = p.product_variant_id.website_price
-            p.website_public_price = p.product_variant_id.website_public_price
+        # First filter out the ones that have no variant:
+        # This makes sure that every template below has a corresponding product in the zipped result.
+        self = self.filtered('product_variant_id')
+        # use mapped who returns a recordset with only itself to prefetch (and don't prefetch every product_variant_ids)
+        for template, product in zip(self, self.mapped('product_variant_id')):
+            template.website_price = product.website_price
+            template.website_public_price = product.website_public_price
 
     def _default_website_sequence(self):
         self._cr.execute("SELECT MIN(website_sequence) FROM %s" % self._table)

From 81908899fc49af3bdbd41f3869c96d4fe2651811 Mon Sep 17 00:00:00 2001
From: Rohan Patel <rop@odoo.com>
Date: Tue, 29 Aug 2017 17:08:50 +0530
Subject: [PATCH 082/119] [IMP] l10n_vn: created new tags and assign them to
 taxes

task: https://www.odoo.com/web#id=22700&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720
PR: #19064
---
 addons/l10n_vn/__openerp__.py                 |  2 +-
 addons/l10n_vn/account_tax.xml                | 84 +++++++++++++++----
 .../2.0/post-migrate_tags_on_taxes.py         |  6 ++
 3 files changed, 73 insertions(+), 19 deletions(-)
 create mode 100644 addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py

diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
index d102ab871bd..ef8efe0555d 100644
--- a/addons/l10n_vn/__openerp__.py
+++ b/addons/l10n_vn/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     "name" : "Vietnam - Accounting",
-    "version" : "1.0",
+    "version" : "2.0",
     "author" : "General Solutions",
     'website': 'http://gscom.vn',
     'category': 'Localization',
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml
index 107ef8ba626..068839b4079 100644
--- a/addons/l10n_vn/account_tax.xml
+++ b/addons/l10n_vn/account_tax.xml
@@ -2,28 +2,76 @@
 <odoo>
 
     <!-- Tax Definitions -->
-    <record id="tax_tag_purchase_10" model="account.account.tag">
-        <field name="name">Thuế GTGT được khấu trừ 10%</field>
+    <record id="tag_vn_01" model="account.account.tag">
+        <field name="name">HHDV mua vào</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_purchase_5" model="account.account.tag">
-        <field name="name">Thuế GTGT được khấu trừ 5%</field>
+    <record id="tag_vn_02" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_purchase_0" model="account.account.tag">
-        <field name="name">Thuế GTGT được khấu trừ 0%</field>
+    <record id="tag_vn_03" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 0%</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_sale_10" model="account.account.tag">
-        <field name="name">Thuế GTGT phải nộp 10%</field>
+    <record id="tag_vn_04" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 5%</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_sale_5" model="account.account.tag">
-        <field name="name">Thuế GTGT phải nộp 5%</field>
+    <record id="tag_vn_05" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 10%</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_sale_0" model="account.account.tag">
-        <field name="name">Thuế GTGT phải nộp 0%</field>
+    <record id="tag_vn_06" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_07" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_08" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_09" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 10%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_10" model="account.account.tag">
+        <field name="name">HHDV bán ra</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_11" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_12" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_13" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_14" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 10%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_15" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_16" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_17" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_18" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 10%</field>
         <field name="applicability">taxes</field>
     </record>
 
@@ -37,7 +85,7 @@
         <field name="account_id" ref="chart1331"/>
         <field name="refund_account_id" ref="chart1331"/>
         <field name="type_tax_use">purchase</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_purchase_10')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_09'),ref('tag_vn_05')])]"/>
     </record>
     <record id="tax_purchase_vat5" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -48,7 +96,7 @@
         <field name="account_id" ref="chart1331"/>
         <field name="refund_account_id" ref="chart1331"/>
         <field name="type_tax_use">purchase</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_purchase_5')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_08'),ref('tag_vn_04')])]"/>
     </record>
     <record id="tax_purchase_vat0" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -59,7 +107,7 @@
         <field name="account_id" ref="chart1331"/>
         <field name="refund_account_id" ref="chart1331"/>
         <field name="type_tax_use">purchase</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_purchase_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_07')])]"/>
     </record>
 
     <!-- for sale -->
@@ -72,7 +120,7 @@
         <field name="account_id" ref="chart33311"/>
         <field name="refund_account_id" ref="chart33311"/>
         <field name="type_tax_use">sale</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_sale_10')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_18'),ref('tag_vn_14')])]"/>
     </record>
     <record id="tax_sale_vat5" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -83,7 +131,7 @@
         <field name="account_id" ref="chart33311"/>
         <field name="refund_account_id" ref="chart33311"/>
         <field name="type_tax_use">sale</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_sale_5')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_17'),ref('tag_vn_13')])]"/>
     </record>
     <record id="tax_sale_vat0" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -94,7 +142,7 @@
         <field name="account_id" ref="chart33311"/>
         <field name="refund_account_id" ref="chart33311"/>
         <field name="type_tax_use">sale</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_sale_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_16')])]"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)

From 4f61e7f0481fa2e2bfd806d92ea77f07b78d42de Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 29 Aug 2017 13:41:28 +0200
Subject: [PATCH 083/119] [FIX] web: WidgetDomain: don't crash on false domain

Before this rev., when the value of a field with widget='domain'
was false, the search_count RPC made to display the number of
records matching the domain crashed, and the widget displayed that
the domain was invalid. This rev. adds a fallback on [] when the
domain is false.
---
 .../static/src/js/views/basic/basic_model.js  |  2 +-
 .../static/tests/fields/basic_fields_tests.js | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index aa0aab7aa64..9dc544ba84f 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -2043,7 +2043,7 @@ var BasicModel = AbstractModel.extend({
         if (record.data.hasOwnProperty(domainModel)) {
             domainModel = record._changes && record._changes[domainModel] || record.data[domainModel];
         }
-        var domainValue = record._changes && record._changes[fieldName] || record.data[fieldName];
+        var domainValue = record._changes && record._changes[fieldName] || record.data[fieldName] || [];
 
         // avoid rpc if not necessary
         var hasChanged = this._saveSpecialDataCache(record, fieldName, {
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 984fa156d9c..c33cb8a4151 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -3757,6 +3757,44 @@ QUnit.module('basic_fields', {
             "field selector popover should contain 'Color index' field");
         form.destroy();
     });
+
+    QUnit.test('domain field: handle false domain as []', function (assert) {
+        assert.expect(2);
+
+        this.data.partner.records[0].foo = false;
+        this.data.partner.fields.bar.type = "char";
+        this.data.partner.records[0].bar = "product";
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch:
+                '<form>' +
+                    '<sheet>' +
+                        '<group>' +
+                            '<field name="bar"/>' +
+                            '<field name="foo" widget="domain" options="{\'model\': \'bar\'}"/>' +
+                        '</group>' +
+                    '</sheet>' +
+                '</form>',
+            mockRPC: function (route, args) {
+                if (args.method === 'search_count') {
+                    assert.deepEqual(args.args[0], [], "should send a valid domain");
+                }
+                return this._super.apply(this, arguments);
+            },
+            res_id: 1,
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        var $warning = form.$('.o_field_widget[name=foo] .text-warning');
+        assert.strictEqual($warning.length, 0, "should not display that the domain is invalid");
+
+        form.destroy();
+    });
 });
 });
 });

From 209fd529f829b7345542afc1e0697056e50d3afd Mon Sep 17 00:00:00 2001
From: amoyaux <arm@odoo.com>
Date: Wed, 9 Aug 2017 14:19:44 +0200
Subject: [PATCH 084/119] [FIX] stock : check backorder compare apples and
 oranges.

The function that checks if we need a back oder or not compares
the initial demand and the quantity processed on the picking.

When unit of measure are activated the initial demand (product_qty)
uses the uom of the product. However the quantity processed on the move
(quantity_done) uses the uom of the move.

This commit uses product_uom_qty instead of product_qty. Product_uom_qty
represents the initial demand transformed with the uom of the move.
It also add a small test with a back order that ensure the quantities
are correct.

It also repairs the test stock flow where in some case immediate transfer
return the back order wizard instead of processing the move. In these cases
we catch the back order wizard and run it.
---
 addons/stock/models/stock_picking.py  |  4 +-
 addons/stock/tests/test_move2.py      | 81 +++++++++++++++++++++++++++
 addons/stock/tests/test_stock_flow.py | 24 ++++----
 3 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index de736ef0bcf..38a0586d248 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -646,8 +646,8 @@ class Picking(models.Model):
         for move in self.move_lines:
             quantity_todo.setdefault(move.product_id.id, 0)
             quantity_done.setdefault(move.product_id.id, 0)
-            quantity_todo[move.product_id.id] += move.product_qty
-            quantity_done[move.product_id.id] += move.quantity_done #TODO: convert to base units
+            quantity_todo[move.product_id.id] += move.product_uom_qty
+            quantity_done[move.product_id.id] += move.quantity_done
         for ops in self.move_line_ids.filtered(lambda x: x.package_id and not x.product_id and not x.move_id):
             for quant in ops.package_id.quant_ids:
                 quantity_done.setdefault(quant.product_id.id, 0)
diff --git a/addons/stock/tests/test_move2.py b/addons/stock/tests/test_move2.py
index b9fcd4f0dfc..3f24334d195 100644
--- a/addons/stock/tests/test_move2.py
+++ b/addons/stock/tests/test_move2.py
@@ -3,6 +3,7 @@
 
 from odoo.addons.stock.tests.common import TestStockCommon
 from odoo.exceptions import UserError
+from odoo import api, registry
 
 
 class TestPickShip(TestStockCommon):
@@ -1204,3 +1205,83 @@ class TestSinglePicking(TestStockCommon):
         })
         move_line.lot_id = lot1
         delivery_order.action_done()
+
+
+class TestStockUOM(TestStockCommon):
+
+    def setUp(self):
+        with registry().cursor() as cr:
+            env = api.Environment(cr, 1, {})
+            dp = env.ref('product.decimal_product_uom')
+            self.old_digits = dp.digits
+            dp.digits = 7
+        super(TestStockUOM, self).setUp()
+
+    def tearDown(self):
+        super(TestStockUOM, self).tearDown()
+        with self.registry.cursor() as cr:
+            env = api.Environment(cr, 1, {})
+            dp = env.ref('product.decimal_product_uom')
+            dp.digits = self.old_digits
+
+    def test_pickings_transfer_with_different_uom_and_back_orders(self):
+        """ Picking transfer with diffrent unit of meassure. """
+        # weight category
+        categ_test = self.env['product.uom.categ'].create({'name': 'Bigger than tons'})
+
+        T_LBS = self.env['product.uom'].create({
+            'name': 'T-LBS',
+            'category_id': categ_test.id,
+            'uom_type': 'reference',
+            'rounding': 0.01
+        })
+        T_GT = self.env['product.uom'].create({
+            'name': 'T-GT',
+            'category_id': categ_test.id,
+            'uom_type': 'bigger',
+            'rounding': 0.0000001,
+            'factor_inv': 2240.00,
+        })
+        T_TEST = self.env['product.product'].create({
+            'name': 'T_TEST',
+            'type': 'product',
+            'uom_id': T_LBS.id,
+            'uom_po_id': T_LBS.id,
+            'tracking': 'lot',
+        })
+        picking_in = self.env['stock.picking'].create({
+            'partner_id': self.partner_delta_id,
+            'picking_type_id': self.picking_type_in,
+            'location_id': self.supplier_location,
+            'location_dest_id': self.stock_location
+        })
+        move = self.env['stock.move'].create({
+            'name': 'First move with 60 GT',
+            'product_id': T_TEST.id,
+            'product_uom_qty': 60,
+            'product_uom': T_GT.id,
+            'picking_id': picking_in.id,
+            'location_id': self.supplier_location,
+            'location_dest_id': self.stock_location
+        })
+        picking_in.action_confirm()
+
+        self.assertEqual(move.product_uom_qty, 60.00, 'Wrong T_GT quantity')
+        self.assertEqual(move.product_qty, 134400.00, 'Wrong T_LBS quantity')
+
+        lot = self.env['stock.production.lot'].create({'name': 'Lot TEST', 'product_id': T_TEST.id})
+        self.env['stock.move.line'].create({
+            'move_id': move.id,
+            'product_id': T_TEST.id,
+            'product_uom_id': T_LBS.id,
+            'location_id': self.supplier_location,
+            'location_dest_id': self.stock_location,
+            'qty_done': 42760.00,
+            'lot_id': lot.id,
+        })
+
+        picking_in.action_done()
+        back_order_in = self.env['stock.picking'].search([('backorder_id', '=', picking_in.id)])
+
+        self.assertEqual(len(back_order_in), 1.00, 'There should be one back order created')
+        self.assertEqual(back_order_in.move_lines.product_qty, 91640.00, 'There should be one back order created')
diff --git a/addons/stock/tests/test_stock_flow.py b/addons/stock/tests/test_stock_flow.py
index d6e3fa838c4..6291f804595 100644
--- a/addons/stock/tests/test_stock_flow.py
+++ b/addons/stock/tests/test_stock_flow.py
@@ -848,9 +848,7 @@ class TestStockFlow(TestStockCommon):
 
         res_dict = picking_out.button_validate()
         wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
-        res_dict_for_back_order = wizard.process()
-        backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
-        backorder_wizard.process()
+        wizard.process()
 
         # ----------------------------------------------------------------------
         # Check product stock location quantity and quantity available.
@@ -931,9 +929,7 @@ class TestStockFlow(TestStockCommon):
         # Transfer Incoming shipment.
         res_dict = picking_in.button_validate()
         wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
-        res_dict_for_back_order = wizard.process()
-        backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
-        backorder_wizard.process()
+        wizard.process()
 
         # -----------------------------------------------------------------------
         # Check incoming shipment after transfer.
@@ -970,7 +966,9 @@ class TestStockFlow(TestStockCommon):
         pack_opt.write({'product_uom_qty': 0.5})
         res_dict = picking_out.button_validate()
         wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
-        wizard.process()
+        res_dict_for_back_order = wizard.process()
+        backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
+        backorder_wizard.process()
         quants = self.StockQuantObj.search([('product_id', '=', productKG.id), ('location_id', '=', self.stock_location)])
         total_qty = [quant.quantity for quant in quants]
         # Check total quantity stock location.
@@ -992,7 +990,9 @@ class TestStockFlow(TestStockCommon):
         pack_opt.write({'product_uom_qty': 0.5})
         res_dict = bo_out_1.button_validate()
         wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
-        wizard.process()
+        res_dict_for_back_order = wizard.process()
+        backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
+        backorder_wizard.process()
         quants = self.StockQuantObj.search([('product_id', '=', productKG.id), ('location_id', '=', self.stock_location)])
         total_qty = [quant.quantity for quant in quants]
 
@@ -1014,7 +1014,9 @@ class TestStockFlow(TestStockCommon):
         pack_opt.write({'product_uom_qty': 0.5})
         res_dict = bo_out_2.button_validate()
         wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
-        wizard.process()
+        res_dict_for_back_order = wizard.process()
+        backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
+        backorder_wizard.process()
         # Check total quantity stock location of product KG.
         quants = self.StockQuantObj.search([('product_id', '=', productKG.id), ('location_id', '=', self.stock_location)])
         total_qty = [quant.quantity for quant in quants]
@@ -1035,7 +1037,9 @@ class TestStockFlow(TestStockCommon):
         pack_opt.write({'product_uom_qty': 0.5})
         res_dict = bo_out_3.button_validate()
         wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
-        wizard.process()
+        res_dict_for_back_order = wizard.process()
+        backorder_wizard = self.env[(res_dict_for_back_order.get('res_model'))].browse(res_dict_for_back_order.get('res_id'))
+        backorder_wizard.process()
         quants = self.StockQuantObj.search([('product_id', '=', productKG.id), ('location_id', '=', self.stock_location)])
         total_qty = [quant.quantity for quant in quants]
         self.assertEqual(sum(total_qty), 999.9980, 'Expecting 999.9980 kg , got %.4f kg on location stock!' % (sum(total_qty)))

From 722dbcfa075a29692339469abcb5a556ef951420 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 29 Aug 2017 16:09:02 +0200
Subject: [PATCH 085/119] [FIX] hr_expense: also consider `cash` journals

---
 addons/hr_expense/models/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index aa708898d4e..3a5b0eab4db 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -397,7 +397,7 @@ class HrExpenseSheet(models.Model):
     journal_id = fields.Many2one('account.journal', string='Expense Journal', states={'done': [('readonly', True)], 'post': [('readonly', True)]},
         default=lambda self: self.env['ir.model.data'].xmlid_to_object('hr_expense.hr_expense_account_journal') or self.env['account.journal'].search([('type', '=', 'purchase')], limit=1),
         help="The journal used when the expense is done.")
-    bank_journal_id = fields.Many2one('account.journal', string='Bank Journal', states={'done': [('readonly', True)], 'post': [('readonly', True)]}, default=lambda self: self.env['account.journal'].search([('type', 'in', ['case', 'bank'])], limit=1), help="The payment method used when the expense is paid by the company.")
+    bank_journal_id = fields.Many2one('account.journal', string='Bank Journal', states={'done': [('readonly', True)], 'post': [('readonly', True)]}, default=lambda self: self.env['account.journal'].search([('type', 'in', ['cash', 'bank'])], limit=1), help="The payment method used when the expense is paid by the company.")
     accounting_date = fields.Date(string="Accounting Date")
     account_move_id = fields.Many2one('account.move', string='Journal Entry', copy=False)
     department_id = fields.Many2one('hr.department', string='Department', states={'post': [('readonly', True)], 'done': [('readonly', True)]})

From 122242233358ad95d40a3e65229b65684fa3222c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 23 Aug 2017 14:19:15 +0200
Subject: [PATCH 086/119] [FIX] p3: race condition when *reloading* an existing
 db

When re-launching Odoo on an existing database in Python 3.6[0] it's
possible that the scheduler will preempt the main thread
mid-module-import and run the cron thread which causes registry (and
module) initialisation with only a subset of the Python files loaded
and thus e.g. tries loading auth_crypt with a registry in which none
of res has been loaded makes for interesting situations.

Delay spawning the cron thread until *after* the registry preload at
least, though I don't think that actually entirely fixes the issue.

[0] and probably in any Python >= 3.3, I'm guessing it's related to
    the per-module import locks which replaced the old global lock:
    https://docs.python.org/3.3/whatsnew/3.3.html#a-finer-grained-import-lock

    though since ir.cron has little reason to import anything it could
    also just be Python 3 scheduler changes which allow/cause a
    context-switch during imports while the Python 2 scheduler would
    not allow that. IDK.
---
 odoo/service/server.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/odoo/service/server.py b/odoo/service/server.py
index c3b523efe7e..42e76a11688 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -276,10 +276,6 @@ class ThreadedServer(CommonServer):
             # some tests need the http deamon to be available...
             self.http_spawn()
 
-        if not stop:
-            # only relevant if we are not in "--stop-after-init" mode
-            self.cron_spawn()
-
     def stop(self):
         """ Shutdown the WSGI server. Wait for non deamon threads.
         """
@@ -323,6 +319,8 @@ class ThreadedServer(CommonServer):
             self.stop()
             return rc
 
+        self.cron_spawn()
+
         # Wait for a first signal to be handled. (time.sleep will be interrupted
         # by the signal handler.) The try/except is for the win32 case.
         try:

From b2f2006b7fc2c7301e048df7e392193f56aecd79 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Wed, 30 Aug 2017 09:16:47 +0200
Subject: [PATCH 087/119] [FIX] account: sequence_number_next fixes.

-changing the date_invoice field do not reset anymore the sequence_number_next (it now only affects the prefix)
-the date_invoice is now passed as ir_sequence_date AND ir_sequence_date_range in the context, for sequences that use the date_range feature in prefixes
---
 addons/account/models/account_invoice.py | 47 ++++++++++++++++--------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 3ad85d3cfa2..1bcf86010aa 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -343,38 +343,53 @@ class AccountInvoice(models.Model):
     has_outstanding = fields.Boolean(compute='_get_outstanding_info_JSON', groups="account.group_account_invoice")
 
     #fields use to set the sequence, on the first invoice of the journal
-    sequence_number_next = fields.Char(string='Next Number', compute="_get_sequence_prefix", inverse="_set_sequence_next")
+    sequence_number_next = fields.Char(string='Next Number', compute="_get_sequence_number_next", inverse="_set_sequence_next")
     sequence_number_next_prefix = fields.Char(string='Next Number', compute="_get_sequence_prefix")
 
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
     ]
 
+    def _get_seq_number_next_stuff(self):
+        self.ensure_one()
+        journal_sequence = self.journal_id.sequence_id
+        if self.journal_id.refund_sequence:
+            domain = [('type', '=', self.type)]
+            journal_sequence = self.type in ['in_refund', 'out_refund'] and self.journal_id.refund_sequence_id or self.journal_id.sequence_id
+        elif self.type in ['in_invoice', 'in_refund']:
+            domain = [('type', 'in', ['in_invoice', 'in_refund'])]
+        else:
+            domain = [('type', 'in', ['out_invoice', 'out_refund'])]
+        if self.id:
+            domain += [('id', '<>', self.id)]
+        domain += [('journal_id', '=', self.journal_id.id), ('state', 'not in', ['draft', 'cancel'])]
+        return journal_sequence, domain
+
     @api.depends('state', 'journal_id', 'date_invoice')
     def _get_sequence_prefix(self):
+        """ computes the prefix of the number that will be assigned to the first invoice/bill/refund of a journal, in order to
+        let the user manually change it.
+        """
+        for invoice in self:
+            journal_sequence, domain = invoice._get_seq_number_next_stuff()
+            if (invoice.state == 'draft') and not self.search(domain, limit=1):
+                prefix, dummy = journal_sequence.with_context(ir_sequence_date=invoice.date_invoice,
+                                                              ir_sequence_date_range=invoice.date_invoice)._get_prefix_suffix()
+                invoice.sequence_number_next_prefix = prefix
+            else:
+                invoice.sequence_number_next_prefix = False
+
+    @api.depends('state', 'journal_id')
+    def _get_sequence_number_next(self):
         """ computes the number that will be assigned to the first invoice/bill/refund of a journal, in order to
         let the user manually change it.
         """
         for invoice in self:
-            journal_sequence = invoice.journal_id.sequence_id
-            if invoice.journal_id.refund_sequence:
-                domain = [('type', '=', invoice.type)]
-                journal_sequence = invoice.type in ['in_refund', 'out_refund'] and invoice.journal_id.refund_sequence_id or invoice.journal_id.sequence_id
-            elif invoice.type in ['in_invoice', 'in_refund']:
-                domain = [('type', 'in', ['in_invoice', 'in_refund'])]
-            else:
-                domain = [('type', 'in', ['out_invoice', 'out_refund'])]
-            if invoice.id:
-                domain += [('id', '<>', invoice.id)]
-            domain += [('journal_id', '=', invoice.journal_id.id), ('state', 'not in', ['draft', 'cancel'])]
-
+            journal_sequence, domain = invoice._get_seq_number_next_stuff()
             if (invoice.state == 'draft') and not self.search(domain, limit=1):
-                prefix, dummy = journal_sequence.with_context(ir_sequence_date=invoice.date_invoice)._get_prefix_suffix()
-                invoice.sequence_number_next_prefix = prefix
                 number_next = journal_sequence._get_current_sequence().number_next_actual
                 invoice.sequence_number_next = '%%0%sd' % journal_sequence.padding % number_next
             else:
-                invoice.sequence_number_next_prefix = False
                 invoice.sequence_number_next = 'no'
 
     @api.multi

From 6630ce7e7607edd6838647ea761b3e4a061e9473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Ernesto=20Torres=20Mac=C3=ADas?= <luis_t@vauxoo.com>
Date: Wed, 30 Aug 2017 02:40:24 -0500
Subject: [PATCH 088/119] [FIX] l10n_mx: changing nature of accounts

Was PR #19137
---
 addons/l10n_mx/data/account_tag_data.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_mx/data/account_tag_data.xml b/addons/l10n_mx/data/account_tag_data.xml
index ecf157f78b2..5160151c821 100644
--- a/addons/l10n_mx/data/account_tag_data.xml
+++ b/addons/l10n_mx/data/account_tag_data.xml
@@ -479,7 +479,7 @@
                 <field name='name'>119.01 IVA pendiente de pago</field>
                 <field name='color'>4</field>
                 <field name='applicability'>accounts</field>
-                <field name='nature'>D</field>
+                <field name='nature'>A</field>
             </record>
             <record id='account_tag_119_02' model='account.account.tag'>
                 <field name='name'>119.02 IVA de importación pendiente de pago</field>
@@ -2015,7 +2015,7 @@
                 <field name='name'>304.01 Utilidad de ejercicios anteriores</field>
                 <field name='color'>4</field>
                 <field name='applicability'>accounts</field>
-                <field name='nature'>D</field>
+                <field name='nature'>A</field>
             </record>
             <record id='account_tag_304_02' model='account.account.tag'>
                 <field name='name'>304.02 Pérdida de ejercicios anteriores</field>
@@ -2429,7 +2429,7 @@
                 <field name='name'>503.01 Devoluciones, descuentos o bonificaciones sobre compras</field>
                 <field name='color'>4</field>
                 <field name='applicability'>accounts</field>
-                <field name='nature'>D</field>
+                <field name='nature'>A</field>
             </record>
             <record id='account_tag_504_01' model='account.account.tag'>
                 <field name='name'>504.01 Gastos indirectos de fabricación</field>
@@ -5573,7 +5573,7 @@
                 <field name='name'>899.01 Otras cuentas de orden</field>
                 <field name='color'>4</field>
                 <field name='applicability'>accounts</field>
-                <field name='nature'>A</field>
+                <field name='nature'>D</field>
             </record>
             <record id='account_tag_899_02' model='account.account.tag'>
                 <field name='name'>899.02 Contra cuenta otras cuentas de orden</field>

From e88f91ba41d6af028df019893d656a5f50b35d28 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Tue, 29 Aug 2017 14:34:26 +0200
Subject: [PATCH 089/119] [FIX] web_editor, website_sale: load images of the
 shop when product has been updated

Before this commit, when the shop was in multi images, the main image was not refreshed when changed in the back end.
This was because of the ?unique parameter that was computed on the product variant image. Hence, when the product image changed, the variant image did not, the hash neither, and the image wasn't refreshed

This commit fixes this by adding an option to the qweb.field.image

OPW 765287

closes #19133
---
 addons/web_editor/models/ir_qweb.py     | 2 +-
 addons/website_sale/views/templates.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web_editor/models/ir_qweb.py b/addons/web_editor/models/ir_qweb.py
index 751767800d6..64746898b79 100644
--- a/addons/web_editor/models/ir_qweb.py
+++ b/addons/web_editor/models/ir_qweb.py
@@ -293,7 +293,7 @@ class Image(models.AbstractModel):
             if max_width or max_height:
                 max_size = '%sx%s' % (max_width, max_height)
 
-        sha = hashlib.sha1(getattr(record, '__last_update')).hexdigest()[0:7]
+        sha = hashlib.sha1(options.get('unique', getattr(record, '__last_update'))).hexdigest()[0:7]
         max_size = '' if max_size is None else '/%s' % max_size
         src = '/web/image/%s/%s/%s%s?unique=%s' % (record._name, record.id, field_name, max_size, sha)
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 97ad41ab074..f0e1a756263 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -400,13 +400,13 @@
                         <div class="col-sm-7">
                             <span itemprop="image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name', 'zoom': 'image'}" groups="!website_sale.group_website_multi_image"/>
                             <t groups="website_sale.group_website_multi_image">
-                                <t t-set="variant_img" t-value="product.product_variant_ids[0].image_variant"/>
+                                <t t-set="variant_img" t-value="product.product_variant_id.image_variant"/>
                                 <t t-set="image_ids"  t-value="product.product_image_ids"/>
                                 <div id="o-carousel-product" class="carousel slide" data-ride="carousel" data-interval="0">
                                   <div class="carousel-outer">
                                     <div class="carousel-inner">
-                                        <div class="item active" itemprop="image" t-field="product.product_variant_ids[0].image" t-options='{"widget": "image", "class": "product_detail_img js_variant_img", "alt-field": "name", "zoom": "image"}'/>
-                                        <div t-if="variant_img" class="item" itemprop="image" t-field="product.image" t-options='{"widget": "image", "class": "product_detail_img", "alt-field": "name", "zoom": "image"}'/>
+                                        <div class="item active" itemprop="image" t-field="product.product_variant_id.image" t-options="{'widget': 'image', 'class': 'product_detail_img js_variant_img', 'alt-field': 'name', 'zoom': 'image', 'unique': product['__last_update'] + product.product_variant_id['__last_update']}"/>
+                                        <div t-if="variant_img" class="item" itemprop="image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name', 'zoom': 'image', 'unique': product['__last_update'] + product.product_variant_id['__last_update']}}"/>
                                         <t t-if="len(image_ids)" t-foreach="image_ids" t-as="pimg">
                                             <div class="item" t-field="pimg.image" t-options='{"widget": "image", "class": "product_detail_img", "alt-field": "name", "zoom": "image" }'/>
                                         </t>

From 72dcb2eb912d56252095d5c944c6cbe12d67df97 Mon Sep 17 00:00:00 2001
From: Katherine Zaoral <kathy@vauxoo.com>
Date: Fri, 18 Aug 2017 15:28:10 +0000
Subject: [PATCH 090/119] [FIX] l10n_mx: Fix rst error in module description

---
 addons/l10n_mx/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index 49baf7a72ad..d7bf6c4ede9 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -28,7 +28,7 @@ With this module you will have:
  - Minimal chart of account tested in production environments.
  - Minimal chart of taxes, to comply with SAT_ requirements.
 
-.. SAT: http://www.sat.gob.mx/
+.. _SAT: http://www.sat.gob.mx/
     """,
     "depends": [
         "account",

From f39bc449481caef3f590710ff1394659bbe0b5cd Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 29 Aug 2017 17:09:40 +0200
Subject: [PATCH 091/119] [FIX] stock_account:Manager Cannot Change
 Configuration Settings

When the user is a stock manager and has the Settings rights, he can
modify the inventory settings.

opw:767233
---
 addons/stock_account/models/stock_config_settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock_account/models/stock_config_settings.py b/addons/stock_account/models/stock_config_settings.py
index e5c2e1e4c6b..ed9261bf18e 100644
--- a/addons/stock_account/models/stock_config_settings.py
+++ b/addons/stock_account/models/stock_config_settings.py
@@ -25,4 +25,6 @@ class StockConfigSettings(models.TransientModel):
             data = 'real_time'
         else:
             data = 'manual_periodic'
+        if self.user_has_groups('stock.group_stock_manager') and self.user_has_groups('base.group_system'):
+            self = self.sudo()
         return self.env['ir.values'].set_default('product.category', 'property_valuation', data)

From 551dc26940f2f33af7fa71c7d1256fe4f2f2fd8f Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 30 Aug 2017 08:55:03 +0200
Subject: [PATCH 092/119] [FIX] web: tab navigation in editable list with
 create="0"

Before this rev., when the user pressed 'TAB' in the last cell of
the last row of an editable list with attribute create="0", a new
line was added to the list, thus totally ignoring the attribute.
Now, it goes back to the first cell of the first row instead, as it
was before the new views.

Closes #19053
---
 .../static/src/js/fields/relational_fields.js |  6 +-
 .../src/js/views/list/list_controller.js      |  6 +-
 .../js/views/list/list_editable_renderer.js   |  7 +-
 addons/web/static/tests/views/list_tests.js   | 75 +++++++++++++++++++
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index e05a53194c3..67218e5decd 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -1063,7 +1063,11 @@ var FieldOne2Many = FieldX2Many.extend({
         ev.stopPropagation();
 
         if (this.editable) {
-            if (!this.creatingRecord) {
+            if (!this.activeActions.create) {
+                if (ev.data.onFail) {
+                    ev.data.onFail();
+                }
+            } else if (!this.creatingRecord) {
                 this.creatingRecord = true;
                 this._setValue({
                     operation: 'CREATE',
diff --git a/addons/web/static/src/js/views/list/list_controller.js b/addons/web/static/src/js/views/list/list_controller.js
index 3b74f140e4d..33637e53f52 100644
--- a/addons/web/static/src/js/views/list/list_controller.js
+++ b/addons/web/static/src/js/views/list/list_controller.js
@@ -313,7 +313,11 @@ var ListController = BasicController.extend({
      */
     _onAddRecord: function (event) {
         event.stopPropagation();
-        this._addRecord();
+        if (this.activeActions.create) {
+            this._addRecord();
+        } else if (event.data.onFail) {
+            event.data.onFail();
+        }
     },
     /**
      * Handles a click on a button by performing its action.
diff --git a/addons/web/static/src/js/views/list/list_editable_renderer.js b/addons/web/static/src/js/views/list/list_editable_renderer.js
index 3cd93bb6e8b..c5f65ecc6e2 100644
--- a/addons/web/static/src/js/views/list/list_editable_renderer.js
+++ b/addons/web/static/src/js/views/list/list_editable_renderer.js
@@ -341,7 +341,12 @@ ListRenderer.include({
         if (this.currentRow < this.state.data.length - 1) {
             this._selectCell(this.currentRow + 1, 0);
         } else {
-            this.unselectRow().then(this.trigger_up.bind(this, 'add_record'));
+            var self = this;
+            this.unselectRow().then(function () {
+                self.trigger_up('add_record', {
+                    onFail: self._selectCell.bind(self, 0, 0, {}),
+                });
+            });
         }
     },
     /**
diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
index 4b33af9f0a6..2ac373dbcd0 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -19,6 +19,7 @@ QUnit.module('Views', {
                     int_field: {string: "int_field", type: "integer", sortable: true},
                     qux: {string: "my float", type: "float"},
                     m2o: {string: "M2O field", type: "many2one", relation: "bar"},
+                    o2m: {string: "O2M field", type: "one2many", relation: "bar"},
                     m2m: {string: "M2M field", type: "many2many", relation: "bar"},
                     amount: {string: "Monetary field", type: "monetary"},
                     currency_id: {string: "Currency", type: "many2one",
@@ -1994,6 +1995,80 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('navigation with tab on a list with create="0"', function (assert) {
+        assert.expect(4);
+
+        var list = createView({
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree editable="bottom" create="0">' +
+                        '<field name="display_name"/>' +
+                    '</tree>',
+        });
+
+        assert.strictEqual(list.$('.o_data_row').length, 4,
+            "the list should contain 4 rows");
+
+        list.$('.o_data_row:nth(2) .o_data_cell:first').click();
+        assert.ok(list.$('.o_data_row:nth(2)').hasClass('o_selected_row'),
+            "third row should be in edition");
+
+        // Press 'Tab' -> should go to next line
+        list.$('.o_selected_row input').trigger({type: 'keydown', which: 9});
+        assert.ok(list.$('.o_data_row:nth(3)').hasClass('o_selected_row'),
+            "fourth row should be in edition");
+
+        // Press 'Tab' -> should go back to first line as the create action isn't available
+        list.$('.o_selected_row input').trigger({type: 'keydown', which: 9});
+        assert.ok(list.$('.o_data_row:first').hasClass('o_selected_row'),
+            "first row should be in edition");
+
+        list.destroy();
+    });
+
+
+    QUnit.test('navigation with tab on a one2many list with create="0"', function (assert) {
+        assert.expect(4);
+
+        this.data.foo.records[0].o2m = [1, 2];
+        var form = createView({
+            View: FormView,
+            model: 'foo',
+            data: this.data,
+            arch: '<form><sheet>' +
+                    '<field name="o2m">' +
+                        '<tree editable="bottom" create="0">' +
+                            '<field name="display_name"/>' +
+                        '</tree>' +
+                    '</field>' +
+                '</sheet></form>',
+            res_id: 1,
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        assert.strictEqual(form.$('.o_field_widget[name=o2m] .o_data_row').length, 2,
+            "there should be two records in the many2many");
+
+        form.$('.o_field_widget[name=o2m] .o_data_cell:first').click();
+        assert.ok(form.$('.o_field_widget[name=o2m] .o_data_row:first').hasClass('o_selected_row'),
+            "first row should be in edition");
+
+        // Press 'Tab' -> should go to next line
+        form.$('.o_field_widget[name=o2m] .o_selected_row input').trigger({type: 'keydown', which: 9});
+        assert.ok(form.$('.o_field_widget[name=o2m] .o_data_row:nth(1)').hasClass('o_selected_row'),
+            "second row should be in edition");
+
+        // Press 'Tab' -> should go back to first line as the create action isn't available
+        form.$('.o_field_widget[name=o2m] .o_selected_row input').trigger({type: 'keydown', which: 9});
+        assert.ok(form.$('.o_field_widget[name=o2m] .o_data_row:first').hasClass('o_selected_row'),
+            "first row should be in edition");
+
+        form.destroy();
+    });
+
     QUnit.test('edition, then navigation with tab (with a readonly field)', function (assert) {
         // This test makes sure that if we have 2 cells in a row, the first in
         // edit mode, and the second one readonly, then if we edit and press TAB,

From 96b1db4cd44ab70c5a7014ee36a8b475e1c5e38a Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 30 Aug 2017 09:24:31 +0200
Subject: [PATCH 093/119] [FIX] web: prevent 'reload' event from being handled
 twice

When the external button of a many2one field is clicked, the
related record is opened in a dialog. When the user clicks on
'Save' in this dialog, a 'reload' event is triggered to reload the
parent view (the one in the background), as the display name might
have changed.

However, when there is another many2one field in the opened dialog,
and if its external button is clicked, there are 2 opened dialogs,
and thus 3 nested form views. If the user clicks on 'Save' in the
third one, only the direct parent view must be reloaded (the one
in the first dialog).

Before this rev., the 'reload' event wasn't stopPropagated, so it
was handled by the view in the dialog, and by the one in the
background, which produced a crash.

This could happen for instance in Sales Order, edit a sale order
line, click on the external button of the product, in the dialog,
click on the external button of the category, edit some field and
click on 'Save'.

Closes #19052
---
 .../src/js/views/basic/basic_controller.js    |  1 +
 addons/web/static/tests/views/form_tests.js   | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 32570038987..67de3ec8ad9 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -539,6 +539,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
      *   reload
      */
     _onReload: function (event) {
+        event.stopPropagation(); // prevent other controllers from handling this request
         var data = event && event.data || {};
         var handle = data.db_id;
         if (handle) {
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 6bd2b4ca7b5..69e9e3696f7 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -5734,5 +5734,60 @@ QUnit.module('Views', {
         config.debug = initialDebugMode;
         form.destroy();
     });
+
+    QUnit.test('reload event is handled only once', function (assert) {
+        // In this test, several form controllers are nested (two of them are
+        // opened in dialogs). When the users clicks on save in the last
+        // opened dialog, a 'reload' event is triggered up to reload the (direct)
+        // parent view. If this event isn't stopPropagated by the first controller
+        // catching it, it will crash when the other one will try to handle it,
+        // as this one doesn't know at all the dataPointID to reload.
+        assert.expect(9);
+
+        var arch = '<form>' +
+                        '<field name="display_name"/>' +
+                        '<field name="trululu"/>' +
+                    '</form>';
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: arch,
+            archs: {
+                'partner,false,form': arch,
+            },
+            res_id: 2,
+            mockRPC: function (route, args) {
+                assert.step(args.method);
+                if (args.method === 'get_formview_id') {
+                    return $.when(false);
+                }
+                return this._super.apply(this, arguments);
+            },
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        form.$('.o_external_button').click(); // open the many2one record in a modal
+        $('.modal .o_external_button').click(); // in the modal, open the many2one record in another modal
+
+        $('.modal:nth(1) .o_field_widget[name=display_name]').val('new name').trigger('input');
+        $('.modal:nth(1) .modal-footer .btn-primary').first().click(); // save changes
+
+        assert.strictEqual($('.modal .o_field_widget[name=trululu] input').val(), 'new name',
+            "record should have been reloaded");
+        assert.verifySteps([
+            "read", // main record
+            "get_formview_id", // id of first form view opened in a dialog
+            "read", // first dialog
+            "get_formview_id", // id of second form view opened in a dialog
+            "read", // second dialog
+            "write", // save second dialog
+            "read", // reload first dialog
+        ]);
+
+        form.destroy();
+    });
 });
 });

From de6a50e984b6da4b1023d9d3a74923c76c2587d0 Mon Sep 17 00:00:00 2001
From: amoyaux <arm@odoo.com>
Date: Fri, 25 Aug 2017 13:18:45 +0200
Subject: [PATCH 094/119] [IMP] stock: modify move initial demand should not
 always unsreserve

Write method on stock move always unreserve concerning move if
initial demand is modified. Unreserve will delete all move lines
linked to the move including those already modified.

Thus modify initial demand(unreserve) will destroy all the
job done by the user.

This commit will only unreserve move is the initial demand
is smaller than the quantity reserved (could be improved by dropping
only few move lines). If the initial demand is greater than the
reserved quantity it will not unreserve but only change the
state to partially avaialbe.
---
 addons/stock/models/stock_move.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index c29a941e3bb..3ee63610245 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -352,8 +352,11 @@ class StockMove(models.Model):
     @api.multi
     def write(self, vals):
         # FIXME: pim fix your crap
-        if vals.get('product_uom_qty') and self.env.context.get('do_not_unreserve') is None:
-            self.filtered(lambda m: m.state not in ['draft', 'done', 'cancel']).do_unreserve()
+        if vals.get('product_uom_qty'):
+            if self.env.context.get('do_not_unreserve') is None:
+                move_to_unreserve = self.filtered(lambda m: m.state not in ['draft', 'done', 'cancel'] and m.reserved_availability > vals.get('product_uom_qty'))
+                move_to_unreserve.do_unreserve()
+                (self - move_to_unreserve).filtered(lambda m: m.state == 'assigned').write({'state': 'partially_available'})
 
         # TDE CLEANME: it is a gros bordel + tracking
         Picking = self.env['stock.picking']

From 4ec6069accb862beead8377247a9ca6b128d37ed Mon Sep 17 00:00:00 2001
From: amoyaux <arm@odoo.com>
Date: Tue, 29 Aug 2017 10:19:08 +0200
Subject: [PATCH 095/119] [FIX] mrp: update qty to produce does not remove the
 qty produced

When updating the quantity to produce on a MO, the quantity done
on finished/consumed moves that were not done was erased.

It happens due to write on stock move that always wanted to
unreserve the move and thus drop the move lines with qty_done.
This issue has been resolve in previous commit

This commit correct some mistakes in wizard methods in order
to correctly update open moves.
---
 addons/mrp/wizard/change_production_qty.py |  1 -
 addons/mrp/wizard/mrp_product_produce.py   | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index b408bef5f8b..cd3cf5a5864 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -55,7 +55,6 @@ class ChangeProductionQty(models.TransientModel):
                     operation_bom_qty[operation.id] = bom_data['qty']
             self._update_product_to_produce(production, production.product_qty - qty_produced)
             moves = production.move_raw_ids.filtered(lambda x: x.state not in ('done', 'cancel'))
-            moves.do_unreserve()
             moves.action_assign()
             for wo in production.workorder_ids:
                 operation = wo.operation_id
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index b887ac2a62d..8b08771e6e6 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -78,22 +78,22 @@ class MrpProductProduce(models.TransientModel):
     @api.multi
     def do_produce(self):
         # Nothing to do for lots since values are created using default data (stock.move.lots)
-        moves = self.production_id.move_raw_ids
         quantity = self.product_qty
         if float_compare(quantity, 0, precision_rounding=self.product_uom_id.rounding) <= 0:
             raise UserError(_('You should at least produce some quantity'))
-        for move in moves.filtered(lambda x: x.product_id.tracking == 'none' and x.quantity_done == 0 and x.state not in ('done', 'cancel')):
-            if move.unit_factor:
+        for move in self.production_id.move_raw_ids:
+            # TODO currently not possible to guess if the user updated quantity by hand or automatically by the produce wizard.
+            if move.product_id.tracking == 'none' and move.quantity_done < move.product_uom_qty and move.state not in ('done', 'cancel') and move.unit_factor:
                 rounding = move.product_uom.rounding
                 move.quantity_done += float_round(quantity * move.unit_factor, precision_rounding=rounding)
-        moves = self.production_id.move_finished_ids.filtered(lambda x: x.product_id.tracking == 'none' and x.state not in ('done', 'cancel'))
-        for move in moves:
-            rounding = move.product_uom.rounding
-            if move.product_id.id == self.production_id.product_id.id:
-                move.quantity_done += float_round(quantity, precision_rounding=rounding)
-            elif move.unit_factor:
-                # byproducts handling
-                move.quantity_done += float_round(quantity * move.unit_factor, precision_rounding=rounding)
+        for move in self.production_id.move_finished_ids:
+            if move.product_id.tracking == 'none' and move.state not in ('done', 'cancel'):
+                rounding = move.product_uom.rounding
+                if move.product_id.id == self.production_id.product_id.id:
+                    move.quantity_done += float_round(quantity, precision_rounding=rounding)
+                elif move.unit_factor:
+                    # byproducts handling
+                    move.quantity_done += float_round(quantity * move.unit_factor, precision_rounding=rounding)
         self.check_finished_move_lots()
         if self.production_id.state == 'confirmed':
             self.production_id.write({

From aee1456e893fd704859477f2dc524cdc6998c357 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Wed, 30 Aug 2017 11:43:49 +0200
Subject: [PATCH 096/119] [FIX] website_sale: correcting syntax typo in xml

---
 addons/website_sale/views/templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index f0e1a756263..8e490262b83 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -406,7 +406,7 @@
                                   <div class="carousel-outer">
                                     <div class="carousel-inner">
                                         <div class="item active" itemprop="image" t-field="product.product_variant_id.image" t-options="{'widget': 'image', 'class': 'product_detail_img js_variant_img', 'alt-field': 'name', 'zoom': 'image', 'unique': product['__last_update'] + product.product_variant_id['__last_update']}"/>
-                                        <div t-if="variant_img" class="item" itemprop="image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name', 'zoom': 'image', 'unique': product['__last_update'] + product.product_variant_id['__last_update']}}"/>
+                                        <div t-if="variant_img" class="item" itemprop="image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name', 'zoom': 'image', 'unique': product['__last_update'] + product.product_variant_id['__last_update']}"/>
                                         <t t-if="len(image_ids)" t-foreach="image_ids" t-as="pimg">
                                             <div class="item" t-field="pimg.image" t-options='{"widget": "image", "class": "product_detail_img", "alt-field": "name", "zoom": "image" }'/>
                                         </t>

From f1082f15525ccf42b1fb95fb7da0211eaf64fcb9 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 30 Aug 2017 10:38:53 +0200
Subject: [PATCH 097/119] [FIX] web: don't send virtual id on save

The problem occurred on form views with an x2many field with a
default value containing CREATE commands, i.e. when opening such
a form view in create mode, the x2many field is pre-filled with
some (non-existing yet) subrecords.

If the user then edited those subrecords, and then clicked on
'Save' to create the main record, an 'UPDATE' command was sent
alongside the 'CREATE' one for the x2many, and the id of the
'UPDATE' command was a virtual id (as the subrecord didn't exist
yet), and it crashed.

This could happen in MRP:
  - Enable lots in Iventory
  - Choose a product which is a component of another (through mrp bom)
  - Set this product as tracked by lot
  - Set this product inventory quantity to 0
  - Create a new manufacturing order for the product for which it is a
    component
  - Click on "Check Availability"
  - click on Produce: the many2many already contains a subrecord
  - edit the lot field of that subrecord
  - click on 'Record Production'
---
 .../static/src/js/views/basic/basic_model.js  |  5 ++++-
 .../tests/fields/relational_fields_tests.js   | 20 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 9dc544ba84f..4e3e5823223 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -2407,7 +2407,10 @@ var BasicModel = AbstractModel.extend({
                 _.each(list._changes, function (change) {
                     if (change.operation === 'ADD') {
                         relRecordAdded.push(self.localData[change.id]);
-                    } else if (change.operation === 'UPDATE') {
+                    } else if (change.operation === 'UPDATE' && !self.isNew(change.id)) {
+                        // ignore new records that would have been updated
+                        // afterwards, as all their changes would already
+                        // be aggregated in the CREATE command
                         relRecordUpdated.push(self.localData[change.id]);
                     }
                 });
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index e211d120fe2..6337d74326e 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -998,14 +998,15 @@ QUnit.module('relational_fields', {
     });
 
     QUnit.test('list in form: default_get with x2many create', function (assert) {
-        assert.expect(3);
+        assert.expect(5);
 
+        var displayName = 'brandon is the new timmy';
         this.data.partner.onchanges.timmy = function (obj) {
             assert.deepEqual(
                 obj.timmy,
                 [
                     [6, false, []],
-                    [0, false, {display_name: 'brandon is the new timmy', name: 'brandon'}]
+                    [0, false, {display_name: displayName, name: 'brandon'}]
                 ],
                 "should have properly created the x2many command list");
             obj.int_field = obj.timmy.length;
@@ -1029,6 +1030,15 @@ QUnit.module('relational_fields', {
                 if (args.method === 'default_get') {
                     return $.when({timmy: [[0, 0, {display_name: 'brandon is the new timmy', name: 'brandon'}]]});
                 }
+                if (args.method === 'create') {
+                    assert.deepEqual(args.args[0], {
+                        int_field: 2,
+                        timmy: [
+                            [6, false, []],
+                            [0, false, {display_name: displayName, name: 'brandon'}],
+                        ],
+                    }, "should send the correct values to create");
+                }
                 return this._super.apply(this, arguments);
             },
         });
@@ -1038,6 +1048,12 @@ QUnit.module('relational_fields', {
         assert.strictEqual($('input.o_field_integer').val(), '2',
             "should have called and executed the onchange properly");
 
+        // edit the subrecord and save
+        displayName = 'new value';
+        form.$('.o_data_cell').click();
+        form.$('.o_data_cell input').val(displayName).trigger('input');
+        form.$buttons.find('.o_form_button_save').click();
+
         form.destroy();
     });
 

From 9b58abdd5c065bff098002bfe0fdf9f5729ca6ce Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 30 Aug 2017 10:47:17 +0200
Subject: [PATCH 098/119] [FIX] web: reset 'invisible' table cells to correct
 display

Make sure '.o_invisible_modifier' table-cells are forced back to
`display: table-cell` to keep correct alignement. Indeed using the
`initial` value forced them to `inline` instead (creating some
obvious visual bugs in some cases).
---
 addons/web/static/src/less/list_view.less | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/less/list_view.less b/addons/web/static/src/less/list_view.less
index edb4c184408..d84f673ab75 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -100,7 +100,9 @@
     }
 
     .o_data_cell.o_invisible_modifier {
-        display: initial!important;  // Override invisible to keep the cells aligned
+        // Override display: none to keep table cells aligned. Note: cannot use
+        // 'initial' as it will force them to 'inline', not 'table-cell'.
+        display: table-cell!important;
     }
 
     //--------------------------------------------------------------------------

From 24ca3793bf283afa8172fff7ebbbdc129d1f3c20 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 30 Aug 2017 12:45:35 +0200
Subject: [PATCH 099/119] [FIX] website_forum: do not compare recordset against
 integer

---
 addons/website_forum/models/forum.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index afec8963313..8b03a0a809c 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -393,7 +393,7 @@ class Post(models.Model):
             post.can_downvote = is_admin or user.karma >= post.forum_id.karma_downvote
             post.can_comment = is_admin or user.karma >= post.karma_comment
             post.can_comment_convert = is_admin or user.karma >= post.karma_comment_convert
-            post.can_view = is_admin or user.karma >= post.karma_close or (post_sudo.create_uid.karma > 0 and (post_sudo.active or post_sudo.create_uid.id == user))
+            post.can_view = is_admin or user.karma >= post.karma_close or (post_sudo.create_uid.karma > 0 and (post_sudo.active or post_sudo.create_uid == user))
             post.can_display_biography = is_admin or post_sudo.create_uid.karma >= post.forum_id.karma_user_bio
             post.can_post = is_admin or user.karma >= post.forum_id.karma_post
             post.can_flag = is_admin or user.karma >= post.forum_id.karma_flag

From 67adc9d9a9be92dfdc9b9514f60a68e8395426cd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 22 Aug 2017 10:20:49 +0200
Subject: [PATCH 100/119] [FIX] account: update the reconciliation line on
 input instead of on blur

This change is used to view the residual amount when the amount used for
the write-off.
Create a new line on key press enter.
---
 .../reconciliation/reconciliation_renderer.js | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
index d750f73503d..ff0abf316ec 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
@@ -253,10 +253,13 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
         'click .accounting_view .line_info_button.fa-exclamation-triangle': '_onTogglePartialReconcile',
         'click .reconcile_model_create': '_onCreateReconcileModel',
         'click .reconcile_model_edit': '_onEditReconcileModel',
+        'keyup input': '_onInputKeyup',
+        'blur input': '_onInputKeyup',
     },
     custom_events: _.extend({}, FieldManagerMixin.custom_events, {
         'field_changed': '_onFieldChanged',
     }),
+    _avoidFieldUpdate: {},
 
     /**
      * create partner_id field in editable mode
@@ -400,6 +403,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
             this.model.notifyChanges(this.handleCreateRecord, state.createForm);
             var record = this.model.get(this.handleCreateRecord);
             _.each(this.fields, function (field, fieldName) {
+                if (self._avoidFieldUpdate[fieldName]) return;
                 if (fieldName === "partner_id") return;
                 if ((data[fieldName] || state.createForm[fieldName]) && !_.isEqual(state.createForm[fieldName], data[fieldName])) {
                     field.reset(record);
@@ -591,6 +595,32 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
     _onFilterChange: function () {
         this.trigger_up('change_filter', {'data': _.str.strip($(event.target).val())});
     },
+    /**
+     * @private
+     * @param {keyup event} event
+     */
+    _onInputKeyup: function (event) {
+        if(event.keyCode === 13) {
+            if (_.findWhere(this.model.lines, {mode: 'create'}).balance.amount) {
+                this._onCreateProposition();
+            }
+            return;
+        }
+
+        var self = this;
+        for (var fieldName in this.fields) {
+            var field = this.fields[fieldName];
+            if (!field.$el.is(event.target)) {
+                continue;
+            }
+            this._avoidFieldUpdate[field.name] = event.type !== 'focusout';
+            field.value = false;
+            field._setValue($(event.target).val()).then(function () {
+                self._avoidFieldUpdate[field.name] = false;
+            });
+            break;
+        }
+    },
     /**
      * @private
      */

From dce35ca44b9a30387b593583cfc97c9ab7b300ed Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 30 Aug 2017 13:29:44 +0200
Subject: [PATCH 101/119] [FIX] l10n_*: limit tag migration to 9.0 series

---
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 .../{2.0 => 9.0.2.0}/pre-set_tags_and_taxes_updatable.py          | 0
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 .../{2.0 => 9.0.2.0}/pre-set_tags_and_taxes_updatable.py          | 0
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 .../{2.0 => 9.0.2.0}/pre-set_tags_and_taxes_updatable.py          | 0
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 .../migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py     | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename addons/l10n_be/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)
 rename addons/l10n_lu/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)
 rename addons/l10n_no/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)
 rename addons/l10n_no/migrations/{2.0 => 9.0.2.0}/pre-set_tags_and_taxes_updatable.py (100%)
 rename addons/l10n_pl/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)
 rename addons/l10n_pl/migrations/{2.0 => 9.0.2.0}/pre-set_tags_and_taxes_updatable.py (100%)
 rename addons/l10n_sg/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)
 rename addons/l10n_sg/migrations/{2.0 => 9.0.2.0}/pre-set_tags_and_taxes_updatable.py (100%)
 rename addons/l10n_th/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)
 rename addons/l10n_vn/migrations/{2.0 => 9.0.2.0}/post-migrate_tags_on_taxes.py (100%)

diff --git a/addons/l10n_be/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_be/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_lu/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_lu/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_no/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_no/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_pl/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_pl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_pl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_pl/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_sg/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
similarity index 100%
rename from addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py
rename to addons/l10n_sg/migrations/9.0.2.0/pre-set_tags_and_taxes_updatable.py
diff --git a/addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_th/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
diff --git a/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
similarity index 100%
rename from addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py
rename to addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py

From cb21934e001a927226e6c53e370fbb0bde903111 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 25 Aug 2017 10:45:31 +0200
Subject: [PATCH 102/119] [FIX] stock: inventory adjustment

Backport of commit c00267bc340090142ed6c8d62485a6825c657d1b

opw-767538
---
 addons/stock/stock.py       | 15 ++++++++++
 addons/stock/stock_view.xml | 58 +++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a6eb97bc239..d95e34eca3b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3157,6 +3157,19 @@ class stock_inventory(osv.osv):
             to_clean['value']['package_id'] = False
         return to_clean
 
+    def action_inventory_line_tree(self, cr, uid, ids, context=None):
+        inv = self.browse(cr, uid, ids, context=context)
+        action = self.pool['ir.model.data'].xmlid_to_object(cr, uid, 'stock.action_inventory_line_tree', context=context).read()[0]
+        action['context'] = {
+            'default_location_id': inv.location_id.id,
+            'default_product_id': inv.product_id.id,
+            'default_prod_lot_id': inv.lot_id.id,
+            'default_package_id': inv.package_id.id,
+            'default_partner_id': inv.partner_id.id,
+            'default_inventory_id': inv.id,
+        }
+        return action
+
     _constraints = [
         (_check_filter_product, 'The selected inventory options are not coherent.',
             ['filter', 'product_id', 'lot_id', 'partner_id', 'package_id']),
@@ -3215,6 +3228,8 @@ class stock_inventory_line(osv.osv):
         'prodlot_name': fields.related('prod_lot_id', 'name', type='char', string='Serial Number Name', store={
                                                                                             'stock.production.lot': (_get_prodlot_change, ['name'], 20),
                                                                                             'stock.inventory.line': (lambda self, cr, uid, ids, c={}: ids, ['prod_lot_id'], 20),}),
+        'inventory_location_id': fields.related(
+            'inventory_id', 'location_id', type='many2one', relation='stock.location', string='Location'),
     }
 
     _defaults = {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f5d9b915a42..449cd99df9c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -51,6 +51,40 @@
             </field>
         </record>
 
+        <record id="stock_inventory_line_tree2" model="ir.ui.view">
+            <field name="name">stock.inventory.line.tree2</field>
+            <field name="model">stock.inventory.line</field>
+            <field name="arch" type="xml">
+                <tree editable="top" string="Inventory Details" decoration-info="product_qty != theoretical_qty" decoration-danger="theoretical_qty &lt; 0">
+                    <field name="product_id"  domain="[('type','=','product')]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+                    <field name="product_uom_id" groups="product.group_uom" string="UoM" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+                    <field name="location_id" domain="[('id', 'child_of', inventory_location_id)]" groups="stock.group_locations" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+                    <field name="prod_lot_id" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot"/>
+                    <field name="package_id" domain="['|', ('location_id','=', False), ('location_id', '=', location_id)]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" groups="stock.group_tracking_lot"/>
+                    <field name="partner_id" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" groups="stock.group_tracking_owner"/>
+                    <field name="theoretical_qty" readonly="1"/>
+                    <field name="product_qty" string="Real Quantity"/>
+                    <field name="state" invisible="True"/>
+                    <field name="inventory_id" invisible="1"/>
+                    <field name="inventory_location_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="stock_inventory_line_search" model="ir.ui.view">
+            <field name="name">stock.inventory.line.search</field>
+            <field name="model">stock.inventory.line</field>
+            <field name="arch" type="xml">
+                <search string="Search Inventory Lines">
+                    <field name="product_id"/>
+                    <field name="location_id" groups="stock.group_stock_multi_locations"/>
+                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                    <field name="package_id" groups="stock.group_tracking_lot"/>
+                    <field name="partner_id" groups="stock.group_tracking_owner"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_inventory_filter" model="ir.ui.view">
             <field name="name">stock.inventory.filter</field>
             <field name="model">stock.inventory</field>
@@ -93,6 +127,19 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
                 <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="action_inventory_line_tree"
+                            class="oe_stat_button"
+                            icon="fa-building-o"
+                            type="object"
+                            help="List view of lines"
+                            groups="base.group_no_one"
+                            states="confirm">
+                            <div class="o_form_field o_stat_info">
+                                <span class="o_stat_text">Details</span>
+                            </div>
+                        </button>
+                    </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name" placeholder="e.g. Annual inventory"/></h1>
@@ -221,6 +268,17 @@
               </p>
             </field>
         </record>
+
+        <record id="action_inventory_line_tree" model="ir.actions.act_window">
+            <field name="name">Inventory Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock_inventory_line_tree2"/>
+            <field name="domain">[('inventory_id', '=', active_id)]</field>
+        </record>
+
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
         <record id="view_production_lot_form" model="ir.ui.view">

From 6a5c1001d3cc0b7043cd621d11c5d4636916e69f Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Wed, 30 Aug 2017 14:12:47 +0200
Subject: [PATCH 103/119] [FIX] mrp: stupid typo introduced at
 ccfc4e7026e2ab03a2adda526f890ca810e0da70

Sorry about that.
---
 addons/mrp/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 13f54e711ba..6902c9f0952 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -51,7 +51,7 @@ class product_product(osv.osv):
         Production = self.pool('mrp.production')
         res = dict.fromkeys(ids, 0)
         for g in Production.read_group(cr, uid, [('product_id', 'in', ids)], ['product_id'], ['product_id'], context=context):
-            res[g['partner_id'][0]] = g['partner_id_count']
+            res[g['product_id'][0]] = g['product_id_count']
         return res
 
     _columns = {

From 88a25c0e87c120d95961e4d4d4baa6d2952518c6 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 31 Aug 2017 00:14:37 +0200
Subject: [PATCH 104/119] [FIX] *: fix previous forward port

---
 addons/hr_contract/tests/test_auto_status.py         | 3 +--
 addons/stock_account/models/stock_config_settings.py | 3 ---
 addons/website_sale/models/product.py                | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/hr_contract/tests/test_auto_status.py b/addons/hr_contract/tests/test_auto_status.py
index 010524924d3..fb755bdb82f 100644
--- a/addons/hr_contract/tests/test_auto_status.py
+++ b/addons/hr_contract/tests/test_auto_status.py
@@ -14,8 +14,7 @@ class TestHrContracts(TransactionCase):
         self.test_contract = dict(name='Test', wage=1, employee_id=self.employee.id, state='open')
 
     def apply_cron(self):
-        self.env.ref('hr_contract.ir_cron_data_contract_update_to_pending').method_direct_trigger()
-        self.env.ref('hr_contract.ir_cron_data_contract_update_to_close').method_direct_trigger()
+        self.env.ref('hr_contract.ir_cron_data_contract_update_state').method_direct_trigger()
 
     def test_contract_enddate(self):
         self.test_contract.update(dict(date_end=datetime.now() + relativedelta(days=100)))
diff --git a/addons/stock_account/models/stock_config_settings.py b/addons/stock_account/models/stock_config_settings.py
index 2ffbeb108f8..c2f60ecc29f 100644
--- a/addons/stock_account/models/stock_config_settings.py
+++ b/addons/stock_account/models/stock_config_settings.py
@@ -9,6 +9,3 @@ class StockConfigSettings(models.TransientModel):
 
     module_stock_landed_costs = fields.Boolean("Landed Costs",
         help="Affect landed costs on receipt operations and split them among products to update their cost price.")
-
-        if self.user_has_groups('stock.group_stock_manager') and self.user_has_groups('base.group_system'):
-            self = self.sudo()
\ No newline at end of file
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index d9a7beccc95..d5ea40a9eeb 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -142,7 +142,7 @@ class ProductTemplate(models.Model):
         # This makes sure that every template below has a corresponding product in the zipped result.
         self = self.filtered('product_variant_id')
         # use mapped who returns a recordset with only itself to prefetch (and don't prefetch every product_variant_ids)
-        for template, product in zip(self, self.mapped('product_variant_id')):
+        for template, product in pycompat.izip(self, self.mapped('product_variant_id')):
             template.website_price = product.website_price
             template.website_public_price = product.website_public_price
 

From 6b370c0d7c6d98b7671390d993a8925d88183bd1 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Mon, 21 Aug 2017 17:41:32 +0530
Subject: [PATCH 105/119] [IMP] stock: restructured the stock config menus

- Set groups on location menu for visible only if mulit-location is set.
- Restrucured the menus in configuration.
- Products
	- Categories
	- Barcode Nomenclatures
- Unit of Measures
	- UoM Categories
	- UoM
---
 addons/stock/views/stock_location_views.xml |  2 +-
 addons/stock/views/stock_menu_views.xml     | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/stock/views/stock_location_views.xml b/addons/stock/views/stock_location_views.xml
index 0d91ca295a9..89fc9e1b818 100644
--- a/addons/stock/views/stock_location_views.xml
+++ b/addons/stock/views/stock_location_views.xml
@@ -138,7 +138,7 @@
         </field>
     </record>
     <menuitem action="action_location_form" id="menu_action_location_form"
-        parent="menu_warehouse_config" sequence="2"/>
+        parent="menu_warehouse_config" sequence="2" groups="stock.group_stock_multi_locations"/>
 
 
         <record id="stock_location_path_filter" model="ir.ui.view">
diff --git a/addons/stock/views/stock_menu_views.xml b/addons/stock/views/stock_menu_views.xml
index a8d58466cbc..02e4506430f 100644
--- a/addons/stock/views/stock_menu_views.xml
+++ b/addons/stock/views/stock_menu_views.xml
@@ -11,10 +11,14 @@
     <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" groups="stock.group_stock_manager" sequence="1"/>
     <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="3"/>
 
-    <menuitem id="menu_wms_barcode_nomenclature_all" parent="menu_stock_config_settings" action="barcodes.action_barcode_nomenclature_form"
-        sequence="50" groups="base.group_no_one"/>
     <menuitem id="menu_product_in_config_stock" name="Products" parent="stock.menu_stock_config_settings" sequence="4"/>
 
+    <menuitem id="menu_wms_barcode_nomenclature_all" parent="menu_product_in_config_stock" action="barcodes.action_barcode_nomenclature_form"
+        sequence="50" groups="base.group_no_one"/>
+
+    <menuitem id="product_uom_menu" name="Units of Measures" parent="menu_stock_config_settings"
+        sequence="5" groups="product.group_uom"/>
+
     <menuitem
         action="product.product_category_action_form" id="menu_product_category_config_stock"
         parent="stock.menu_product_in_config_stock" sequence="2"/>
@@ -26,13 +30,15 @@
         parent="menu_product_in_config_stock" sequence="5" groups="product.group_product_variant"/>
     <menuitem
         action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
-        parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/>
+        name="UoM Categories"
+        parent="product_uom_menu" sequence="5"/>
     <menuitem
         id="menu_stock_unit_measure_stock" name="Units of Measure"
         parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
 
     <menuitem id="menu_stock_uom_form_action" action="product.product_uom_form_action"
-        parent="menu_stock_config_settings" sequence="35" groups="product.group_uom"/>
+        name="UoM"
+        parent="product_uom_menu" sequence="35"/>
 
     <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 

From 4384cc7273346c50773b31ca0f6dbcc00461694f Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Tue, 22 Aug 2017 14:18:04 +0530
Subject: [PATCH 106/119] [IMP] stock: improve stock move line tree view and
 menus

- Renamed menu 'Stock Moves' to 'Picking Moves'
- Renamed menu 'Stock Move Lines' to 'Product Moves'
- Added default filter 'Done' on Stock move lines.
- Moved date field at the first.
- Removed groups to visible Source and Destination Location id multi-location is not activated.
---
 addons/stock/views/stock_move_line_views.xml | 21 +++++++++++++++-----
 addons/stock/views/stock_move_views.xml      |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index f23aae541d6..3006eb45f45 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -5,14 +5,14 @@
         <field name="model">stock.move.line</field>
         <field name="arch" type="xml">
             <tree decoration-muted="state == 'cancel'" decoration-danger="(state not in ('cancel','done'))" string="Move Lines" create="0">
+                <field name="date"/>
                 <field name="picking_id" string="Reference"/>
                 <field name="create_date" invisible="1" groups="base.group_no_one"/>
                 <field name="product_id"/>
                 <field name="product_uom_qty"/>
                 <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
-                <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
-                <field name="date" groups="base.group_no_one"/>
+                <field name="location_id"/>
+                <field name="location_dest_id"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -42,13 +42,24 @@
             </form>
         </field>
     </record>
+
+    <record id="stock_move_line_view_search" model="ir.ui.view">
+        <field name="name">stock.move.line.search</field>
+        <field name="model">stock.move.line</field>
+        <field name="arch" type="xml">
+            <search string="Stock Moves">
+                <filter string="Done" name="done" domain="[('state','=','done')]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="stock_move_line_action" model="ir.actions.act_window">
-            <field name="name">Stock Move Lines</field>
+            <field name="name">Product Moves</field>
             <field name="res_model">stock.move.line</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_line_tree"/>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_done': 1}</field>
     </record>
 
     <menuitem action="stock_move_line_action" id="stock_move_line_menu" parent="stock.menu_warehouse_report" sequence="150" groups="base.group_no_one"/>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index fa4bcf3c348..ff7f946050d 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -360,7 +360,7 @@
         </record>
 
         <record id="stock_move_action" model="ir.actions.act_window">
-            <field name="name">Stock Moves</field>
+            <field name="name">Picking Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From 6bd26593e044000cc801c40449b527b4ed0619ec Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Tue, 22 Aug 2017 15:01:37 +0530
Subject: [PATCH 107/119] [IMP] stock: restructured some menuitems in
 operations

- Operations
    - Products
        - Transfers
        - Inventory Adjustment
        - Sraps
    - Scheduling
        - Run Scheduler
---
 addons/stock/__manifest__.py                      |  5 ++---
 addons/stock/views/procurement_views.xml          |  5 +++--
 addons/stock/views/stock_inventory_views.xml      |  2 +-
 addons/stock/views/stock_picking_views.xml        |  6 +++++-
 addons/stock/views/stock_scrap_views.xml          |  2 +-
 odoo/addons/test_main_flows/static/src/js/tour.js | 10 +++++++---
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index 41aaa65f4e5..3c3509539db 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -43,14 +43,13 @@
         'wizard/stock_immediate_transfer_views.xml',
         'wizard/stock_backorder_confirmation_views.xml',
 
-        'views/stock_scrap_views.xml',
-
         'views/res_partner_views.xml',
         'views/product_strategy_views.xml',
-        'views/stock_inventory_views.xml',
         'views/stock_incoterms_views.xml',
         'views/stock_production_lot_views.xml',
         'views/stock_picking_views.xml',
+        'views/stock_scrap_views.xml',
+        'views/stock_inventory_views.xml',
         'views/stock_quant_views.xml',
         'views/stock_location_views.xml',
         'views/procurement_views.xml',
diff --git a/addons/stock/views/procurement_views.xml b/addons/stock/views/procurement_views.xml
index 012789e5495..eb83e73aec5 100644
--- a/addons/stock/views/procurement_views.xml
+++ b/addons/stock/views/procurement_views.xml
@@ -92,9 +92,10 @@
         </record>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" groups="group_stock_manager" sequence="50"/>
+        <menuitem id="menu_stock_sched" name="Scheduler" parent="stock.menu_stock_root" groups="group_stock_manager" sequence="50"/>
         <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" sequence="2" groups="base.group_no_one"/>
-        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="1" groups="stock.group_stock_manager"/>
+        <menuitem id="procurement_order_compute_all_menu" name="Scheduling" sequence="5" groups="group_stock_manager" parent="menu_stock_warehouse_mgmt"/>
+        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="procurement_order_compute_all_menu" name="Run Schedular" sequence="1" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_config_settings" sequence="5"/>
         <menuitem action="procurement.procurement_order_action_exceptions" id="menu_stock_procurement_action" parent="stock.menu_warehouse_report" sequence="130" groups="stock.group_stock_manager"/>
 </odoo>
diff --git a/addons/stock/views/stock_inventory_views.xml b/addons/stock/views/stock_inventory_views.xml
index a7a63adaea2..4026cd2e277 100644
--- a/addons/stock/views/stock_inventory_views.xml
+++ b/addons/stock/views/stock_inventory_views.xml
@@ -271,5 +271,5 @@
         <field name="domain">[('inventory_id', '=', active_id)]</field>
     </record>
 
-    <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
+    <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="stock_picking_menu_product" sequence="30"/>
 </odoo>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 6e0f20e6358..f0ce80d0243 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -388,7 +388,11 @@
             </field>
         </record>
 
-        <menuitem id="all_picking" name="All Transfers" parent="menu_stock_warehouse_mgmt" sequence="2" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
+        <menuitem id="stock_picking_menu_product" name="Products"
+            parent="menu_stock_warehouse_mgmt" sequence="1"
+            groups="stock.group_stock_manager,stock.group_stock_user"/>
+
+        <menuitem id="all_picking" name="Transfers" parent="stock_picking_menu_product" sequence="2" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
 
         <record id="stock_picking_action_picking_type" model="ir.actions.act_window">
             <field name="name">All Transfers</field>
diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml
index fbd2684d80a..570e24974e4 100644
--- a/addons/stock/views/stock_scrap_views.xml
+++ b/addons/stock/views/stock_scrap_views.xml
@@ -136,7 +136,7 @@
     <menuitem
         id="menu_stock_scrap"
         name="Scrap"
-        parent="menu_stock_inventory_control"
+        parent="stock_picking_menu_product"
         action="action_stock_scrap"
         sequence="99"/>
 
diff --git a/odoo/addons/test_main_flows/static/src/js/tour.js b/odoo/addons/test_main_flows/static/src/js/tour.js
index 71dbbd8e293..f6b3d29012d 100644
--- a/odoo/addons/test_main_flows/static/src/js/tour.js
+++ b/odoo/addons/test_main_flows/static/src/js/tour.js
@@ -407,11 +407,15 @@ tour.register('main_flow_tour', {
 }, {
 // Run the schedulers
     edition: "enterprise",
-    trigger: ".o_menu_sections a:contains('Schedulers')",
-    content: _t("Go to Schedulers"),
+    trigger: ".o_menu_sections a:contains('Operations')",
+    content: _t("Go to Operations"),
     position: "bottom"
 }, {
-    trigger: ".o_menu_sections a:has(span:contains('Run Schedulers')), .oe_secondary_submenu .oe_menu_text:contains('Run Schedulers'):first",
+    trigger: ".o_app[data-menu-xmlid='stock.procurement_order_compute_all_menu'], .oe_menu_toggler[data-menu-xmlid='stock.procurement_order_compute_all_menu']",
+    content: _t("Click on schedulers menu"),
+    position: "bottom"
+}, {
+    trigger: ".o_menu_sections a:has(span:contains('Run Scheduler')), .oe_secondary_submenu .oe_menu_text:contains('Run Scheduler'):first",
     content: _t("Run the schedulers"),
     position: "bottom"
 }, {

From 147821363c4eca5f363ec2b332558b74d68f453a Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Tue, 22 Aug 2017 16:06:53 +0530
Subject: [PATCH 108/119] [IMP] stock: some improvement in immediate transfer
 wizard

- removed parentheses on 'done' and set italic on 'reserved'
---
 addons/stock/wizard/stock_immediate_transfer_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_immediate_transfer_views.xml b/addons/stock/wizard/stock_immediate_transfer_views.xml
index 2b1995650db..4987bd3cb17 100644
--- a/addons/stock/wizard/stock_immediate_transfer_views.xml
+++ b/addons/stock/wizard/stock_immediate_transfer_views.xml
@@ -7,8 +7,8 @@
             <form string="Immediate transfer?">
                 <group>
                     <p>
-                        You haven't entered (<i>done</i>) quantities, by clicking on <i>apply</i>
-                        Odoo will process all the reserved quantities.
+                        You haven't entered <i>done</i> quantities, by clicking on <i>apply</i>
+                        Odoo will process all the <i>reserved</i> quantities.
                     </p>
                 </group>
                 <footer>

From f707b476b6bc436b2eb3b2401e3fa593dca0ca2d Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Tue, 22 Aug 2017 16:50:24 +0530
Subject: [PATCH 109/119] [IMP] stock: improved the form view of DO

- Removed class on origin field for display full width.
- Moved uom on the right in move lines internal tree view.
- Moved Cancel button on the right in header of do form view.
---
 addons/stock/views/stock_picking_views.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index f0ce80d0243..9ba9b539523 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -210,13 +210,13 @@
                     <button name="do_print_picking" string="Print" groups="stock.group_stock_user" type="object" attrs="{'invisible': [('state', 'not in', ('assigned', 'partially_available'))]}"/>
                     <button name="%(action_report_delivery)d" string="Print" states="done" type="action" groups="base.group_user"/>
                     <button name="%(act_stock_return_picking)d" string="Return" states="done" type="action" groups="base.group_user"/>
-                    <button name="action_cancel" states="assigned,confirmed,partially_available,draft,waiting" string="Cancel" groups="base.group_user" type="object"/>
                     <field name="picking_type_code" invisible="1"/>
                     <button name="do_unreserve" string="Unreserve" groups="base.group_user" type="object" attrs="{'invisible': ['|', ('picking_type_code', '=', 'incoming'), ('state', 'not in', ('assigned', 'partially_available'))]}"/>
                     <field name="show_operations" invisible="1" readonly="1"/>
                     <field name="move_line_exist" invisible="1"/>
                     <field name="has_packages" invisible="1"/>
                     <button name="button_scrap" type="object" string="Scrap" attrs="{'invisible': ['|', '&amp;', ('picking_type_code', '!=', 'incoming'), ('state', 'in', ('draft', 'cancel', 'waiting')), '&amp;', ('picking_type_code', '=', 'incoming'), ('state', '!=', 'done')]}"/>
+                    <button name="action_cancel" states="assigned,confirmed,partially_available,draft,waiting" string="Cancel" groups="base.group_user" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,partially_available,assigned,done" />
                     <field name="picking_type_entire_packs" invisible="1"/>
                 </header>
@@ -243,7 +243,7 @@
                         </group>
                         <group>
                             <field name="min_date"/>
-                            <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/>
+                            <field name="origin" placeholder="e.g. PO0032"/>
                             <field name="owner_id" groups="stock.group_tracking_owner"/>
                             <div groups="stock.group_tracking_owner" colspan="2" col="2">
                                 <button name="action_assign_owner" string="Assign Owner" type="object" attrs="{'invisible': ['|',('move_line_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}"
@@ -291,9 +291,9 @@
                                     <field name="product_id" required="1" attrs="{'readonly': ['&amp;', ('state', '!=', 'draft'), ('additional', '=', False)]}"/>
                                     <field name="is_initial_demand_editable" invisible="1"/>
                                     <field name="product_uom_qty" string="Initial Demand" attrs="{'readonly': [('is_initial_demand_editable', '=', False), ('state', '!=', 'draft')]}"/>
-                                    <field name="product_uom" attrs="{'readonly': [('state', '!=', 'draft'), ('additional', '=', False)]}" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                                     <field name="reserved_availability" string="Reserved"/>
                                     <field name="quantity_done" string="Done" attrs="{'readonly': ['|', ('show_details_visible', '=', True), ('state', '=', 'cancel')], 'invisible': ['|', ('state', 'in', ['draft', 'confirmed', 'waiting']), ('show_operations', '=', True)]}"/>
+                                    <field name="product_uom" attrs="{'readonly': [('state', '!=', 'draft'), ('additional', '=', False)]}" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                                     <button name="action_show_details" string="Register lots, packs, location" type="object" icon="fa-list" attrs="{'invisible': [('show_details_visible', '=', False)]}"/>
                                 </tree>
                             </field>

From 394b45b4b639151bd055add76e67ae93e259631e Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Wed, 23 Aug 2017 10:20:31 +0530
Subject: [PATCH 110/119] [IMP] stock: put readonly origin field

---
 addons/stock/views/stock_picking_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 9ba9b539523..66c4bd8a8d1 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -243,7 +243,7 @@
                         </group>
                         <group>
                             <field name="min_date"/>
-                            <field name="origin" placeholder="e.g. PO0032"/>
+                            <field name="origin" placeholder="e.g. PO0032" readonly="1"/>
                             <field name="owner_id" groups="stock.group_tracking_owner"/>
                             <div groups="stock.group_tracking_owner" colspan="2" col="2">
                                 <button name="action_assign_owner" string="Assign Owner" type="object" attrs="{'invisible': ['|',('move_line_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}"

From e7b803377127590a14a79ca3ef4efde686d83367 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Wed, 23 Aug 2017 10:35:33 +0530
Subject: [PATCH 111/119] [IMP] stock: put groups multi-location no Destination
 Location

- remove source document in demo data.
- renamed 'Destination Location Zone' to 'Destination Location'.
---
 addons/stock/data/stock_demo.yml           | 7 -------
 addons/stock/models/stock_picking.py       | 2 +-
 addons/stock/views/stock_picking_views.xml | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/stock/data/stock_demo.yml b/addons/stock/data/stock_demo.yml
index ac8ac582632..697bd8a2cad 100644
--- a/addons/stock/data/stock_demo.yml
+++ b/addons/stock/data/stock_demo.yml
@@ -131,7 +131,6 @@
 -
  !record {model: stock.picking, id: incomming_shipment}:
     picking_type_id: stock.picking_type_in
-    origin: 'incoming_shipment for test'
     location_id: stock_location_suppliers
     location_dest_id: stock_location_stock
 -
@@ -146,7 +145,6 @@
 -
  !record {model: stock.picking, id: incomming_shipment1}:
     picking_type_id: stock.picking_type_in
-    origin: 'incoming_shipment'
     partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
@@ -160,7 +158,6 @@
 -
  !record {model: stock.picking, id: incomming_shipment2}:
     picking_type_id: stock.picking_type_in
-    origin: 'incoming_shipment main_warehouse'
     partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
@@ -174,7 +171,6 @@
 -
  !record {model: stock.picking, id: incomming_shipment3}:
     picking_type_id: stock.picking_type_in
-    origin: 'incoming_shipment your_company warehouse'
     partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
@@ -188,7 +184,6 @@
 -
  !record {model: stock.picking, id: incomming_shipment4}:
    picking_type_id: stock.picking_type_in
-   origin: 'incoming_shipment_main_warehouse'
    partner_id: base.res_partner_1
    location_id: stock.stock_location_suppliers
    location_dest_id: stock.stock_location_stock
@@ -219,7 +214,6 @@
 -
  !record {model: stock.picking, id: incomming_chicago_warehouse1}:
     picking_type_id: chi_picking_type_in
-    origin: 'incoming_shipment_chicago_warehouse'
     partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
@@ -240,7 +234,6 @@
 -
  !record {model: stock.picking, id: incomming_chicago_warehouse2}:
     picking_type_id: chi_picking_type_in
-    origin: 'incoming_shipment chicago_warehouse'
     partner_id: base.res_partner_1
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 38a0586d248..258c452bdeb 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -240,7 +240,7 @@ class Picking(models.Model):
         readonly=True, required=True,
         states={'draft': [('readonly', False)]})
     location_dest_id = fields.Many2one(
-        'stock.location', "Destination Location Zone",
+        'stock.location', "Destination Location",
         default=lambda self: self.env['stock.picking.type'].browse(self._context.get('default_picking_type_id')).default_location_dest_id,
         readonly=True, required=True,
         states={'draft': [('readonly', False)]})
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 66c4bd8a8d1..6a9e83c7a4b 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -181,7 +181,7 @@
             <field name="arch" type="xml">
                 <tree decoration-info="state == 'draft'" decoration-muted="state == 'cancel'" decoration-danger="state not in ('cancel', 'done') and min_date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="location_dest_id"/>
+                    <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
                     <field name="partner_id"/>
                     <field name="date" invisible="1"/>
                     <field name="min_date"/>

From cc07b482fe8786d27410d2a34a694c8509650cd2 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Wed, 23 Aug 2017 11:16:34 +0530
Subject: [PATCH 112/119] [IMP] stock: improve stock quant list view

- Added new field 'reserved_quantity'.
- Added new filter Reservations('reserved_quantity').
- Removed 'Transit Location' default filter and keep only 'Internal Location'.
- Added graph view in stock quant.
- Added Product Template in search view.
---
 addons/stock/models/stock_quant.py       |  4 ++++
 addons/stock/views/stock_quant_views.xml | 26 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 582d24d1033..7a247fa1fea 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -15,6 +15,10 @@ class StockQuant(models.Model):
     product_id = fields.Many2one(
         'product.product', 'Product',
         ondelete='restrict', readonly=True, required=True)
+    # so user can filter on template in webclient
+    product_tmpl_id = fields.Many2one(
+        'product.template', string='Product Template',
+        related='product_id.product_tmpl_id')
     product_uom_id = fields.Many2one(
         'product.uom', 'Unit of Measure',
         readonly=True, related='product_id.uom_id')
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index e92515f6037..750fdbe5b56 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -18,6 +18,7 @@
                     <separator/>
                     <filter name="negative" string="Negative Stock" domain="[('quantity', '&lt;', 0.0)]"/>
                     <filter name="positive" string="Positive Stock" domain="[('quantity', '&gt;', 0.0)]"/>
+                    <filter name="reserved" string="Reservations" domain="[('reserved_quantity', '&gt;', 0.0)]"/>
                 </group>
                 <group expand='0' string='Group by...'>
                     <filter string='Location' name="locationgroup" domain="[]" context="{'group_by': 'location_id'}"/>
@@ -62,12 +63,13 @@
         <field name="arch" type="xml">
             <tree string="Inventory Valuation" create="0" delete="0">
                 <field name="product_id"/>
-                <field name="quantity"/>
-                <field name="product_uom_id" groups="product.group_uom"/>
                 <field name="location_id"/>
-                <field name="owner_id" groups="stock.group_tracking_owner"/>
                 <field name="lot_id" groups="stock.group_production_lot"/>
                 <field name="package_id" groups="stock.group_tracking_lot"/>
+                <field name="reserved_quantity" string="Reserved"/>
+                <field name="quantity" string="On Hand"/>
+                <field name="product_uom_id" groups="product.group_uom"/>
+                <field name="owner_id" groups="stock.group_tracking_owner"/>
                 <field name='company_id' groups="base.group_multi_company"/>
             </tree>
         </field>
@@ -79,18 +81,30 @@
         <field name="model">stock.quant</field>
         <field name="arch" type="xml">
             <pivot string="Inventory">
-                <field name="location_id" type="row"/>
+                <field name="product_id" type="row"/>
+                <field name="location_id" type="col"/>
                 <field name="quantity" type="measure"/>
             </pivot>
         </field>
     </record>
 
+    <record id="stock_quant_view_graph" model="ir.ui.view">
+        <field name="name">stock.quant.graph</field>
+        <field name="model">stock.quant</field>
+        <field name="arch" type="xml">
+            <graph string="Stock Quant">
+                <field name="location_id"/>
+                <field name="quantity" type="measure"/>
+            </graph>
+        </field>
+    </record>
+
     <record model="ir.actions.act_window" id="quantsact"> <!-- Menu + python -->
         <field name="name">Inventory</field>
         <field name="res_model">stock.quant</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form,pivot</field>
-        <field name="context">{'search_default_internal_loc': 1, 'search_default_transit_loc': 1}</field>
+        <field name="view_mode">tree,form,pivot,graph</field>
+        <field name="context">{'search_default_internal_loc': 1,}</field>
         <field name="help">This analysis gives you a fast overview on the current stock level of your products and their current inventory value.</field>
     </record>
     <record model="ir.actions.act_window" id="product_template_open_quants"> <!-- Not used -->

From 7be8249357a7ede319b028b9bfe16ef652504730 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Wed, 23 Aug 2017 18:09:52 +0530
Subject: [PATCH 113/119] [IMP] stock: improve stock_quant form view

- Added stat button in stock_quant for open stock_move_line.
- Added 'Reserved Quantity' field.
- Moved UoM on right of 'On Hand'.
- Set product name in breadcrumb instead of 'stock.quant,2'
---
 addons/stock/models/stock_quant.py       | 13 +++++++++
 addons/stock/views/stock_quant_views.xml | 37 ++++++++++++++++--------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 7a247fa1fea..767162c1e92 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -11,6 +11,7 @@ from odoo.osv import expression
 class StockQuant(models.Model):
     _name = 'stock.quant'
     _description = 'Quants'
+    _rec_name = 'product_id'
 
     product_id = fields.Many2one(
         'product.product', 'Product',
@@ -47,6 +48,18 @@ class StockQuant(models.Model):
         readonly=True, required=True)
     in_date = fields.Datetime('Incoming Date', readonly=True)
 
+    @api.multi
+    def action_view_stock_moves(self):
+        self.ensure_one()
+        action = self.env.ref('stock.stock_move_line_action').read()[0]
+        action['domain'] = [
+            ('product_id', '=', self.product_id.id),
+            '|', ('location_id', '=', self.location_id.id),
+            ('location_dest_id', '=', self.location_id.id),
+            ('lot_id', '=', self.lot_id.id),
+            ('package_id', '=', self.package_id.id)]
+        return action
+
     @api.multi
     @api.constrains('product_id')
     def check_product_id(self):
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index 750fdbe5b56..ad263184b5c 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -38,20 +38,33 @@
         <field eval="10" name="priority"/>
         <field name="arch" type="xml">
             <form string="Inventory Valuation" create="false" edit="false" delete="false">
-                <group>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button class="oe_stat_button" icon="fa-arrows-v" type="object" name="action_view_stock_moves" string="Picking Moves"/>
+                    </div>
                     <group>
-                        <field name="product_id"/>
-                        <field name="quantity"/>
-                        <field name="product_uom_id" groups="product.group_uom"/>
-                        <field name="lot_id" groups="stock.group_production_lot"/>
-                        <field name="package_id" groups="stock.group_tracking_lot"/>
-                        <field name="location_id"/>
-                        <field name="owner_id" groups="stock.group_tracking_owner"/>
+                        <group>
+                            <field name="product_id"/>
+                            <field name="location_id"/>
+                            <field name="lot_id" groups="stock.group_production_lot"/>
+                            <field name="package_id" groups="stock.group_tracking_lot"/>
+                            <field name="owner_id" groups="stock.group_tracking_owner"/>
+                        </group>
+                        <group>
+                            <label for="quantity" string="Quantity On Hand"/>
+                            <div class="o_row">
+                                <field name="quantity"/>
+                                <field name="product_uom_id" groups="product.group_uom"/>
+                            </div>
+                            <label for="reserved_quantity" string="Quantity Reserved"/>
+                            <div class="o_row">
+                                <field name="reserved_quantity"/>
+                                <field name="product_uom_id" groups="product.group_uom"/>
+                            </div>
+                            <field name="in_date" attrs="{'invisible': [('lot_id', '=', False)]}" groups="stock.group_production_lot"/>
+                        </group>
                     </group>
-                    <group>
-                        <field name="in_date" attrs="{'invisible': [('lot_id', '=', False)]}" groups="stock.group_production_lot"/>
-                    </group>
-                </group>
+                </sheet>
             </form>
         </field>
     </record>

From 7f180207b10108fb933a0e9b8bfe5d738b47823c Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Wed, 23 Aug 2017 18:57:48 +0530
Subject: [PATCH 114/119] [IMP] stock: improve reception form view

- Invisible 'Shipping Policy' and 'Priority' for Reception.
- Invisible Operation Type when it's in the context.
- Changed shipping policy 'Partial' to 'As soon as possible' and 'All at once' to 'When all products are ready'.
---
 addons/stock/models/stock_picking.py       | 2 +-
 addons/stock/views/stock_picking_views.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 258c452bdeb..1733d1f4da1 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -187,7 +187,7 @@ class Picking(models.Model):
         help="If this shipment was split, then this field links to the shipment which contains the already processed part.")
 
     move_type = fields.Selection([
-        ('direct', 'Partial'), ('one', 'All at once')], 'Shipping Policy',
+        ('direct', 'As soon as possible'), ('one', 'When all products are ready')], 'Shipping Policy',
         default='direct', required=True,
         states={'done': [('readonly', True)], 'cancel': [('readonly', True)]},
         help="It specifies goods to be deliver partially or all at once")
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 6a9e83c7a4b..8d1aa7145e3 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -302,14 +302,14 @@
                         <page string="Additional Info" name="extra">
                             <group>
                                 <group>
-                                    <field name="move_type"/>
-                                    <field name="picking_type_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                                     <field name="picking_type_code" invisible="1"/>
+                                    <field name="move_type" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
+                                    <field name="picking_type_id" attrs="{'readonly': [('state', '!=', 'draft')]}" invisible="context.get('default_picking_type_id')"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                                     <field name="group_id" groups="base.group_no_one"/>
-                                    <field name="priority"/>
+                                    <field name="priority" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
                                 </group>
                             </group>
                         </page>

From 7cbca2582c8c4f3ac436c2292535cb960ce20bf3 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Fri, 25 Aug 2017 17:39:07 +0530
Subject: [PATCH 115/119] [IMP] stock: invisible 'Reserved' column when picking
 type 'incoming' in picking tree view

---
 addons/stock/views/stock_picking_views.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 8d1aa7145e3..054198117ba 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -273,9 +273,8 @@
                         </page>
                         <page string="Operations">
                             <field name="id" invisible="1"/>
-                            <field name="move_lines" attrs="{'readonly': [('state', 'in', ('cancel', 'done'))]}" context="{'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
+                            <field name="move_lines" attrs="{'readonly': [('state', 'in', ('cancel', 'done'))]}" context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
                                 <tree decoration-danger="state != 'done' and quantity_done > reserved_availability" decoration-muted="scrapped == True or state == 'cancel'" string="Stock Moves" editable="bottom">
-                                    <field name="name" invisible="1"/>
                                     <field name="date_expected" invisible="1"/>
                                     <field name="state" invisible="1" readonly="0"/>
                                     <field name="picking_type_id" invisible="1"/>
@@ -291,7 +290,7 @@
                                     <field name="product_id" required="1" attrs="{'readonly': ['&amp;', ('state', '!=', 'draft'), ('additional', '=', False)]}"/>
                                     <field name="is_initial_demand_editable" invisible="1"/>
                                     <field name="product_uom_qty" string="Initial Demand" attrs="{'readonly': [('is_initial_demand_editable', '=', False), ('state', '!=', 'draft')]}"/>
-                                    <field name="reserved_availability" string="Reserved"/>
+                                    <field name="reserved_availability" string="Reserved" invisible="context.get('picking_type_code') == 'incoming'"/>
                                     <field name="quantity_done" string="Done" attrs="{'readonly': ['|', ('show_details_visible', '=', True), ('state', '=', 'cancel')], 'invisible': ['|', ('state', 'in', ['draft', 'confirmed', 'waiting']), ('show_operations', '=', True)]}"/>
                                     <field name="product_uom" attrs="{'readonly': [('state', '!=', 'draft'), ('additional', '=', False)]}" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                                     <button name="action_show_details" string="Register lots, packs, location" type="object" icon="fa-list" attrs="{'invisible': [('show_details_visible', '=', False)]}"/>

From 55d363e960a81411699adf860d436de6ed1dcbe9 Mon Sep 17 00:00:00 2001
From: Jignesh Rathod <jir@openerp.com>
Date: Mon, 28 Aug 2017 15:41:20 +0530
Subject: [PATCH 116/119] [IMP] stock: improve search view of product moves.

---
 addons/stock/views/stock_move_line_views.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index 3006eb45f45..a5e3cf7889a 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -48,7 +48,15 @@
         <field name="model">stock.move.line</field>
         <field name="arch" type="xml">
             <search string="Stock Moves">
+                <field name="picking_id" string="Reference"/>
+                <field name="product_id"/>
+                <field name="location_id" groups="stock.group_stock_multi_locations"/>
+                <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
                 <filter string="Done" name="done" domain="[('state','=','done')]"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter string="Status" name="by_state" domain="[]"  context="{'group_by':'state'}"/>
+                </group>
             </search>
         </field>
     </record>

From 2e5fd48362c4d534ff64d4bdd18a48b80146a5a9 Mon Sep 17 00:00:00 2001
From: Jignesh Rathod <jir@openerp.com>
Date: Mon, 28 Aug 2017 16:13:27 +0530
Subject: [PATCH 117/119] [IMP] stock: stock move lines form view.

---
 addons/stock/views/stock_move_line_views.xml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index a5e3cf7889a..877663c77d9 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -28,14 +28,24 @@
                 <sheet>
                     <group>
                         <group>
+                            <field name="date" groups="base.group_no_one"/>
                             <field name="picking_id"/>
-                            <field name="create_date" groups="base.group_no_one"/>
                             <field name="product_id"/>
-                            <field name="product_uom_qty"/>
-                            <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                             <field name="location_id" groups="stock.group_stock_multi_locations"/>
                             <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
-                            <field name="date" groups="base.group_no_one"/>
+                        </group>
+                        <group>
+                            <label for="product_uom_qty" string="Quantity Reserved"/>
+                            <div class="o_row">
+                                <field name="product_uom_qty"/>
+                                <field name="product_uom_id" options="{'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
+                            </div>
+                            <label for="qty_done" string="Quantity Done"/>
+                            <div class="o_row">
+                                <field name="qty_done"/>
+                                <field name="product_uom_id" options="{'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
+                            </div>
+                            <field name="create_date" groups="base.group_no_one"/>
                         </group>
                     </group>
                 </sheet>

From 23e77b80336514d07504c35d717d4573bed90071 Mon Sep 17 00:00:00 2001
From: Jignesh Rathod <jir@openerp.com>
Date: Mon, 28 Aug 2017 16:44:31 +0530
Subject: [PATCH 118/119] [IMP] stock: restructure menus of stock.

---
 addons/stock/models/stock_move_line.py                     | 2 +-
 addons/stock/views/procurement_views.xml                   | 7 +++----
 addons/stock/views/stock_menu_views.xml                    | 4 +++-
 addons/stock/views/stock_picking_views.xml                 | 4 ++--
 .../views/stock_picking_batch_views.xml                    | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index 1050d60902e..34fe0157b94 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -42,7 +42,7 @@ class StockMoveLine(models.Model):
     from_loc = fields.Char(compute='_compute_location_description')
     to_loc = fields.Char(compute='_compute_location_description')
     lots_visible = fields.Boolean(compute='_compute_lots_visible')
-    state = fields.Selection(related='move_id.state')
+    state = fields.Selection(related='move_id.state', store=True)
     consume_line_ids = fields.Many2many('stock.move.line', 'stock_move_line_consume_rel', 'consume_line_id', 'produce_line_id', help="Technical link to see who consumed what. ")
     produce_line_ids = fields.Many2many('stock.move.line', 'stock_move_line_consume_rel', 'produce_line_id', 'consume_line_id', help="Technical link to see which line was produced with this. ")
 
diff --git a/addons/stock/views/procurement_views.xml b/addons/stock/views/procurement_views.xml
index eb83e73aec5..c36e2de7a6c 100644
--- a/addons/stock/views/procurement_views.xml
+++ b/addons/stock/views/procurement_views.xml
@@ -92,10 +92,9 @@
         </record>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
-        <menuitem id="menu_stock_sched" name="Scheduler" parent="stock.menu_stock_root" groups="group_stock_manager" sequence="50"/>
-        <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" sequence="2" groups="base.group_no_one"/>
-        <menuitem id="procurement_order_compute_all_menu" name="Scheduling" sequence="5" groups="group_stock_manager" parent="menu_stock_warehouse_mgmt"/>
-        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="procurement_order_compute_all_menu" name="Run Schedular" sequence="1" groups="stock.group_stock_manager"/>
+        <menuitem id="procurement_order_compute_all_menu" name="Schedulers" sequence="5" groups="group_stock_manager" parent="menu_stock_warehouse_mgmt"/>
+        <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="procurement_order_compute_all_menu" name="Run Scheduler" sequence="5" groups="stock.group_stock_manager"/>
+        <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="procurement_order_compute_all_menu" sequence="10" groups="base.group_no_one"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_config_settings" sequence="5"/>
         <menuitem action="procurement.procurement_order_action_exceptions" id="menu_stock_procurement_action" parent="stock.menu_warehouse_report" sequence="130" groups="stock.group_stock_manager"/>
 </odoo>
diff --git a/addons/stock/views/stock_menu_views.xml b/addons/stock/views/stock_menu_views.xml
index 02e4506430f..41a1f709455 100644
--- a/addons/stock/views/stock_menu_views.xml
+++ b/addons/stock/views/stock_menu_views.xml
@@ -9,7 +9,7 @@
     <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
         sequence="100" groups="group_stock_manager"/>
     <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" groups="stock.group_stock_manager" sequence="1"/>
-    <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="3"/>
+
 
     <menuitem id="menu_product_in_config_stock" name="Products" parent="stock.menu_stock_config_settings" sequence="4"/>
 
@@ -19,6 +19,8 @@
     <menuitem id="product_uom_menu" name="Units of Measures" parent="menu_stock_config_settings"
         sequence="5" groups="product.group_uom"/>
 
+    <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="6"/>
+
     <menuitem
         action="product.product_category_action_form" id="menu_product_category_config_stock"
         parent="stock.menu_product_in_config_stock" sequence="2"/>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 054198117ba..26262d3592e 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -303,7 +303,7 @@
                                 <group>
                                     <field name="picking_type_code" invisible="1"/>
                                     <field name="move_type" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
-                                    <field name="picking_type_id" attrs="{'readonly': [('state', '!=', 'draft')]}" invisible="context.get('default_picking_type_id')"/>
+                                    <field name="picking_type_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
@@ -391,7 +391,7 @@
             parent="menu_stock_warehouse_mgmt" sequence="1"
             groups="stock.group_stock_manager,stock.group_stock_user"/>
 
-        <menuitem id="all_picking" name="Transfers" parent="stock_picking_menu_product" sequence="2" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
+        <menuitem id="all_picking" name="Transfers" parent="stock_picking_menu_product" sequence="5" action="action_picking_tree_all" groups="stock.group_stock_manager,stock.group_stock_user"/>
 
         <record id="stock_picking_action_picking_type" model="ir.actions.act_window">
             <field name="name">All Transfers</field>
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index cb2a782ce94..9c71aed8401 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -115,7 +115,7 @@
           </p>
         </field>
     </record>
-    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.menu_stock_warehouse_mgmt" sequence="30"/>
+    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.stock_picking_menu_product" sequence="2"/>
 
     <record id="vpicktree_inherit_stock_picking_batch" model="ir.ui.view">
         <field name="name">stock.picking.tree</field>

From fe77df3ba480d40b3d6b25736397bd52c684ce03 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Tue, 29 Aug 2017 11:12:00 +0530
Subject: [PATCH 119/119] [IMP] stock, stock_picking_batch: improve tree, form
 view of product moves and menus

---
 addons/stock/views/stock_move_line_views.xml              | 8 ++++----
 .../views/stock_picking_batch_views.xml                   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index 877663c77d9..929e22c3c12 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -9,10 +9,11 @@
                 <field name="picking_id" string="Reference"/>
                 <field name="create_date" invisible="1" groups="base.group_no_one"/>
                 <field name="product_id"/>
-                <field name="product_uom_qty"/>
-                <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                 <field name="location_id"/>
                 <field name="location_dest_id"/>
+                <field name="product_uom_qty"/>
+                <field name="qty_done" string="Quantity Done"/>
+                <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -29,7 +30,7 @@
                     <group>
                         <group>
                             <field name="date" groups="base.group_no_one"/>
-                            <field name="picking_id"/>
+                            <field name="picking_id" string="Reference"/>
                             <field name="product_id"/>
                             <field name="location_id" groups="stock.group_stock_multi_locations"/>
                             <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
@@ -45,7 +46,6 @@
                                 <field name="qty_done"/>
                                 <field name="product_uom_id" options="{'no_create': True}" string="Unit of Measure" groups="product.group_uom"/>
                             </div>
-                            <field name="create_date" groups="base.group_no_one"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 9c71aed8401..6e79f52529d 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -97,7 +97,7 @@
         </field>
     </record>
     <record id="stock_picking_batch_action" model="ir.actions.act_window">
-        <field name="name">Batch Picking</field>
+        <field name="name">Batch Pickings</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.picking.batch</field>
         <field name="view_type">form</field>
@@ -115,7 +115,7 @@
           </p>
         </field>
     </record>
-    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.stock_picking_menu_product" sequence="2"/>
+    <menuitem action="stock_picking_batch_action" id="stock_picking_batch_menu" parent="stock.stock_picking_menu_product" sequence="10"/>
 
     <record id="vpicktree_inherit_stock_picking_batch" model="ir.ui.view">
         <field name="name">stock.picking.tree</field>