Merge lp:~camptocamp/carriers-deliveries/7.0-postlogistics-file_type-imp into lp:~stock-logistic-core-editors/carriers-deliveries/7.0

[Yannick Vaucher @ Camptocamp]

This follow the change made in
https://code.launchpad.net/~akretion-team/carriers-deliveries/base-deliv-carr-label--improve-file_type-inheritance-shipping-label-dbl/+merge/211287

[David BEAL (ak) (davidbeal)]

LGTM to me

thanks yannick

review: Approve

[lp:~camptocamp/carriers-deliveries/7.0-postlogistics-file_type-imp]

28. By Yannick Vaucher @ Camptocamp on 2014-03-28

add extension to file name

[Leonardo Pistone (lepistone)]

thanks

review: Approve (code review)

=== modified file 'delivery_carrier_label_postlogistics/stock.py'
--- delivery_carrier_label_postlogistics/stock.py	2014-02-25 14:28:29 +0000
+++ delivery_carrier_label_postlogistics/stock.py	2014-03-28 10:48:15 +0000
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import orm, fields
+from openerp.osv import orm
 
 from postlogistics.web_service import PostlogisticsWebService
 
@@ -68,7 +68,7 @@
             labels.append({'tracking_id': track and track.id or False,
                            'file': label['binary'].decode('base64'),
                            'file_type': label['file_type'],
-                           'name': tracking_number,
+                           'name': tracking_number + '.' + label['file_type'],
                            })
 
         return labels
@@ -91,7 +91,10 @@
     _inherit = 'shipping.label'
 
     def _get_file_type_selection(self, cr, uid, context=None):
-        """ Return a sorted list of extensions of label file format
+        """ Return a concatenated list of extensions of label file format
+        plus file format from super
+
+        This will be filtered and sorted in __get_file_type_selection
 
         :return: list of tuple (code, name)
 
@@ -105,11 +108,5 @@
                      ('pdf', 'PDF'),
                      ('spdf', 'sPDF'), # sPDF is a pdf without integrated font
                      ('zpl2', 'ZPL2')]
-        add_types = [t for t in new_types if not t in file_types]
-        file_types.extend(add_types)
-        file_types.sort(key=lambda t: t[0])
+        file_types.extend(new_types)
         return file_types
-
-    _columns = {
-        'file_type': fields.selection(_get_file_type_selection, 'File type')
-    }