Merge lp:~camptocamp/carriers-deliveries/7.0-needed_changes_to_fit_with_stock_picking_v7_changes-rde into lp:~stock-logistic-core-editors/carriers-deliveries/7.0

[Romain Deheele - Camptocamp]

Hi,

Most of changes are about to fit with stock.picking/stock.picking.out v7 changes
(be careful about fixme in addons/delivery/stock.py in line 207)
Tests are green.

Regards,

Romain

[Leonardo Pistone (lepistone)]

Thanks for fixing the tests Romain. I only see a small alignment issue in l49. Can you please check that your changes pass flake8?

review: Needs Fixing (code review)

[lp:~camptocamp/carriers-deliveries/7.0-needed_changes_to_fit_with_stock_picking_v7_changes-rde]

27. By Romain Deheele - Camptocamp on 2014-03-24

[UPD] clean according flake8

[Romain Deheele - Camptocamp (romaindeheele)]

Thanks Leonardo,
  PEP8 check done.

Romain

[Leonardo Pistone (lepistone)]

review: Approve

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

Thanks

review: Approve (code review)

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

LGTM

review: Approve (code review, no test)

=== modified file 'base_delivery_carrier_files/__openerp__.py'
--- base_delivery_carrier_files/__openerp__.py	2014-03-13 16:11:58 +0000
+++ base_delivery_carrier_files/__openerp__.py	2014-03-24 10:53:45 +0000
@@ -24,19 +24,27 @@
     'version': '1.1',
     'category': 'Generic Modules/Warehouse',
     'description': """
-Base module for creation of carrier files  (La Poste, TNT Express Shipper, ...). exported as text (csv, ...).
-It contains the base structure to handle the export of files on Delivery Orders and an API to ease the generation of the files for the developers in sub-modules.
-
-The delivery orders can be grouped in one files or be exported each one in a separate file.
-The files can be generated automatically on the shipment of a Delivery Order or from a manual action.
-They are exported to a defined path or in a document directory of your choice if the "document" module is installed.
-
-A generic carrier file is included in the module. It can also be used as a basis to create your own sub-module.
+Base module for creation of carrier files (La Poste, TNT Express Shipper, ...).
+Files are exported as text (csv, ...).
+It contains :
+- the base structure to handle the export of files on Delivery Orders
+- an API to ease the generation of the files for the developers in sub-modules.
+
+The delivery orders can be grouped in one files
+or be exported each one in a separate file.
+The files can be generated automatically
+on the shipment of a Delivery Order or from a manual action.
+They are exported to a defined path or
+in a document directory of your choice if the "document" module is installed.
+
+A generic carrier file is included in the module.
+It can also be used as a basis to create your own sub-module.
 
 Sub-modules already exist to generate file according to specs of :
  - La Poste (France) : delivery_carrier_file_laposte
  - TNT Express Shipper (France) : delivery_carrier_file_tnt
- - Make your own ! Look at the code of the modules above, it's trivial to create a sub-module for a carrier.
+ - Make your own ! Look at the code of the modules above,
+   it's trivial to create a sub-module for a carrier.
 
 """,
     'author': 'Camptocamp',
@@ -50,7 +58,7 @@
              'wizard/generate_carrier_files_view.xml',
              'security/ir.model.access.csv'],
     'demo': ['carrier_file_demo.xml',
-                 'carrier_file_demo.yml'],
+             'carrier_file_demo.yml'],
     'test': ['test/carrier_file.yml',
              'test/carrier_file_manual.yml'],
     'images': [],

=== modified file 'base_delivery_carrier_files/carrier_file.py'
--- base_delivery_carrier_files/carrier_file.py	2014-03-13 09:19:28 +0000
+++ base_delivery_carrier_files/carrier_file.py	2014-03-24 10:53:45 +0000
@@ -46,42 +46,55 @@
         'name': fields.char('Name', size=64, required=True),
         'type': fields.selection(get_type_selection, 'Type', required=True),
         'group_pickings': fields.boolean('Group all pickings in one file',
-                                         help=('All the pickings will be grouped in the same file. '
-                                               'Has no effect when the files are automatically '
-                                               'exported at the delivery order process.')),
-        'write_mode': fields.selection(get_write_mode_selection, 'Write on', required=True),
+                                         help='All the pickings will be '
+                                              'grouped in the same file. '
+                                              'Has no effect when the files '
+                                              'are automatically exported at '
+                                              'the delivery order process.'),
+        'write_mode': fields.selection(get_write_mode_selection,
+                                       'Write on',
+                                       required=True),
         'export_path': fields.char('Export Path', size=256),
         'auto_export': fields.boolean('Export at delivery order process',
-                                      help=("The file will be automatically generated when a "
-                                            "delivery order is processed. If activated, each "
-                                            "delivery order will be exported in a separate file.")),
+                                      help='The file will be automatically '
+                                           'generated when a delivery order '
+                                           'is processed. If activated, each '
+                                           'delivery order will be exported '
+                                           'in a separate file.'),
     }
 
-    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):
         """
         Method responsible of writing the file, on the filesystem or
         by inheriting the module, in the document module as instance
 
-        :param browse_record carrier_file: browsable carrier.file (configuration)
+        :param browse_record carrier_file: browsable carrier.file
+                                           (configuration)
         :param tuple filename: name of the file to write
         :param tuple file_content: content of the file to write
         :return: True if write is successful
         """
         if not carrier_file.export_path:
-            raise osv.except_osv(_('Error'),
-                                 _('Export path is not defined for carrier file %s') %
+            raise orm.except_orm(_('Error'),
+                                 _('Export path is not defined '
+                                   'for carrier file %s') %
                                  (carrier_file.name,))
         full_path = os.path.join(carrier_file.export_path, filename)
         with open(full_path, 'w') as file_handle:
             file_handle.write(file_content)
         return True
 
-    def _generate_files(self, cr, uid, carrier_file, picking_ids, context=None):
+    def _generate_files(self, cr, uid, carrier_file, picking_ids,
+                        context=None):
         """
-        Generate one or more files according to carrier_file configuration for all picking_ids
+        Generate one or more files according to carrier_file configuration
+        for all picking_ids
 
-        :param browse_record carrier_file: browsable carrier file configuration
-        :param list picking_ids: list of ids of pickings for which we have to generate a file
+        :param browse_record carrier_file: browsable carrier file
+                                           configuration
+        :param list picking_ids: list of ids of pickings for which
+                                 we have to generate a file
         :return: True if successful
         """
         picking_obj = self.pool.get('stock.picking')
@@ -106,11 +119,13 @@
                                       {'carrier_file_generated': True},
                                       context=context)
             except Exception, e:
-                log.exception("Could not create the picking file for pickings %s: %s",
+                log.exception("Could not create the picking file "
+                              "for pickings %s: %s",
                               picking_ids, e)
         return True
 
-    def generate_files(self, cr, uid, carrier_file_id, picking_ids, context=None):
+    def generate_files(self, cr, uid, carrier_file_id, picking_ids,
+                       context=None):
         """
         Generate one or more files according to carrier_file
         configuration for all picking_ids
@@ -124,16 +139,19 @@
         """
         if not isinstance(carrier_file_id, (int, long)):
             if len(carrier_file_id) > 1:
-                raise Exception('Code Error: you have to export only one carrier at a time.')
+                raise Exception('Code Error: you have to export '
+                                'only one carrier at a time.')
             else:
                 carrier_file_id = carrier_file_id[0]
         carrier_file = self.browse(cr, uid, carrier_file_id, context=context)
-        return self._generate_files(cr, uid, carrier_file, picking_ids, context=context)
+        return self._generate_files(cr, uid, carrier_file, picking_ids,
+                                    context=context)
 
 
 class delivery_carrier(orm.Model):
     _inherit = 'delivery.carrier'
 
     _columns = {
-        'carrier_file_id': fields.many2one('delivery.carrier.file', 'Carrier File')
+        'carrier_file_id': fields.many2one('delivery.carrier.file',
+                                           'Carrier File')
     }

=== modified file 'base_delivery_carrier_files/carrier_file_demo.yml'
--- base_delivery_carrier_files/carrier_file_demo.yml	2014-03-13 09:19:28 +0000
+++ base_delivery_carrier_files/carrier_file_demo.yml	2014-03-24 10:53:45 +0000
@@ -28,7 +28,7 @@
     property_stock_account_output: account.o_income
     description: Ice cream can be mass-produced and thus is widely available in developed parts of the world. Ice cream can be purchased in large cartons (vats and squrounds) from supermarkets and grocery stores, in smaller quantities from ice cream shops, convenience stores, and milk bars, and in individual servings from small carts or vans at public events.
 -
- !record {model: stock.picking, id: outgoing_shipment_carrier_file}:
+ !record {model: stock.picking.out, id: outgoing_shipment_carrier_file}:
     type: out
     location_dest_id: location_delivery_counter
     carrier_id: delivery.delivery_carrier
@@ -41,7 +41,7 @@
     location_id: location_refrigerator
     location_dest_id: location_delivery_counter
 -
- !record {model: stock.picking, id: outgoing_shipment_carrier_file_manual}:
+ !record {model: stock.picking.out, id: outgoing_shipment_carrier_file_manual}:
     type: out
     location_dest_id: location_delivery_counter
     carrier_id: delivery.free_delivery_carrier

=== modified file 'base_delivery_carrier_files/csv_writer/unicode_writer.py'
--- base_delivery_carrier_files/csv_writer/unicode_writer.py	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files/csv_writer/unicode_writer.py	2014-03-24 10:53:45 +0000
@@ -8,7 +8,6 @@
     import StringIO
 
 
-
 class UnicodeWriter(object):
     """
     A CSV writer which will write rows to CSV file "f",

=== modified file 'base_delivery_carrier_files/stock.py'
--- base_delivery_carrier_files/stock.py	2014-03-13 09:19:28 +0000
+++ base_delivery_carrier_files/stock.py	2014-03-24 10:53:45 +0000
@@ -26,8 +26,11 @@
     _inherit = 'stock.picking'
 
     _columns = {
-        'carrier_file_generated': fields.boolean('Carrier File Generated', readonly=True,
-                              help="The file for the delivery carrier has been generated."),
+        'carrier_file_generated': fields.boolean('Carrier File Generated',
+                                                 readonly=True,
+                                                 help="The file for "
+                                                 "the delivery carrier "
+                                                 "has been generated."),
     }
 
     def generate_carrier_files(self, cr, uid, ids, auto=True, context=None):
@@ -53,21 +56,25 @@
                 continue
             if picking.carrier_file_generated:
                 continue
-            if not picking.carrier_id or not picking.carrier_id.carrier_file_id:
+            carrier = picking.carrier_id
+            if not carrier or not carrier.carrier_file_id:
                 continue
-            if auto and not picking.carrier_id.carrier_file_id.auto_export:
+            if auto and not carrier.carrier_file_id.auto_export:
                 continue
             p_carrier_file_id = picking.carrier_id.carrier_file_id.id
-            carrier_file_ids.setdefault(p_carrier_file_id, []).append(picking.id)
+            carrier_file_ids.setdefault(p_carrier_file_id, []).\
+                append(picking.id)
 
-        for carrier_file_id, carrier_picking_ids in carrier_file_ids.iteritems():
+        for carrier_file_id, carrier_picking_ids\
+                in carrier_file_ids.iteritems():
             carrier_file_obj.generate_files(cr, uid, carrier_file_id,
                                             carrier_picking_ids,
                                             context=context)
         return True
 
     def action_done(self, cr, uid, ids, context=None):
-        result = super(stock_picking, self).action_done(cr, uid, ids, context=context)
+        result = super(stock_picking, self).action_done(cr, uid, ids,
+                                                        context=context)
         self.generate_carrier_files(cr, uid, ids, auto=True, context=context)
         return result
 
@@ -75,5 +82,17 @@
         if default is None:
             default = {}
         default.update({'carrier_file_generated': False})
-        return super(stock_picking, self).copy(cr, uid, id, default, context=context)
-
+        return super(stock_picking, self).copy(cr, uid, id, default,
+                                               context=context)
+
+
+class stock_picking_out(orm.Model):
+    _inherit = 'stock.picking.out'
+
+    _columns = {
+        'carrier_file_generated': fields.boolean('Carrier File Generated',
+                                                 readonly=True,
+                                                 help="The file for "
+                                                 "the delivery carrier "
+                                                 "has been generated."),
+    }

=== modified file 'base_delivery_carrier_files/stock_view.xml'
--- base_delivery_carrier_files/stock_view.xml	2014-03-13 09:19:28 +0000
+++ base_delivery_carrier_files/stock_view.xml	2014-03-24 10:53:45 +0000
@@ -3,12 +3,14 @@
     <data>
         <record id="view_picking_out_form_carrier_file" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <page string="Additional info" position="inside">
-                        <field name="carrier_file_generated"/>
+                    <page string="Additional Info" position="inside">
+                        <group>
+                            <field name="carrier_file_generated"/>
+                        </group>
                     </page>
                 </data>
             </field>
@@ -16,7 +18,7 @@
 
         <record id="view_picking_out_search_carrier_file" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_search"/>
             <field name="arch" type="xml">
                 <data>

=== modified file 'base_delivery_carrier_files/test/carrier_file.yml'
--- base_delivery_carrier_files/test/carrier_file.yml	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files/test/carrier_file.yml	2014-03-24 10:53:45 +0000
@@ -26,7 +26,7 @@
   I deliver outgoing shipment.
 -
   !python {model: stock.partial.picking}: |
-    context.update({'active_model': 'stock.picking', 'active_id': ref('outgoing_shipment_carrier_file'), 'active_ids': [ref('outgoing_shipment_carrier_file')]})
+    context.update({'active_model': 'stock.picking.out', 'active_id': ref('outgoing_shipment_carrier_file'), 'active_ids': [ref('outgoing_shipment_carrier_file')]})
 -
   !record {model: stock.partial.picking, id: partial_outgoing}:
     picking_id: 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: outgoing_shipment_carrier_file, string: Carrier file should be generated}:
+  !assert {model: stock.picking.out, id: outgoing_shipment_carrier_file, string: Carrier file should be generated}:
     - carrier_file_generated == True

=== modified file 'base_delivery_carrier_files/test/carrier_file_manual.yml'
--- base_delivery_carrier_files/test/carrier_file_manual.yml	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files/test/carrier_file_manual.yml	2014-03-24 10:53:45 +0000
@@ -26,7 +26,7 @@
   I deliver outgoing shipment.
 -
   !python {model: stock.partial.picking}: |
-    context.update({'active_model': 'stock.picking', 'active_id': ref('outgoing_shipment_carrier_file_manual'), 'active_ids': [ref('outgoing_shipment_carrier_file_manual')]})
+    context.update({'active_model': 'stock.picking.out', 'active_id': ref('outgoing_shipment_carrier_file_manual'), 'active_ids': [ref('outgoing_shipment_carrier_file_manual')]})
 -
   !record {model: stock.partial.picking, id: partial_outgoing}:
     picking_id: outgoing_shipment_carrier_file_manual
@@ -36,16 +36,16 @@
 -
   I check shipment details after shipping, the carrier file must not have been generated
 -
-  !assert {model: stock.picking, id: outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
+  !assert {model: stock.picking.out, id: 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('outgoing_shipment_carrier_file_manual')], 'active_model': 'stock.picking'})
+    wizard_id = self.create(cr, uid, {}, {'active_ids': [ref('outgoing_shipment_carrier_file_manual')], 'active_model': 'stock.picking.out'})
     self.action_generate(cr, uid, [wizard_id], {'active_ids': [ref('outgoing_shipment_carrier_file_manual')]})
 -
   I check shipment details after manual generation, the carrier file must have been generated
 -
-  !assert {model: stock.picking, id: outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
+  !assert {model: stock.picking.out, id: outgoing_shipment_carrier_file_manual, string: Carrier file should be generated}:
     - carrier_file_generated == True

=== modified file 'base_delivery_carrier_files/wizard/__init__.py'
--- base_delivery_carrier_files/wizard/__init__.py	2012-04-02 06:59:30 +0000
+++ base_delivery_carrier_files/wizard/__init__.py	2014-03-24 10:53:45 +0000
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import generate_carrier_files
+from . import generate_carrier_files

=== modified file 'base_delivery_carrier_files/wizard/generate_carrier_files.py'
--- base_delivery_carrier_files/wizard/generate_carrier_files.py	2012-04-02 06:59:30 +0000
+++ base_delivery_carrier_files/wizard/generate_carrier_files.py	2014-03-24 10:53:45 +0000
@@ -19,24 +19,25 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import orm, fields
 from tools.translate import _
 
 
-class DeliveryCarrierFileGenerate(osv.osv_memory):
+class DeliveryCarrierFileGenerate(orm.TransientModel):
 
     _name = 'delivery.carrier.file.generate'
 
     def _get_picking_ids(self, cr, uid, context=None):
-        if context is None: context = {}
+        if context is None:
+            context = {}
         res = False
-        if (context.get('active_model', False) == 'stock.picking' and
-            context.get('active_ids', False)):
+        if (context.get('active_model', False) == 'stock.picking.out' and
+                context.get('active_ids', False)):
             res = context['active_ids']
         return res
 
     _columns = {
-        'picking_ids': fields.many2many('stock.picking',
+        'picking_ids': fields.many2many('stock.picking.out',
                                         string='Delivery Orders'),
     }
 
@@ -51,7 +52,7 @@
         context = context or {}
         form = self.browse(cr, uid, ids, context=context)[0]
         if not form.picking_ids:
-            raise osv.except_osv(_('Error'), _('No delivery orders selected'))
+            raise orm.except_orm(_('Error'), _('No delivery orders selected'))
 
         picking_obj = self.pool.get('stock.picking')
         picking_ids = [picking.id for picking in form.picking_ids]
@@ -61,5 +62,3 @@
                                            context=context)
 
         return {'type': 'ir.actions.act_window_close'}
-
-DeliveryCarrierFileGenerate()

=== modified file 'base_delivery_carrier_files/wizard/generate_carrier_files_view.xml'
--- base_delivery_carrier_files/wizard/generate_carrier_files_view.xml	2012-02-20 13:45:30 +0000
+++ base_delivery_carrier_files/wizard/generate_carrier_files_view.xml	2014-03-24 10:53:45 +0000
@@ -5,7 +5,6 @@
         <record id="view_delivery_carrier_file_generate" model="ir.ui.view">
             <field name="name">delivery.carrier.file.generate</field>
             <field name="model">delivery.carrier.file.generate</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier Files">
                     <label string="Generate the carrier files for the selected delivery orders."/>
@@ -42,7 +41,7 @@
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_delivery_carrier_file_generate'))" />
             <field name="key">action</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
         </record>
 
     </data>