Fall 5398: CR1 - Anpassungen SST-01 / Neues Feld

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",

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', '<br/>')
+            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'

ext/custom-addons/dp_custom/views/res_partner_views.xml

@@ -12,9 +12,9 @@
                             class="btn-danger" attrs="{'invisible':[('portal_pending','=',False)]}"/>
                 </header>
             </xpath>
-            <xpath expr="//h1" position="after">
+            <xpath expr="//field[@name='parent_id']/.." position="before">
                 <h3>
-                    <field name="name2" attrs="{'invisible': [('is_company', '=', False)]}"/>
+                    <field name="name2" placeholder="Unternehmen 2"/>
                 </h3>
             </xpath>
 

ext/custom-addons/dp_reports/reports/report_templates.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
     <template id="report_assets_common" inherit_id="web.report_assets_common">
         <xpath expr="." position="inside">
@@ -138,29 +137,52 @@
             <span t-esc="company.partner_id.name"/>
         </strong>
         <div class="company-data">
-                <span t-esc="company.partner_id.street"/><br/>
+            <span t-esc="company.partner_id.street"/>
-                <span t-esc="company.partner_id.zip"/><span t-esc="company.partner_id.city"/><br/>
+            <br/>
-                <span t-esc="company.partner_id.country_id.name"/><br/><br/>
+            <span t-esc="company.partner_id.zip"/>
-                Phone: <span t-esc="company.partner_id.phone"/><br/>
+            <span t-esc="company.partner_id.city"/>
-                Fax: +43 2538/8628 - 400<br/>
+            <br/>
-                E-Mail: <span t-esc="company.partner_id.email"/><br/>
+            <span t-esc="company.partner_id.country_id.name"/>
+            <br/>
+            <br/>
+            Phone:
+            <span t-esc="company.partner_id.phone"/>
+            <br/>
+            Fax: +43 2538/8628 - 400
+            <br/>
+            E-Mail:
+            <span t-esc="company.partner_id.email"/>
+            <br/>
         </div>
         <div>
-                <strong><span t-esc="company.partner_id.website"/></strong>
+            <strong>
+                <span t-esc="company.partner_id.website"/>
+            </strong>
         </div>
     </template>
+
     <template id="partner_data">
         <strong>
             Kundendaten
         </strong>
         <div class="partner-data">
-                <span t-esc="o.partner_id.name"/><br/>
+            <span t-esc="o.partner_id.name"/>
-                <span t-esc="o.partner_id.street"/><br/>
+            <br/>
-                <span t-esc="o.partner_id.zip"/> <span t-esc="o.partner_id.city"/><br/>
+            <t t-if="o.partner_id.name2">
-                <span t-esc="o.partner_id.country_id.name"/><br/>
+                <span t-esc="o.partner_id.name2"/>
-                <span t-esc="o.partner_id.email"/><br/>
+                <br/>
+            </t>
+            <span t-esc="o.partner_id.street"/>
+            <br/>
+            <span t-esc="o.partner_id.zip"/>
+            <span t-esc="o.partner_id.city"/>
+            <br/>
+            <span t-esc="o.partner_id.country_id.name"/>
+            <br/>
+            <span t-esc="o.partner_id.email"/>
+            <br/>
             <span t-esc="o.partner_id.phone"/>
         </div>
     </template>
-    </data>
+
 </odoo>