Merge lp:~zikzak/magentoerpconnect/check_vat into lp:magentoerpconnect/oerp6.0-stable

[Raimon Esteve (www.zikzakmedia.com)]

https://bugs.launchpad.net/magentoerpconnect/+bug/683680

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

Guys, I'm not sure if we should merge this or not. Is that code generic enough?
Here in Brazil for instance we made a new extension module to deal with VAT and other legal stuff:
https://code.launchpad.net/~akretion-team/magentoerpconnect/magentoerpconnect_br
Others could give their views please?

[Raimon Esteve (www.zikzakmedia.com) (resteve)]

Now, there are bug if recibe partner with VAT and of course, don't
create partner, not create sale ;)

You can configure in sale.order what vat would do chek and use def
openerp check_vat, for exampe, check_vat_es.

--
Raimon Esteve
// OpenERP Partner. www.openerp.com/node/682
// e-sale: Zoook 100% OpenERP / Magento
// AulaERP, formació online www.aulaerp.com
www.zikzakmedia.com

Unmerged revisions

392. By Raimon Esteve (www.zikzakmedia.com) on 2011-02-24

[IMP] Add revision 391 and Check VAT features

=== modified file 'sale.py'
--- sale.py	2011-01-19 02:57:13 +0000
+++ sale.py	2011-02-24 10:57:58 +0000
@@ -120,6 +120,7 @@
         'auto_import': fields.boolean('Automatic Import'),
         'allow_magento_order_status_push': fields.boolean('Allow Magento Order Status push', help='Allow to send back order status to Magento if order status changed in OpenERP first?'),
         'allow_magento_notification': fields.boolean('Allow Magento Notification', help='Allow Magento to notify customer (mail) if OpenERP update Magento order status?'),
+        'vat_country_ids': fields.many2many('res.country','sale_shop_vat_country_rel', 'shop_id','country_id','Vat Country'),
     }   
 
     _defaults = {
@@ -346,19 +347,35 @@
         # Adds vat number (country code+magento vat) if base_vat module is installed and Magento sends customer_taxvat
         cr.execute('select * from ir_module_module where name=%s and state=%s', ('base_vat','installed'))
         if cr.fetchone() and 'customer_taxvat' in data_record and data_record['customer_taxvat']:
+            check_vat = True
             allchars = string.maketrans('', '')
             delchars = ''.join([c for c in allchars if c not in string.letters + string.digits])
             vat = data_record['customer_taxvat'].translate(allchars, delchars).upper()
-            vat_country, vat_number = vat[:2].lower(), vat[2:]
-            check = getattr(partner_obj, 'check_vat_' + vat_country)
-            vat_ok = check(vat_number)
-            if not vat_ok and 'country_id' in data_record['billing_address']:
+            vat_country = vat[:2]
+
+            if not hasattr(partner_obj, 'check_vat_' + vat_country.lower()):
+                shop = self.pool.get('sale.shop').browse(cr, uid, res['shop_id'])
+                for country_id in shop.vat_country_ids:
+                    vat_country = country_id.code
+                    if hasattr(partner_obj, 'check_vat_' + vat_country.lower()):
+                        check_vat = True
+                        break
+
+            if check_vat and hasattr(partner_obj, 'check_vat_' + vat_country.lower()):
+                check = getattr(partner_obj, 'check_vat_' + vat_country.lower())
+                vat_ok = check(vat)
+            else:
+                vat_ok = False
+
+            if not vat_ok and 'country_id' in data_record['billing_address'] and hasattr(partner_obj, 'check_vat_' + vat_country.lower()):
                 # Maybe magento vat number has not country code prefix. Take it from billing address.
                 check = getattr(partner_obj, 'check_vat_' + data_record['billing_address']['country_id'].lower())
                 vat_ok = check(vat)
                 vat = data_record['billing_address']['country_id'] + vat
-            if vat_ok:    
-                partner_obj.write(cr, uid, [partner_id], {'vat_subjected':True, 'vat':vat})
+
+            if vat_ok:
+                partner_obj.write(cr, uid, [partner_id], {'vat_subjected':True, 'vat':(vat_country+vat).upper()})
+
         return res
     
     def get_order_lines(self, cr, uid, res, external_referential_id, data_record, key_field, mapping_lines, defaults, context):
 
=== modified file 'sale_view.xml'
--- sale_view.xml	2011-01-18 17:37:25 +0000
+++ sale_view.xml	2011-02-24 10:57:58 +0000
@@ -61,8 +61,10 @@
 					<page string="Magento Information">
 						<field name="magento_shop" />
 						<field name="auto_import" />
-                                                <field name="allow_magento_order_status_push" />
-                                                <field name="allow_magento_notification" attrs="{'invisible':[('allow_magento_order_status_push','=',False)]}"/>
+                        <field name="allow_magento_order_status_push" />
+                        <field name="allow_magento_notification" attrs="{'invisible':[('allow_magento_order_status_push','=',False)]}"/>
+                        <separator string="Allow countries check Vat" colspan="4" />
+                        <field name="vat_country_ids" nolabel="1" colspan="4"/>
 					</page>
 				</xpath>
 			</field>