Merge lp:~camptocamp/carriers-deliveries/6.1-change-class-name-to-avoid-error_rde into lp:~stock-logistic-core-editors/carriers-deliveries/6.1

[Romain Deheele - Camptocamp]

Hi,

In base_delivery_carrier_files_document, file carrier_file.py,
by coincidence, the class and a frequently used parameter are both named "carrier_file".
in l.55, the super method will take carrier_file parameter while it needs carrier_file, the class name.
It causes logically the error : TypeError: 'must be type, not browse_record'

Great catch from Leonardo Pistone, thank you.

Regards,

Romain

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Leonardo Pistone (lepistone)]

thanks!

review: Approve (code review)

=== modified file 'base_delivery_carrier_files_document/carrier_file.py'
--- base_delivery_carrier_files_document/carrier_file.py	2012-04-02 06:59:30 +0000
+++ base_delivery_carrier_files_document/carrier_file.py	2014-04-02 16:03:35 +0000
@@ -24,11 +24,11 @@
 from osv import osv, fields
 
 
-class carrier_file(osv.osv):
+class carrier_file_model(osv.osv):
     _inherit = 'delivery.carrier.file'
 
     def get_write_mode_selection(self, cr, uid, context=None):
-        res = super(carrier_file, self).get_write_mode_selection(cr, uid, context=context)
+        res = super(carrier_file_model, self).get_write_mode_selection(cr, uid, context=context)
         if 'document' not in res:
             res.append(('document', 'Document'))
         return res
@@ -52,7 +52,7 @@
             self.pool.get('ir.attachment').create(cr, uid, vals, context=context)
             return True
         else:
-            return (super(carrier_file, self)
+            return (super(carrier_file_model, self)
                     ._write_file(cr, uid, carrier_file, filename, file_content, context=None))
 
-carrier_file()
+carrier_file_model()