diff --git a/ext/custom-addons/dp_custom/__manifest__.py b/ext/custom-addons/dp_custom/__manifest__.py
index 6102ab36..1b16c770 100644
--- a/ext/custom-addons/dp_custom/__manifest__.py
+++ b/ext/custom-addons/dp_custom/__manifest__.py
@@ -35,6 +35,7 @@
         'sale_stock',
         'report_intrastat',
         'dp_intercompany_invoicing',
+        'sale_partner_incoterm',
     ],
     'data': [
         'wizards/wizard_confirm_production.xml',
diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 2a821162..316c93f5 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -56,7 +56,7 @@ class SaleOrder(models.Model):
         for record in self:
             sum = 0
             for line in record.order_line:
-                sum += line.product_id.weight * line.product_uom_qty
+                sum += (line.lot_id.weight or line.product_id.weight) * line.product_uom_qty
             record.weight_total = sum
 
     @api.multi
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index 25b580aa..5afb2f5b 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -33,6 +33,11 @@
                 <field name="lot_id"/>
                 <field name="from_designbox"/>
             </xpath>
+            <group name="technical" position="replace">
+                <group string="Berichtswesen" name="technical">
+                    <field name="origin"/>
+                </group>
+            </group>
         </field>
     </record>
 
diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index 9c3798e5..bcec8bd6 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -107,7 +107,7 @@
                             UID-Nr.:
                             <span t-esc="company.vat"/>
                             &#183;
-                            EORI-Nr.:
+                            EORI-Nr.
                             <span t-esc="company.eori_nr"/>
                             &#183;
                             Firmenbuch Nr.:
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index e10d5209..cd70d8cf 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -37,26 +37,32 @@
                 </div>
                 <div class="row mt32"/>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Kundennr.:</span></strong>
-                    <span class="col-xs-2" t-field="o.partner_id.ref"/>
+                    <div class="col-xs-3">
+                        <strong><span class="col-xs-8" style="padding: 0px">Kundennr.:</span></strong>
+                        <span class="col-xs-4" style="padding: 0px" t-field="o.partner_id.ref"/>
+                    </div>
                     <strong><span class="col-xs-2">Ansprechpartner:</span></strong>
-                    <span class="col-xs-2" t-field="o.user_id"/>
+                    <span class="col-xs-3" t-field="o.user_id"/>
                     <strong><span class="col-xs-2">Positionen:</span></strong>
                     <span class="col-xs-2" t-field="o.positions"/>
                 </div>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Rechnungsdatum:</span></strong>
-                    <span class="col-xs-2" t-field="o.date_invoice"/>
+                    <div class="col-xs-3">
+                        <strong><span class="col-xs-8" style="padding: 0px">Rechnungsdatum:</span></strong>
+                        <span class="col-xs-4" style="padding: 0px" t-field="o.date_invoice"/>
+                    </div>
                     <strong><span class="col-xs-2">Email:</span></strong>
-                    <span class="col-xs-2" t-field="o.user_id.email"/>
+                    <span class="col-xs-3" t-field="o.user_id.email"/>
                     <strong><span class="col-xs-2">Artikel:</span></strong>
                     <span class="col-xs-2" t-field="o.num_items"/>
                 </div>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Lieferdatum:</span></strong>
-                    <span class="col-xs-2">?????????</span>
+                    <div class="col-xs-3">
+                        <strong><span class="col-xs-8" style="padding: 0px">Lieferdatum:</span></strong>
+                        <span class="col-xs-4" style="padding: 0px">?????????</span>
+                    </div>
                     <strong><span class="col-xs-2">Telefon:</span></strong>
-                    <span class="col-xs-2" t-field="o.user_id.phone"/>
+                    <span class="col-xs-3" t-field="o.user_id.phone"/>
                     <strong><span class="col-xs-2">Bezeichnung:</span></strong>
                     <span class="col-xs-2" t-field="o.number"/>
                 </div>
diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml
index 8e5794b1..5580da68 100644
--- a/ext/custom-addons/dp_reports_sale/reports/sale.xml
+++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml
@@ -36,26 +36,32 @@
                 </div>
                 <div class="row mt32"/>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Kundennr.:</span></strong>
-                    <span class="col-xs-2" t-field="o.partner_id.ref"/>
+                    <div class="col-xs-3">
+                        <strong><span class="col-xs-8" style="padding: 0px">Kundennr.:</span></strong>
+                        <span class="col-xs-4" style="padding: 0px" t-field="o.partner_id.ref"/>
+                    </div>
                     <strong><span class="col-xs-2">Ansprechpartner:</span></strong>
-                    <span class="col-xs-2" t-field="o.user_id"/>
+                    <span class="col-xs-3" t-field="o.user_id"/>
                     <strong><span class="col-xs-2">Positionen:</span></strong>
                     <span class="col-xs-2" t-field="o.positions"/>
                 </div>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Angebotsdatum:</span></strong>
-                    <span class="col-xs-2" t-field="o.date_order" t-options='{"widget": "date"}'/>
+                    <div class="col-xs-3">
+                        <strong><span class="col-xs-8" style="padding: 0px">Angebotsdatum:</span></strong>
+                        <span class="col-xs-4" style="padding: 0px" t-field="o.date_order" t-options='{"widget": "date"}'/>
+                    </div>
                     <strong><span class="col-xs-2">Email:</span></strong>
-                    <span class="col-xs-2" t-field="o.user_id.email"/>
+                    <span class="col-xs-3" t-field="o.user_id.email"/>
                     <strong><span class="col-xs-2">Artikel:</span></strong>
                     <span class="col-xs-2" t-field="o.num_items"/>
                 </div>
                 <div class="row height-20">
-                    <strong><span class="col-xs-2">Lieferdatum:</span></strong>
-                    <span class="col-xs-2" t-field="o.earliest_scheduled_date" t-options='{"widget": "date"}'/>
+                    <div class="col-xs-3">
+                        <strong><span class="col-xs-6" style="padding: 0px">Lieferdatum:</span></strong>
+                        <span class="col-xs-6" style="padding: 0px" t-field="o.earliest_scheduled_date" t-options='{"widget": "date"}'/>
+                    </div>
                     <strong><span class="col-xs-2">Telefon:</span></strong>
-                    <span class="col-xs-2" t-field="o.user_id.phone"/>
+                    <span class="col-xs-3" t-field="o.user_id.phone"/>
                     <strong><span class="col-xs-2">Bezeichnung:</span></strong>
                     <span class="col-xs-2" t-field="o.quote_name"/>
                 </div>
diff --git a/setup/lib/config.py b/setup/lib/config.py
index e5e4bcba..139c232d 100644
--- a/setup/lib/config.py
+++ b/setup/lib/config.py
@@ -76,7 +76,7 @@ class Config(object):
             'security_lead': 0,
 
             # Einstellungen Finanzen
-            'tax_calculation_rounding_method': 'round_per_line',
+            'tax_calculation_rounding_method': 'round_globally',
             'vat_check_vies': True,
             'group_multi_currency': True,  # Multiwährungsfunktion aktivieren
             'module_account_reports_followup': False,
@@ -137,6 +137,8 @@ class Config(object):
             'dp_retail_invoice',
             'website_sale',
             'account_invoice_fiscal_position_update',
+            'dp_sale_filter_partner_addresses',
+            'website_form_project',
 
         ]