diff --git a/CHANGELOG b/CHANGELOG index 7ba347dc1a..57ddbdc9cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Add One2Many to selections on carrier + Version 5.4.0 - 2019-11-04 * Bug fixes (see mercurial logs for details) diff --git a/carrier.py b/carrier.py index 86759ee056..6e41831a53 100644 --- a/carrier.py +++ b/carrier.py @@ -24,6 +24,7 @@ class Carrier(ModelSQL, ModelView): ('product', 'Product Price'), ], 'Carrier Cost Method', required=True, help='Method to compute carrier cost.') + selections = fields.One2Many('carrier.selection', 'carrier', "Selections") @staticmethod def default_carrier_cost_method(): diff --git a/carrier.xml b/carrier.xml index f28bcedabf..6327f93ccc 100644 --- a/carrier.xml +++ b/carrier.xml @@ -77,7 +77,14 @@ this repository contains the full copyright notices and license terms. --> carrier.selection tree - selection_tree + + selection_list + + + carrier.selection + tree + + selection_list_sequence @@ -87,7 +94,7 @@ this repository contains the full copyright notices and license terms. --> - + + + + + + + diff --git a/view/selection_tree.xml b/view/selection_list_sequence.xml similarity index 100% rename from view/selection_tree.xml rename to view/selection_list_sequence.xml