Merge lp:~midwest/e-commerce-addons/e-commerce-addons into lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable

[Kyle Waid]

Allow 'all' tax type for external tax lookup

=== modified file 'base_sale_multichannels/account.py'
--- base_sale_multichannels/account.py	2011-12-29 10:53:06 +0000
+++ base_sale_multichannels/account.py	2012-05-23 20:21:19 +0000
@@ -28,13 +28,13 @@
     def get_tax_from_rate(self, cr, uid, rate, is_tax_included=False, context=None):
         #TODO improve, if tax are not correctly mapped the order should be in exception (integration with sale_execption)
         tax_ids = self.pool.get('account.tax').search(cr, uid, [('price_include', '=', is_tax_included),
-                ('type_tax_use', '=', 'sale'), ('amount', '>=', rate - 0.001), ('amount', '<=', rate + 0.001)])
+                ('type_tax_use', 'in', ['sale', 'all']), ('amount', '>=', rate - 0.001), ('amount', '<=', rate + 0.001)])
         if tax_ids and len(tax_ids) > 0:
             return tax_ids[0]
         else:
         #try to find a tax with less precision 
             tax_ids = self.pool.get('account.tax').search(cr, uid, [('price_include', '=', is_tax_included), 
-                    ('type_tax_use', '=', 'sale'), ('amount', '>=', rate - 0.01), ('amount', '<=', rate + 0.01)])
+                    ('type_tax_use', 'in', ['sale', 'all']), ('amount', '>=', rate - 0.01), ('amount', '<=', rate + 0.01)])
             if tax_ids and len(tax_ids) > 0:
                 return tax_ids[0]
         return False