From 7df047b3d79b4b946c689b890e54ca9e4885ee42 Mon Sep 17 00:00:00 2001
From: Ahmed Aly <ahmed.aly@datenpol.at>
Date: Wed, 2 May 2018 10:04:50 +0200
Subject: [PATCH 1/2] Fall 5556: Gesamtmenge fix

---
 ext/custom-addons/dp_reports_stock/reports/stock.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ext/custom-addons/dp_reports_stock/reports/stock.xml b/ext/custom-addons/dp_reports_stock/reports/stock.xml
index 1bade2b2..72438ec8 100644
--- a/ext/custom-addons/dp_reports_stock/reports/stock.xml
+++ b/ext/custom-addons/dp_reports_stock/reports/stock.xml
@@ -78,6 +78,7 @@
                             </tr>
                         </tbody>
                     </table>
+                    <t t-set="total_ordered_qty" t-value="0"/>
                     <table class="table table-condensed mt48" t-if="not o.move_line_ids">
                         <thead class="table-header">
                             <tr>
@@ -95,7 +96,9 @@
                                     <span t-field="move.product_id"/>
                                 </td>
                                 <td>
-                                    <span t-esc="o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.')"/>
+                                    <t t-set="ordered_qty" t-value="int(o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.'))"/>
+                                    <t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/>
+                                    <span t-esc="ordered_qty"/>
                                     <span t-field="move.product_uom"/>
                                 </td>
                             </tr>
@@ -159,7 +162,9 @@
                                 <td class="text-center">
                                     <span t-field="move_line.package_id"/>
                                     <span t-if="move_line.package_id">:</span>
-                                    <span t-esc="o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.')"/>
+                                    <t t-set="ordered_qty" t-value="int(o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.'))"/>
+                                    <t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/>
+                                    <span t-esc="ordered_qty"/>
                                     <span t-field="move_line.product_uom_id"/>
                                 </td>
                                 <td class="text-right" t-if="move_line.state == 'done'">
@@ -183,7 +188,7 @@
                         <div class="col-xs-6">
                             <span class="pull-right" style="padding-top: 5px; border-top: 1px solid;">
                                 <strong>Total Amount:</strong>
-                                <span t-field="o.number_of_packages"/>
+                                <span t-esc="total_ordered_qty"/>
                             </span>
                         </div>
                     </div>

From d37e02e9a3e0e6d0711e253b08866d17b01f60f6 Mon Sep 17 00:00:00 2001
From: Ahmed Aly <ahmed.aly@datenpol.at>
Date: Wed, 2 May 2018 10:45:28 +0200
Subject: [PATCH 2/2] Feedback 1648: Rabatt nicht andrucken wenn 0

---
 ext/custom-addons/dp_reports_account/__manifest__.py     | 6 +++---
 ext/custom-addons/dp_reports_account/reports/invoice.xml | 2 +-
 ext/custom-addons/dp_reports_sale/__manifest__.py        | 8 ++++----
 ext/custom-addons/dp_reports_sale/reports/sale.xml       | 2 +-
 ext/custom-addons/dp_reports_stock/__manifest__.py       | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/custom-addons/dp_reports_account/__manifest__.py b/ext/custom-addons/dp_reports_account/__manifest__.py
index c7b31359..0466a343 100644
--- a/ext/custom-addons/dp_reports_account/__manifest__.py
+++ b/ext/custom-addons/dp_reports_account/__manifest__.py
@@ -2,11 +2,11 @@
 
 # noinspection PyStatementEffect
 {
-    'name': 'datepol Report-Anpassungen',
+    'name': 'DP Finanzen Report-Anpassungen',
     'category': 'Custom',
     'version': '11.0.1.0.0',
-    'summary': """Individuelle Report Anpassungen""",
-    'description': """Individuelle Report Anpassungen""",
+    'summary': """Individuelle Report Anpassungen im Bereich Finanzen""",
+    'description': """Individuelle Report Anpassungen im Bereich Finanzen""",
     'author': 'datenpol gmbh',
     'website': 'http://www.datenpol.at/',
     'depends': [
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index 9e8e6981..66283856 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -172,7 +172,7 @@
                                                   t-field="invoice_line.price_unit"/>
                                         </td>
                                         <td class="text-right" t-if="discount_is_set">
-                                            <span t-if="not invoice_line.hide_discount"
+                                            <span t-if="not invoice_line.hide_discount and invoice_line.discount"
                                                   t-field="invoice_line.discount"/>
                                         </td>
                                         <td class="text-right">
diff --git a/ext/custom-addons/dp_reports_sale/__manifest__.py b/ext/custom-addons/dp_reports_sale/__manifest__.py
index 752b0831..b2b0c1be 100644
--- a/ext/custom-addons/dp_reports_sale/__manifest__.py
+++ b/ext/custom-addons/dp_reports_sale/__manifest__.py
@@ -2,16 +2,16 @@
 
 # noinspection PyStatementEffect
 {
-    'name': 'datepol Report-Anpassungen',
+    'name': 'DP Verkauf Report-Anpassungen',
     'category': 'Custom',
     'version': '11.0.1.0.0',
-    'summary': """Individuelle Report Anpassungen""",
-    'description': """Individuelle Report Anpassungen""",
+    'summary': """Individuelle Report Anpassungen im Bereich Verkauf""",
+    'description': """Individuelle Report Anpassungen im Bereich Verkauf""",
     'author': 'datenpol gmbh',
     'website': 'http://www.datenpol.at/',
     'depends': [
         'dp_reports',
-        'sale',
+        'sale_management',
         'dp_sale_delivery_date',
         'dp_sale_hide_discount',
     ],
diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml
index cf47e47e..74f13616 100644
--- a/ext/custom-addons/dp_reports_sale/reports/sale.xml
+++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml
@@ -167,7 +167,7 @@
                                           t-field="order_line.price_unit"/>
                                 </td>
                                 <td rowspan="2" class="text-right" t-if="discount_is_set">
-                                    <span t-if="not order_line.hide_discount" t-field="order_line.discount"/>
+                                    <span t-if="not order_line.hide_discount and order_line.discount" t-field="order_line.discount"/>
                                 </td>
                                 <td rowspan="2" class="text-right">
                                     <span t-field="order_line.price_subtotal"/>
diff --git a/ext/custom-addons/dp_reports_stock/__manifest__.py b/ext/custom-addons/dp_reports_stock/__manifest__.py
index 996fc886..a563debc 100644
--- a/ext/custom-addons/dp_reports_stock/__manifest__.py
+++ b/ext/custom-addons/dp_reports_stock/__manifest__.py
@@ -2,11 +2,11 @@
 
 # noinspection PyStatementEffect
 {
-    'name': 'datepol Report-Anpassungen',
+    'name': 'DP Lager Report-Anpassungen',
     'category': 'Custom',
-    'version': '1.0',
-    'summary': """Individuelle Report Anpassungen""",
-    'description': """Individuelle Report Anpassungen""",
+    'version': '11.0.1.0.0',
+    'summary': """Individuelle Report Anpassungen im Bereich Lager""",
+    'description': """Individuelle Report Anpassungen im Bereich Lager""",
     'author': 'datenpol gmbh',
     'website': 'http://www.datenpol.at/',
     'depends': [