improve account_invoice_layout module

bzr revid: hmo@tinyerp.com-20081226100330-1h4k14j7lym3msu7

diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index 034e869..2579609 100644 (file)
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
        <data>
-       <wizard string="Invoice + Message"
+       <wizard string="Invoices with Layout and Message"
                        model="account.invoice"
                        name="wizard.notify_message"
                        id="wizard_notify_message"
@@ -9,7 +9,7 @@
                        />
 
        <report id="account_invoices_1"
-                       string="Invoice"
+                       string="Invoices with Layout"
                        model="account.invoice"
                        name="account.invoice.layout"
                        rml="account_invoice_layout/report/report_account_invoice_layout.rml"

diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
index e7aa4cd..649db05 100644 (file)
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -97,7 +97,7 @@ class account_invoice_with_message(report_sxw.rml_parse):
 
     def spcl_msg(self, form):
         account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, form['message'])
-        msg = account_msg_data.msg
+        msg = account_msg_data.msg        
         return msg
 
 

diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index db21532..1e14600 100644 (file)
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -292,9 +292,10 @@
 <font color="white"> </font>
 </para>
 <para style="P19">[[ format((o.payment_term and o.payment_term.note) or '') ]]</para>
+<section>
 <para style="P19">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
-<para style="P19">[[ note or removeParentNode('table') ]]</para>
-
+<para style="P19">[[ note or removeParentNode('para') ]]</para>
+</section>
 </story>
 </document>