openerp-community-reviewer team mailing list archive

[David BEAL <david.beal@xxxxxxxxxxxx>]

David BEAL has proposed merging lp:~akretion-team/carriers-deliveries/base-deliv-carr-label--improve-file_type-inheritance-shipping-label-dbl into lp:carriers-deliveries.

Requested reviews:
  Yannick Vaucher @ Camptocamp (yvaucher-c2c)

For more details, see:
https://code.launchpad.net/~akretion-team/carriers-deliveries/base-deliv-carr-label--improve-file_type-inheritance-shipping-label-dbl/+merge/211287

Improve file_type field inheritance in shipping.label
-- 
https://code.launchpad.net/~akretion-team/carriers-deliveries/base-deliv-carr-label--improve-file_type-inheritance-shipping-label-dbl/+merge/211287
Your team Stock and Logistic Core Editors is subscribed to branch lp:carriers-deliveries.

=== 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-17 11:29:44 +0000
@@ -283,10 +283,14 @@
     _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):
+        return self._get_file_type_selection(cr, uid, context=context)
+
     _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'),
     }