Merge 008e80b into 930bf86

connector_prestashop/models/prestashop_backend/common.py

@@ -19,6 +19,7 @@
 from ..product_supplierinfo.importer import import_suppliers
 from ..account_invoice.importer import import_refunds
 from ..product_template.importer import import_products
+from ..product_category.importer import import_categories
 from ..sale_order.importer import import_orders_since
 
 from openerp import models, fields, api
@@ -67,6 +68,8 @@ def _select_versions(self):
     )
     taxes_included = fields.Boolean("Use tax included prices")
     import_partners_since = fields.Datetime('Import partners since')
+    import_product_categories_since = fields.Datetime(
+        'Import product categories since')
     import_orders_since = fields.Datetime('Import Orders since')
     import_products_since = fields.Datetime('Import Products since')
     import_refunds_since = fields.Datetime('Import Refunds since')
@@ -155,6 +158,20 @@ def import_customers_since(self):
             )
         return True
 
+    @api.multi
+    def import_product_categories(self):
+        session = ConnectorSession(
+            self.env.cr, self.env.uid, context=self.env.context)
+        for backend_record in self:
+            since_date = self._date_as_user_tz(
+                backend_record.import_product_categories_since)
+            import_categories.delay(
+                session,
+                backend_record.id,
+                since_date,
+                priority=10)
+        return True
+
     @api.multi
     def import_products(self):
         session = ConnectorSession(

connector_prestashop/models/product_category/importer.py

@@ -6,11 +6,14 @@
 
 from ...backend import prestashop
 from ...unit.importer import (
+    import_batch,
     DelayedBatchImporter,
     TranslatableRecordImporter,
 )
+from openerp.addons.connector.queue.job import job
 from openerp.addons.connector.unit.mapper import ImportMapper, mapping
 from ...unit.mapper import backend_to_m2o
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
 _logger = logging.getLogger(__name__)
 
@@ -98,3 +101,22 @@ def _import_dependencies(self):
 @prestashop
 class ProductCategoryBatchImporter(DelayedBatchImporter):
     _model_name = 'prestashop.product.category'
+
+
+@job(default_channel='root.prestashop')
+def import_categories(session, backend_id, since_date):
+    """ Import prestashop product categories """
+    filters = None
+    if since_date:
+        filters = {'date': '1', 'filter[date_upd]': '>[%s]' % (since_date)}
+    now_fmt = datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+    import_batch(
+        session,
+        'prestashop.product.category',
+        backend_id,
+        filters,
+        priority=15
+    )
+    session.env['prestashop.backend'].browse(backend_id).write({
+        'import_product_categories_since': now_fmt
+    })

connector_prestashop/views/prestashop_model_view.xml

@@ -78,6 +78,18 @@
                                     class="oe_highlight"
                                     string="Import in background"/>
                         </group>
+                        <group>
+                            <div>
+                                <label string="Import product categories" class="oe_inline"/>
+                                <field name="import_product_categories_since"
+                                       class="oe_inline"
+                                       nolabel="1"/>
+                            </div>
+                            <button name="import_product_categories"
+                                        type="object"
+                                        class="oe_highlight"
+                                        string="Import in background"/>
+                        </group>
                         <group>
                             <div>
                                 <label string="Import product categories and products" class="oe_inline"/>