openerp-community-reviewer team mailing list archive

[Romain Deheele - Camptocamp <romain.deheele@xxxxxxxxxxxxxx>]

Romain Deheele - Camptocamp has proposed merging lp:~camptocamp/carriers-deliveries/7.0-v7-port-base_delivery_carrier_files_document-addon_rde into lp:carriers-deliveries.

Requested reviews:
  Stock and Logistic Core Editors (stock-logistic-core-editors)

For more details, see:
https://code.launchpad.net/~camptocamp/carriers-deliveries/7.0-v7-port-base_delivery_carrier_files_document-addon_rde/+merge/213083

Hi,

This branch ports base_delivery_carrier_files_document in v7.0.

Regards,

Romain
-- 
https://code.launchpad.net/~camptocamp/carriers-deliveries/7.0-v7-port-base_delivery_carrier_files_document-addon_rde/+merge/213083
Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~camptocamp/carriers-deliveries/7.0-v7-port-base_delivery_carrier_files_document-addon_rde into lp:carriers-deliveries.

=== modified file 'base_delivery_carrier_files_document/__init__.py'
--- base_delivery_carrier_files_document/__init__.py	2012-04-02 06:59:30 +0000
+++ base_delivery_carrier_files_document/__init__.py	2014-03-27 14:53:06 +0000
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import carrier_file
+from . import carrier_file  # noqa

=== modified file 'base_delivery_carrier_files_document/__openerp__.py'
--- base_delivery_carrier_files_document/__openerp__.py	2013-11-11 14:03:34 +0000
+++ base_delivery_carrier_files_document/__openerp__.py	2014-03-27 14:53:06 +0000
@@ -25,19 +25,19 @@
     'category': 'Generic Modules/Warehouse',
     'description': """
 Allow to store the carrier files in a Document directory.
-Auto-install when the module Document and Base Delivery Carrier Files are installed.
+Auto-install when the module Document and
+Base Delivery Carrier Files are installed.
     """,
     'author': 'Camptocamp',
     'license': 'AGPL-3',
     'website': 'http://www.camptocamp.com',
     'depends': ['base_delivery_carrier_files',
                 'document'],
-    'init_xml': [],
-    'update_xml': ['carrier_file_view.xml',],
-    'demo_xml': ['carrier_file_demo.xml'],
+    'data': ['carrier_file_view.xml'],
+    'demo': ['carrier_file_demo.xml'],
     'test': ['test/carrier_file.yml',
-             'test/carrier_file_manual.yml',],
+             'test/carrier_file_manual.yml'],
     'images': [],
-    'installable': False,
+    'installable': True,
     'auto_install': True,
 }

=== 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-03-27 14:53:06 +0000
@@ -21,38 +21,43 @@
 
 import base64
 
-from osv import osv, fields
-
-
-class carrier_file(osv.osv):
+from openerp.osv import orm, fields
+
+
+class carrier_file(orm.Model):
     _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, self).\
+            get_write_mode_selection(cr, uid, context=context)
         if 'document' not in res:
             res.append(('document', 'Document'))
         return res
 
     _columns = {
-        'write_mode': fields.selection(get_write_mode_selection, 'Write on', required=True),
-        'document_directory_id': fields.many2one('document.directory', 'Document Directory'),
+        'write_mode': fields.selection(get_write_mode_selection, 'Write on',
+                                       required=True),
+        'document_directory_id': fields.many2one('document.directory',
+                                                 'Document Directory'),
         'export_path': fields.char('Export Path', size=256),
     }
 
-    def _prepare_attachment(self, carrier_file, filename, file_content, context=None):
+    def _prepare_attachment(self, carrier_file, filename, file_content,
+                            context=None):
         return {'name': "%s_%s" % (carrier_file.name, filename),
                 'datas_fname': filename,
                 'datas': base64.encodestring(file_content),
                 'parent_id': carrier_file.document_directory_id.id,
                 'type': 'binary'}
 
-    def _write_file(self, cr, uid, carrier_file, filename, file_content, context=None):
+    def _write_file(self, cr, uid, carrier_file, filename, file_content,
+                    context=None):
         if carrier_file.write_mode == 'document':
-            vals = self._prepare_attachment(carrier_file, filename, file_content)
-            self.pool.get('ir.attachment').create(cr, uid, vals, context=context)
+            vals = self._prepare_attachment(carrier_file, filename,
+                                            file_content)
+            self.pool['ir.attachment'].create(cr, uid, vals, context=context)
             return True
         else:
             return (super(carrier_file, self)
-                    ._write_file(cr, uid, carrier_file, filename, file_content, context=None))
-
-carrier_file()
+                    ._write_file(cr, uid, carrier_file, filename, file_content,
+                                 context=None))

=== modified file 'base_delivery_carrier_files_document/carrier_file_view.xml'
--- base_delivery_carrier_files_document/carrier_file_view.xml	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files_document/carrier_file_view.xml	2014-03-27 14:53:06 +0000
@@ -5,7 +5,6 @@
             <field name="name">delivery.carrier.file.form</field>
             <field name="model">delivery.carrier.file</field>
             <field name="inherit_id" ref="base_delivery_carrier_files.view_delivery_carrier_file_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <field name="export_path" position="after">

=== modified file 'base_delivery_carrier_files_document/test/carrier_file.yml'
--- base_delivery_carrier_files_document/test/carrier_file.yml	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files_document/test/carrier_file.yml	2014-03-27 14:53:06 +0000
@@ -26,7 +26,7 @@
   I deliver outgoing shipment.
 -
   !python {model: stock.partial.picking}: |
-    context.update({'active_model': 'stock.picking', 'active_id': ref('base_delivery_carrier_files.outgoing_shipment_carrier_file'), 'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file')]})
+    context.update({'active_model': 'stock.picking.out', 'active_id': ref('base_delivery_carrier_files.outgoing_shipment_carrier_file'), 'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file')]})
 -
   !record {model: stock.partial.picking, id: partial_outgoing}:
     picking_id: base_delivery_carrier_files.outgoing_shipment_carrier_file
@@ -36,5 +36,5 @@
 -
   I check shipment details after shipment, the carrier file must have been generated
 -
-  !assert {model: stock.picking, id: base_delivery_carrier_files.outgoing_shipment_carrier_file, string: Carrier file should be generated}:
+  !assert {model: stock.picking.out, id: base_delivery_carrier_files.outgoing_shipment_carrier_file, string: Carrier file should be generated}:
     - carrier_file_generated == True

=== modified file 'base_delivery_carrier_files_document/test/carrier_file_manual.yml'
--- base_delivery_carrier_files_document/test/carrier_file_manual.yml	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files_document/test/carrier_file_manual.yml	2014-03-27 14:53:06 +0000
@@ -26,7 +26,7 @@
   I deliver outgoing shipment.
 -
   !python {model: stock.partial.picking}: |
-    context.update({'active_model': 'stock.picking', 'active_id': ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual'), 'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual')]})
+    context.update({'active_model': 'stock.picking.out', 'active_id': ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual'), 'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual')]})
 -
   !record {model: stock.partial.picking, id: partial_outgoing}:
     picking_id: base_delivery_carrier_files.outgoing_shipment_carrier_file_manual
@@ -36,16 +36,16 @@
 -
   I check shipment details after shipment, the carrier file must not have been generated
 -
-  !assert {model: stock.picking, id: base_delivery_carrier_files.outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
+  !assert {model: stock.picking.out, id: base_delivery_carrier_files.outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
     - carrier_file_generated is False
 -
   I generate the carrier files of my shipment from the wizard
 -
   !python {model: delivery.carrier.file.generate}: |
-    wizard_id = self.create(cr, uid, {}, {'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual')], 'active_model': 'stock.picking'})
+    wizard_id = self.create(cr, uid, {}, {'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual')], 'active_model': 'stock.picking.out'})
     self.action_generate(cr, uid, [wizard_id], {'active_ids': [ref('base_delivery_carrier_files.outgoing_shipment_carrier_file_manual')]})
 -
   I check shipment details after manual generation, the carrier file must have been generated
 -
-  !assert {model: stock.picking, id: base_delivery_carrier_files.outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
+  !assert {model: stock.picking.out, id: base_delivery_carrier_files.outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
     - carrier_file_generated == True