← Back to branch summary

~camptocamp/carriers-deliveries/7.0-pending-merges-20140331

« back to all changes in this revision

Viewing changes to delivery_carrier_label_postlogistics/stock.py

merge 7.0-postlogistics-file_type-imp

Show diffs side-by-side

added added

removed removed

Lines of Context:
delivery_carrier_label_postlogistics/stock.py
20
20
##############################################################################
21
21
from operator import attrgetter
22
22
 
23
 
from openerp.osv import orm, fields
 
23
from openerp.osv import orm
24
24
 
25
25
from postlogistics.web_service import PostlogisticsWebService
26
26
 
88
88
            labels.append({'tracking_id': track.id if track else False,
89
89
                           'file': label['binary'].decode('base64'),
90
90
                           'file_type': label['file_type'],
91
 
                           'name': tracking_number,
 
91
                           'name': tracking_number + '.' + label['file_type'],
92
92
                           })
93
93
 
94
94
        return labels
115
115
    _inherit = 'shipping.label'
116
116
 
117
117
    def _get_file_type_selection(self, cr, uid, context=None):
118
 
        """ Return a sorted list of extensions of label file format
 
118
        """ Return a concatenated list of extensions of label file format
 
119
        plus file format from super
 
120
 
 
121
        This will be filtered and sorted in __get_file_type_selection
119
122
 
120
123
        :return: list of tuple (code, name)
121
124
 
129
132
                     ('pdf', 'PDF'),
130
133
                     ('spdf', 'sPDF'), # sPDF is a pdf without integrated font
131
134
                     ('zpl2', 'ZPL2')]
132
 
        add_types = [t for t in new_types if not t in file_types]
133
 
        file_types.extend(add_types)
134
 
        file_types.sort(key=lambda t: t[0])
 
135
        file_types.extend(new_types)
135
136
        return file_types
136
 
 
137
 
    _columns = {
138
 
        'file_type': fields.selection(_get_file_type_selection, 'File type')
139
 
    }