Merge PR OCA#288 into 12.0

Signed-off-by AaronHForgeFlow
avoinsystems · Mar 24, 2020 · 5202c85 · 5202c85
2 parents 2fe835d + 99340cf
commit 5202c85
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py
@@ -34,6 +34,12 @@ def _prepare_account_move_line(self, qty, cost,
                 })
         return res
 
+    @api.model
+    def _prepare_merge_moves_distinct_fields(self):
+        fields = super()._prepare_merge_moves_distinct_fields()
+        fields.append('analytic_account_id')
+        return fields
+
 
 class StockMoveLine(models.Model):
     _inherit = "stock.move.line"