projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
176e9fd
)
SALE,ACCOUNT,PURCHASE: fix notes in report to wrap correctly
author
ced
<>
Mon, 26 Feb 2007 12:31:01 +0000
(12:31 +0000)
committer
ced
<>
Mon, 26 Feb 2007 12:31:01 +0000
(12:31 +0000)
bzr revid: ced-
d275a8c7609473315a6d468f8b13cda8d66f458f
addons/account/report/invoice.rml
patch
|
blob
|
history
addons/purchase/report/order.rml
patch
|
blob
|
history
addons/purchase/report/request_quotation.rml
patch
|
blob
|
history
addons/sale/report/order.rml
patch
|
blob
|
history
diff --git
a/addons/account/report/invoice.rml
b/addons/account/report/invoice.rml
index
8e42966
..
90a503d
100644
(file)
--- a/
addons/account/report/invoice.rml
+++ b/
addons/account/report/invoice.rml
@@
-189,10
+189,10
@@
<blockTable colWidths="28.0,499.0" style="Tableau8">
<tr>
<td>
<blockTable colWidths="28.0,499.0" style="Tableau8">
<tr>
<td>
- <para style="P13">[[ repeatIn((l.note and [l.note]) or [], 'note') ]]</para>
+ <para style="P13">[[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]]</para>
</td>
<td>
</td>
<td>
- <para style="P14">[[ note or removeParentNode('table') ]] [[ setTag('para','xpre') ]]</para>
+ <para style="P14">[[ note or removeParentNode('table') ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
diff --git
a/addons/purchase/report/order.rml
b/addons/purchase/report/order.rml
index
eaac95e
..
892583e
100644
(file)
--- a/
addons/purchase/report/order.rml
+++ b/
addons/purchase/report/order.rml
@@
-206,19
+206,14
@@
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
- <blockTable colWidths="43.0,333.0,135.0" style="Tableau5">
+ <blockTable colWidths="43.0,468.0" style="Tableau5">
<tr>
<td>
<tr>
<td>
- <para style="P19">[[ repeatIn((line.notes and [line.notes]) or [], 'l') ]]</para>
+ <para style="P19">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
</td>
<td>
<para style="P20">[[ l or removeParentNode('table') ]]</para>
</td>
</td>
<td>
<para style="P20">[[ l or removeParentNode('table') ]]</para>
</td>
- <td>
- <para style="P19">
- <font color="white"> </font>
- </para>
- </td>
</tr>
</blockTable>
</section>
</tr>
</blockTable>
</section>
diff --git
a/addons/purchase/report/request_quotation.rml
b/addons/purchase/report/request_quotation.rml
index
5aca5fb
..
afe4ca2
100644
(file)
--- a/
addons/purchase/report/request_quotation.rml
+++ b/
addons/purchase/report/request_quotation.rml
@@
-185,7
+185,7
@@
<blockTable colWidths="96.0,332.0,82.0" style="Tableau5">
<tr>
<td>
<blockTable colWidths="96.0,332.0,82.0" style="Tableau5">
<tr>
<td>
- <para style="P20">[[ repeatIn((line.notes and [line.notes]) or [], 'l') ]]</para>
+ <para style="P20">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
</td>
<td>
<para style="P21">[[ l or removeParentNode('table') ]]</para>
</td>
<td>
<para style="P21">[[ l or removeParentNode('table') ]]</para>
diff --git
a/addons/sale/report/order.rml
b/addons/sale/report/order.rml
index
68b6c28
..
04fde68
100644
(file)
--- a/
addons/sale/report/order.rml
+++ b/
addons/sale/report/order.rml
@@
-185,10
+185,10
@@
<blockTable colWidths="52.0,366.0,110.0" style="Tableau5">
<tr>
<td>
<blockTable colWidths="52.0,366.0,110.0" style="Tableau5">
<tr>
<td>
- <para style="P20">[[ repeatIn((line.notes and [line.notes]) or [], 'l') ]]</para>
+ <para style="P20">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
</td>
<td>
</td>
<td>
- <para style="P21">[[ l ]] [[ setTag('para','xpre') ]]</para>
+ <para style="P21">[[ l or removeParentNode('table') ]]</para>
</td>
<td>
<para style="P20">
</td>
<td>
<para style="P20">
@@
-198,7
+198,7
@@
</tr>
</blockTable>
</section>
</tr>
</blockTable>
</section>
- <blockTable colWidths="349.0,69.0,110.0" style="Tableau6">
+ <blockTable colWidths="348.0,69.0,110.0" style="Tableau6">
<tr>
<td>
<para style="P22">
<tr>
<td>
<para style="P22">