From: Olivier Dony <odo@openerp.com>
Date: Wed, 17 Sep 2014 13:15:22 +0000 (+0200)
Subject: [MERGE] Forward-port saas-3 up to 09ab2d4
X-Git-Tag: 8.0.0~25^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=c926b54a49936b75988f4518f07e0b74d17ac1c8;p=odoo%2Fodoo.git

[MERGE] Forward-port saas-3 up to 09ab2d4
---

c926b54a49936b75988f4518f07e0b74d17ac1c8
diff --cc openerp/osv/orm.py
index 853ec4c,520b2b0..986c14e
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@@ -53,9 -53,10 +53,10 @@@ import simplejso
  import time
  import traceback
  import types
+ from collections import defaultdict
  
  import babel.dates
 -import dateutil.parser
 +import dateutil.relativedelta
  import psycopg2
  from lxml import etree