Merge lp:~openerp-community/prestashoperpconnect/7.0-pass-vals-to-events into lp:prestashoperpconnect

[Guewen Baconnier @ Camptocamp]

[CHG] adapt the API to the change done in the connector (events on_record_create and on_record_write)

This is the change in the Prestashop Connector to adapt the API change here: https://code.launchpad.net/~lmi/openerp-connector/7.0-pass-vals-to-events/+merge/189234

Will need to be merged at the same time.

The same MP exist for the Magento connector at https://code.launchpad.net/~openerp-connector-community/openerp-connector/7.0-magentoerpconnect-pass-vals-to-events/+merge/189295

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi Guewen, I ifx some stuff in my local branch, can you change the branch owner so I can directly push in this branch the fix?

Thanks

Here is my diff

=== modified file 'prestashoperpconnect/product.py'
--- prestashoperpconnect/product.py 2013-10-08 13:28:25 +0000
+++ prestashoperpconnect/product.py 2013-10-10 06:48:40 +0000
@@ -432,10 +432,10 @@

 @on_record_write(model_names='prestashop.product.product')
 def prestashop_product_stock_updated(session, model_name, record_id,
- fields=None):
+ vals):
     if session.context.get('connector_no_export'):
         return
- inventory_fields = list(set(fields).intersection(INVENTORY_FIELDS))
+ inventory_fields = list(set(vals).intersection(INVENTORY_FIELDS))
     if inventory_fields:
         export_inventory.delay(session, model_name,
                                record_id, fields=inventory_fields,

=== modified file 'prestashoperpconnect/sale.py'
--- prestashoperpconnect/sale.py 2013-10-09 08:07:30 +0000
+++ prestashoperpconnect/sale.py 2013-10-10 06:52:33 +0000
@@ -262,18 +262,13 @@
 # TODO improve me, make the search on the sale order backend only
 @on_record_write(model_names='sale.order')
 def prestashop_sale_state_modified(session, model_name, record_id,
- fields=None):
- if 'state' in fields:
- sale = session.pool[model_name].browse(
- session.cr,
- session.uid,
- record_id
- )
+ vals):
+ if 'state' in vals:
         state_list_model = 'sale.order.state.list'
         states = session.pool[state_list_model].search(
             session.cr,
             session.uid,
- [('name', '=', sale.state)]
+ [('name', '=', vals['state'])]
         )

review: Needs Fixing

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Seems I should stop working in the evening ;-)

I changed the owner.

Thanks

[lp:~openerp-community/prestashoperpconnect/7.0-pass-vals-to-events]

267. By Sébastien BEAU - http://www.akretion.com on 2013-10-10

[CHG] complete the API adaptation with the change done in the connector (events on_record_create and on_record_write)

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

I push the fix, now me we will test it and than approve the merge

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Could you test it?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> I push the fix, now me we will test it and than approve the merge

Some news?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I will merge the change soon, but I couldn't afford to test the prestashop branch myself.

Unmerged revisions

267. By Sébastien BEAU - http://www.akretion.com on 2013-10-10

[CHG] complete the API adaptation with the change done in the connector (events on_record_create and on_record_write)

266. By Guewen Baconnier @ Camptocamp on 2013-10-09

[CHG] adapt the API to the change done in the connector (events on_record_create and on_record_write)

=== modified file 'prestashoperpconnect/product.py'
--- prestashoperpconnect/product.py	2013-10-08 13:28:25 +0000
+++ prestashoperpconnect/product.py	2013-10-10 08:59:47 +0000
@@ -432,10 +432,10 @@
 
 @on_record_write(model_names='prestashop.product.product')
 def prestashop_product_stock_updated(session, model_name, record_id,
-                                     fields=None):
+                                     vals):
     if session.context.get('connector_no_export'):
         return
-    inventory_fields = list(set(fields).intersection(INVENTORY_FIELDS))
+    inventory_fields = list(set(vals).intersection(INVENTORY_FIELDS))
     if inventory_fields:
         export_inventory.delay(session, model_name,
                                record_id, fields=inventory_fields,
 
=== modified file 'prestashoperpconnect/sale.py'
--- prestashoperpconnect/sale.py	2013-10-09 08:07:30 +0000
+++ prestashoperpconnect/sale.py	2013-10-10 08:59:47 +0000
@@ -262,18 +262,13 @@
 # TODO improve me, make the search on the sale order backend only
 @on_record_write(model_names='sale.order')
 def prestashop_sale_state_modified(session, model_name, record_id,
-                                   fields=None):
-    if 'state' in fields:
-        sale = session.pool[model_name].browse(
-            session.cr,
-            session.uid,
-            record_id
-        )
+                                   vals):
+    if 'state' in vals:
         state_list_model = 'sale.order.state.list'
         states = session.pool[state_list_model].search(
             session.cr,
             session.uid,
-            [('name', '=', sale.state)]
+            [('name', '=', vals['state'])]
         )
 
         if states:
 
=== modified file 'prestashoperpconnect_catalog_manager/product.py'
--- prestashoperpconnect_catalog_manager/product.py	2013-07-11 14:10:26 +0000
+++ prestashoperpconnect_catalog_manager/product.py	2013-10-10 08:59:47 +0000
@@ -36,28 +36,28 @@
 import openerp.addons.decimal_precision as dp
 
 @on_record_create(model_names='prestashop.product.product')
-def prestashop_product_product_create(session, model_name, record_id):
+def prestashop_product_product_create(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     export_record.delay(session, model_name, record_id)
 
 @on_record_write(model_names='prestashop.product.product')
-def prestashop_product_product_write(session, model_name, record_id, fields):
+def prestashop_product_product_write(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
-    fields = list(set(fields).difference(set(INVENTORY_FIELDS)))
+    fields = list(set(vals).difference(set(INVENTORY_FIELDS)))
     if fields:
         export_record.delay(session, model_name, record_id, fields)
 
 @on_record_write(model_names='product.product')
-def product_product_write(session, model_name, record_id, fields):
+def product_product_write(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     model = session.pool.get(model_name)
     record = model.browse(session.cr, session.uid,
                            record_id, context=session.context)
     for binding in record.prestashop_bind_ids:
-        export_record.delay(session, 'prestashop.product.product', binding.id, fields)
+        export_record.delay(session, 'prestashop.product.product', binding.id, vals.keys())
 
 
 class prestashop_product_product(orm.Model):
 
=== modified file 'prestashoperpconnect_catalog_manager/product_attribute.py'
--- prestashoperpconnect_catalog_manager/product_attribute.py	2013-06-15 21:15:57 +0000
+++ prestashoperpconnect_catalog_manager/product_attribute.py	2013-10-10 08:59:47 +0000
@@ -121,49 +121,49 @@
 
 
 @on_record_create(model_names='prestashop.product.attribute')
-def prestashop_product_attribute_created(session, model_name, record_id):
+def prestashop_product_attribute_created(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     export_record.delay(session, model_name, record_id)
 
 
 @on_record_create(model_names='prestashop.attribute.option')
-def prestashop_attribute_option_created(session, model_name, record_id):
+def prestashop_attribute_option_created(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     export_record.delay(session, model_name, record_id)
 
 @on_record_write(model_names='prestashop.product.attribute')
-def prestashop_product_attribute_written(session, model_name, record_id, fields=None):
+def prestashop_product_attribute_written(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     export_record.delay(session, model_name, record_id)
 
 @on_record_write(model_names='prestashop.attribute.option')
-def prestashop_attribute_option_written(session, model_name, record_id, fields=None):
+def prestashop_attribute_option_written(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     export_record.delay(session, model_name, record_id)
 
 @on_record_write(model_names='attribute.attribute')
-def product_attribute_written(session, model_name, record_id, fields=None):
+def product_attribute_written(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     model = session.pool.get(model_name)
     record = model.browse(session.cr, session.uid,
                            record_id, context=session.context)
     for binding in record.prestashop_bind_ids:
-        export_record.delay(session, 'prestashop.product.attribute', binding.id, fields)
+        export_record.delay(session, 'prestashop.product.attribute', binding.id, vals.keys())
 
 @on_record_write(model_names='attribute.option')
-def attribute_option_written(session, model_name, record_id, fields=None):
+def attribute_option_written(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
     model = session.pool.get(model_name)
     record = model.browse(session.cr, session.uid,
                            record_id, context=session.context)
     for binding in record.prestashop_bind_ids:
-        export_record.delay(session, 'prestashop.attribute.option', binding.id, fields)
+        export_record.delay(session, 'prestashop.attribute.option', binding.id, vals.keys())
 
 
 @prestashop