[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100427050246-pd71bpdnltvekycm

addons/account/account.py

@@ -1062,7 +1062,7 @@ class account_move(osv.osv):
             # Example:
             #    difference == 0.01 is OK iff price_accuracy <= 1!
             #    difference == 0.0001 is OK iff price_accuracy <= 3!
-            if abs(amount) < 10 ** -(int(config['price_accuracy'])):
+            if abs(amount) < 10 ** -(int(config['price_accuracy'])+1):
                 if not len(line_draft_ids):
                     continue
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {

addons/crm/scripts/openerp_mailgate/openerp_mailgate.py

@@ -168,8 +168,8 @@ class email_parser(object):
 
     def _decode_header(self, s):
         from email.Header import decode_header
-        s = decode_header(s)        
-        return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s))
+        s = decode_header(s) 
+        return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
 
     def msg_new(self, msg):
         message = self.msg_body_get(msg)