Merge lp:~akretion-team/openerp-connector-magento/7-flag-sync-in-storeview-cde into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0-next-release

[Chafique DELLI]

add synchronization flag for sale order import from a Storeview

add synchronization flag for sale order import from a Storeview
concrete use cases: a Storeview is active on Magento but we do not want to manage the orders of this Storeview on OpenERP.

[lp:~akretion-team/openerp-connector-magento/7-flag-sync-in-storeview-cde]

989. By Chafique DELLI on 2014-05-23

[IMP] add help on field no_import_sync

[David BEAL (ak) (davidbeal)]

LGTM to me, no test

Thanks for the contribution

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi,

thanks for the proposal.

A field named 'no_import_sync' should deactivate *all* the synchros of the store view, in that case, I wonder if it could have more impact and the help message should now be focused on the import of sales orders.

If it should really disable only the sales orders, the name should be more specific, like 'no_sales_order_sync'.

review: Needs Fixing

[lp:~akretion-team/openerp-connector-magento/7-flag-sync-in-storeview-cde]

990. By Chafique DELLI on 2014-05-23

[IMP] modification of the fields named "no_import_sync" for a more specific name "no_sales_order_sync"

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM
Thanks

review: Approve (code review)

[David BEAL (ak) (davidbeal)]

LGTM
Thanks

review: Approve

[Chafique DELLI (chafique-delli)]

Thank you Guewen and David for the Review.

Regards

Le 26/05/2014 09:59, Guewen Baconnier @ Camptocamp a écrit :
> Review: Approve code review
>
> LGTM
> Thanks

--
Chafique DELLI
www.akretion.com/fr
intégration OpenERP
35B rue Montgolfier
69100 Villeurbanne
Email: <email address hidden>
Tél.[phone]

=== modified file 'magentoerpconnect/magento_model.py'
--- magentoerpconnect/magento_model.py	2014-05-06 09:33:40 +0000
+++ magentoerpconnect/magento_model.py	2014-05-23 14:36:06 +0000
@@ -287,7 +287,7 @@
     def _scheduler_import_product_categories(self, cr, uid, domain=None, context=None):
         self._magento_backend(cr, uid, self.import_product_categories,
                               domain=domain, context=context)
-        
+
     def _scheduler_import_product_product(self, cr, uid, domain=None, context=None):
         self._magento_backend(cr, uid, self.import_product_product,
                               domain=domain, context=context)
@@ -484,6 +484,14 @@
             'Import sale orders from date',
             help='do not consider non-imported sale orders before this date. '
                  'Leave empty to import all sale orders'),
+        'no_sales_order_sync': fields.boolean(
+            'No Sales Order Synchronization',
+            help='Check if the storeview is active in Magento '
+                 'but its sales orders should not be imported.'),
+    }
+
+    _defaults = {
+        'no_sales_order_sync': False,
     }
 
     _sql_constraints = [
@@ -495,6 +503,11 @@
         session = ConnectorSession(cr, uid, context=context)
         import_start_time = datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         for storeview in self.browse(cr, uid, ids, context=context):
+            if storeview.no_sales_order_sync:
+                _logger.debug("The storeview '%s' is active in Magento "
+                              "but its sales orders should not be imported." %
+                              storeview.name)
+                continue
             backend_id = storeview.backend_id.id
             if storeview.import_orders_from_date:
                 from_date = datetime.strptime(

=== modified file 'magentoerpconnect/magento_model_view.xml'
--- magentoerpconnect/magento_model_view.xml	2014-04-04 08:46:16 +0000
+++ magentoerpconnect/magento_model_view.xml	2014-05-23 14:36:06 +0000
@@ -309,6 +309,7 @@
                             <field name="store_id"/>
                             <field name="sort_order"/>
                             <field name="enabled"/>
+                            <field name="no_sales_order_sync"/>
                         </group>
                         <group string="Options">
                             <field name="lang_id" widget="selection"/>
@@ -326,7 +327,8 @@
                                   <button name="import_sale_orders"
                                           type="object"
                                           class="oe_highlight"
-                                          string="Import Sale Orders"/>
+                                          string="Import Sale Orders"
+                                          attrs="{'invisible': [('no_sales_order_sync', '=', True)]}"/>
 
                                 </group>
                             </page>
@@ -346,6 +348,7 @@
                     <field name="name"/>
                     <field name="code"/>
                     <field name="enabled"/>
+                    <field name="no_sales_order_sync"/>
                     <field name="sort_order"/>
                     <field name="store_id"/>
                 </tree>