Merge lp:~account-core-editors/account-invoice-report/7.0-add-html-note into lp:~account-core-editors/account-invoice-report/7.0

[Nicolas Bessi - Camptocamp]

Add HTML note in invoice line + support of fromatted not in mako. Fixes some bank formatting in mako

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Should be in english:
47 + _columns = {'formatted_note': fields.html('Note formatée')}

Dubious CSS:
59 + font-size:smaller:border

Typo in the class name:
75 + <td class="formated_note">
s/formated/formatted/

review: Needs Fixing

[lp:~account-core-editors/account-invoice-report/7.0-add-html-note]

8. By Nicolas Bessi - Camptocamp on 2013-01-15

[FIX] typo, css + merge trouble

Unmerged revisions

=== modified file 'invoice_webkit/invoice.py'
--- invoice_webkit/invoice.py	2012-12-18 16:24:39 +0000
+++ invoice_webkit/invoice.py	2013-01-15 08:19:22 +0000
@@ -28,15 +28,16 @@
 ##############################################################################
 from openerp.osv.orm import Model, fields
 
+
 class InvoiceConditionText(Model):
     """add info condition in the invoice"""
     _name = "account.condition_text"
     _description = "Invoices conditions"
 
     _columns = {
-        'name' : fields.char('Condition summary', required=True, size=128),
-        'type' : fields.selection([('header','Top condition'),
-                                   ('footer','Bottom condition')],
+        'name': fields.char('Condition summary', required=True, size=128),
+        'type': fields.selection([('header','Top condition'),
+                                   ('footer', 'Bottom condition')],
                                     'type', required=True),
 
         'text': fields.text('Condition', translate=True, required=True)}
@@ -48,7 +49,7 @@
 
     def _set_condition(self, cr, uid, inv_id, commentid, key):
         """Set the text of the notes in invoices"""
-        if not commentid :
+        if not commentid:
             return {}
         try :
             lang = self.browse(cr, uid, inv_id)[0].partner_id.lang
@@ -65,5 +66,12 @@
 
     _columns = {'text_condition1': fields.many2one('account.condition_text', 'Header condition'),
                 'text_condition2': fields.many2one('account.condition_text', 'Footer condition'),
-                'note1' : fields.text('Header'),
-                'note2' : fields.text('Footer'),}
+                'note1': fields.text('Header'),
+                'note2': fields.text('Footer'),}
+
+
+class AccountInvoiceLine(Model):
+
+    _inherit = 'account.invoice.line'
+
+    _columns = {'formatted_note': fields.html('Formatted Note')}

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2012-12-18 16:24:39 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-01-15 08:19:22 +0000
@@ -30,6 +30,12 @@
     display:table-header-group;
 }
 
+.formatted_note {
+        border-right:thin solid #EEEEEE;
+        left:10px;
+        font-size:smaller;
+}
+
 
 .list_bank_table {
     text-align:center;
@@ -232,10 +238,12 @@
                 <td class="amount" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Account')) or ''} ${line.discount and '%' or ''}</td>
                 <td class="amount" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</td>
             </tr>
-            %if line.name :
-                <tr>
-                    <td colspan="7" class="note" style="font-style:italic; font-size: 10; border-top: thin solid  #ffffff ; border-right:  thin solid #E3E4EA;  padding:20;">${line.name | carriage_returns}</td>
-                </tr>
+            %if line.formatted_note:
+            <tr>
+              <td class="formatted_note">
+                ${line.formatted_note| n}
+              </td>
+            <tr>
             %endif
         %endfor
         </tbody>
@@ -291,12 +299,11 @@
         <br/>
     <%
       inv_bank = inv.partner_bank_id
-      bank_institution = inv_bank and inv_bank.bank
     %>
     <table class="list_bank_table" width="100%" >
         <tr>
             <th style="width:20%;">${_("Bank")}</th>
-            <td style="width:30%;text-align:left;">${ bank_institution and bank_institution.name or '-' } </td>
+            <td style="width:30%;text-align:left;">${inv_bank and inv_bank.bank_name or '-' } </td>
             %if inv.partner_id and inv.partner_id.vat :
             <th style="width:20%;">${_("Customer VAT No")}</th>
             <td style="width:30%;">${inv.partner_id.vat or '-'}</td>
@@ -307,14 +314,14 @@
             %endif
         </tr>
         <tr>
-            <th style="width:20%;">${_("IBAN")}</th>
-            <td style="width:30%;text-align:left;">${ inv_bank and inv_bank.iban or '-' }</td>
+            <th style="width:20%;">${_("Bank account")}</th>
+            <td style="width:30%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</td>
             <th style="width:20%;">${_("Our VAT No")}</th>
-            <td style="width:30%;" class="vat">''</td>
+            <td style="width:30%;" class="vat">${inv.company_id.partner_id.vat or '-'}</td>
         </tr>
         <tr>
             <th width="20%">${_("BIC")}</th>
-            <td style="width:30%;">${ inv.partner_bank_id and inv.partner_bank_id.bank and inv.partner_bank_id.bank.bic or '-' }</td>
+            <td style="width:30%;">${inv_bank and inv_bank.bank_bic or '-' }</td>
         </tr>
     </table>
     <br/>

=== modified file 'invoice_webkit/view/invoice_view.xml'
--- invoice_webkit/view/invoice_view.xml	2012-12-18 16:24:39 +0000
+++ invoice_webkit/view/invoice_view.xml	2013-01-15 08:19:22 +0000
@@ -64,5 +64,29 @@
       </field>
     </record>
 
+    <record model="ir.ui.view" id="invoice_form_add_notes_in_invoice_line_1">
+      <field name="name">account.invoice.form.add.notes</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//tree[@string='Invoice Lines']" position="attributes" >
+          <attribute name="editable" eval="False"/>
+        </xpath>
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="invoice_form_add_notes_in_invoice_line_2">
+      <field name="name">account.invoice.form.add.notes</field>
+      <field name="model">account.invoice.line</field>
+      <field name="inherit_id" ref="account.view_invoice_line_form"/>
+      <field name="arch" type="xml">
+        <field name="name" position="after">
+          <group>
+          <field name="formatted_note" colspan="4"/>
+          </group>
+        </field>
+      </field>
+    </record>
+
   </data>
 </openerp>