Merge lp:~akretion-team/carriers-deliveries/base-deliv-carr-label--improve-file_type-inheritance-shipping-label-dbl into lp:~stock-logistic-core-editors/carriers-deliveries/7.0

[David BEAL (ak)]

Improve file_type field inheritance in shipping.label

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Indeed I forgot this one in my previous MP

Thanks!

I'll make the change in delivery_carrier_label_postlogistics

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

review: Approve (code review)

[lp:~akretion-team/carriers-deliveries/base-deliv-carr-label--improve-file_type-inheritance-shipping-label-dbl]

26. By David BEAL (ak) on 2014-03-18

[IMP] add field selection sort

[David BEAL (ak) (davidbeal)]

rev 26 move sort from postlogistics to the root function of the file_type field

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

LGTM

review: Approve (code review, no test)

=== modified file 'base_delivery_carrier_label/stock.py'
--- base_delivery_carrier_label/stock.py	2014-01-15 13:13:55 +0000
+++ base_delivery_carrier_label/stock.py	2014-03-18 14:13:15 +0000
@@ -283,10 +283,17 @@
     _description = "Shipping Label"
 
     def _get_file_type_selection(self, cr, uid, context=None):
+        """ To inherit to add file type """
         return [('pdf', 'PDF')]
 
+    def __get_file_type_selection(self, cr, uid, context=None):
+        file_types = self._get_file_type_selection(cr, uid, context=context)
+        file_types = list(set(file_types))
+        file_types.sort(key=lambda t: t[0])
+        return file_types
+
     _columns = {
-        'file_type': fields.selection(_get_file_type_selection, 'File type'),
+        'file_type': fields.selection(__get_file_type_selection, 'File type'),
         'tracking_id': fields.many2one('stock.tracking', 'Pack'),
     }