Merge lp:~camptocamp/carriers-deliveries/7.0-base_delivery_carrier_label-improve-carrier-type into lp:~stock-logistic-core-editors/carriers-deliveries/7.0

[Yannick Vaucher @ Camptocamp]

As discussed on community list this is a better way to handle field selection inheritance.

Other linked MP:
https://code.launchpad.net/~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_postlogistics-improve-carrier-type/+merge/208383

[lp:~camptocamp/carriers-deliveries/7.0-base_delivery_carrier_label-improve-carrier-type]

11. By Yannick Vaucher @ Camptocamp on 2014-02-26

docstring

[David BEAL (ak) (davidbeal)]

LGTM

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

=== modified file 'base_delivery_carrier_label/delivery.py'
--- base_delivery_carrier_label/delivery.py	2013-11-27 06:54:16 +0000
+++ base_delivery_carrier_label/delivery.py	2014-02-26 14:47:26 +0000
@@ -70,9 +70,13 @@
         """ To inherit to add carrier type """
         return []
 
+    def __get_carrier_type_selection(self, cr, uid, context=None):
+        """ Wrapper to preserve inheritance for selection field """
+        return self._get_carrier_type_selection(cr, uid, context=context)
+
     _columns = {
         'type': fields.selection(
-            _get_carrier_type_selection, 'Type',
+            __get_carrier_type_selection, 'Type',
             help="Carrier type (combines several delivery methods)"),
         'code': fields.char(
             'Code', size=10,