From 1913d4d998ce092033164cc41ab1df0762591a9a Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Tue, 18 Dec 2018 10:08:48 +0100
Subject: [PATCH] add field fax to res_partner & res_company; adapt
 report_templates (multi_company)

---
 .../dp_custom/models/res_company.py           |  1 +
 .../dp_custom/models/res_partner.py           |  1 +
 .../dp_custom/views/res_company_views.xml     |  3 +++
 .../dp_custom/views/res_partner_views.xml     |  4 ++++
 .../dp_reports/reports/report_templates.xml   | 19 +++++++++++--------
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ext/custom-addons/dp_custom/models/res_company.py b/ext/custom-addons/dp_custom/models/res_company.py
index 68d330a3..97fd75c6 100644
--- a/ext/custom-addons/dp_custom/models/res_company.py
+++ b/ext/custom-addons/dp_custom/models/res_company.py
@@ -28,6 +28,7 @@ class Company(models.Model):
     _inherit = 'res.company'
 
     eori_nr = fields.Char(string='EORI-Nr')
+    fax = fields.Char(related='partner_id.fax')
 
     @api.model
     def set_company_logo(self, company, logo):
diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py
index 3ff96c32..53d1e676 100644
--- a/ext/custom-addons/dp_custom/models/res_partner.py
+++ b/ext/custom-addons/dp_custom/models/res_partner.py
@@ -76,6 +76,7 @@ class Partner(models.Model):
     country_id = fields.Many2one('res.country', string='Country', ondelete='restrict', default=_default_country_id)
     commission_account_ids = fields.Many2many(comodel_name='commission.account', string='Provisionsempfänger')
     partner_flash = fields.Char()
+    fax = fields.Char(string='Fax')
 
     _sql_constraints = [
         ('ref_uniq', 'unique(ref)', 'Die Interne Referenz muss eindeutig sein'),
diff --git a/ext/custom-addons/dp_custom/views/res_company_views.xml b/ext/custom-addons/dp_custom/views/res_company_views.xml
index aa6beb28..6b526078 100644
--- a/ext/custom-addons/dp_custom/views/res_company_views.xml
+++ b/ext/custom-addons/dp_custom/views/res_company_views.xml
@@ -9,6 +9,9 @@
             <field name="company_registry" position="after">
                 <field name="eori_nr"/>
             </field>
+            <field name="email" position="before">
+                <field name="fax" string="Fax"/>
+            </field>
         </field>
     </record>
 
diff --git a/ext/custom-addons/dp_custom/views/res_partner_views.xml b/ext/custom-addons/dp_custom/views/res_partner_views.xml
index 2ebc6eb5..8a968f54 100644
--- a/ext/custom-addons/dp_custom/views/res_partner_views.xml
+++ b/ext/custom-addons/dp_custom/views/res_partner_views.xml
@@ -33,6 +33,10 @@
                 </div>
             </xpath>
 
+            <xpath expr="//field[@name='email']" position="before">
+                <field name="fax" widget="phone" string="Fax"/>
+            </xpath>
+
             <field name="opt_out" position="attributes">
                 <attribute name="groups"/>
             </field>
diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index 93dfc78e..bea41c73 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -97,17 +97,17 @@
             </div>
             <div class="row">
                 <div class="col-xs-12 text-center">
+                        <!-- <span>AT 46 3250 1000 0200 9306</span> -->
+                        <!-- <span>RLN WAT WW MIB</span> -->
+                        <!-- <span>Raiffeisenbank Spannberg</span> -->
                     <strong>
                         IBAN:
-                        <!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].acc_number"/> -->
-                        <span>AT 46 3250 1000 0200 9306</span>
+                        <span t-if="company.bank_ids" t-esc="company.bank_ids[0].acc_number"/>
                         &#183;
                         BIC:
-                        <!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.bic"/> -->
-                        <span>RLN WAT WW MIB</span>
+                        <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.bic"/>
                         &#183;
-                        <!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.name"/> -->
-                        <span>Raiffeisenbank Spannberg</span>
+                        <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.name"/>
                         &#183;
                         UID-Nr.:
                         <span t-esc="company.vat"/>
@@ -160,8 +160,11 @@
             <br/>
             Phone:
             <span t-esc="company.partner_id.phone"/>
-            <br/>
-            Fax: +43 2538/8628 - 400
+            <t t-if="company.partner_id.fax">
+                <br/>
+                Fax:
+                <span t-esc="company.partner_id.fax"/>
+            </t>
             <br/>
             E-Mail:
             <span t-esc="company.partner_id.email"/>