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-needed_changes_to_fit_with_stock_picking_v7_changes-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-needed_changes_to_fit_with_stock_picking_v7_changes-rde/+merge/211056

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
-- 
https://code.launchpad.net/~camptocamp/carriers-deliveries/7.0-needed_changes_to_fit_with_stock_picking_v7_changes-rde/+merge/211056
Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~camptocamp/carriers-deliveries/7.0-needed_changes_to_fit_with_stock_picking_v7_changes-rde into lp:carriers-deliveries.

=== 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-18 17:19:21 +0000
@@ -50,7 +50,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_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-18 17:19:21 +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/stock.py'
--- base_delivery_carrier_files/stock.py	2014-03-13 09:19:28 +0000
+++ base_delivery_carrier_files/stock.py	2014-03-18 17:19:21 +0000
@@ -77,3 +77,13 @@
         default.update({'carrier_file_generated': False})
         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-18 17:19:21 +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-18 17:19:21 +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-18 17:19:21 +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-18 17:19:21 +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-18 17:19:21 +0000
@@ -19,24 +19,24 @@
 #
 ##############################################################################
 
-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 = {}
         res = False
-        if (context.get('active_model', False) == 'stock.picking' and
+        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'),
     }
 
@@ -62,4 +62,3 @@
 
         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-18 17:19:21 +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>