Merge pull request OCA#359 from jcoux/491_account_invoice_report

BSSFL-491: Fix invoice report (add condition to display bank details)
sambarros · Feb 13, 2018 · 8dff9f0 · 8dff9f0
2 parents 78a83ff + 514a855
commit 8dff9f0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -25,6 +25,8 @@ latest (unreleased)
 
 **Bugfixes**
 
+* BSSFL-491: Fix invoice report (add condition to display bank details)
+
 **Build**
 
 **Documentation**

diff --git a/odoo/local-src/sf_account/report/sf_report_invoice.xml b/odoo/local-src/sf_account/report/sf_report_invoice.xml
@@ -210,23 +210,25 @@
                     </div>
 
                     <!-- Bank details -->
-                    <t t-set="b" t-value="o.payment_mode_id.fixed_journal_id.bank_account_id"/>
-                    <div class="row" t-if="b and b.bank_id">
-                        <div class="col-xs-8 pull-left">
-                            <span>Payment for: </span><span t-field="o.company_id.name"/> <span t-field="o.company_id.partner_id.city"/>
-                            <br />
-                            <span>Bank: </span><span t-field="b.bank_id.name"/>, <span t-field="b.bank_id.country.code"/>-<span t-field="b.bank_id.zip"/>
-                            <span t-field="b.bank_id.city"/>, <span t-field="b.bank_id.country"/>
-                            <br />
-                            <span>BIC/SWIFT: </span><span t-field="b.bank_id.bic"/><span> / IBAN: </span><span t-field="b.acc_number"/>
+                    <t t-if="o.type not in ['out_refund', 'in_refund']">
+                        <t t-set="b" t-value="o.payment_mode_id.fixed_journal_id.bank_account_id"/>
+                        <div class="row" t-if="b and b.bank_id">
+                            <div class="col-xs-8 pull-left">
+                                <span>Payment for: </span><span t-field="o.company_id.name"/> <span t-field="o.company_id.partner_id.city"/>
+                                <br />
+                                <span>Bank: </span><span t-field="b.bank_id.name"/>, <span t-field="b.bank_id.country.code"/>-<span t-field="b.bank_id.zip"/>
+                                <span t-field="b.bank_id.city"/>, <span t-field="b.bank_id.country"/>
+                                <br />
+                                <span>BIC/SWIFT: </span><span t-field="b.bank_id.bic"/><span> / IBAN: </span><span t-field="b.acc_number"/>
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="row">
-                        <div class="col-xs-8 pull-left">
-                            <p style="font-weight: bold;">All bank fees are the responsibility of the customer</p>
+                        <div class="row">
+                            <div class="col-xs-8 pull-left">
+                                <p style="font-weight: bold;">All bank fees are the responsibility of the customer</p>
+                            </div>
                         </div>
-                    </div>
+                    </t>
                 </div>
             </t>
         </t>

diff --git a/odoo/migration.yml b/odoo/migration.yml
@@ -214,4 +214,5 @@ migration:
     - version: 10.17.0
       addons:
         upgrade:
+          - sf_account
           - sf_sale