[MERGE] 6.1 fixes into trunk

bzr revid: xmo@openerp.com-20120322113142-gim4svx01p336nxm
2012-03-22 12:31:42 +01:00
parent ff245d6eb5 5a5791474a
commit 1da49a44a5
43 changed files with 7481 additions and 357 deletions
@@ -1106,7 +1106,7 @@
    </div>
 </t>
 <t t-name="FieldBinaryImage">
-    <table cellpadding="0" cellspacing="0" border="0">
+    <table cellpadding="0" cellspacing="0" border="0" width="100%">
    <tr>
        <td align="center">
            <img t-att-src='_s + "/web/static/src/img/placeholder.png"' class="oe-binary-image"