add field fax to res_partner & res_company; adapt report_templates (multi_company)

develop
Andreas Osim 2018-12-18 10:08:48 +01:00
parent e98f9da5d1
commit 1913d4d998
5 changed files with 20 additions and 8 deletions

View File

@ -28,6 +28,7 @@ class Company(models.Model):
_inherit = 'res.company' _inherit = 'res.company'
eori_nr = fields.Char(string='EORI-Nr') eori_nr = fields.Char(string='EORI-Nr')
fax = fields.Char(related='partner_id.fax')
@api.model @api.model
def set_company_logo(self, company, logo): def set_company_logo(self, company, logo):

View File

@ -76,6 +76,7 @@ class Partner(models.Model):
country_id = fields.Many2one('res.country', string='Country', ondelete='restrict', default=_default_country_id) 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') commission_account_ids = fields.Many2many(comodel_name='commission.account', string='Provisionsempfänger')
partner_flash = fields.Char() partner_flash = fields.Char()
fax = fields.Char(string='Fax')
_sql_constraints = [ _sql_constraints = [
('ref_uniq', 'unique(ref)', 'Die Interne Referenz muss eindeutig sein'), ('ref_uniq', 'unique(ref)', 'Die Interne Referenz muss eindeutig sein'),

View File

@ -9,6 +9,9 @@
<field name="company_registry" position="after"> <field name="company_registry" position="after">
<field name="eori_nr"/> <field name="eori_nr"/>
</field> </field>
<field name="email" position="before">
<field name="fax" string="Fax"/>
</field>
</field> </field>
</record> </record>

View File

@ -33,6 +33,10 @@
</div> </div>
</xpath> </xpath>
<xpath expr="//field[@name='email']" position="before">
<field name="fax" widget="phone" string="Fax"/>
</xpath>
<field name="opt_out" position="attributes"> <field name="opt_out" position="attributes">
<attribute name="groups"/> <attribute name="groups"/>
</field> </field>

View File

@ -97,17 +97,17 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12 text-center"> <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> <strong>
IBAN: IBAN:
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].acc_number"/> --> <span t-if="company.bank_ids" t-esc="company.bank_ids[0].acc_number"/>
<span>AT 46 3250 1000 0200 9306</span>
&#183; &#183;
BIC: BIC:
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.bic"/> --> <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.bic"/>
<span>RLN WAT WW MIB</span>
&#183; &#183;
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.name"/> --> <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.name"/>
<span>Raiffeisenbank Spannberg</span>
&#183; &#183;
UID-Nr.: UID-Nr.:
<span t-esc="company.vat"/> <span t-esc="company.vat"/>
@ -160,8 +160,11 @@
<br/> <br/>
Phone: Phone:
<span t-esc="company.partner_id.phone"/> <span t-esc="company.partner_id.phone"/>
<br/> <t t-if="company.partner_id.fax">
Fax: +43 2538/8628 - 400 <br/>
Fax:
<span t-esc="company.partner_id.fax"/>
</t>
<br/> <br/>
E-Mail: E-Mail:
<span t-esc="company.partner_id.email"/> <span t-esc="company.partner_id.email"/>