diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index eec7f0a8..b33a29a2 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -453,6 +453,7 @@ class SaleOrderLine(models.Model):
                             'name': 'Händlerrabatt {}%'.format(discount),
                             'intrastat_id': False
                         })
+                        del vals['discount']
                         invoice_lines |= self.env['account.invoice.line'].create(vals)
         return invoice_lines
 
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index 1a24c924..deaf93f6 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -104,7 +104,12 @@
                                 <tr t-if="layout_category['name'] != 'Uncategorized'">
                                     <td colspan="6">
                                         <strong>
-                                            <t t-esc="layout_category['name']"/> - <t t-esc="o.partner_id.name"/><t t-if="layout_category['confirmation_nr']"> - <t t-esc="layout_category['confirmation_nr']"/></t>
+                                            <t t-esc="layout_category['name']"/>
+                                            -
+                                            <t t-esc="o.partner_id.name"/>
+                                            <t t-if="layout_category['confirmation_nr']">-
+                                                <t t-esc="layout_category['confirmation_nr']"/>
+                                            </t>
                                         </strong>
                                     </td>
                                     <td class="text-right" t-if="discount_is_set"/>
@@ -128,9 +133,8 @@
                                             <span t-field="invoice_line.weight"/>
                                             kg
                                         </td>
-                                        <td class="text-right">
-                                        </td>
-                                        <td rowspan="2" class="text-left">
+                                        <td class="text-right"/>
+                                        <td class="text-left">
                                             <t t-if="invoice_line.product_id.default_code">
                                                 <strong>
                                                     <span t-field="invoice_line.product_id.default_code"/>
@@ -144,25 +148,16 @@
                                             </span>
                                             <span t-field="invoice_line.name"/>
                                         </td>
-                                        <td rowspan="2" class="text-right">
+                                        <td class="text-right">
                                             <span t-field="invoice_line.price_unit"/>
                                         </td>
-                                        <td rowspan="2" class="text-right" t-if="discount_is_set">
+                                        <td class="text-right" t-if="discount_is_set">
                                             <span t-field="invoice_line.discount"/>
                                         </td>
-                                        <td rowspan="2" class="text-right">
+                                        <td class="text-right">
                                             <span t-field="invoice_line.price_subtotal"/>
                                         </td>
                                     </tr>
-
-                                    <tr>
-                                        <td colspan="4" style="border: 0;text-align: center;">
-                                            <!-- Fall 5078, Rechnung - keine Bilder mehr
-                                            <img t-if="invoice_line.product_id.image_medium"
-                                                 t-att-src="'data:image/png;base64,%s' % invoice_line.product_id.image_medium.decode()"/>
-                                            -->
-                                        </td>
-                                    </tr>
                                 </t>
                             </t>
                         </tbody>
@@ -267,7 +262,7 @@
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
             print_report_name="(object._get_printed_report_name())"
             paperformat="dp_reports.paperformat_a4_european"
-        />
+    />
 
     <record id="account.account_invoices_without_payment" model="ir.actions.report">
         <field name="name">Rechnung ohne Zolltarifnummer</field>
diff --git a/setup/odoo-playboook/roles/odoo/defaults/main.yml b/setup/odoo-playboook/roles/odoo/defaults/main.yml
index 24d34b86..101852d4 100644
--- a/setup/odoo-playboook/roles/odoo/defaults/main.yml
+++ b/setup/odoo-playboook/roles/odoo/defaults/main.yml
@@ -67,8 +67,8 @@ odoo_config_geoip_database: /usr/share/GeoIP/GeoLiteCity.dat
 odoo_config_http_enable: True           # >= 11.0
 odoo_config_http_interface: ''          # >= 11.0
 odoo_config_http_port: 8069             # >= 11.0
-odoo_config_limit_memory_hard: 805306368
-odoo_config_limit_memory_soft: 671088640
+odoo_config_limit_memory_hard: 2684354560
+odoo_config_limit_memory_soft: 2147483648
 odoo_config_limit_time_cpu: 60
 odoo_config_limit_time_real: 120
 odoo_config_limit_time_real_cron: -1    # >= 10.0