[MERGE] forward port branch 10.0 up to cbca27d0052

4 files changed, 40 insertions, 40 deletions

diff --git a/odoo/addons/base/static/src/css/description.css b/odoo/addons/base/static/src/css/description.css
index cbfa3d5e968..b1f436b872f 100644
--- a/odoo/addons/base/static/src/css/description.css
+++ b/odoo/addons/base/static/src/css/description.css
@@ -1,5 +1,4 @@
-@charset "utf-8";
-/*
+/**
  *  This CSS is for the html description of modules
  * TODO clean
  */
@@ -78,11 +77,11 @@
 /* ------ BASE GRID CONSTRUCTS ----- */
 .oe_page {
   margin: 0px auto 64px auto;
-  max-width: 992px;
+  max-width: 100%;
 }
 
 .oe_row {
-  width: 928px;
+  width: 100%;
   margin-top: 16px;
   margin-bottom: 16px;
   margin-left: auto;
@@ -111,35 +110,35 @@
 }
 
 .oe_span12 {
-  width: 928px;
+  width: 100%;
 }
 
 .oe_span10 {
-  width: 773px;
+  width: 83.33333%;
 }
 
 .oe_span9 {
-  width: 696px;
+  width: 75%;
 }
 
 .oe_span8 {
-  width: 618px;
+  width: 66.66667%;
 }
 
 .oe_span6 {
-  width: 464px;
+  width: 50%;
 }
 
 .oe_span4 {
-  width: 309px;
+  width: 33.33333%;
 }
 
 .oe_span3 {
-  width: 232px;
+  width: 25%;
 }
 
 .oe_span2 {
-  width: 154px;
+  width: 16.66667%;
 }
 
 [class*='oe_span'].oe_fit {
@@ -162,28 +161,28 @@
   width: auto;
 }
 .oe_row.oe_flex .oe_span12 {
-  max-width: 928px;
+  max-width: 100%;
 }
 .oe_row.oe_flex .oe_span10 {
-  max-width: 769px;
+  max-width: 83.33333%;
 }
 .oe_row.oe_flex .oe_span9 {
-  max-width: 692px;
+  max-width: 75%;
 }
 .oe_row.oe_flex .oe_span8 {
-  max-width: 614px;
+  max-width: 66.66667%;
 }
 .oe_row.oe_flex .oe_span6 {
-  max-width: 460px;
+  max-width: 50%;
 }
 .oe_row.oe_flex .oe_span4 {
-  max-width: 305px;
+  max-width: 33.33333%;
 }
 .oe_row.oe_flex .oe_span3 {
-  max-width: 228px;
+  max-width: 25%;
 }
 .oe_row.oe_flex .oe_span2 {
-  max-width: 150px;
+  max-width: 16.66667%;
 }
 
 .oe_mb0 {
diff --git a/odoo/addons/base/static/src/css/description.sass b/odoo/addons/base/static/src/css/description.sass
index 4fa2ed100d8..49be6054652 100644
--- a/odoo/addons/base/static/src/css/description.sass
+++ b/odoo/addons/base/static/src/css/description.sass
@@ -86,11 +86,11 @@ $v8_anchor_visited_color: rgb(91, 40, 79)
 
 .oe_page
   margin: 0px auto 64px auto
-  max-width: 992px
+  max-width: 100%
 
 
 .oe_row
-  width: 928px
+  width: 100%
   margin-top: 16px
   margin-bottom: 16px
   margin-left: auto
@@ -107,14 +107,14 @@ $v8_anchor_visited_color: rgb(91, 40, 79)
   line-height: 0
   height: 0
 
-$oe_span12_width: 928px
-$oe_span10_width: 773px
-$oe_span9_width:  696px
-$oe_span8_width:  618px
-$oe_span6_width:  464px
-$oe_span4_width:  309px
-$oe_span3_width:  232px
-$oe_span2_width:  154px
+$oe_span12_width: 100%
+$oe_span10_width: 83.33333333%
+$oe_span9_width:  75%
+$oe_span8_width:  66.66666667%
+$oe_span6_width:  50%
+$oe_span4_width:  33.33333333%
+$oe_span3_width:  25%
+$oe_span2_width:  16.66666667%
 
 [class*='oe_span']
   float: left
@@ -155,19 +155,19 @@ $oe_span2_width:  154px
   .oe_span12
     max-width: $oe_span12_width
   .oe_span10
-    max-width: ($oe_span10_width +-4px)
+    max-width: $oe_span10_width
   .oe_span9
-    max-width: ($oe_span9_width +-4px)
-  .oe_span8 
-    max-width: ($oe_span8_width +-4px)
+    max-width: $oe_span9_width
+  .oe_span8
+    max-width: $oe_span8_width
   .oe_span6
-    max-width: ($oe_span6_width +-4px)
+    max-width: $oe_span6_width
   .oe_span4
-    max-width: ($oe_span4_width +-4px)
+    max-width: $oe_span4_width
   .oe_span3
-    max-width: ($oe_span3_width +-4px)
+    max-width: $oe_span3_width
   .oe_span2
-    max-width: ($oe_span2_width +-4px)
+    max-width: $oe_span2_width
 
 .oe_mb0
   margin-bottom: 0px !important
diff --git a/odoo/loglevels.py b/odoo/loglevels.py
index 400f08e1a8f..0972dc5d2b4 100644
--- a/odoo/loglevels.py
+++ b/odoo/loglevels.py
@@ -94,7 +94,7 @@ def ustr(value, hint_encoding='utf-8', errors='strict'):
 def exception_to_unicode(e):
     if (sys.version_info[:2] < (2,6)) and hasattr(e, 'message'):
         return ustr(e.message)
-    if hasattr(e, 'args'):
+    if getattr(e, 'args', ()):
         return "\n".join((ustr(a) for a in e.args))
     try:
         return unicode(e)
diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py
index fbef3443929..8d6703a5d17 100644
--- a/odoo/tools/translate.py
+++ b/odoo/tools/translate.py
@@ -949,7 +949,8 @@ def trans_generate(lang, modules, cr):
     def get_module_from_path(path):
         for (mp, rec) in path_list:
             mp = os.path.join(mp, '')
-            if rec and path.startswith(mp) and os.path.dirname(path) != mp:
+            dirname = os.path.join(os.path.dirname(path), '')
+            if rec and path.startswith(mp) and dirname != mp:
                 path = path[len(mp):]
                 return path.split(os.path.sep)[0]
         return 'base' # files that are not in a module are considered as being in 'base' module