diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-03-21 15:45:21 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-03-21 15:45:21 +0530 |
| commit | 976f7319e70ea5f4e625ecec5cc97b07381a896d (patch) | |
| tree | 6bceafd07eb3a64465175d945b81381b5637b0e6 /addons/edi/static/src | |
| parent | fa3f4f180f533f3f21cf072f0e48d1a64c8e3296 (diff) | |
| parent | 3b1bafc30c7b8bfe1dfce614d194d1704bbc4ffa (diff) | |
[MERGE]
bzr revid: sgo@tinyerp.com-20120321101521-kfb67vhspm6uzo5d
Diffstat (limited to 'addons/edi/static/src')
| -rw-r--r-- | addons/edi/static/src/css/edi.css | 8 | ||||
| -rw-r--r-- | addons/edi/static/src/xml/edi.xml | 2 | ||||
| -rw-r--r-- | addons/edi/static/src/xml/edi_account.xml | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css index 478985ee585..1601151ae1f 100644 --- a/addons/edi/static/src/css/edi.css +++ b/addons/edi/static/src/css/edi.css @@ -146,6 +146,14 @@ table.oe_edi_data, .oe_edi_doc_title { font-style: italic; font-size: 95%; padding-left: 10px; + + /* prevent wide notes from disrupting layout due to <pre> styling */ + white-space: pre-line; + width: 90%; +} +.oe_edi_data_row .oe_edi_inner_note { + /* prevent wide notes from disrupting layout due to <pre> styling */ + width: 25em; } .oe_edi_shade { background: #e8e8e8; diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml index 1f27c49ccdd..b9b385e9a07 100644 --- a/addons/edi/static/src/xml/edi.xml +++ b/addons/edi/static/src/xml/edi.xml @@ -11,7 +11,7 @@ <td colspan="2" valign="top" id="oe_header" class="header"> <div> <a href="/" class="company_logo_link"> <div class="company_logo" - t-att-style="'background: url('+ (doc.company_address ? '/edi/binary?db='+widget.db+'&token='+widget.token : '/web/static/src/img/logo.png')+')'"/></a> </div> + t-att-style="'background-size: 180px 46px; background: url('+ (doc.company_address ? '/edi/binary?db='+widget.db+'&token='+widget.token : '/web/static/src/img/logo.png')+')'"/></a> </div> </td> </tr> <tr> diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml index dc6fb7f9754..3ce1daebf93 100644 --- a/addons/edi/static/src/xml/edi_account.xml +++ b/addons/edi/static/src/xml/edi_account.xml @@ -39,9 +39,9 @@ <th align="left">Your Reference</th> </tr> <tr class="oe_edi_data_row"> - <td align="left"><t t-esc="doc.name"/></td> - <td align="left"><t t-esc="doc.date_invoice"/></td> - <td align="left"><t t-esc="doc.partner_ref"/></td> + <td align="left"><t t-if="doc.name" t-esc="doc.name"/></td> + <td align="left"><t t-if="doc.date_invoice" t-esc="doc.date_invoice"/></td> + <td align="left"><t t-if="doc.partner_ref" t-esc="doc.partner_ref"/></td> </tr> </table> <p/> |