From be9f2840a3959598b7a99fb71d75ca237f907944 Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Thu, 29 Oct 2015 00:09:12 +0200
Subject: [PATCH 1/7] guess-fixed view definition

---
 view/account_invoice.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/view/account_invoice.xml b/view/account_invoice.xml
index 982bbdc..52a5eda 100644
--- a/view/account_invoice.xml
+++ b/view/account_invoice.xml
@@ -7,14 +7,15 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//sheet[@string='Invoice']/group/group[2]/field[@name='date_invoice']" position="after">
+                <xpath expr="//sheet/group/group[2]/field[@name='date_invoice']" position="after">
                     <field name="date_delivered"/>
                 </xpath>
 
-                <xpath expr="//page[@string='Other Info']//group/field[@name='name']" position="after">
+                <xpath expr="//notebook/page[2]//group/field[@name='name']" position="after">
                     <field name="invoice_number"/>
                     <field name="ref_number"/>
                 </xpath>
+
             </field>
         </record>
     </data>

From df14c22be2b8fdc583a4b9fdb191d73d42cc99a3 Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Sat, 28 Nov 2015 14:26:23 +0200
Subject: [PATCH 2/7] WIP: v9 compatibility

---
 model/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/account_invoice.py b/model/account_invoice.py
index bcaf9c5..c33746f 100644
--- a/model/account_invoice.py
+++ b/model/account_invoice.py
@@ -47,7 +47,7 @@ def _compute_ref_number(self):
     @api.one
     def _compute_barcode_string(self):
         primary_bank_account = self.partner_bank_id or \
-            self.company_id.bank_ids and self.company_id.bank_ids[0]
+            self.company_id.partner_id.bank_ids and self.company_id.partner_id.bank_ids[0]
         if (self.amount_total and primary_bank_account.acc_number
                 and self.ref_number and self.date_due):
             amount_total_string = str(self.amount_total)

From 738d719a520adce55a9ca7d22c1f33d3e0bec1fd Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Sat, 28 Nov 2015 14:27:29 +0200
Subject: [PATCH 3/7] tidy up view definition

---
 view/account_invoice.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/account_invoice.xml b/view/account_invoice.xml
index 52a5eda..3576b0d 100644
--- a/view/account_invoice.xml
+++ b/view/account_invoice.xml
@@ -7,9 +7,9 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//sheet/group/group[2]/field[@name='date_invoice']" position="after">
+                <field name="date_invoice" position="after">
                     <field name="date_delivered"/>
-                </xpath>
+                </field>
 
                 <xpath expr="//notebook/page[2]//group/field[@name='name']" position="after">
                     <field name="invoice_number"/>

From 68aa156bda3b21b8111cd1cf60a3c96548fe6ba1 Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Sat, 28 Nov 2015 14:34:56 +0200
Subject: [PATCH 4/7] WIP: fix call to the document

---
 report/report_invoice.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/report/report_invoice.xml b/report/report_invoice.xml
index b7dcc44..67a2ebe 100644
--- a/report/report_invoice.xml
+++ b/report/report_invoice.xml
@@ -497,8 +497,8 @@
 
         <template id="report_invoice_finnish_translate" t-name="Finnish Invoice">
             <t t-call="report.html_container">
-                <t t-foreach="doc_ids" t-as="doc_id">
-                    <t t-raw="translate_doc(doc_id, doc_model, 'partner_id.lang', 'l10n_fi_invoice.report_invoice_finnish_document')"/>
+                <t t-foreach="docs" t-as="doc">
+                    <t t-lang="doc.partner_id.lang" t-call="l10n_fi_invoice.report_invoice_finnish_document"/>
                 </t>
             </t>
         </template>

From 37b176e5677677fa4341bfc30b2c2581442223fb Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Sun, 6 Dec 2015 14:24:18 +0200
Subject: [PATCH 5/7] change doc variable from o to doc

---
 report/report_invoice.xml | 94 +++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/report/report_invoice.xml b/report/report_invoice.xml
index 67a2ebe..7c004a3 100644
--- a/report/report_invoice.xml
+++ b/report/report_invoice.xml
@@ -15,13 +15,13 @@
                             <div class="row">
                                 <div class="col-xs-2 col-xs-offset-1"
                                      style="float: none; display: inline-block; vertical-align: middle;">
-                                    <img t-if="o.company_id.logo"
-                                         t-att-src="'data:image/png;base64,%s' % o.company_id.logo"
+                                    <img t-if="doc.company_id.logo"
+                                         t-att-src="'data:image/png;base64,%s' % doc.company_id.logo"
                                          style="max-height: 2.1cm; max-width: 4cm;"/>
                                 </div>
                                 <div class="col-xs-4"
                                      style="font-size: .85em; float: none; display: inline-block; vertical-align: middle;">
-                                    <div t-field="o.company_id.partner_id"
+                                    <div t-field="doc.company_id.partner_id"
                                          t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
                                 </div>
                                 <div class="col-xs-5 text-left"
@@ -138,10 +138,10 @@
                             <div class="row">
                                 <div class="col-xs-6 col-xs-offset-1"
                                      style="margin-top: 10em; margin-bottom: 4em; font-size:1.1em;">
-                                    <address t-field="o.partner_id"
+                                    <address t-field="doc.partner_id"
                                              t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
-                                    <span t-if="o.partner_id.vat">VAT:
-                                        <span t-field="o.partner_id.vat"/>
+                                    <span t-if="doc.partner_id.vat">VAT:
+                                        <span t-field="doc.partner_id.vat"/>
                                     </span>
                                 </div>
                                 <div class="col-xs-5">
@@ -152,7 +152,7 @@
                                                 <span>Invoice number</span>
                                             </td>
                                             <td>
-                                                <t t-esc="o.number"/>
+                                                <t t-esc="doc.number"/>
                                             </td>
                                         </tr>
                                         <tr>
@@ -160,13 +160,13 @@
                                                 <span>Invoice reference</span>
                                             </td>
                                             <td>
-                                                <t t-esc="o.ref_number"/>
+                                                <t t-esc="doc.ref_number"/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Invoice Date</td>
                                             <td>
-                                                <span t-field="o.date_invoice"/>
+                                                <span t-field="doc.date_invoice"/>
                                             </td>
                                         </tr>
                                         <tr>
@@ -174,31 +174,31 @@
                                                 <span>Date due</span>
                                             </td>
                                             <td>
-                                                <span t-field="o.date_due"/>
+                                                <span t-field="doc.date_due"/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Date fulfilled</td>
                                             <td>
-                                                <span t-field="o.date_delivered"/>
+                                                <span t-field="doc.date_delivered"/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Payment term</td>
                                             <td>
-                                                <span t-field="o.payment_term"/>
+                                                <span t-field="doc.payment_term"/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Our reference</td>
                                             <td>
-                                                <span t-field="o.origin"/>
+                                                <span t-field="doc.origin"/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Your reference</td>
                                             <td>
-                                                <span t-field="o.name"/>
+                                                <span t-field="doc.name"/>
                                             </td>
                                         </tr>
                                     </table>
@@ -208,7 +208,7 @@
                         <hr/>
                         <div class="padding-correction" style="min-height: 13.70cm;">
                             <div style="margin-bottom: 1em;">
-                                <span t-field="o.comment"/>
+                                <span t-field="doc.comment"/>
                             </div>
                             <table class="table table-condensed products-table">
                                 <thead>
@@ -225,7 +225,7 @@
                                     </tr>
                                 </thead>
                                 <tbody class="invoice_tbody">
-                                    <tr t-foreach="o.invoice_line" t-as="l">
+                                    <tr t-foreach="doc.invoice_line" t-as="l">
                                         <td>
                                             <span class="line_number" t-esc="str(l_index+1) + '.'"/>
                                             <span class="col-xs-offset-2" t-field="l.name"/>
@@ -245,7 +245,7 @@
                                         </td>
                                         <td class="text-right">
                                             <span t-field="l.price_subtotal"
-                                                  t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                                  t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                         </td>
                                     </tr>
                                 </tbody>
@@ -257,29 +257,29 @@
                                         <tr>
                                             <td>Total Without Taxes</td>
                                             <td class="text-right totals-col">
-                                                <span t-field="o.amount_untaxed"
-                                                      t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                                <span t-field="doc.amount_untaxed"
+                                                      t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Taxes</td>
                                             <td class="text-right totals-col">
-                                                <span t-field="o.amount_tax"
-                                                      t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                                <span t-field="doc.amount_tax"
+                                                      t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>Total</td>
                                             <td class="text-right totals-col">
-                                                <span t-field="o.amount_total"
-                                                      t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                                <span t-field="doc.amount_total"
+                                                      t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                             </td>
                                         </tr>
                                     </table>
                                 </div>
                             </div>
 
-                            <div class="row" t-if="o.tax_line">
+                            <div class="row" t-if="doc.tax_line">
                                 <div class="col-xs-6 col-xs-offset-6">
                                     <table class="table table-condensed">
                                         <thead>
@@ -290,17 +290,17 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                            <tr t-foreach="o.tax_line" t-as="t">
+                                            <tr t-foreach="doc.tax_line" t-as="t">
                                                 <td>
                                                     <span t-field="t.name"/>
                                                 </td>
                                                 <td class="text-right">
                                                     <span t-field="t.base"
-                                                          t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                                          t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                                 </td>
                                                 <td class="text-right">
                                                     <span t-field="t.amount"
-                                                          t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                                          t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                                 </td>
                                             </tr>
                                         </tbody>
@@ -312,26 +312,26 @@
                         <div class="bank-transfer-wrap last-page" style="page-break-inside: avoid;">
                             <div class="row padding-correction" style="margin-bottom: 1em; font-size: .8em;">
                                 <div class="col-xs-4">
-                                    <div t-field="o.company_id.partner_id"
+                                    <div t-field="doc.company_id.partner_id"
                                          t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
                                 </div>
                                 <div class="col-xs-4">
                                     <div>
-                                        <span t-field="o.company_id.phone"/>
+                                        <span t-field="doc.company_id.phone"/>
                                     </div>
                                     <div>
-                                        <span t-field="o.company_id.email"/>
+                                        <span t-field="doc.company_id.email"/>
                                     </div>
                                     <div>
-                                        <span t-field="o.company_id.website"/>
+                                        <span t-field="doc.company_id.website"/>
                                     </div>
                                 </div>
                                 <div class="col-xs-4">
-                                    <div t-if="o.company_id.city">Kotipaikka:
-                                        <span t-field="o.company_id.city"/>
+                                    <div t-if="doc.company_id.city">Kotipaikka:
+                                        <span t-field="doc.company_id.city"/>
                                     </div>
                                     <div>Y-tunnus:
-                                        <span t-field="o.company_id.company_registry"/>
+                                        <span t-field="doc.company_id.company_registry"/>
                                     </div>
                                 </div>
                             </div>
@@ -349,12 +349,12 @@
                                             </div>
                                         </div>
                                         <div class="col-xs-10 border-left">
-                                            <t t-if="o.partner_bank_id.acc_number">
+                                            <t t-if="doc.partner_bank_id.acc_number">
                                                 IBAN
-                                                <t t-esc="o.partner_bank_id.acc_number"/>
+                                                <t t-esc="doc.partner_bank_id.acc_number"/>
                                             </t>
-                                            <t t-if="not o.partner_bank_id.acc_number">
-                                                <t t-foreach="o.company_id.bank_ids" t-as="t">
+                                            <t t-if="not doc.partner_bank_id.acc_number">
+                                                <t t-foreach="doc.company_id.bank_ids" t-as="t">
                                                     <div t-if="t_index &lt; 3">
                                                         IBAN
                                                         <span t-field="t.acc_number"/>
@@ -376,7 +376,7 @@
                                             </div>
                                         </div>
                                         <div class="col-xs-10 border-left" id="company-info" style="height: 4.5em">
-                                            <div t-field="o.company_id.partner_id"
+                                            <div t-field="doc.company_id.partner_id"
                                                  t-field-options='{"widget": "contact", "fields": ["name"], "no_marker": true}'
                                                  style="font-size: .8em;"/>
                                         </div>
@@ -391,7 +391,7 @@
                                             </div>
                                         </div>
                                         <div class="col-xs-10" id="payer-info" style="height: 6em;">
-                                            <div t-field="o.partner_id"
+                                            <div t-field="doc.partner_id"
                                                  t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
                                                  style="font-size: .8em;"/>
                                         </div>
@@ -432,7 +432,7 @@
                                     </div>
                                     <div class="row border-bottom">
                                         <div class="col-xs-12" style="height: 10.5em;">
-                                            Laskun numero <t t-esc="o.number"/>
+                                            Laskun numero <t t-esc="doc.number"/>
                                         </div>
                                     </div>
                                     <div class="row row-eq-height border-bottom small-row">
@@ -446,7 +446,7 @@
                                         </div>
                                         <div class="col-xs-10 border-left">
                                             <strong>
-                                                <span t-field="o.ref_number" class="bank-transfer-value"/>
+                                                <span t-field="doc.ref_number" class="bank-transfer-value"/>
                                             </strong>
                                         </div>
                                     </div>
@@ -457,13 +457,13 @@
                                         </div>
                                         <div class="col-xs-4 border-left">
                                             <strong>
-                                                <span t-field="o.date_due" class="bank-transfer-value"/>
+                                                <span t-field="doc.date_due" class="bank-transfer-value"/>
                                             </strong>
                                         </div>
                                         <div class="col-xs-6 border-left" style="padding-left: 0;">
                                             <span class="bank-transfer-label">Euro</span>
                                             <strong>
-                                                <span t-field="o.amount_total" class="bank-transfer-value"
+                                                <span t-field="doc.amount_total" class="bank-transfer-value"
                                                       style="float: right;"/>
                                             </strong>
                                         </div>
@@ -472,11 +472,11 @@
                             </div>
                             <div class="row">
                                 <div class="col-xs-9" style="text-align: center;">
-                                    <t t-if="o.barcode_string">
+                                    <t t-if="doc.barcode_string">
                                         <img style="margin-left: 2cm; margin-right: 2cm; margin-top: .2cm;"
-                                             t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;height=%s&amp;width=%s' %('Code128', o.barcode_string, 60, 600)"/>
+                                             t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;height=%s&amp;width=%s' %('Code128', doc.barcode_string, 60, 600)"/>
                                         <div class="barcode-values">
-                                            <t t-esc="o.barcode_string"/>
+                                            <t t-esc="doc.barcode_string"/>
                                         </div>
                                     </t>
                                 </div>

From b818c1325adbb9f44f851ec7bea394b40725533f Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Sun, 6 Dec 2015 15:19:07 +0200
Subject: [PATCH 6/7] compatibility fixes

---
 report/report_invoice.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/report/report_invoice.xml b/report/report_invoice.xml
index 7c004a3..eff7849 100644
--- a/report/report_invoice.xml
+++ b/report/report_invoice.xml
@@ -186,7 +186,7 @@
                                         <tr>
                                             <td>Payment term</td>
                                             <td>
-                                                <span t-field="doc.payment_term"/>
+                                                <span t-field="doc.payment_term_id"/>
                                             </td>
                                         </tr>
                                         <tr>
@@ -225,14 +225,14 @@
                                     </tr>
                                 </thead>
                                 <tbody class="invoice_tbody">
-                                    <tr t-foreach="doc.invoice_line" t-as="l">
+                                    <tr t-foreach="doc.invoice_line_ids" t-as="l">
                                         <td>
                                             <span class="line_number" t-esc="str(l_index+1) + '.'"/>
                                             <span class="col-xs-offset-2" t-field="l.name"/>
                                         </td>
                                         <td>
                                             <span t-field="l.quantity"/>
-                                            <span t-field="l.uos_id" groups="product.group_uom"/>
+                                            <span t-field="l.uom_id" groups="product.group_uom"/>
                                         </td>
                                         <td class="text-right">
                                             <span t-field="l.price_unit"/>
@@ -241,7 +241,7 @@
                                             <span t-field="l.discount"/>
                                         </td>
                                         <td class="text-right">
-                                            <span t-esc="', '.join(map(lambda x: x.name, l.invoice_line_tax_id))"/>
+                                            <span t-esc="', '.join(map(lambda x: x.name, l.invoice_line_tax_ids))"/>
                                         </td>
                                         <td class="text-right">
                                             <span t-field="l.price_subtotal"
@@ -279,7 +279,7 @@
                                 </div>
                             </div>
 
-                            <div class="row" t-if="doc.tax_line">
+                            <div class="row" t-if="doc.tax_line_ids">
                                 <div class="col-xs-6 col-xs-offset-6">
                                     <table class="table table-condensed">
                                         <thead>
@@ -290,12 +290,12 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                            <tr t-foreach="doc.tax_line" t-as="t">
+                                            <tr t-foreach="doc.tax_line_ids" t-as="t">
                                                 <td>
                                                     <span t-field="t.name"/>
                                                 </td>
                                                 <td class="text-right">
-                                                    <span t-field="t.base"
+                                                    <span t-field="t.tax_id.amount"
                                                           t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
                                                 </td>
                                                 <td class="text-right">
@@ -354,7 +354,7 @@
                                                 <t t-esc="doc.partner_bank_id.acc_number"/>
                                             </t>
                                             <t t-if="not doc.partner_bank_id.acc_number">
-                                                <t t-foreach="doc.company_id.bank_ids" t-as="t">
+                                                <t t-foreach="doc.company_id.partner_id.bank_ids" t-as="t">
                                                     <div t-if="t_index &lt; 3">
                                                         IBAN
                                                         <span t-field="t.acc_number"/>

From a13cbb37fc69867cd9575b61a415a98fd9bbd763 Mon Sep 17 00:00:00 2001
From: Teppo Naakka <teppo.naakka@gmail.com>
Date: Wed, 9 Dec 2015 17:26:50 +0200
Subject: [PATCH 7/7] barcode alignment fixed

---
 report/report_invoice.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report/report_invoice.xml b/report/report_invoice.xml
index eff7849..013f166 100644
--- a/report/report_invoice.xml
+++ b/report/report_invoice.xml
@@ -473,7 +473,7 @@
                             <div class="row">
                                 <div class="col-xs-9" style="text-align: center;">
                                     <t t-if="doc.barcode_string">
-                                        <img style="margin-left: 2cm; margin-right: 2cm; margin-top: .2cm;"
+                                        <img style="margin-left: 0cm; margin-right: 2cm; margin-top: .2cm;"
                                              t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;height=%s&amp;width=%s' %('Code128', doc.barcode_string, 60, 600)"/>
                                         <div class="barcode-values">
                                             <t t-esc="doc.barcode_string"/>