Merge lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-stock-config-1070726 into lp:magentoerpconnect/oerp6.1-oldstable

[Guewen Baconnier @ Camptocamp]

lp:1070726

Allows to choose if the product should:
 * have a stock
 * not have a stock
 * use the default configuration of magento

A sql query in the init of the module ensures that the values are initialized to "use_default" when we update the module.

That's basically a port of this feature from the the oerp6.1-stable branch.

[lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-stock-config-1070726]

567. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-10-24

[FIX] debug? no!

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I would be glad to have someone review my branch.

Thanks

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

LGTM

review: Approve (code review, no test)

=== modified file 'magentoerpconnect/magerp_osv.py'
--- magentoerpconnect/magerp_osv.py	2012-07-05 12:55:29 +0000
+++ magentoerpconnect/magerp_osv.py	2012-10-24 13:13:21 +0000
@@ -116,7 +116,10 @@
                 self.logger.error(_("Method: %s\nArguments:%s\nError:%s"), method, arguments, e, exc_info=True)
                 self.logger.warn(_("Webservice Failure, sleeping %s second before next attempt"), sleep_time)
                 time.sleep(sleep_time)
-        raise
+                raise
+            except xmlrpclib.Fault, exc:
+                self.logger.error('call to %s%s failed: %s', method, tuple(arguments), exc)
+                raise
 
 
     def fetch_image(self, imgloc):
 
=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2012-08-23 13:28:10 +0000
+++ magentoerpconnect/product.py	2012-10-24 13:13:21 +0000
@@ -1161,17 +1161,29 @@
         'tier_price':fields.one2many('product.tierprice', 'product', 'Tier Price'),
         'product_type': fields.selection(_product_type_get, 'Magento Product Type'),
         'magento_exported': fields.function(_is_magento_exported, type="boolean", method=True, string="Exists on Magento"),  # used to set the sku readonly when already exported
+        'mag_manage_stock': fields.selection([
+                                ('use_default','Use Default Config'),
+                                ('no', 'Do Not Manage Stock'),
+                                ('yes','Manage Stock')],
+                                'Manage Stock Level', required=True),
         }
 
     _defaults = {
         'magento_exportable': True,
         'product_type': 'simple',
+        'mag_manage_stock': 'use_default',
     }
 
     _sql_constraints = [
         ('magento_sku_uniq', 'unique (magento_sku)', 'The Magento SKU should be uniq!'),
     ]
 
+    def init(self, cr):
+        """Initialize the empty magento manage stock option to the use_default when we
+        update the module"""
+        cr.execute("UPDATE product_product SET mag_manage_stock = 'use_default' "
+                   "WHERE mag_manage_stock IS NULL")
+
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('referential_id', False):
             instance = vals['referential_id']
@@ -1541,6 +1553,8 @@
                        'virtual_available')
         stock_quantity = product[stock_field]
         return {'qty': stock_quantity,
+                'manage_stock': int(product.mag_manage_stock == 'yes'),
+                'use_config_manage_stock': int(product.mag_manage_stock == 'use_default'),
                 # put the stock availability to "out of stock"
                 'is_in_stock': int(stock_quantity > 0)}
 
 
=== modified file 'magentoerpconnect/product_view.xml'
--- magentoerpconnect/product_view.xml	2012-03-28 09:58:18 +0000
+++ magentoerpconnect/product_view.xml	2012-10-24 13:13:21 +0000
@@ -280,6 +280,7 @@
                         <field name="set" select="2" attrs="{'required':[('magento_exportable','==',True)], 'readonly': [('magento_exported', '=', True)]}"/>
                         <field name="magento_sku" select="2" attrs="{'required':[('magento_exportable','==',True)]}"/>
                         <field name="product_type" select="2" attrs="{'required':[('magento_exportable','==',True)]}"/>
+                        <field name="mag_manage_stock" select="2" attrs="{'required':[('magento_exportable','==',True)]}"/>
                         <field name="magento_exportable"/>
                         <field name="magento_exported" invisible="1" />
                     </group>