Merge lp:~sebastien.beau/magentoerpconnect/oerp6.1-stable-minor-improvement into lp:magentoerpconnect/oerp6.1-stable

[Sébastien BEAU - http://www.akretion.com]

[lp:~sebastien.beau/magentoerpconnect/oerp6.1-stable-minor-improvement]

699. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[IMP] magentoerpconnect: to support more kind of filter when doing a search check if the filter is not already a list/tupple if it's the case then we do not put the list in a list

Unmerged revisions

699. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[IMP] magentoerpconnect: to support more kind of filter when doing a search check if the filter is not already a list/tupple if it's the case then we do not put the list in a list

698. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[MERGE] merge with stable and solve conflict

697. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[FIX] magentoerpconnect_product_variant: remove broken mapping

696. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[FIX] magentoerpconnect_magento_invoice: fix the invoice date, it should be the same in the to system

695. By Sébastien BEAU - http://www.akretion.com on 2013-06-09

[FIX] magentoerpconnect_bundle_split: fix indentation

694. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[IMP] complete mapping for invoice

693. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[IMP] improve message error when carrier method have an invalid magento code

692. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[REF] refactor the carrier mapping, move it out of the mapping and replace it by a python function. It's more simple to overwrite. This is needed for exemple for the delivery module connected to the French carrier

691. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[FIX] magentoerpconnect: fix import of order without shipping address

690. By Sébastien BEAU - http://www.akretion.com on 2013-06-08

[FIX] remove useless "space"

=== modified file 'magentoerpconnect/delivery.py'
--- magentoerpconnect/delivery.py	2012-08-21 15:34:50 +0000
+++ magentoerpconnect/delivery.py	2013-06-09 02:36:28 +0000
@@ -63,10 +63,11 @@
                 _("Error"),
                 _("The carrier %s doesn't have a magento_code valid !"
                   "The value %s is not in the carrier list %s "
-                  "allowed by Magento") %
+                  "allowed by Magento. Please fix it before trying"
+                  " to export again the picking  %s") %
                 (carrier['name'],
                  carrier['magento_carrier_code'],
-                 mag_carrier.keys()))
+                 mag_carrier.keys(),context['picking_name']))
         return True
 delivery_carrier()
 

=== modified file 'magentoerpconnect/invoice.py'
--- magentoerpconnect/invoice.py	2012-12-03 15:05:27 +0000
+++ magentoerpconnect/invoice.py	2013-06-09 02:36:28 +0000
@@ -138,7 +138,7 @@
                                                      context=context)
 
     def export_invoice(self, cr, uid, ids, context=None):
-        for invoice in self .browse(cr, uid, ids, context=context):
+        for invoice in self.browse(cr, uid, ids, context=context):
             self._export_one_invoice(cr, uid, invoice, context=context)
         return True
 

=== modified file 'magentoerpconnect/magerp_osv.py'
--- magentoerpconnect/magerp_osv.py	2012-08-21 15:34:50 +0000
+++ magentoerpconnect/magerp_osv.py	2013-06-09 02:36:28 +0000
@@ -93,7 +93,9 @@
             raise except_osv(_('User Error'),
                 _('There is no "List Method" configured on the mapping %s') %
                 mapping[mapping_id]['model'])
-        return external_session.connection.call(search_read_method, [resource_filter or {}])
+        if not type(resource_filter) in [list, tuple]:
+            resource_filter = [resource_filter or {}]
+        return external_session.connection.call(search_read_method, resource_filter)
 
 Model._get_external_resources = _get_external_resources
 

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2013-05-13 11:36:53 +0000
+++ magentoerpconnect/sale.py	2013-06-09 02:36:28 +0000
@@ -428,11 +428,37 @@
             local_defaults[address_key]['partner_id'] = partner_id
         return local_defaults
 
+    def get_magento_carrier_info(self, cr, uid, resource, context=None):
+        if 'shipping_method' in resource:
+            method = resource['shipping_method']
+            carrier_obj = self.pool['delivery.carrier']
+            partner_obj = self.pool['res.partner']
+            carrier_ids = carrier_obj.search(cr, uid, [
+                            ('magento_code', '=', method)
+                        ], context=context)
+            if carrier_ids:
+                carrier_id = carrier_ids[0]
+            else:
+                fake_partner_id = partner_obj.search(cr, uid, [])[0]
+                model_data_obj = self.pool['ir.model.data']
+                model, product_id = model_data_obj.get_object_reference(cr, uid,
+                        'base_sale_multichannels', 'product_product_shipping')
+                carrier_id = carrier_obj.create(cr, uid, {
+                        'partner_id': fake_partner_id,
+                        'product_id': product_id,
+                        'name': method,
+                        'magento_code': method,
+                    }, context=context)
+            return {'carrier_id': carrier_id}
+        return {}
+
     @only_for_referential('magento')
     def _transform_one_resource(self, cr, uid, external_session, convertion_type, resource, mapping, mapping_id, \
                      mapping_line_filter_ids=None, parent_data=None, previous_result=None, defaults=None, context=None):
         resource = self.clean_magento_resource(cr, uid, resource, context=context)
         resource = self.clean_magento_items(cr, uid, resource, context=context)
+        result = self.get_magento_carrier_info(cr, uid, resource, context=context)
+
         for line in mapping[mapping_id]['mapping_lines']:
             if line['name'] == 'customer_id' and not resource.get('customer_id'):
                 #If there is not partner it's a guest order
@@ -445,9 +471,12 @@
                 resource['shipping_address'].pop('customer_id', None)
                 defaults = self.create_onfly_partner(cr, uid, external_session, resource, mapping, defaults, context=context)
 
-        return super(sale_order, self)._transform_one_resource(cr, uid, external_session, convertion_type, resource,\
+        result.update(super(sale_order, self)._transform_one_resource(cr, uid, external_session, convertion_type, resource,\
                  mapping, mapping_id,  mapping_line_filter_ids=mapping_line_filter_ids, parent_data=parent_data,\
-                 previous_result=previous_result, defaults=defaults, context=context)
+                 previous_result=previous_result, defaults=defaults, context=context))
+        return result
+
+
 
     @only_for_referential('magento')
     def _get_external_resource_ids(self, cr, uid, external_session, resource_filter=None, mapping=None, mapping_id=None, context=None):
@@ -617,7 +646,7 @@
         else:
             if not resource['billing_address'].get('customer_id'):
                 resource['billing_address']['customer_id'] = resource['customer_id']
-            if not resource['shipping_address'].get('customer_id'):
+            if resource['shipping_address'] and not resource['shipping_address'].get('customer_id'):
                 resource['shipping_address']['customer_id'] = resource['customer_id']
         return resource
 

=== modified file 'magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv'
--- magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv	2012-05-19 11:35:11 +0000
+++ magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv	2013-06-09 02:36:28 +0000
@@ -12,5 +12,5 @@
 mag1500_res_partner,,magentoerpconnect.magento1500,account.model_res_partner,customer.list,customer.info,customer.update,customer.create,,,,customer_id,
 mag1500_sale_shop,,magentoerpconnect.magento1500,base_sale_multichannels.model_sale_shop,ol_groups.list,,,,,,,group_id,
 mag1500_sale_order,,magentoerpconnect.magento1500,base_sale_multichannels.model_sale_order,sales_order.list,sales_order.info,,,,sales_order.search,sales_order.done,increment_id,
-mag1500_account_invoice,,magentoerpconnect.magento1500,account.model_account_invoice,,,,,,,,,
+mag1500_account_invoice,,magentoerpconnect.magento1500,account.model_account_invoice,,order_invoice.info,,,,,,,
 mag1500_product_link,,magentoerpconnect.magento1500,magentoerpconnect.model_product_link,,,,,,,,,

=== modified file 'magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv	2013-02-26 12:15:30 +0000
+++ magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv	2013-06-09 02:36:28 +0000
@@ -18,16 +18,6 @@
 ",,,
 mag1500_sale_order_gift_certificates_amount=>,,in,function,giftcert_amount,,float,False,mag1500_sale_order,gift_certificates_amount,"result=[('gift_certificates_amount', ifield)]",,,
 mag1500_sale_order_gift_certificates_code=>,,in,function,giftcert_code,,unicode,False,mag1500_sale_order,gift_certificates_code,"result = [('gift_certificates_code', ifield)]",,,
-mag1500_sale_order_carrier_id=>,,in,function,shipping_method,,unicode,False,mag1500_sale_order,carrier_id,"if ifield:
-    carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('magento_code', '=', ifield)])
-    if carrier_ids:
-        result=[('carrier_id', carrier_ids[0])]
-    else:
-        fake_partner_id = self.pool.get('res.partner').search(cr, uid, [])[0]
-        model_data_obj = self.pool.get('ir.model.data')
-        model, product_id = model_data_obj.get_object_reference(cr, uid, 'base_sale_multichannels', 'product_product_shipping')
-        carrier_id = self.pool.get('delivery.carrier').create(cr, uid, {'partner_id' : fake_partner_id, 'product_id' : product_id, 'name' : ifield, 'magento_code' : ifield})
-        result=[('carrier_id', carrier_id)]",,,
 mag1500_sale_order_shipping_amount_tax_included=>,,in,function,base_shipping_incl_tax,,float,False,mag1500_sale_order,shipping_amount_tax_included,"amount_tax_inc = float(resource.get('base_shipping_incl_tax', 0.0)) - float(resource.get('shipping_discount_amount', 0.0))
 amount_tax_exc = float(resource.get('shipping_amount', 0))
 

=== modified file 'magentoerpconnect/stock.py'
--- magentoerpconnect/stock.py	2013-01-29 08:13:16 +0000
+++ magentoerpconnect/stock.py	2013-06-09 02:36:28 +0000
@@ -86,6 +86,9 @@
             carrier_id = carrier_id[0]
 
         if carrier_id and picking.carrier_tracking_ref:
+            if context is None: context = {}
+            picking = self.browse(cr, uid, id, context=context)
+            context['picking_name'] = picking.name
             self.pool.get('delivery.carrier').check_ext_carrier_reference(
                     cr, uid, carrier_id, magento_incrementid, context)
 

=== modified file 'magentoerpconnect_bundle_split/sale.py'
--- magentoerpconnect_bundle_split/sale.py	2012-10-08 15:55:39 +0000
+++ magentoerpconnect_bundle_split/sale.py	2013-06-09 02:36:28 +0000
@@ -51,12 +51,12 @@
     def oe_create(self, cr, uid,
           external_session, vals, resource, defaults, context):
 
-    order_id = super(sale_order, self).\
-        oe_create(cr, uid, external_session,
-              vals,
-              resource,
-              defaults=defaults,
-              context=context)
+        order_id = super(sale_order, self).\
+            oe_create(cr, uid, external_session,
+                  vals,
+                  resource,
+                  defaults=defaults,
+                  context=context)
 
         order_line_obj = self.pool.get('sale.order.line')
         order = self.browse(cr, uid, order_id, context=context)

=== modified file 'magentoerpconnect_magento_invoice/account.py'
--- magentoerpconnect_magento_invoice/account.py	2012-08-30 08:39:41 +0000
+++ magentoerpconnect_magento_invoice/account.py	2013-06-09 02:36:28 +0000
@@ -21,15 +21,26 @@
 
 
 from openerp.osv.orm import Model
+from base_external_referentials.external_osv import ExternalSession
 
 class account_invoice(Model):
     _inherit = "account.invoice"
 
+    def _get_magento_invoice_date(self, cr, uid, invoice, ext_invoice_id, context=None):
+        external_session = ExternalSession(invoice.shop_id.referential_id, invoice.shop_id)
+        resource = self._get_external_resources(cr, uid, external_session, external_id=ext_invoice_id)
+        return resource['created_at'].split(' ')[0]
+
     def action_move_create(self, cr, uid, ids, context=None):
         if context is None:
             context = {'lang': 'en_US'}
         for invoice in self.browse(cr, uid, ids, context=context):
-            ext_invoice_id = self._export_one_invoice(cr, uid, invoice, context=context)
-            invoice.write({'internal_number': ext_invoice_id}, context=context)
+            if not invoice.internal_number and invoice.type == 'out_invoice'\
+                    and invoice.sale_ids and invoice.sale_ids[0].shop_id.type_name == 'Magento':
+                ext_invoice_id = self._export_one_invoice(cr, uid, invoice, context=context)
+                date_invoice = self._get_magento_invoice_date(cr, uid, invoice, ext_invoice_id, context=context)
+                invoice.write({
+                    'internal_number': ext_invoice_id,
+                    'date_invoice': date_invoice,
+                    }, context=context)
         return super(account_invoice, self).action_move_create(cr, uid, ids, context=context)
-

=== modified file 'magentoerpconnect_product_variant/settings/1.5.0.0/external.mappinglines.template.csv'
--- magentoerpconnect_product_variant/settings/1.5.0.0/external.mappinglines.template.csv	2012-05-09 15:36:12 +0000
+++ magentoerpconnect_product_variant/settings/1.5.0.0/external.mappinglines.template.csv	2013-06-09 02:36:28 +0000
@@ -1,5 +1,4 @@
 id,sequence,type,evaluation_type,external_field,field_id:id,external_type,alternative_key,mapping_id:id,function_name,in_function,out_function,child_mapping_id:id,datetime_format
-magentoerpconnect.mag1500_product_product_weight,,in_out,direct,weight,product_variant_multi.field_product_product_total_weight,float,False,magentoerpconnect.mag1500_product_product,,,,,
 mag1500_product_product_dim_value,10,out,function,,,unicode,False,magentoerpconnect.mag1500_product_product,dim_value,,"result = []
 if resource.get('is_multi_variants'):
     for dim_value in self.pool.get('product.variant.dimension.value').browse(cr, uid, resource['dimension_value_ids'], context=context):