Fall 5397: CR1 - Auslieferungsmethode + neues Logo

dev/scripts/interfaces/sst11_pg_create_company.py

@@ -5,7 +5,7 @@ from urllib.parse import urlparse
 host = 'localhost'
 port = 8080
 db = 'tz-austria_1'
-user = 'admin'
+user = 'tz-admin'
 pw = 'x'
 
 odoo = odoorpc.ODOO(host, port=port)
@@ -27,17 +27,18 @@ values = {
     "email": "company@test.at",
     "opt_out": True,
     "ref": "A144S4",
-    "partner_sector_id": "Test",
+    "partner_sector_id": "ENDKUNDE",
     "comment": "comment",
     "vat": False,
     "lang": "de",
-    "line_ids": ["12345", "12346"],
+    "line_ids": ["0000"],
     "property_payment_term_id": "15 Tage",
     "property_product_pricelist": "EUR",
     "date_vat_check": "2017-08-04",
     "active": True,
-    "retail_partner_id": "A144S3",
+    "retail_partner_id": "004354",
     "retailer": False,
+    "carrier": "LKW"
 }
 
 res_partner_obj = odoo.env['res.partner']

ext/custom-addons/dp_custom/data/product_data.xml

@@ -6,4 +6,9 @@
         <field name="type">service</field>
     </record>
 
+    <record id="product_transport" model="product.template">
+        <field name="name">Transport</field>
+        <field name="type">service</field>
+    </record>
+
 </odoo>

ext/custom-addons/dp_custom/models/res_partner.py

@@ -233,6 +233,15 @@ class Partner(models.Model):
             else:
                 raise ValidationError(_("Unternehmen mit Odoo-ID \'%s\' existiert nicht") % vals['company_odoo_id'])
 
+        if vals.get('carrier', False):
+            carrier_id = self.env['delivery.carrier'].search([('name', '=', vals['carrier'])])
+            if carrier_id:
+                vals['property_delivery_carrier_id'] = carrier_id.id
+                del vals['carrier']
+            else:
+                raise ValidationError(
+                    _("Die Auslieferungsmethode mit dem Namen \'%s\' existiert nicht") % vals['carrier'])
+
         return vals
 
     @api.model
@@ -245,7 +254,8 @@ 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', 'name2'])
+                                'retail_partner_id', 'retailer', 'info_uid', 'name2', 'carrier'])
+            return common_list
         elif self.env.context.get('sst_14', False):
             common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id'])
             return common_list

ext/custom-addons/dp_custom/models/sale.py

@@ -154,7 +154,8 @@ class SaleOrder(models.Model):
         if not partner.parent_id:
             raise ValidationError(
                 _('Zu dem Kontakt mit der portal-ID %s existiert kein Unternehmen') % vals['portal_id'])
-        vals['partner_id'] = partner.parent_id.id
+        partner = partner.parent_id
+        vals['partner_id'] = partner.id
         if not partner:
             raise ValidationError(
                 _("Der Kunde mit der Portal-ID \'%s\' kann nicht zugeordnet werden") % vals['portal_id'])
@@ -192,7 +193,8 @@ class SaleOrder(models.Model):
             'payment_term_id': payment_term.id,
             'partner_shipping_id': delivery_partner.id,
             'partner_invoice_id': partner.id,
-            'incoterm': partner.sale_incoterm_id.id
+            'incoterm': partner.sale_incoterm_id.id,
+            'carrier_id': partner.property_delivery_carrier_id.id
         })
         order_id = self.create(vals)
         if attachment_vals:

ext/custom-addons/dp_dmi/__manifest__.py

@@ -40,6 +40,7 @@
         'account.payment.term.csv',
         'account.payment.term.line.csv',
         'res.line.csv',
+        'delivery.carrier.csv',
     ],
     'installable': True,
     'auto_install': False,

ext/custom-addons/dp_dmi/delivery.carrier.csv

@@ -0,0 +1,2 @@
+"id","name","delivery_type","product_id/id","fixed_price"
+"carrier_lkw","LKW","fixed","dp_custom.product_transport","0.0"

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

@@ -32,7 +32,7 @@
     <template id="external_layout_header">
         <div class="header">
             <div class="row">
-                <div class="col-xs-10 header-label">
+                <div class="col-xs-8 header-label">
                     <p t-if="o._name == 'account.invoice'">
                         <span t-if="o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')">
                             RECHNUNG
@@ -55,7 +55,7 @@
                         <span t-field="o.quote_name"/>
                     </p>
                 </div>
-                <div class="col-xs-2 header-logo">
+                <div class="col-xs-4 header-logo">
                     <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
                          style="max-height: 85px;"/>
                 </div>