From 4533f77cc2e06927c6f27f8c8025e3b39666af8b Mon Sep 17 00:00:00 2001
From: Ahmed Aly <ahmed.aly@datenpol.at>
Date: Tue, 10 Apr 2018 14:12:13 +0200
Subject: [PATCH] Feedback 1597: "Rabatt verstecken" funktioniert nicht

---
 ext/custom-addons/dp_reports_account/__manifest__.py     | 1 +
 ext/custom-addons/dp_reports_account/reports/invoice.xml | 2 +-
 ext/custom-addons/dp_reports_sale/__manifest__.py        | 1 +
 ext/custom-addons/dp_reports_sale/reports/sale.xml       | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/custom-addons/dp_reports_account/__manifest__.py b/ext/custom-addons/dp_reports_account/__manifest__.py
index 57e19c78..c7b31359 100644
--- a/ext/custom-addons/dp_reports_account/__manifest__.py
+++ b/ext/custom-addons/dp_reports_account/__manifest__.py
@@ -13,6 +13,7 @@
         'account_invoicing',
         'report_intrastat',
         'dp_reports',
+        'dp_sale_hide_discount',
     ],
     'data': [
         'reports/invoice.xml',
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index ee1336c6..38ff7729 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -163,7 +163,7 @@
                                             <span t-field="invoice_line.price_unit"/>
                                         </td>
                                         <td class="text-right" t-if="discount_is_set">
-                                            <span t-field="invoice_line.discount"/>
+                                            <span t-if="not invoice_line.hide_discount" t-field="invoice_line.discount"/>
                                         </td>
                                         <td class="text-right">
                                             <span t-field="invoice_line.price_subtotal"/>
diff --git a/ext/custom-addons/dp_reports_sale/__manifest__.py b/ext/custom-addons/dp_reports_sale/__manifest__.py
index 14d18ec6..752b0831 100644
--- a/ext/custom-addons/dp_reports_sale/__manifest__.py
+++ b/ext/custom-addons/dp_reports_sale/__manifest__.py
@@ -13,6 +13,7 @@
         'dp_reports',
         'sale',
         'dp_sale_delivery_date',
+        'dp_sale_hide_discount',
     ],
     'data': [
         'reports/sale.xml',
diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml
index c79afdc3..dc37df21 100644
--- a/ext/custom-addons/dp_reports_sale/reports/sale.xml
+++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml
@@ -125,7 +125,7 @@
                                     <span t-field="order_line.price_unit"/>
                                 </td>
                                 <td rowspan="2" class="text-right" t-if="discount_is_set">
-                                    <span t-field="order_line.discount"/>
+                                    <span t-if="not order_line.hide_discount" t-field="order_line.discount"/>
                                 </td>
                                 <td rowspan="2" class="text-right">
                                     <span t-field="order_line.price_subtotal"/>