Merge lp:~albert-nan/magentoerpconnect/NaN into lp:~magentoerpconnect-core-editors/magentoerpconnect/magentoerpconnect_generic

[Albert Cervera i Areny - http://www.NaN-tic.com]

Ensure 'None' is never used as it's not serializable with XML-RPC protocol.

[lp:~albert-nan/magentoerpconnect/NaN]

298. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-11

[IMP] Several changes including:
- Added country to taxes.
- Added hability to import invoice numbers.

299. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Removed 'mag_' prefix in sale.order

300. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Ensure product.product -> export_inventory() function does not return 'None' but 'False'.

301. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Mergeed latest trunk changes.

302. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Added context to several calls.

Unmerged revisions

302. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Added context to several calls.

301. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Mergeed latest trunk changes.

300. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Ensure product.product -> export_inventory() function does not return 'None' but 'False'.

299. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-12

Removed 'mag_' prefix in sale.order

298. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-11

[IMP] Several changes including:
- Added country to taxes.
- Added hability to import invoice numbers.

297. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-04-03

[FIX] Added context in all calls.

296. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-03-30

[FIX] Ensure 'None' is never returned as it's not serializable in XML-RPC protocol. Use False instead.

=== modified file '__init__.py'
--- __init__.py	2010-02-04 13:09:52 +0000
+++ __init__.py	2010-04-12 10:56:33 +0000
@@ -18,8 +18,9 @@
 import magerp_core
 import product
 import partner
+import invoice
 import sale
-import invoice
 import product_images
+import country
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file '__terp__.py'
--- __terp__.py	2010-02-26 21:03:53 +0000
+++ __terp__.py	2010-04-12 10:56:33 +0000
@@ -24,6 +24,7 @@
                  "base_sale_multichannels",
                  "product_images_olbs",
                  "account_payment",
+                 'nan_external_prices',
                 ],
     "author" : "Sharoon Thomas, Raphael Valyi",
     "description": """Magento E-commerce management
@@ -41,6 +42,7 @@
             'sale_view.xml',
             'product_images_view.xml',
             'magerp_menu.xml',
+            'country_view.xml',
             'settings/external.mapping.template.csv',
             'settings/external.mappinglines.template.csv',
             'settings/magerp_product_product_type.xml',

=== added file 'country.py'
--- country.py	1970-01-01 00:00:00 +0000
+++ country.py	2010-04-12 10:56:33 +0000
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+#########################################################################
+#                                                                       #
+# Copyright (C) 2010  NaN Projectes de Programari Lliure, S.L.          #
+#                     http://www.NaN-tic.com                            #
+#                                                                       #
+# This program is free software: you can redistribute it and/or modify  #
+# it under the terms of the GNU General Public License as published by  #
+# the Free Software Foundation, either version 3 of the License, or     #
+# (at your option) any later version.                                   #
+#                                                                       #
+# This program is distributed in the hope that it will be useful,       #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+# GNU General Public License for more details.                          #
+#                                                                       #
+# You should have received a copy of the GNU General Public License     #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>. #
+#                                                                       #
+#########################################################################
+
+from osv import osv, fields
+
+class res_country(osv.osv):
+    _inherit = 'res.country'
+ 
+    _columns = {
+        'fiscal_position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', help='Fiscal position that will be used for partners in this country if partner has no fiscal position set. Note that this will only be used in orders and invoices imported from Magento.'),
+    }
+res_country()
+
+class account_tax(osv.osv):
+    _inherit = 'account.tax'
+    _columns = {
+        'country_id': fields.many2one('res.country', 'Country'),
+    }
+account_tax()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'country_view.xml'
--- country_view.xml	1970-01-01 00:00:00 +0000
+++ country_view.xml	2010-04-12 10:56:33 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+	<record model="ir.ui.view" id="view_country_form_fiscal_position">
+		<field name="name">res.country.form.fiscal_position</field>
+		<field name="model">res.country</field>
+		<field name="inherit_id" ref="base.view_country_form" />
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<field name="code" position="after">
+				<field name="fiscal_position_id"/>
+			</field>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_country_tree_fiscal_position">
+		<field name="name">res.country.tree.fiscal_position</field>
+		<field name="model">res.country</field>
+		<field name="inherit_id" ref="base.view_country_tree" />
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<field name="code" position="after">
+				<field name="fiscal_position_id"/>
+			</field>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_tax_form_country_id">
+		<field name="name">account.tax.form.country_id</field>
+		<field name="model">account.tax</field>
+		<field name="inherit_id" ref="account.view_tax_form" />
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<field name="type_tax_use" position="after">
+				<field name="country_id"/>
+			</field>
+		</field>
+	</record>
+</data>
+</openerp>

=== modified file 'invoice.py'
--- invoice.py	2009-11-25 12:32:15 +0000
+++ invoice.py	2010-04-12 10:56:33 +0000
@@ -20,12 +20,17 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.  #
 #########################################################################
 
-from osv import osv, fields
+from osv import osv
+from osv import fields
 
 class account_invoice(osv.osv):
-    _inherit = "account.invoice"
+    _inherit = 'account.invoice'
     
     _columns = {
-                    'magento_ref':fields.char('Magento REF', size=32),
-                }
-account_invoice()
\ No newline at end of file
+        'magento_ref':fields.char('Magento REF', size=32),
+    }
+
+    
+account_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'magerp_core.py'
--- magerp_core.py	2010-04-08 13:33:20 +0000
+++ magerp_core.py	2010-04-12 10:56:33 +0000
@@ -55,7 +55,7 @@
             core_imp_conn = self.external_connection(cr, uid, inst, DEBUG)
             if core_imp_conn:
                 self.pool.get('external.shop.group').mage_import_base(cr, uid,core_imp_conn, inst.id, defaults={'referential_id':inst.id})
-                self.pool.get('sale.shop').mage_import_base(cr, uid, core_imp_conn, inst.id, defaults={'magento_shop':True})
+                self.pool.get('sale.shop').mage_import_base(cr, uid, core_imp_conn, inst.id, defaults={})
                 self.pool.get('magerp.storeviews').mage_import_base(cr,uid,core_imp_conn, inst.id, defaults={})
             else:
                 osv.except_osv(_("Connection Error"), _("Could not connect to server\nCheck location, username & password."))

=== modified file 'magerp_osv.py'
--- magerp_osv.py	2010-01-02 18:43:26 +0000
+++ magerp_osv.py	2010-04-12 10:56:33 +0000
@@ -22,6 +22,9 @@
         self.logger = netsvc.Logger()
         
     def try_connect(self):
+        #import traceback
+        #traceback.print_stack()
+        print "TRYING CONNECT..."
         self.session = self.ser.login(self.username, self.password)
         if self.debug:
             self.logger.notifyChannel(_("Magento Connection"), netsvc.LOG_INFO, _("Login Successful"))
@@ -69,7 +72,12 @@
         else:
             arguments = []
         try:
-            return self.try_call(method, arguments)
+            import time
+            print "TRYING CALL: ", method, arguments
+            start = time.time()
+            result = self.try_call(method, arguments)
+            print "CALL ELAPSED: ", time.time() - start
+            return result
         except Exception, e:
             self.logger.notifyChannel(_("Magento Call"), netsvc.LOG_WARNING, _("Webservice Failure, sleeping 1 second before next attempt"))
             time.sleep(1)
@@ -227,7 +235,12 @@
                     subject[key] = True
         return subject
     
-    def mage_import_base(self,cr,uid,conn, external_referential_id, defaults={}, context={}):
+    def mage_import_base(self,cr,uid,conn, external_referential_id, defaults=None, context=None):
+        if defaults is None:
+            defaults = {}
+        if context is None:
+            context = {}
+
         if not 'ids_or_filter' in context.keys():
             context['ids_or_filter'] = []
         result = {'create_ids': [], 'write_ids': []}
@@ -247,7 +260,10 @@
                     
                     #it may happen that list method doesn't provide enough information, forcing us to use get_method on each record (case for sale orders)
                     if context.get('one_by_one', False):
-                        del(context['one_by_one'])
+                        # Copy the context before removing items so we do not affect
+                        # successive calls
+                        context = context.copy()
+                        del( context['one_by_one'] )
                         for record in data:
                             id = record[self.pool.get('external.mapping').read(cr, uid, mapping_id[0],['external_key_name'])['external_key_name']]
                             get_method = self.pool.get('external.mapping').read(cr,uid,mapping_id[0],['external_get_method']).get('external_get_method',False)
@@ -288,3 +304,4 @@
             mageids.append(each[self._MAGE_FIELD])
         return mageids
         
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'product.py'
--- product.py	2010-04-05 19:00:41 +0000
+++ product.py	2010-04-12 10:56:33 +0000
@@ -810,12 +810,17 @@
         self.write(cr, uid, oe_id, {'magento_sku': sku})
         return res
     
-    def ext_export(self, cr, uid, ids, external_referential_ids=[], defaults={}, context={}):
-        ids = self.search(cr, uid, [('id', 'in', ids), ('magento_exportable', '=', True)]) #restrict export to only exportable products
+    def ext_export(self, cr, uid, ids, external_referential_ids=[], defaults=None, context=None):
+        if defaults is None:
+            defaults = {}
+        if context is None:
+            context = {}
+
+        ids = self.search(cr, uid, [('id', 'in', ids), ('magento_exportable', '=', True)], context=context) #restrict export to only exportable products
         dates_2_ids = []
         ids_2_dates = {}
         
-        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'])
+        shop = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'], context)
         
         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')))
@@ -885,19 +890,22 @@
         sku = self.product_to_sku(cr, uid, product)
         return super(magerp_osv.magerp_osv, self).ext_update(cr, uid, data, conn, method, oe_id, sku, ir_model_data_id, create_method, ctx)
     
-    def export_inventory(self, cr, uid, ids, shop, ctx):
+    def export_inventory(self, cr, uid, ids, shop, context):
         logger = netsvc.Logger()
-        stock_id = self.pool.get('sale.shop').browse(cr, uid, ctx['shop_id']).warehouse_id.lot_stock_id.id
-        for product in self.browse(cr, uid, ids):
+        stock_id = self.pool.get('sale.shop').browse(cr, uid, context['shop_id'], context).warehouse_id.lot_stock_id.id
+        for product in self.browse(cr, uid, ids, context):
             if product.magento_sku and product.type != 'service':
-                virtual_available = self.read(cr, uid, product.id, ['virtual_available'], {'location': stock_id})['virtual_available']
-		# Changing Stock Availability to "Out of Stock" in Magento
+                virtual_available = self.read(cr, uid, product.id, ['virtual_available'], {'location': stock_id}, context)['virtual_available']
+                # Changing Stock Availability to "Out of Stock" in Magento
                 # if a product has qty lt or equal to 0.
                 if virtual_available <= 0 :
                     is_in_stock = 0
                 else :
                     is_in_stock = 1
-                ctx['conn_obj'].call('product_stock.update', [product.magento_sku, {'qty': virtual_available, 'is_in_stock': is_in_stock}])
+                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 False
     
 product_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale.py'
--- sale.py	2010-03-26 17:32:47 +0000
+++ sale.py	2010-04-12 10:56:33 +0000
@@ -23,11 +23,13 @@
 import magerp_osv
 import netsvc
 from tools.translate import _
+from tools import config
 import string
 #from datetime import datetime
 import time
 DEBUG = True
 
+
 #TODO, may be move that on out CSV mapping, but not sure we can easily
 #see OpenERP sale/sale.py and Magento app/code/core/Mage/Sales/Model/Order.php for details
 ORDER_STATUS_MAPPING = {'draft': 'processing', 'progress': 'processing', 'shipping_except': 'complete', 'invoice_except': 'complete', 'done': 'closed', 'cancel': 'canceled', 'waiting_date': 'holded'}
@@ -55,22 +57,26 @@
                 res[shop.id] = False
         return res
     
-    def export_images(self, cr, uid, ids, ctx):
-        for shop in self.browse(cr, uid, ids):
+    def export_images(self, cr, uid, ids, context):
+        if context is None:
+            context = {}
+        for shop in self.browse(cr, uid, ids, context):
+            ctx = context.copy()
             ctx['shop_id'] = shop.id
             ctx['conn_obj'] = self.external_connection(cr, uid, shop.referential_id)
             recent_changed_images = self.pool.get('product.images').get_changed_ids(cr, uid, shop.last_images_export_date)
             if recent_changed_images:
                 res = self.pool.get('product.images').update_remote_images(cr, uid, recent_changed_images, ctx)
             res = True
-            self.write(cr,uid,ctx['shop_id'],{'last_images_export_date':time.strftime('%Y-%m-%d %H:%M:%S')})
-               
+            self.write(cr,uid,ctx['shop_id'],{
+                'last_images_export_date':time.strftime('%Y-%m-%d %H:%M:%S')
+            }, context)
   
     def _get_rootcategory(self, cr, uid, ids, prop, unknow_none, context):
         res = {}
         for shop in self.browse(cr, uid, ids, context):
             if shop.root_category_id:
-                rid = self.pool.get('product.category').extid_to_oeid(cr, uid, shop.root_category_id, shop.referential_id.id)
+                rid = self.pool.get('product.category').extid_to_oeid(cr, uid, shop.root_category_id, shop.referential_id.id, context)
                 res[shop.id] = rid
             else:
                 res[shop.id] = False
@@ -94,29 +100,62 @@
         'exportable_product_ids': fields.function(_get_exportable_product_ids, method=True, type='one2many', relation="product.product", string='Exportable Products'),
         'magento_shop': fields.boolean('Magento Shop', readonly=True),
         'auto_import': fields.boolean('Automatic Import'),
+        'import_invoices': fields.boolean('Import Invoices', help='If marked, invoices will be imported when orders are imported.'),
     }   
 
-    def import_shop_orders(self, cr, uid, shop, defaults, ctx):
+    def import_shop_orders(self, cr, uid, shop, defaults, context):
+        if context is None:
+            context = {}
         result = []
         for storeview in shop.storeview_ids:
-            magento_storeview_id = self.pool.get('magerp.storeviews').oeid_to_extid(cr, uid, storeview.id, shop.referential_id.id, context={})
+            magento_storeview_id = self.pool.get('magerp.storeviews').oeid_to_extid(cr, uid, storeview.id, shop.referential_id.id, context)
             ids_or_filter = [{'store_id': {'eq': magento_storeview_id}}]
                         
-            #get last imported order:
-            last_external_id = self.get_last_imported_external_id(cr, 'sale.order', shop.referential_id.id, "sale_order.shop_id=%s and magento_storeview_id=%s" % (shop.id, storeview.id))[1]
+            # get last imported order:
+            last_external_id = self.get_last_imported_external_id(cr, uid, 'sale.order', shop.referential_id.id, [
+                ('shop_id','=',shop.id),
+                ('magento_storeview_id','=',storeview.id)
+            ], context)[1]
             if last_external_id:
                 ids_or_filter[0]['increment_id'] = {'gt': last_external_id}
             defaults['magento_storeview_id'] = storeview.id
-            result.append(self.pool.get('sale.order').mage_import_base(cr, uid, ctx.get('conn_obj', False), shop.referential_id.id,
+            ctx = context.copy()
+            ctx.update({
+                'one_by_one': True,
+                'ids_or_filter': ids_or_filter,
+            })
+            data = self.pool.get('sale.order').mage_import_base(cr, uid, context.get('conn_obj'), shop.referential_id.id,
                                                               defaults=defaults,
-                                                              context={
-                                                                       'one_by_one': True, 
-                                                                       'ids_or_filter':ids_or_filter
-                                                                       }))
+                                                              context=ctx)
+            result.append( data )
+
+            # Import Invoices
+            if shop.import_invoices:
+                # Get last imported invoice
+                ids = self.pool.get('sale.order').search(cr, uid, [('use_external_prices','=',True),('magento_invoice','=',False)], order='create_date ASC', limit=1, context=context)
+                if ids:
+                    external_id = self.pool.get('sale.order').oeid_to_extid(cr, uid, ids[0], shop.referential_id.id, context)
+                    filter = [ {'store_id': {'eq': magento_storeview_id}, 'order_increment_id': {'gt': external_id}} ]
+                    conn = context.get('conn_obj')
+                    data = conn.call( 'sales_order_invoice.list', filter )
+                    for record in data:
+                        order_id = self.pool.get('sale.order').extid_to_oeid(cr, uid, record['order_increment_id'], shop.referential_id.id, context)
+                        self.pool.get('sale.order').write(cr, uid, [order_id], {
+                            'magento_invoice': record['increment_id'],
+                        }, context)
+                        workflow = netsvc.LocalService('workflow')
+                        order = self.pool.get('sale.order').browse(cr, uid, order_id, context)
+                        if order.order_policy == 'manual':
+                            workflow.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
+                            if order.shop_id.invoice_generation_policy != 'none':
+                                workflow.trg_validate(uid, 'sale.order', order_id, 'manual_invoice', cr)
+                        elif order.order_policy == 'picking':
+                            workflow.trg_validate(uid, 'sale.order', order_id, 'order_confirm', cr)
+
         return result
 
-    def update_shop_orders(self, cr, uid, order, ext_id, ctx):
-        conn = ctx.get('conn_obj', False)
+    def update_shop_orders(self, cr, uid, order, ext_id, context):
+        conn = context.get('conn_obj', False)
         status = ORDER_STATUS_MAPPING.get(order.state, False)
         result = {}
         
@@ -128,11 +167,16 @@
         cr.execute("select account_invoice.id from account_invoice inner join sale_order_invoice_rel on invoice_id = account_invoice.id where order_id = %s" % order.id)
         resultset = cr.fetchone()
         if resultset and len(resultset) == 1:
-            invoice = self.pool.get("account.invoice").browse(cr, uid, resultset[0])
+            invoice = self.pool.get("account.invoice").browse(cr, uid, resultset[0], context)
+            if invoice.amount_total != order.amount_total:
+                raise osv.except_osv( _('Error'), _('Invoice total != order total in invoice id %d') % resultset[0] )
             if invoice.amount_total == order.amount_total and not invoice.magento_ref:
                 try:
                     result['magento_invoice_ref'] = conn.call('sales_order_invoice.create', [order.magento_incrementid, [], _("Invoice Created"), True, True])
-                    self.pool.get("account.invoice").write(cr, uid, invoice.id, {'magento_ref': result['magento_invoice_ref'], 'origin': result['magento_invoice_ref']})
+                    self.pool.get("account.invoice").write(cr, uid, invoice.id, {
+                        'magento_ref': result['magento_invoice_ref'], 
+                        'origin': result['magento_invoice_ref']
+                    }, context)
                 except Exception, e:
                     pass #TODO make sure that's because Magento invoice already exists and then re-attach it!
 
@@ -140,14 +184,12 @@
 
     # Schedules functions ============ #
     def run_import_orders_scheduler(self, cr, uid, context=None):
-        if context == None:
-            context = {}
         sale_obj = self.pool.get('sale.shop')
         search_params = [
             ('magento_shop', '=', True),
             ('auto_import', '=', True),
         ]
-        shops_ids = sale_obj.search(cr, uid, search_params)
+        shops_ids = sale_obj.search(cr, uid, search_params, context=context)
         if shops_ids:
             self.import_orders(cr, uid, shops_ids, context)
         if DEBUG:
@@ -219,12 +261,20 @@
                 'magento_incrementid': fields.char('Magento Increment ID', size=32),
                 'magento_payment_method': fields.char('Magento Payment Method', size=32),
                 'magento_storeview_id': fields.many2one('magerp.storeviews', 'Magento Store View'),
+                'magento_invoice': fields.char('Magento Invoice', size=256, readonly=True, help='Magento invoice number.'),
     }
     
     def _auto_init(self, cr, context={}):
         cr.execute("ALTER TABLE sale_order_line ALTER COLUMN discount TYPE numeric(16,6);")
         cr.execute("ALTER TABLE account_invoice_line ALTER COLUMN discount TYPE numeric(16,6);")
         super(sale_order, self)._auto_init(cr, context)
+
+    def _inv_get(self, cr, uid, order, context={}):
+        # If 'magento_invoice' was provided use it as invoice number when invoice is created
+        result = super(sale_order, self)._inv_get(cr, uid, order, context)
+        if order.magento_invoice:
+            result['number'] = order.magento_invoice
+        return result
         
     def get_mage_customer_address_id(self, address_data):
         if address_data.get('customer_address_id', False):
@@ -310,7 +360,8 @@
                     #simple VAT tax on order line (else override method):
                     line_tax_vat = float(line_data['tax_percent']) / 100.0
                     if line_tax_vat > 0:
-                        line_tax_ids = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>=', line_tax_vat - 0.001), ('amount', '<=', line_tax_vat + 0.001)])
+                        country = data_record['billing_address']['country_id']
+                        line_tax_ids = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>=', line_tax_vat - 0.001), ('amount', '<=', line_tax_vat + 0.001), '|', ('country_id','=',country), ('country_id','=',False) ], context=context)
                         if line_tax_ids and len(line_tax_ids) > 0:
                             defaults_line['tax_id'] = [(6, 0, [line_tax_ids[0]])]
                     lines_vals.append((0, 0, self.oevals_from_extdata(cr, uid, external_referential_id, line_data, 'item_id', mapping_lines, defaults_line, context)))
@@ -344,6 +395,12 @@
         if not context.get('one_by_one', False):
             if data_record.get('billing_address', False):
                 res = self.get_order_addresses(cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context)
+                if 'partner_order_id' in res:
+                    address = self.pool.get('res.partner.address').browse(cr, uid, res['partner_order_id'], context)
+                    position = address.country_id and address.country_id.fiscal_position_id or False
+                    if position:
+                        res['fiscal_position'] = position.id
+
             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)
@@ -370,7 +427,7 @@
                 if payment.get('amount_paid', False):
                     self.generate_payment_with_pay_code(cr, uid, payment['method'], res['partner_id'], payment['amount_paid'], "mag_" + payment['payment_id'], "mag_" + data_record['increment_id'], res['date_order'], True, context)
                 elif payment.get('amount_ordered', False):
-                    self.generate_payment_with_pay_code(cr, uid, payment['method'], res['partner_id'], payment['amount_ordered'], "mag_" + payment['payment_id'], "mag_" + data_record['increment_id'], res['date_order'], False, context) 
+                    self.generate_payment_with_pay_code(cr, uid, payment['method'], res['partner_id'], payment['amount_ordered'], "mag_" + payment['payment_id'], "mag_" + data_record['increment_id'], res['date_order'], False, context)
         return res
     
     def oe_update(self,cr, uid, existing_rec_id, vals, data, external_referential_id, defaults, context):
@@ -390,16 +447,16 @@
             wf_service.trg_validate(uid, 'sale.order', order_id, 'cancel', cr)
         else:
             order = self.browse(cr, uid, order_id, context)
-            if order.order_policy == 'manual' and order.shop_id.picking_generation_policy != 'none':
-                wf_service.trg_validate(uid, 'sale.order', order.id, 'order_confirm', cr)
-                if order.shop_id.invoice_generation_policy != 'none':
-                    wf_service.trg_validate(uid, 'sale.order', order.id, 'manual_invoice', cr)
-            elif order.order_policy == 'picking' and order.shop_id.picking_generation_policy != 'none':
-                wf_service.trg_validate(uid, 'sale.order', order.id, 'order_confirm', cr)
+            if order.shop_id.picking_generation_policy != 'none':
+                if order.order_policy == 'manual':
+                    wf_service.trg_validate(uid, 'sale.order', order.id, 'order_confirm', cr)
+                    if order.shop_id.invoice_generation_policy != 'none':
+                        wf_service.trg_validate(uid, 'sale.order', order.id, 'manual_invoice', cr)
+                elif order.order_policy == 'picking':
+                    wf_service.trg_validate(uid, 'sale.order', order.id, 'order_confirm', cr)
                 
 sale_order()
 
-
 class magerp_sale_shop_payment_type(magerp_osv.magerp_osv):
     _name = "magerp.sale.shop.payment.type"
     _description = "Magento Sale Shop Payment Type"
@@ -419,3 +476,5 @@
     }
 
 magerp_sale_shop_payment_type()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_view.xml'
--- sale_view.xml	2010-03-26 17:32:47 +0000
+++ sale_view.xml	2010-04-12 10:56:33 +0000
@@ -54,6 +54,7 @@
 			<field name="arch" type="xml">
 				<field name="fiscal_position" position="after">
 					<field name="magento_payment_method" />
+					<field name="magento_invoice" select="2"/>
 				</field>
 			</field>
 		</record>
@@ -89,13 +90,25 @@
 			</field>
 		</record>
 
+		<record id="view_shop_form_import_invoices" model="ir.ui.view">
+			<field name="name">sale.shop.form.import_invoices</field>
+			<field name="model">sale.shop</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="magerp_view_shop_auto_import_form"/>
+			<field name="arch" type="xml">
+				<field name="picking_generation_policy" position="after">
+					<field name="import_invoices"/>
+				</field>
+			</field>
+		</record>
+
 		<record id="magerp_view_shop_payment_type_form" model="ir.ui.view">
 			<field name="name">magerp_view_shop_payment_type_form</field>
 			<field name="model">sale.shop</field>
 			<field name="type">form</field>
-			<field name="inherit_id" ref="base_sale_multichannels.base_sale_multichannels_view_shop_form"/>
+			<field name="inherit_id" ref="view_shop_form_import_invoices"/>
 			<field name="arch" type="xml">
-				<field name="picking_generation_policy" position="after">
+				<field name="import_invoices" position="after">
 					<group col="4" colspan="4">
 					<field name="payment_types" nolabel="1"/>
 					</group>

=== modified file 'settings/external.mappinglines.template.csv'
--- settings/external.mappinglines.template.csv	2010-03-16 13:59:26 +0000
+++ settings/external.mappinglines.template.csv	2010-04-12 10:56:33 +0000
@@ -7,37 +7,51 @@
 "mag_erp_s_gpid","magento1324","base_sale_multichannels.model_external_shop_group","default_group_id","in_out","int","result=[('default_shop_integer_id',ifield)]",
 "mag_erp_sv_name","magento1324","model_magerp_storeviews","name","in_out","str","result=[('name',ifield)]","result=[('name',record['name'])]"
 "mag_erp_sv_code","magento1324","model_magerp_storeviews","code","in_out","str","result=[('code',ifield)]",
-"mag_erp_sv_sg","magento1324","model_magerp_storeviews","website_id","in_out","int","result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
+"mag_erp_sv_sg","magento1324","model_magerp_storeviews","website_id","in_out","int","result=[('website_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context))]",
 "mag_erp_sv_isa","magento1324","model_magerp_storeviews","is_active","in_out","str","result=[('is_active',bool(eval(ifield)))]",
 "mag_erp_sv_stord","magento1324","model_magerp_storeviews","sort_order","in_out","int","result=[('sort_order',ifield)]",
-"mag_erp_sv_gpid","magento1324","model_magerp_storeviews","group_id","in_out","int","result=[('shop_id',self.pool.get('sale.shop').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
-"mag_erp_st_name","magento1324","sale.model_sale_shop","name","in_out","str","result=[('name',ifield)]","result=[('name',record['name'])]"
+"mag_erp_sv_gpid","magento1324","model_magerp_storeviews","group_id","in_out","int","result=[('shop_id',self.pool.get('sale.shop').extid_to_oeid(cr, uid, ifield, external_referential_id, context))]",
+"mag_erp_st_name","magento1324","sale.model_sale_shop","name","in_out","str","
+name = ifield
+website_id = self.pool.get('external.shop.group').extid_to_oeid(cr, uid, data['website_id'], external_referential_id, context)
+if website_id:
+    name += ' - ' +  self.pool.get('external.shop.group').browse(cr, uid, website_id, context).name
+result = [('name',name)]
+","
+name = record['name']
+if name:
+    name = name.split(' - ')[0]
+result=[('name', name)]"
 "mag_erp_st_gpid","magento1324","sale.model_sale_shop","group_id","in_out","int","result=[('group_id',ifield)]",
-"mag_erp_st_grp","magento1324","sale.model_sale_shop","website_id","in_out","int","result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
+"mag_erp_st_grp","magento1324","sale.model_sale_shop","website_id","in_out","int","result=[('shop_group_id',self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context))]",
 "mag_erp_st_default_st","magento1324","sale.model_sale_shop","default_store_id","in_out","int","result=[('default_storeview_integer_id',ifield)]",
 "mag_erp_st_root_categ","magento1324","sale.model_sale_shop","root_category_id","in_out","int","result=[('root_category_id',ifield)]",
-"mag_erp_so_name","magento1324","sale.model_sale_order","increment_id","in_out","str","result=[('magento_incrementid',str(ifield)), ('name','mag_' + str(ifield))]",
-"mag_erp_so_custo","magento1324","sale.model_sale_order","customer_id","in_out","int","result=[('partner_id',self.pool.get('res.partner').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
+"mag_erp_so_name","magento1324","sale.model_sale_order","increment_id","in_out","str","result=[('magento_incrementid',str(ifield)), ('name',str(ifield)), ('use_external_prices', True)]",
+"mag_erp_so_custo","magento1324","sale.model_sale_order","customer_id","in_out","int","result=[('partner_id',self.pool.get('res.partner').extid_to_oeid(cr, uid, ifield, external_referential_id, context))]",
 "mag_erp_so_pay","magento1324","sale.model_sale_order","payment","in_out","str","
 payments_mapping = {'checkmo': 'manual', 'ccsave': 'prepaid', 'free':'prepaid','googlecheckout':'prepaid','paypayl_express':'prepaid', 'paybox_system': 'prepaid', 'paypal_standard': 'prepaid', 'cashondelivery': 'manual', 'servired_standard': 'prepaid', 'bbva': 'prepaid', 'cofidis': 'prepaid'}
 ifield=eval(ifield)
 payment_type = False
 cr.execute('select * from ir_module_module where name=%s and state=%s', ('sale_payment','installed'))
 if cr.fetchone():
-    payment_type = self.pool.get('payment.type').search(cr, uid, [('code', '=', ifield['method'])])
+    payment_type = self.pool.get('payment.type').search(cr, uid, [('code', '=', ifield['method'])], context=context)
     payment_type = payment_type and payment_type[0]
 result=[('order_policy', ifield['method'] in payments_mapping and payments_mapping[ifield['method']] or 'prepaid'), ('magento_payment_method', ifield['method']), ('payment_type', payment_type)]",
 "mag_erp_soline_name","magento1324","sale.model_sale_order_line","name","in_out","str","result=[('name',ifield)]",
-"mag_erp_soline_pid","magento1324","sale.model_sale_order_line","product_id","in_out","str","result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
+"mag_erp_soline_pid","magento1324","sale.model_sale_order_line","product_id","in_out","str","result=[('product_id',self.pool.get('product.product').extid_to_oeid(cr, uid, ifield, external_referential_id, context))]",
 "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_tax_percent","magento1324","sale.model_sale_order_line","tax_percent","in","str","result=[('external_tax_percent', float(data['tax_percent']))]",
+"mag_erp_soline_tax_amount","magento1324","sale.model_sale_order_line","tax_invoiced","in","str","result=[('external_tax_amount', float(data['tax_amount']))]",
+"mag_erp_soline_base_amount","magento1324","sale.model_sale_order_line","base_row_total","in","str","result=[('external_base_amount', float(data['base_row_total']))]",
+"mag_erp_soline_base_tax_amount","magento1324","sale.model_sale_order_line","base_tax_amount","in","str","result=[('external_base_tax_amount', float(data['base_tax_amount']))]",
 "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_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))])
+"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))], context=context)
 parent_id = False
 if record_id:
-	parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[])
+	parent_rec = self.pool.get('ir.model.data').read(cr,uid,record_id[0],[], context)
 	parent_id=parent_rec.get('res_id',False)
 result=[('magento_parent_id',ifield),('parent_id',parent_id)]","magento_parent_id = False
 if record.get('parent_id',False):
@@ -116,22 +130,22 @@
 "mag_erp_prd_7","magento1324","product.model_product_product","category_ids","in_out","str","categ_ids =[]
 if len(eval(ifield)) > 0:
     for category_ids in eval(ifield):
-        categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, category_ids, external_referential_id))
+        categ_ids.append(self.pool.get('product.category').extid_to_oeid(cr, uid, category_ids, external_referential_id, context))
     categ_id = categ_ids.pop()
 else:
-    categ_id = self.pool.get('external.referential').browse(cr, uid, external_referential_id).default_pro_cat.id
+    categ_id = self.pool.get('external.referential').browse(cr, uid, external_referential_id, context).default_pro_cat.id
 result = [('categ_id', categ_id), ('categ_ids',[(6, 0, categ_ids)])]","
 product = self.browse(cr, uid, record['id'])
-main_categ_id = self.pool.get('product.category').oeid_to_extid(cr, uid, product.categ_id.id, external_referential_id)
+main_categ_id = self.pool.get('product.category').oeid_to_extid(cr, uid, product.categ_id.id, external_referential_id, context)
 categ_ids = [main_categ_id]
 for categ in product.categ_ids: #deal with extra m2m categories
-    categ_id =  self.pool.get('product.category').oeid_to_extid(cr, uid, categ.id, external_referential_id)
+    categ_id =  self.pool.get('product.category').oeid_to_extid(cr, uid, categ.id, external_referential_id, context)
     if categ_id:
         categ_ids.append(categ_id)
 result=[('category_ids', categ_ids)]"
 "mag_erp_prd_8","magento1324","product.model_product_product","price","in_out","float","result=[('list_price',ifield)]","result=[]#map later"
 "mag_erp_prd_9","magento1324","product.model_product_product","cost","in_out","float","result=[('standard_price',ifield)]","result = [('cost',record['standard_price'] or 0)]"
-"mag_erp_prd_10","magento1324","product.model_product_product","set","in_out","str","result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id))]",
+"mag_erp_prd_10","magento1324","product.model_product_product","set","in_out","str","result=[('set',self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, ifield, external_referential_id, context))]",
 "mag_erp_prd_11","magento1324","product.model_product_product","special_price","in_out","float","result = [('x_magerp_special_price',ifield)]",""
 "mag_erp_prd_12","magento1324","product.model_product_product","tier_price","in_out","str","result=[]#no mapping by default","result=[]#no mapping by default"
 "mag_erp_prd_13","magento1324","product.model_product_product","minimal_price","in_out","float","result = [('x_magerp_minimal_price',ifield)]","
@@ -140,7 +154,7 @@
 else:
     result = [('minimal_price',False)]"
 "mag_erp_prd_14","magento1324","product.model_product_product","type_id","in_out","str","if ifield:
-    product_type_ids  = self.pool.get('magerp.product_product_type').search(cr,uid,[('product_type','=',ifield)])
+    product_type_ids  = self.pool.get('magerp.product_product_type').search(cr,uid,[('product_type','=',ifield)], context=context)
     if product_type_ids:
         result = [('product_type',ifield)]","if 'product_type' in record and record['product_type']:
     result = [('type_id',record['product_type'])]
@@ -152,7 +166,7 @@
 "magento_prt_adr_3","magento1324","base.model_res_partner_address","fax","in_out","str","result=[('fax',ifield)]",
 "magento_prt_adr_4","magento1324","base.model_res_partner_address","firstname","in_out","str","result = [('name', (data.get('company', False) and (data['company'] + ' ; ') or '') + ifield + ' ' + data['lastname'])]",
 "magento_prt_adr_6","magento1324","base.model_res_partner_address","is_active","in_out","str","result=[('active',bool(eval(ifield)))]",
-"magento_prt_adr_7","magento1324","base.model_res_partner_address","country_id","in_out","str","result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)])
+"magento_prt_adr_7","magento1324","base.model_res_partner_address","country_id","in_out","str","result = self.pool.get('res.country').search(cr,uid,[('code','=',ifield)], context=context)
 if result and len(result)==1:
 	result=[('country_id',result[0])]
 else:
@@ -168,14 +182,14 @@
 "magento_prt_adr_9","magento1324","base.model_res_partner_address","postcode","in_out","str","result=[('zip',ifield)]",
 "magento_prt_adr_10","magento1324","base.model_res_partner_address","telephone","in_out","str","result=[('phone',ifield)]",
 "magento_prt_adr_11","magento1324","base.model_res_partner_address","region","in_out","str","if ifield:
-	result = self.pool.get('res.country.state').search(cr,uid,[('name','ilike',ifield)])
+	result = self.pool.get('res.country.state').search(cr,uid,[('name','ilike',ifield)], context=context)
 	if result and len(result)==1:
 		result = [('state_id',result[0])]
 	else:
 		result=[]
 else:
 	result=[]",
-"magento_prt_adr_13","magento1324","base.model_res_partner_address","customer_id","in_out","int","result=self.pool.get('res.partner').extid_to_oeid(cr,uid,ifield,external_referential_id)
+"magento_prt_adr_13","magento1324","base.model_res_partner_address","customer_id","in_out","int","result=self.pool.get('res.partner').extid_to_oeid(cr, uid, ifield, external_referential_id, context)
 if result:
 	result=[('partner_id',result)]
 else:
@@ -187,16 +201,16 @@
 else:
 	result=[]",
 "magento_prt_2","magento1324","base.model_res_partner","group_id","in_out","int","if ifield:
-	result=self.pool.get('res.partner.category').extid_to_oeid(cr,uid,ifield,external_referential_id)
+	result=self.pool.get('res.partner.category').extid_to_oeid(cr, uid, ifield, external_referential_id, context)
 	if result:
 		result=[('group_id',result)]",
 "magento_prt_3","magento1324","base.model_res_partner","store_id","in_out","int","if ifield:
-	result=self.pool.get('magerp.storeviews').extid_to_oeid(cr,uid,ifield,external_referential_id)
+	result=self.pool.get('magerp.storeviews').extid_to_oeid(cr, uid, ifield, external_referential_id, context)
 	if result:
-		lang = self.pool.get('magerp.storeviews').browse(cr, uid, result).lang_id
+		lang = self.pool.get('magerp.storeviews').browse(cr, uid, result, context).lang_id
 		result=[('store_id',result),('lang',lang and lang.code or False)]",
 "magento_prt_4","magento1324","base.model_res_partner","website_id","in_out","int","if ifield:
-	result=self.pool.get('external.shop.group').extid_to_oeid(cr,uid,ifield,external_referential_id)
+	result=self.pool.get('external.shop.group').extid_to_oeid(cr, uid, ifield, external_referential_id, context)
 	if result:
 		result=[('website_id',result)]",
 "magento_prt_5","magento1324","base.model_res_partner","created_in","in_out","str","result=[('created_in',ifield)]",