From 7ec1b4ab8e3e1bd61d2827b82464da5bc22dc1ce Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Wed, 4 Apr 2018 08:46:15 +0200 Subject: [PATCH] Fall 5398: CR1 - Anpassungen SST-01 / Neues Feld --- .../interfaces/sst11_pg_create_company.py | 5 +- .../dp_custom/models/res_partner.py | 37 +- .../dp_custom/views/res_partner_views.xml | 4 +- .../dp_reports/reports/report_templates.xml | 316 ++++++++++-------- 4 files changed, 210 insertions(+), 152 deletions(-) diff --git a/dev/scripts/interfaces/sst11_pg_create_company.py b/dev/scripts/interfaces/sst11_pg_create_company.py index 7fef7bc5..40785145 100755 --- a/dev/scripts/interfaces/sst11_pg_create_company.py +++ b/dev/scripts/interfaces/sst11_pg_create_company.py @@ -13,9 +13,10 @@ odoo.login(db, user, pw) values = { "name": "Company2", - "street": "Elterleinplatz 11", + "name2": "Unternehmen 2", + "street": "Matzleinsdorferplatz 5", "street2": "Teststrasse 30", - "zip": 1170, + "zip": 1050, "city": "Wien", "country_id": "AT", "fax": "+43 55567051", diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py index 3e7671a9..5c6ad7ee 100644 --- a/ext/custom-addons/dp_custom/models/res_partner.py +++ b/ext/custom-addons/dp_custom/models/res_partner.py @@ -245,7 +245,7 @@ class Partner(models.Model): elif self.env.context.get('sst_11', False): common_list.extend(['name', 'ref', 'partner_sector_id', 'comment', 'vat', 'property_payment_term_id', 'property_pricelist_id', 'date_vat_check', 'active', 'property_product_pricelist', - 'retail_partner_id', 'retailer', 'info_uid']) + 'retail_partner_id', 'retailer', 'info_uid', 'name2']) elif self.env.context.get('sst_14', False): common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id']) return common_list @@ -296,6 +296,41 @@ class Partner(models.Model): vals[field] = False return super(Partner, self).write(vals) + @api.multi + def name_get(self): + res = [] + for partner in self: + name = partner.name or '' + if partner.name2: + name += " " + partner.name2 + + if partner.company_name or partner.parent_id: + if not name and partner.type in ['invoice', 'delivery', 'other']: + name = dict(self.fields_get(['type'])['type']['selection'])[partner.type] + if not partner.is_company: + name = "%s, %s" % (partner.commercial_company_name or partner.parent_id.name, name) + if self._context.get('show_address_only'): + name = partner._display_address(without_company=True) + if self._context.get('show_address'): + name = name + "\n" + partner._display_address(without_company=True) + name = name.replace('\n\n', '\n') + name = name.replace('\n\n', '\n') + if self._context.get('show_email') and partner.email: + name = "%s <%s>" % (name, partner.email) + if self._context.get('html_format'): + name = name.replace('\n', '
') + res.append((partner.id, name)) + return res + + @api.depends('company_name', 'parent_id.is_company', 'commercial_partner_id.name') + def _compute_commercial_company_name(self): + res = super(Partner, self)._compute_commercial_company_name() + for partner in self: + p = partner.commercial_partner_id + if p.is_company and p.name2: + partner.commercial_company_name += " " + p.name2 + return res + class PartnerSector(models.Model): _name = 'res.partner.sector' 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 844e9ee9..c8211623 100644 --- a/ext/custom-addons/dp_custom/views/res_partner_views.xml +++ b/ext/custom-addons/dp_custom/views/res_partner_views.xml @@ -12,9 +12,9 @@ class="btn-danger" attrs="{'invisible':[('portal_pending','=',False)]}"/> - +

- +

diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml index bcec8bd6..bf59339f 100644 --- a/ext/custom-addons/dp_reports/reports/report_templates.xml +++ b/ext/custom-addons/dp_reports/reports/report_templates.xml @@ -1,166 +1,188 @@ - - + - - - - - - + + +