Merge lp:~gbaconnier-c2c/magentoerpconnect/magentoerpconnectv6-c2c into lp:magentoerpconnect/oerp6.0-stable

[Guewen Baconnier @ Camptocamp]

Hi,

Here is some proposal for the connector.

Revno 396: (Rationalized import of extra sales orders lines like shipping, discount, cash on delivery,... into one single method instead of a method for each one.)
On the sale order's creation, there's a method to add shipping fees. A new method appears to add gift certificates, and there is still the case of the discount coupons and the cash on delivery fees (and maybe other fees/rebates).
The behavior is the same for each of them : get the amount in the magento's data, get a product, get a tax if a tax amount is found in the magento's data and add the line to the order.
That's why instead of having 4 methods doing nearly the same things, I propose you to use the same.
I couldn't test the gift certificate and cash on delivery because I have not them on Magento, but the shipping and discount coupons are ok. I'm also not sure with my methods definitions (I first started with one method with a loop on each type and a dict to define types, but I think the version I propose here let more space for overridings) so don't put your priority on this proposal if you have not a lot of time.

Revno 398: (include_in_menu and page_layout attributes on product categories)
Configure these 2 magento's attributes from OpenERP.

Revno 399: (hooks and small refactoring to allow management of configurable products from a module)
We are going to release our module to manage configurable products very soon (as soon as you approve the hooks in magentoerpconnect in fact).
I added a hook in the method ext_export to export configurable products, the reason is clear.
A little more explanation why I modified the method create_ext_partial_shipping in stock.py :
When you order a configurable product in Magento, and do a "sales_order.info" on the API, it gives you 2 items : the configurable and the simple product. We put the configurable as a service, so it doesn't appear in the picking. But when you want to create the (partial) shipping on Magento, it expects the configurable and the simple product.
So I added the method "add_picking_line" which basically just add the line of the picking. But in our module, I do a super on that method and then I add a second line with the configurable product if so.

There is also a proposal on base_sale_multichannels in that branch :
https://code.launchpad.net/~gbaconnier-c2c/openobject-addons/extra-6.0-c2c-magento-improvements
revno 5352 : (base_sale_multichannels: configure a different payment term for each base_sale_payment_type)

Apply a payment term on sales orders based on payment types.

I'm open to change things that bother you.

Thanks !

Guewen

[lp:~gbaconnier-c2c/magentoerpconnect/magentoerpconnectv6-c2c]

400. By Guewen Baconnier @ CampToCamp <email address hidden> on 2011-03-31

[FIX] mapping for discount

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Seems Good Guewen!
Sebastien already merged the base_sale_multichannels thing and we will merge the other part as soon as we can. Thank you very much, always a pleasure to get all those improvements from CampToCamp.

[lp:~gbaconnier-c2c/magentoerpconnect/magentoerpconnectv6-c2c]

401. By Guewen Baconnier @ CampToCamp <email address hidden> on 2011-04-04

[FIX] replaced options parameter by context

402. By Guewen Baconnier @ CampToCamp <email address hidden> on 2011-04-11

[IMP] translations on product categories

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Last commit enable the translations of product categories on stores.
It correct also this bug :
- If your Magento Instance is configured with a default language of "French" and someone with an english account launch the export of catalog, or it is launched by the cron, translations are english translation instead of using the good one.

=== modified file 'magerp_data.xml'
--- magerp_data.xml	2011-01-18 18:22:58 +0000
+++ magerp_data.xml	2011-04-11 07:44:24 +0000
@@ -14,7 +14,17 @@
 			<field name="standard_price">0.0</field>
 			<field name="type">service</field>
 			<field name="name">Shipping and Handling</field>
-			<field name="exportable" eval="False" />
+			<field name="magento_exportable" eval="False" />
+			<field name="categ_id" ref="mag0"/>
+		</record>
+
+		<record id="product_product_cash_on_delivery" model="product.product">
+			<field name="default_code">CASH ON DELIVERY MAGENTO</field>
+			<field name="list_price">0.0</field>
+			<field name="standard_price">0.0</field>
+			<field name="type">service</field>
+			<field name="name">Cash on delivery</field>
+			<field name="magento_exportable" eval="False" />
 			<field name="categ_id" ref="mag0"/>
 		</record>
 
@@ -24,10 +34,20 @@
 			<field name="standard_price">0.0</field>
 			<field name="type">service</field>
 			<field name="name">Gift Certificate</field>
-			<field name="exportable" eval="False" />
+			<field name="magento_exportable" eval="False" />
 			<field name="categ_id" ref="mag0"/>
 		</record>
 
+		<record id="product_product_discount" model="product.product">
+			<field name="default_code">DISCOUNT MAGENTO</field>
+			<field name="list_price">0.0</field>
+			<field name="standard_price">0.0</field>
+			<field name="type">service</field>
+			<field name="name">Discount coupon</field>
+			<field name="magento_exportable" eval="False" />
+			<field name="categ_id" ref="mag0"/>
+		</record>
+		
         <record forcecreate="True" id="ir_cron_import_orders_scheduler_action" model="ir.cron">
             <field name="name">Magento Import Orders</field>
             <field eval="False" name="active"/>
 
=== modified file 'product.py'
--- product.py	2011-03-10 10:36:25 +0000
+++ product.py	2011-04-11 07:44:24 +0000
@@ -75,13 +75,24 @@
                     ('name', 'Name'),
                     ('price', 'Price')
                     ], 'Default Product Listing Sort (Sort By)'),
-        'magerp_stamp':fields.datetime('Magento stamp')
+        'magerp_stamp':fields.datetime('Magento stamp'),
+        'include_in_menu': fields.boolean('Include in Navigation Menu'),
+        'page_layout': fields.selection([
+                    ('None', 'No layout updates'),
+                    ('empty', 'Empty'),
+                    ('one_column', '1 column'),
+                    ('two_columns_left', '2 columns with left bar'),
+                    ('two_columns_right', '2 columns with right bar'),
+                    ('three_columns', '3 columns'),
+                    ], 'Page Layout'),        
         }
     _defaults = {
         'display_mode':lambda * a:'PRODUCTS',
         'available_sort_by':lambda * a:'None',
         'default_sort_by':lambda * a:'None',
-        'level':lambda * a:1
+        'level':lambda * a:1,
+        'include_in_menu': lambda * a:True,
+        'page_layout': lambda * a:'None'
                  }
     
     def write(self, cr, uid, ids, vals, context=None):
@@ -114,27 +125,45 @@
         ids = [id for id in ids if id in ids_exportable] #we need to kept the order of the categories
         
         shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
-        
+
+        context_dic = [context.copy()]
+        context_dic[0]['export_url'] = True # for the magento version 1.3.2.4, only one url is autorized by category, so we only export with the MAPPING TEMPLATE the url of the default language
+        context_dic[0]['lang'] = shop.referential_id.default_lang_id.code
+
+        for storeview in shop.storeview_ids:
+            if storeview.lang_id and storeview.lang_id.code != shop.referential_id.default_lang_id.code:
+                context_dic += [context.copy()]
+                context_dic[len(context_dic)-1].update({'storeview_code': storeview.code, 'lang': storeview.lang_id.code})
+
         if shop.last_products_export_date:
             last_exported_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(shop.last_products_export_date, '%Y-%m-%d %H:%M:%S')))
         else:
             last_exported_time = False
-        
-        cr.execute("select write_date, create_date from product_category where id in %s", (tuple(ids),))
-        read = cr.fetchall()
-        for categ in read:
-            last_updated_categ = categ[0] and categ[0].split('.')[0] or categ[1] and categ[1].split('.')[0] or False
-            last_updated_categ_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(last_updated_categ, '%Y-%m-%d %H:%M:%S')))
-            if last_updated_categ_time and last_exported_time:
-                if last_exported_time - datetime.timedelta(seconds=1) < last_updated_categ_time:
-                    context['force'] = True
-                    res = super(product_category, self).ext_export(cr, uid, ids, external_referential_ids, defaults, context)
-                    break
-        if not res:
-            context['force'] = True
-            res = super(product_category, self).ext_export(cr, uid, ids, external_referential_ids, defaults, context)
+
+        if not last_exported_time:
+            for ctx_storeview in context_dic:
+                ctx_storeview['force'] = True
+                res = super(product_category, self).ext_export(cr, uid, ids, external_referential_ids, defaults, ctx_storeview)
+        else:
+            cr.execute("select write_date, create_date from product_category where id in %s", (tuple(ids),))
+            read = cr.fetchall()
+            for categ in read:
+                last_updated_categ = categ[0] and categ[0].split('.')[0] or categ[1] and categ[1].split('.')[0] or False
+                last_updated_categ_time = datetime.datetime.fromtimestamp(time.mktime(time.strptime(last_updated_categ, '%Y-%m-%d %H:%M:%S')))
+                if last_updated_categ_time and last_exported_time:
+                    if last_exported_time - datetime.timedelta(seconds=1) < last_updated_categ_time:
+                        for ctx_storeview in context_dic:
+                            ctx_storeview['force'] = True
+                            res = super(product_category, self).ext_export(cr, uid, ids, external_referential_ids, defaults, ctx_storeview)
+                        break
         return res
-                
+
+    def try_ext_update(self, cr, uid, data, conn, method, oe_id, external_id, ir_model_data_id, create_method, context):
+        if context.get('storeview_code', False):
+            return conn.call(method, [external_id, data, context.get('storeview_code', False)])
+        else:
+            return conn.call(method, [external_id, data])    
+
 product_category()
 
 
@@ -899,7 +928,10 @@
         res = super(magerp_osv.magerp_osv, self).ext_create(cr, uid, [product_type, attr_set_id, sku, data], conn, method, oe_id, context)
         self.write(cr, uid, oe_id, {'magento_sku': sku})
         return res
-    
+
+    def ext_export_configurable(self, cr, uid, id, external_referential_ids=None, defaults=None, context=None):
+        raise osv.except_osv(_("Not Implemented"), _("Configurable products are not implemented."))    
+
     def ext_export(self, cr, uid, ids, external_referential_ids=None, defaults=None, context=None):
         if context is None:
             context = {}
@@ -999,6 +1031,8 @@
                             self.ext_export(cr, uid, child_ids, external_referential_ids, defaults, context) #so we export them
                 else:
                     logger.notifyChannel('ext synchro', netsvc.LOG_ERROR, "OpenERP 'grouped' products will export to Magento as 'grouped products' only if they have a BOM and if the 'mrp' BOM module is installed")
+            elif product_type == 'configurable':
+                self.ext_export_configurable(cr, uid, id, external_referential_ids, defaults, context)
             for context_storeview in context_dic:
                 temp_result = super(magerp_osv.magerp_osv, self).ext_export(cr, uid, [id], external_referential_ids, defaults, context_storeview)
                 if child_ids: 
@@ -1030,6 +1064,7 @@
                 is_in_stock = int(virtual_available > 0)
                 context['conn_obj'].call('product_stock.update', [product.magento_sku, {'qty': virtual_available, 'is_in_stock': is_in_stock}])
                 logger.notifyChannel('ext synchro', netsvc.LOG_INFO, "Successfully updated stock level at %s for product with SKU %s " %(virtual_available, product.magento_sku))
+        return True
 
     def ext_grouped_product_assign(self, cr, uid, parent_id, child_ids, quantities, context):
         logger = netsvc.Logger()
 
=== modified file 'product_view.xml'
--- product_view.xml	2011-03-18 16:31:46 +0000
+++ product_view.xml	2011-04-11 07:44:24 +0000
@@ -22,6 +22,7 @@
 										<field name="meta_description" colspan="2" />
 										<field name="url_key" colspan="2" />
 										<field name="level" colspan="2" />
+                                        <field name="include_in_menu" colspan="2" />
 									</group>
 									<group col="1" colspan="1">
 										<separator string="Category Image" />
@@ -51,6 +52,8 @@
 								<separator string="Sorting method" colspan="4" />
 								<field name="available_sort_by" />
 								<field name="default_sort_by" />
+								<separator string="Page Layout" colspan="4" />
+								<field name="page_layout" nolabel="1" />
 							</page>
 						</notebook>
 					</group>
 
=== modified file 'sale.py'
--- sale.py	2011-04-02 14:58:57 +0000
+++ sale.py	2011-04-11 07:44:24 +0000
@@ -384,49 +384,83 @@
                 res['order_line'] = lines_vals
         return res
 
-    def add_gift_certificates(self, cursor, user, order_values, 
-            magento_order_data, context):
-        '''Add gift certificate as a separate line item with single quantity 
-        and negative amount. Known to work with Unigry gift certificates also
-        '''
-        product_obj = self.pool.get('product.product')
-        if ('giftcert_amount' in magento_order_data) and \
-            (float(magento_order_data.get('giftcert_amount', 0)) > 0):
-            gift_product_ids = product_obj.search(cursor, user, 
-                [('default_code', '=', 'GIFT CERTIFICATE')], context=context)
-            if gift_product_ids:
-                gift_product = product_obj.browse(
-                    cursor, user, gift_product_ids[0], context)
-                gift_cert_code = magento_order_data['giftcert_code']
-                order_values['order_line'].append((0, 0, {
-                    'product_id': gift_product.id,
-                    'name': 'Gift Certificate %s' % gift_cert_code,
-                    'product_uom': gift_product.uom_id.id,
-                    'product_uom_qty': 1,
-                    'price_unit': -float(magento_order_data['giftcert_amount']),
-                    }))
-        return order_values
-
-    def get_order_shipping(self, cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
-        ship_product_id = self.pool.get('product.product').search(cr, uid, [('default_code', '=', 'SHIP MAGENTO')])[0]
-        ship_product = self.pool.get('product.product').browse(cr, uid, ship_product_id, context)
-        
-        #simple VAT tax on shipping (else override method):
+    def add_order_extra_line(self, cr, uid, res, data_record, ext_field, product_code, context):
+        """ Add or substract amount on order as a separate line item with single quantity for each type of amounts like :
+        shipping, cash on delivery, discount, gift certificates...
+        Arguments :
+        ext_field: name of the field in data_record where the amount is stored
+        product_code: code of the product to use in the sale order line
+        Optional arguments in kwargs:
+        sign: multiply the amount with the sign to add or substract it from the sale order
+        ext_tax_field: name of the field in data_record where the tax amount is stored
+        ext_code_field: name of the field in data_record containing a code (for coupons and gift certificates) which will be printed on the product name
+        """
+        sign = 'sign' in context and context['sign'] or 1
+        ext_tax_field = 'ext_tax_field' in context and context['ext_tax_field'] or None
+        ext_code_field = 'ext_code_field' in context and context['ext_code_field'] or None
+
+        product_id = self.pool.get('product.product').search(cr, uid, [('default_code', '=', product_code)])[0]
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context)
+        amount = float(data_record[ext_field]) * sign
+
         tax_id = []
-        if data_record['shipping_tax_amount'] and float(data_record['shipping_tax_amount']) != 0:
-            ship_tax_vat = float(data_record['shipping_tax_amount'])/float(data_record['shipping_amount'])
-            ship_tax_ids = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>=', ship_tax_vat - 0.001), ('amount', '<=', ship_tax_vat + 0.001)])
-            if ship_tax_ids and len(ship_tax_ids) > 0:
-                tax_id = [(6, 0, [ship_tax_ids[0]])]
+        if ext_tax_field:
+            if data_record[ext_tax_field] and float(data_record[ext_tax_field]) != 0:
+                tax_vat = abs(float(data_record[ext_tax_field]) / amount)
+                tax_ids = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>=', tax_vat - 0.001), ('amount', '<=', tax_vat + 0.001)])
+                if tax_ids and len(tax_ids) > 0:
+                    tax_id = [(6, 0, [tax_ids[0]])]
+
+        name = product.name
+        if ext_code_field and data_record.get(ext_code_field, False):
+            name = "%s [%s]" % (name, data_record[ext_code_field])
+
         res['order_line'].append((0, 0, {
-                                    'product_id': ship_product.id,
-                                    'name': ship_product.name,
-                                    'product_uom': ship_product.uom_id.id,
+                                    'product_id': product.id,
+                                    'name': name,
+                                    'product_uom': product.uom_id.id,
                                     'product_uom_qty': 1,
-                                    'price_unit': float(data_record['shipping_amount']),
+                                    'price_unit': amount,
                                     'tax_id': tax_id
                                 }))
         return res
+
+    def add_order_shipping(self, cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
+        if data_record.get('shipping_amount', False) and float(data_record.get('shipping_amount', False)) > 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_tax_field': 'shipping_tax_amount',
+            })
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'shipping_amount', 'SHIP MAGENTO', ctx)
+        return res
+
+    def add_gift_certificates(self, cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
+        if data_record.get('giftcert_amount', False) and float(data_record.get('giftcert_amount', False)) > 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_code_field': 'giftcert_code',
+                'sign': -1,
+            })
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'giftcert_amount', 'GIFT CERTIFICATE', ctx)
+        return res
+
+    def add_discount(self, cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
+        if data_record.get('discount_amount', False) and float(data_record.get('discount_amount', False)) < 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_code_field': 'coupon_code',
+            })
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'discount_amount', 'DISCOUNT MAGENTO', ctx)
+        return res
+
+    def add_cash_on_delivery(self, cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
+        if data_record.get('cod_fee', False) and float(data_record.get('cod_fee', False)) > 0:
+            ctx = context.copy()
+            ctx.update({
+                'ext_tax_field': 'cod_tax_amount',
+            })
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'cod_fee', 'CASH ON DELIVERY MAGENTO', ctx)
+        return res
     
     def oevals_from_extdata(self, cr, uid, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
         if not context.get('one_by_one', False):
@@ -439,9 +473,10 @@
             if data_record.get('items', False):
                 try:
                     res = self.get_order_lines(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
-                    if data_record.get('shipping_amount', False) and float(data_record.get('shipping_amount', False)) > 0:
-                        res = self.get_order_shipping(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
-                    res = self.add_gift_certificates(cr, uid, res, data_record, context)
+                    res = self.add_order_shipping(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
+                    res = self.add_gift_certificates(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
+                    res = self.add_discount(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
+                    res = self.add_cash_on_delivery(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
                 except Exception, e:
                     print "order has errors with items lines, data are: ", data_record
                     print e
 
=== modified file 'settings/external.mappinglines.template.csv'
--- settings/external.mappinglines.template.csv	2010-12-14 21:01:23 +0000
+++ settings/external.mappinglines.template.csv	2011-04-11 07:44:24 +0000
@@ -35,7 +35,7 @@
 "mag_erp_soline_uomqty","magento1324","sale.model_sale_order_line","qty_ordered","in_out","str","result=[('product_uom_qty',ifield)]",
 "mag_erp_soline_uosqty","magento1324","sale.model_sale_order_line","qty_ordered","in","str","result=[('product_uos_qty',ifield)]",
 "mag_erp_soline_price","magento1324","sale.model_sale_order_line","price","in","str","result=[('price_unit', float(data['row_total'])/float(data['qty_ordered']))]",
-"mag_erp_soline_disc","magento1324","sale.model_sale_order_line","discount_amount","in","str","result=[('discount', float(data['price']) != 0 and float(data['qty_ordered']) != 0 and float(100*float(ifield))/(float(data['price'])*float(data['qty_ordered'])) or 0)]",
+"mag_erp_soline_disc","magento1324","sale.model_sale_order_line","discount_amount","in","str","result=[('discount', 0.0)]",
 "mag_erp_procat_2","magento1324","product.model_product_category","level","in","int","result=[('sequence',ifield),('level',ifield)]",
 "mag_erp_procat_3","magento1324","product.model_product_category","parent_id","in_out","int","record_id = self.pool.get('ir.model.data').search(cr, uid, [('model', '=', self._name), ('name', '=', self.prefixed_id(ifield))])
 parent_id = False
@@ -46,7 +46,7 @@
 if record.get('parent_id',False):
 	magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
 	if not magento_parent_id:
-		self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[external_referential_id],{},{'conn_obj':conn})
+		self.ext_export(cr,uid,[record.get('parent_id',[False])[0]],[external_referential_id],{},context=context)
 		magento_parent_id = self.oeid_to_extid(cr, uid, record.get('parent_id')[0], external_referential_id)
 if magento_parent_id:
 	result = [('parent_id',magento_parent_id)]"
@@ -55,7 +55,8 @@
 "mag_erp_procat_6","magento1324","product.model_product_category","meta_title","in_out","str","result=[('meta_title',ifield)]","result=[('meta_title',record['meta_title'])]"
 "mag_erp_procat_7","magento1324","product.model_product_category","meta_keywords","in_out","str","result=[('meta_keywords',ifield)]","result=[('meta_keywords',record['meta_keywords'])]"
 "mag_erp_procat_8","magento1324","product.model_product_category","meta_description","in_out","str","result=[('meta_description',ifield)]","result=[('meta_description',record['meta_description'])]"
-"mag_erp_procat_9","magento1324","product.model_product_category","url_key","in_out","str","result=[('url_key',ifield)]","result=[('url_key',record['url_key'])]"
+"mag_erp_procat_9","magento1324","product.model_product_category","url_key","in_out","str","result=[('url_key',ifield)]","if context.get('export_url', False) :
+    result=[('url_key',record['url_key'])]"
 "mag_erp_procat_10","magento1324","product.model_product_category","name","in_out","str","result=[('name',ifield or 'UNDEFINED'),('magento_exportable',True)]","result=[('name',record['name'])]"
 "mag_erp_procat_11","magento1324","product.model_product_category","is_anchor","in_out","str","result=[('is_anchor',ifield and bool(eval(ifield)) or False)]","result=[('is_anchor',record['is_anchor'])]"
 "mag_erp_procat_12","magento1324","product.model_product_category","available_sort_by","in_out","str","result=[('available_sort_by',ifield)]","result=[('available_sort_by',record['available_sort_by'] or 'name')]"
@@ -77,6 +78,11 @@
 	result = [('image',record['image_name'])]
 else:
 	result=[]"
+"mag_erp_procat_16","magento1324","product.model_product_category","include_in_menu","in_out","str","result=[('include_in_menu', ifield and (eval(ifield)) or False)]","result=[('include_in_menu',record['include_in_menu'])]"
+"mag_erp_procat_17","magento1324","product.model_product_category","page_layout","in_out","str","if ifield:
+    result=[('page_layout',ifield)]
+else:
+    result=[('page_layout','None')]","result=[('page_layout', record['page_layout'] or '')]"
 "mag_erp_attrgrp_2","magento1324","model_magerp_product_attribute_groups","attribute_set_id","in_out","int","result=[('attribute_set_id', ifield)]","result=[('attribute_set_id', record['attribute_set_id'])]"
 "mag_erp_attrgrp_3","magento1324","model_magerp_product_attribute_groups","attribute_group_name","in_out","str","result=[('attribute_group_name', ifield)]","result=[('attribute_group_name', record['attribute_group_name'])]"
 "mag_erp_attrgrp_4","magento1324","model_magerp_product_attribute_groups","sort_order","in_out","int","result=[('sort_order', ifield)]","result=[('sort_order', record['sort_order'])]"
 
=== modified file 'stock.py'
--- stock.py	2010-11-15 20:46:10 +0000
+++ stock.py	2011-04-11 07:44:24 +0000
@@ -35,8 +35,15 @@
             ext_shipping_id = conn.call('sales_order_shipment.create', [magento_incrementid, {}, _("Shipping Created"), True, True])
         except Exception, e:
             logger.notifyChannel(_("Magento Call"), netsvc.LOG_ERROR, _("The picking from the order %s can't be created on Magento, please attach it manually, %s") % (magento_incrementid, e))
-        return ext_shipping_id        
+        return ext_shipping_id
 
+    def add_picking_line(self, cr, uid, lines, picking_line, context):
+        """ A line to add in the shipping is a dict with : product_id and product_qty keys."""
+        line_info = {'product_id': picking_line.product_id.id,
+                     'product_qty': picking_line.product_qty,
+        }
+        lines.append(line_info)
+        return lines
 
     def create_ext_partial_shipping(self, cr, uid, id, external_referential_id, magento_incrementid, context):
         logger = netsvc.Logger()
@@ -48,11 +55,17 @@
             product_2_item.update({self.pool.get('product.product').extid_to_oeid(cr, uid, item['product_id'], external_referential_id, context={}): item['item_id']})
         picking = self.pool.get('stock.picking').browse(cr, uid, id, context)
         item_qty = {}
+
+        lines = []
+        # get product and quantities to ship from the picking
         for line in picking.move_lines:
-            if item_qty.get(product_2_item[line.product_id.id], False):
-                item_qty[product_2_item[line.product_id.id]] += line.product_qty
+            lines = self.add_picking_line(cr, uid, lines, line, context)
+
+        for line in lines:
+            if item_qty.get(product_2_item[line['product_id']], False):
+                item_qty[product_2_item[line['product_id']]] += line['product_qty']
             else:
-                item_qty.update({product_2_item[line.product_id.id]:line.product_qty})
+                item_qty.update({product_2_item[line['product_id']]: line['product_qty']})
         try:
             ext_shipping_id = conn.call('sales_order_shipment.create', [magento_incrementid, item_qty, _("Shipping Created"), True, True])
         except Exception, e: