From 83aff9a249289341a3c30b3b2623615711e04b88 Mon Sep 17 00:00:00 2001
From: Christian Hattemer <christian.hattemer@camadeus.at>
Date: Tue, 8 Nov 2016 18:44:44 +0100
Subject: [PATCH] =?UTF-8?q?Aufr=C3=A4umen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ext/config/odoo-server.conf                   |   2 +-
 ext/custom-addons/dp_custom/__init__.py       |   5 +-
 ext/custom-addons/dp_custom/__openerp__.py    |  10 +-
 .../dp_custom/data/dp_custom_data.xml         | 225 +++++++++---------
 .../dp_custom/views/dp_custom_view.xml        |   8 +-
 ext/custom-addons/dp_report/__init__.py       |   2 +-
 ext/custom-addons/dp_report/__openerp__.py    |   8 +-
 .../dp_report/models/__init__.py              |   2 +-
 .../dp_report/views/delivery.xml              | 144 +++++------
 ext/custom-addons/dp_report/views/invoice.xml | 118 ++++-----
 ext/custom-addons/dp_report/views/layouts.xml | 102 ++++----
 .../dp_report/views/saleorder.xml             | 156 ++++++------
 12 files changed, 389 insertions(+), 393 deletions(-)

diff --git a/ext/config/odoo-server.conf b/ext/config/odoo-server.conf
index 7a2599d6..d2b1242e 100644
--- a/ext/config/odoo-server.conf
+++ b/ext/config/odoo-server.conf
@@ -38,4 +38,4 @@ limit_memory_hard = 10000000000
 
 # Use a new worker for the next request if 400MB is reached
 # The worker will be recycled after the current request
-limit_memory_soft = 400000000
\ No newline at end of file
+limit_memory_soft = 400000000
diff --git a/ext/custom-addons/dp_custom/__init__.py b/ext/custom-addons/dp_custom/__init__.py
index 34585445..f6229e8e 100644
--- a/ext/custom-addons/dp_custom/__init__.py
+++ b/ext/custom-addons/dp_custom/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>).
+#    datenpol gmbh
+#    Copyright (C) 2013-TODAY datenpol gmbh (<http://www.datenpol.at/>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,4 +22,3 @@
 import models
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/ext/custom-addons/dp_custom/__openerp__.py b/ext/custom-addons/dp_custom/__openerp__.py
index 5a2657d0..3c2124e1 100644
--- a/ext/custom-addons/dp_custom/__openerp__.py
+++ b/ext/custom-addons/dp_custom/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    datenpol gmbh
-#    Copyright (C) 2013-TODAY datenpol gmbh(<http://www.datenpol.at>)
+#    Copyright (C) 2013-TODAY datenpol gmbh (<http://www.datenpol.at/>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,12 +22,14 @@
 
 {
     'name': 'datenpol Anpassungen',
-    'category': 'Custom', 
+    'category': 'Custom',
     'version': '1.0',
     'description': """Individuelle Anpassungen""",
     'author': 'datenpol gmbh',
-    'website': 'http://www.datenpol.at',
-    'depends': ['base'],
+    'website': 'http://www.datenpol.at/',
+    'depends': [
+        'base',
+    ],
     'data': [
         'data/dp_custom_data.xml',
         'views/dp_custom_view.xml',
diff --git a/ext/custom-addons/dp_custom/data/dp_custom_data.xml b/ext/custom-addons/dp_custom/data/dp_custom_data.xml
index 458fac35..601791f4 100644
--- a/ext/custom-addons/dp_custom/data/dp_custom_data.xml
+++ b/ext/custom-addons/dp_custom/data/dp_custom_data.xml
@@ -1,127 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data noupdate="0">
-	
-	
-		<!--  UNITS -->
+<data noupdate="0">
+    <!--  UNITS -->
 
-		<!-- Einheit in Stück umbenennen -->
-		<record id="product.product_uom_unit" model="product.uom">
-            <field name="name">Stück</field>
-        </record>
-		<!-- 100 Stk. -->
-        <record id="product_uom_unit_100" model="product.uom">
-            <field name="category_id" ref="product.product_uom_categ_unit"/>
-            <field name="name">100 Stk.</field>
-            <field name="factor_inv" eval="100"/>
-            <field name="uom_type">bigger</field>
-        </record>
-		<!-- 1000 Stk. -->
-        <record id="product_uom_unit_1000" model="product.uom">
-            <field name="category_id" ref="product.product_uom_categ_unit"/>
-            <field name="name">1000 Stk.</field>
-            <field name="factor_inv" eval="1000"/>
-            <field name="uom_type">bigger</field>
-        </record>
+    <!-- Einheit in Stück umbenennen -->
+    <record id="product.product_uom_unit" model="product.uom">
+        <field name="name">Stück</field>
+    </record>
+    <!-- 100 Stk. -->
+    <record id="product_uom_unit_100" model="product.uom">
+        <field name="category_id" ref="product.product_uom_categ_unit"/>
+        <field name="name">100 Stk.</field>
+        <field name="factor_inv" eval="100"/>
+        <field name="uom_type">bigger</field>
+    </record>
+    <!-- 1000 Stk. -->
+    <record id="product_uom_unit_1000" model="product.uom">
+        <field name="category_id" ref="product.product_uom_categ_unit"/>
+        <field name="name">1000 Stk.</field>
+        <field name="factor_inv" eval="1000"/>
+        <field name="uom_type">bigger</field>
+    </record>
 
-		<!-- Rolle -->
-        <record id="product_uom_rolle" model="product.uom">
-            <field name="category_id" ref="product.product_uom_categ_unit"/>
-            <field name="name">Rolle(n)</field>
-        </record>
+    <!-- Rolle -->
+    <record id="product_uom_rolle" model="product.uom">
+        <field name="category_id" ref="product.product_uom_categ_unit"/>
+        <field name="name">Rolle(n)</field>
+    </record>
 
-		<!-- Satz -->
-        <record id="product_uom_satz" model="product.uom">
-            <field name="category_id" ref="product.product_uom_categ_unit"/>
-            <field name="name">Satz</field>
-        </record>
+    <!-- Satz -->
+    <record id="product_uom_satz" model="product.uom">
+        <field name="category_id" ref="product.product_uom_categ_unit"/>
+        <field name="name">Satz</field>
+    </record>
 
-		<!-- Arbeitstag -->
-        <record id="product_uom_arbeitstag" model="product.uom">
-            <field name="category_id" ref="product.uom_categ_wtime"/>
-            <field name="name">Arbeitstag</field>
-        </record>
+    <!-- Arbeitstag -->
+    <record id="product_uom_arbeitstag" model="product.uom">
+        <field name="category_id" ref="product.uom_categ_wtime"/>
+        <field name="name">Arbeitstag</field>
+    </record>
 
-	
-		<!-- MM -->
-        <record id="product_uom_mm" model="product.uom">
-            <field name="category_id" ref="product.uom_categ_length"/>
-            <field name="name">mm</field>
-            <field name="factor" eval="0.001"/>
-            <field name="uom_type">smaller</field>
-        </record>
-        
-		<!-- M2 Quadratmeter Category-->
-        <record id="uom_categ_m2" model="product.uom.categ">
-            <field name="name">Quadratm.</field>
-        </record>
-		<!-- M2, Quadratmeter -->
-		<record id="product_uom_m2" model="product.uom">
-		    <field name="name">m²</field>
-		    <field name="category_id" ref="uom_categ_m2"/>
-		    <field name="factor" eval="1.0"/>
-		    <field name="rounding" eval="1"/>
-		</record>
 
-		<!-- M3 Quadratmeter Category-->
-        <record id="uom_categ_m3" model="product.uom.categ">
-            <field name="name">Kubikm.</field>
-        </record>
-		<!-- M3, Kubikmeter -->
-		<record id="product_uom_m3" model="product.uom">
-		    <field name="name">Kubikm.</field>
-		    <field name="category_id" ref="uom_categ_m3"/>
-		    <field name="factor" eval="1.0"/>
-		    <field name="rounding" eval="1"/>
-		</record>
+    <!-- MM -->
+    <record id="product_uom_mm" model="product.uom">
+        <field name="category_id" ref="product.uom_categ_length"/>
+        <field name="name">mm</field>
+        <field name="factor" eval="0.001"/>
+        <field name="uom_type">smaller</field>
+    </record>
 
-		<!-- PKG -->		
-		<record id="product_uom_pkt" model="product.uom">
-		    <field name="name">Paket(e)</field>
-		    <field name="category_id" ref="product.product_uom_categ_unit"/>
-		    <field name="factor" eval="1.0"/>
-		    <field name="rounding" eval="1"/>
-		</record>
+    <!-- M2 Quadratmeter Category-->
+    <record id="uom_categ_m2" model="product.uom.categ">
+        <field name="name">Quadratm.</field>
+    </record>
+    <!-- M2, Quadratmeter -->
+    <record id="product_uom_m2" model="product.uom">
+        <field name="name">m²</field>
+        <field name="category_id" ref="uom_categ_m2"/>
+        <field name="factor" eval="1.0"/>
+        <field name="rounding" eval="1"/>
+    </record>
 
-		<!-- Paar -->		
-		<record id="product_uom_paar" model="product.uom">
-		    <field name="name">Paar(e)</field>
-		    <field name="category_id" ref="product.product_uom_categ_unit"/>
-		    <field name="factor" eval="1.0"/>
-		    <field name="rounding" eval="1"/>
-		</record>
+    <!-- M3 Quadratmeter Category-->
+    <record id="uom_categ_m3" model="product.uom.categ">
+        <field name="name">Kubikm.</field>
+    </record>
+    <!-- M3, Kubikmeter -->
+    <record id="product_uom_m3" model="product.uom">
+        <field name="name">Kubikm.</field>
+        <field name="category_id" ref="uom_categ_m3"/>
+        <field name="factor" eval="1.0"/>
+        <field name="rounding" eval="1"/>
+    </record>
 
-		<!-- Minuten -->
-        <record id="product_uom_min" model="product.uom">
-            <field name="category_id" ref="product.uom_categ_wtime"/>
-            <field name="name">min</field>
-        </record>
-        
-        
-        <!-- Variantenattribut Größe -->
-        <record id="prod_attr_size" model="product.attribute">
-        	<field name="name">Größe</field>
-		    <field name="type">radio</field>
-		    <field name="sequence" eval="10"/>
-        </record>
-        
-        
-        <!-- Verpackungseiheiten -->
-        <!-- TODO Rolle type in product_ul selection ergänzen -->
-        <!-- Ausprägungen hier...? -->
-        <!-- <record id="product_ul_box" model="product.ul">
-            <field name="name">Box</field>
-            <field name="type">box</field>
-        </record> -->
-        <!-- 
-        'name' : fields.char('Name', select=True, required=True, translate=True),
-        'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
-        'height': fields.float('Height', help='The height of the package'),
-        'width': fields.float('Width', help='The width of the package'),
-        'length': fields.float('Length', help='The length of the package'),
-        'weight': fields.float('Empty Package Weight'), -->
-        
-        
-       
-	</data>
+    <!-- PKG -->
+    <record id="product_uom_pkt" model="product.uom">
+        <field name="name">Paket(e)</field>
+        <field name="category_id" ref="product.product_uom_categ_unit"/>
+        <field name="factor" eval="1.0"/>
+        <field name="rounding" eval="1"/>
+    </record>
+
+    <!-- Paar -->
+    <record id="product_uom_paar" model="product.uom">
+        <field name="name">Paar(e)</field>
+        <field name="category_id" ref="product.product_uom_categ_unit"/>
+        <field name="factor" eval="1.0"/>
+        <field name="rounding" eval="1"/>
+    </record>
+
+    <!-- Minuten -->
+    <record id="product_uom_min" model="product.uom">
+        <field name="category_id" ref="product.uom_categ_wtime"/>
+        <field name="name">min</field>
+    </record>
+
+
+    <!-- Variantenattribut Größe -->
+    <record id="prod_attr_size" model="product.attribute">
+        <field name="name">Größe</field>
+        <field name="type">radio</field>
+        <field name="sequence" eval="10"/>
+    </record>
+
+
+    <!-- Verpackungseiheiten -->
+    <!-- TODO Rolle type in product_ul selection ergänzen -->
+    <!-- Ausprägungen hier...? -->
+    <!-- <record id="product_ul_box" model="product.ul">
+        <field name="name">Box</field>
+        <field name="type">box</field>
+    </record> -->
+    <!--
+    'name' : fields.char('Name', select=True, required=True, translate=True),
+    'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
+    'height': fields.float('Height', help='The height of the package'),
+    'width': fields.float('Width', help='The width of the package'),
+    'length': fields.float('Length', help='The length of the package'),
+    'weight': fields.float('Empty Package Weight'), -->
+</data>
 </openerp>
diff --git a/ext/custom-addons/dp_custom/views/dp_custom_view.xml b/ext/custom-addons/dp_custom/views/dp_custom_view.xml
index b24d2621..b3570a73 100644
--- a/ext/custom-addons/dp_custom/views/dp_custom_view.xml
+++ b/ext/custom-addons/dp_custom/views/dp_custom_view.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+<data>
 
-
-	</data>
+</data>
 </openerp>
-
-
-
diff --git a/ext/custom-addons/dp_report/__init__.py b/ext/custom-addons/dp_report/__init__.py
index 5305644d..cde864ba 100644
--- a/ext/custom-addons/dp_report/__init__.py
+++ b/ext/custom-addons/dp_report/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from . import models
\ No newline at end of file
+from . import models
diff --git a/ext/custom-addons/dp_report/__openerp__.py b/ext/custom-addons/dp_report/__openerp__.py
index 8b51bdec..4a35b19b 100644
--- a/ext/custom-addons/dp_report/__openerp__.py
+++ b/ext/custom-addons/dp_report/__openerp__.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 
 {
-    'name': 'datepol Report Anpassungen',
+    'name': 'datepol Report-Anpassungen',
     'category': 'Custom',
     'version': '1.0',
     'summary': """Individuelle Report Anpassungen""",
     'description': """Individuelle Report Anpassungen""",
     'author': 'datenpol gmbh',
-    'website': 'http://www.datenpol.at',
-    'depends': ['base'],
+    'website': 'http://www.datenpol.at/',
+    'depends': [
+        'base',
+    ],
     'data': [
         # 'security/ir.model.access.csv',
         'views/layouts.xml',
diff --git a/ext/custom-addons/dp_report/models/__init__.py b/ext/custom-addons/dp_report/models/__init__.py
index 7c68785e..40a96afc 100644
--- a/ext/custom-addons/dp_report/models/__init__.py
+++ b/ext/custom-addons/dp_report/models/__init__.py
@@ -1 +1 @@
-# -*- coding: utf-8 -*-
\ No newline at end of file
+# -*- coding: utf-8 -*-
diff --git a/ext/custom-addons/dp_report/views/delivery.xml b/ext/custom-addons/dp_report/views/delivery.xml
index 8063c308..c36cf0f7 100644
--- a/ext/custom-addons/dp_report/views/delivery.xml
+++ b/ext/custom-addons/dp_report/views/delivery.xml
@@ -1,75 +1,77 @@
 <openerp>
-    <data>
-        <!-- Delivery Body -->
-        <template id="report_delivery_document" inherit_id="delivery.report_delivery_document2">
-            <h2 position="replace">
-                <h2>
-                    LIEFERSCHEIN <span t-field="o.name"/>
-                </h2>
+<data>
+    <!-- Delivery Body -->
+    <template id="report_delivery_document" inherit_id="delivery.report_delivery_document2">
+        <h2 position="replace">
+            <h2>
+                LIEFERSCHEIN <span t-field="o.name"/>
             </h2>
-            <table class="table table-condensed" position="replace">
-                <table class="table table-condensed">
-                    <thead>
-                        <tr>
-                            <th name="td_sched_date_h"><strong>Scheduled Date</strong></th>
-                            <th><strong>Weight</strong></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td name="td_sched_date">
-                               <span t-field="o.min_date"/>
-                            </td>
-                            <td>
-                                <span t-field="o.weight"/> kg
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+        </h2>
+        <table class="table table-condensed" position="replace">
+            <table class="table table-condensed">
+                <thead>
+                    <tr>
+                        <th name="td_sched_date_h"><strong>Scheduled Date</strong></th>
+                        <th><strong>Weight</strong></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td name="td_sched_date">
+                            <span t-field="o.min_date"/>
+                        </td>
+                        <td>
+                            <span t-field="o.weight"/> kg
+                        </td>
+                    </tr>
+                </tbody>
             </table>
-            <xpath expr="//table[@t-if='not o.pack_operation_ids']/thead" position="replace">
-                <thead>
-                    <tr>
-                        <th><strong>Product</strong></th>
-                        <th><strong>Location</strong></th>
-                        <th class="text-right"><strong>Quantity</strong></th>
-                    </tr>
-                </thead>
-            </xpath>
-            <xpath expr="//table[@t-if='not o.pack_operation_ids']/tbody/tr/td/span[@t-field='move.state']" position="replace"/>
-            <xpath expr="//table[@t-if='o.pack_operation_ids']/thead" position="replace">
-                <thead>
-                    <tr>
-                        <th><strong>Product</strong></th>
-                        <th t-if="has_serial_number"><strong>Serial Number</strong></th>
-                        <th><strong>Location</strong></th>
-                        <th class="text-right"><strong>Quantity</strong></th>
-                    </tr>
-                </thead>
-            </xpath>
-            <xpath expr="//table[@t-if='o.pack_operation_ids']/tbody/tr/td[2]" position="replace"/>
-        </template>
-        <!-- Render Report with Header -->
-        <template id="stock.report_deliveryslip">
-            <t t-set="header" t-value="1"/>
-            <t t-foreach="docs" t-as="o">
-                <t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
-            </t>
-        </template>
-        <!-- Render Report without Header -->
-        <template id="report_deliveryslip_blank">
-            <t t-set="header" t-value="0"/>
-            <t t-foreach="docs" t-as="o">
-                <t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
-            </t>
-        </template>
-        <!-- Create new Report -->
-        <report id="dp_report_deliveryslip_blank"
-            string="Lieferschein Ohne Logo"
-            model="stock.picking"
-            report_type="qweb-pdf"
-            name="dp_report.report_deliveryslip_blank"
-            file="dp_report.report_deliveryslip_blank"/>
+        </table>
+        <xpath expr="//table[@t-if='not o.pack_operation_ids']/thead" position="replace">
+            <thead>
+                <tr>
+                    <th><strong>Product</strong></th>
+                    <th><strong>Location</strong></th>
+                    <th class="text-right"><strong>Quantity</strong></th>
+                </tr>
+            </thead>
+        </xpath>
+        <xpath expr="//table[@t-if='not o.pack_operation_ids']/tbody/tr/td/span[@t-field='move.state']" position="replace"/>
+        <xpath expr="//table[@t-if='o.pack_operation_ids']/thead" position="replace">
+            <thead>
+                <tr>
+                    <th><strong>Product</strong></th>
+                    <th t-if="has_serial_number"><strong>Serial Number</strong></th>
+                    <th><strong>Location</strong></th>
+                    <th class="text-right"><strong>Quantity</strong></th>
+                </tr>
+            </thead>
+        </xpath>
+        <xpath expr="//table[@t-if='o.pack_operation_ids']/tbody/tr/td[2]" position="replace"/>
+    </template>
 
-    </data>
-</openerp>
\ No newline at end of file
+    <!-- Render Report with Header -->
+    <template id="stock.report_deliveryslip">
+        <t t-set="header" t-value="1"/>
+        <t t-foreach="docs" t-as="o">
+            <t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
+        </t>
+    </template>
+
+    <!-- Render Report without Header -->
+    <template id="report_deliveryslip_blank">
+        <t t-set="header" t-value="0"/>
+        <t t-foreach="docs" t-as="o">
+            <t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
+        </t>
+    </template>
+
+    <!-- Create new Report -->
+    <report id="dp_report_deliveryslip_blank"
+        string="Lieferschein Ohne Logo"
+        model="stock.picking"
+        report_type="qweb-pdf"
+        name="dp_report.report_deliveryslip_blank"
+        file="dp_report.report_deliveryslip_blank"/>
+</data>
+</openerp>
diff --git a/ext/custom-addons/dp_report/views/invoice.xml b/ext/custom-addons/dp_report/views/invoice.xml
index 436df4e1..7ed20a8f 100644
--- a/ext/custom-addons/dp_report/views/invoice.xml
+++ b/ext/custom-addons/dp_report/views/invoice.xml
@@ -1,65 +1,65 @@
 <openerp>
-    <data>
-        <!-- Invoice Body -->
-        <template id="report_invoice_document" inherit_id="account.report_invoice_document">
-            <th t-if="display_discount" position="replace">
-                <th t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
-            </th>
-            <td t-if="display_discount" position="replace">
-                <td t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">
-                    <span t-field="l.discount"/>
-                </td>
+<data>
+    <!-- Invoice Body -->
+    <template id="report_invoice_document" inherit_id="account.report_invoice_document">
+        <th t-if="display_discount" position="replace">
+            <th t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
+        </th>
+        <td t-if="display_discount" position="replace">
+            <td t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">
+                <span t-field="l.discount"/>
             </td>
-            <div t-if="o.date_invoice" position="replace">
-                <div class="col-xs-2" t-if="o.date_invoice">
-                    <strong>Invoice Date:</strong>
-                    <p t-field="o.date_invoice"/>
-                </div>
+        </td>
+        <div t-if="o.date_invoice" position="replace">
+            <div class="col-xs-2" t-if="o.date_invoice">
+                <strong>Invoice Date:</strong>
+                <p t-field="o.date_invoice"/>
             </div>
-            <div t-if="o.origin" position="replace">
-                <div class="col-xs-2" t-if="o.origin">
-                    <strong>Source:</strong>
-                    <p t-field="o.origin"/>
-                </div>
+        </div>
+        <div t-if="o.origin" position="replace">
+            <div class="col-xs-2" t-if="o.origin">
+                <strong>Source:</strong>
+                <p t-field="o.origin"/>
             </div>
-            <div t-if="o.date_due and o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')" position="replace"/>
-            <xpath expr="//table[@class='table table-condensed']/thead/tr/th" position='replace'>
-                <th>Description</th>
-            </xpath>
-            <div t-if="o.tax_line_ids" position="replace"/>
-            <p t-if="o.payment_term_id" position="replace">
-                <p t-if="o.payment_term_id">
-                    <strong><span t-field="o.payment_term_id.note"/></strong>
-                </p>
+        </div>
+        <div t-if="o.date_due and o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')" position="replace"/>
+        <xpath expr="//table[@class='table table-condensed']/thead/tr/th" position='replace'>
+            <th>Description</th>
+        </xpath>
+        <div t-if="o.tax_line_ids" position="replace"/>
+        <p t-if="o.payment_term_id" position="replace">
+            <p t-if="o.payment_term_id">
+                <strong><span t-field="o.payment_term_id.note"/></strong>
             </p>
-        </template>
-        <!-- Render Report with Header -->
-        <template id="account.report_invoice">
-            <t t-call="report.html_container">
-                <t t-set="header" t-value="1"/>
-                <t t-foreach="docs" t-as="o">
-                    <t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang">
-                    </t>
-                </t>
-            </t>
-        </template>
-        <!-- Render Report without Header -->
-        <template id="report_invoice_blank">
-            <t t-call="report.html_container">
-                <t t-set="header" t-value="0"/>
-                <t t-foreach="docs" t-as="o">
-                    <t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang">
-                    </t>
-                </t>
-            </t>
-        </template>
-        <!-- Create new Report -->
-        <report id="dp_report_invoice_blank"
-            string="Rechnung Ohne Logo"
-            model="account.invoice"
-            report_type="qweb-pdf"
-            name="dp_report.report_invoice_blank"
-            file="dp_report.report_invoice_blank"/>
+        </p>
+    </template>
 
-    </data>
-</openerp>
\ No newline at end of file
+    <!-- Render Report with Header -->
+    <template id="account.report_invoice">
+        <t t-call="report.html_container">
+            <t t-set="header" t-value="1"/>
+            <t t-foreach="docs" t-as="o">
+                <t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang"/>
+            </t>
+        </t>
+    </template>
+
+    <!-- Render Report without Header -->
+    <template id="report_invoice_blank">
+        <t t-call="report.html_container">
+            <t t-set="header" t-value="0"/>
+            <t t-foreach="docs" t-as="o">
+                <t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang"/>
+            </t>
+        </t>
+    </template>
+
+    <!-- Create new Report -->
+    <report id="dp_report_invoice_blank"
+        string="Rechnung Ohne Logo"
+        model="account.invoice"
+        report_type="qweb-pdf"
+        name="dp_report.report_invoice_blank"
+        file="dp_report.report_invoice_blank"/>
+</data>
+</openerp>
diff --git a/ext/custom-addons/dp_report/views/layouts.xml b/ext/custom-addons/dp_report/views/layouts.xml
index ecd180e0..313ceead 100644
--- a/ext/custom-addons/dp_report/views/layouts.xml
+++ b/ext/custom-addons/dp_report/views/layouts.xml
@@ -1,58 +1,58 @@
 <openerp>
-    <data>
-        <template id="report.external_layout">
-            <!-- Multicompany -->
-            <t t-if="not o and doc">
-                <t t-set="o" t-value="doc"/>
-            </t>
-            <t t-if="o and 'company_id' in o">
-                <t t-set="company" t-value="o.company_id"></t>
-            </t>
-            <t t-if="not o or not 'company_id' in o">
-                <t t-set="company" t-value="res_company"></t>
-            </t>
-            <t t-if="header == 1">
-                <t t-call="dp_report.external_layout_header" />
-            </t>
-            <t t-if="header == 0">
-                <t t-call="dp_report.external_layout_header_blank" />
-            </t>
-            <t t-raw="0" />
-            <t t-call="report.external_layout_footer" />
-            <t t-esc="header"/>
-        </template>
+<data>
+    <template id="report.external_layout">
+        <!-- Multicompany -->
+        <t t-if="not o and doc">
+            <t t-set="o" t-value="doc"/>
+        </t>
+        <t t-if="o and 'company_id' in o">
+            <t t-set="company" t-value="o.company_id"/>
+        </t>
+        <t t-if="not o or not 'company_id' in o">
+            <t t-set="company" t-value="res_company"/>
+        </t>
+        <t t-if="header == 1">
+            <t t-call="dp_report.external_layout_header"/>
+        </t>
+        <t t-if="header == 0">
+            <t t-call="dp_report.external_layout_header_blank"/>
+        </t>
+        <t t-raw="0"/>
+        <t t-call="report.external_layout_footer"/>
+        <t t-esc="header"/>
+    </template>
 
-        <!-- Report Header Full -->
-        <template id="external_layout_header">
-            <div class="header">
-                <div class="row">
-                    <div class="col-xs-3" name="company_address">
-                        <div t-field="company.partner_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
-                            style="border-bottom: 1px solid black;"/>
-                    </div>
-                    <div class="col-xs-9 text-right">
-                        <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo" style="max-height: 105px;"/>
-                    </div>
+    <!-- Report Header Full -->
+    <template id="external_layout_header">
+        <div class="header">
+            <div class="row">
+                <div class="col-xs-3" name="company_address">
+                    <div t-field="company.partner_id"
+                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
+                        style="border-bottom: 1px solid black;"/>
+                </div>
+                <div class="col-xs-9 text-right">
+                    <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo" style="max-height: 105px;"/>
                 </div>
             </div>
-        </template>
+        </div>
+    </template>
 
-        <!-- Report Header Blank -->
-        <template id="external_layout_header_blank">
-    	    <div class="header">
-                <div class="row">
-                    <div class="col-xs-12" style="height: 45px;">
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-xs-3" name="company_address">
-                        <div t-field="company.partner_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
-                            style="border-bottom: 1px solid black;"/>
-                    </div>
+    <!-- Report Header Blank -->
+    <template id="external_layout_header_blank">
+        <div class="header">
+            <div class="row">
+                <div class="col-xs-12" style="height: 45px;">
                 </div>
             </div>
-        </template>
-    </data>
-</openerp>
\ No newline at end of file
+            <div class="row">
+                <div class="col-xs-3" name="company_address">
+                    <div t-field="company.partner_id"
+                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
+                        style="border-bottom: 1px solid black;"/>
+                </div>
+            </div>
+        </div>
+    </template>
+</data>
+</openerp>
diff --git a/ext/custom-addons/dp_report/views/saleorder.xml b/ext/custom-addons/dp_report/views/saleorder.xml
index 4526105b..a2009e9b 100644
--- a/ext/custom-addons/dp_report/views/saleorder.xml
+++ b/ext/custom-addons/dp_report/views/saleorder.xml
@@ -1,85 +1,85 @@
 <openerp>
-    <data>
-        <!-- Sale Order Body -->
-        <template id="report_saleorder_document" inherit_id="sale.report_saleorder_document">
-            <th t-if="display_discount" position="replace">
-                <th t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
-            </th>
-            <td t-if="display_discount" position="replace">
-                <td t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">
-                    <span t-field="l.discount"/>
-                </td>
+<data>
+    <!-- Sale Order Body -->
+    <template id="report_saleorder_document" inherit_id="sale.report_saleorder_document">
+        <th t-if="display_discount" position="replace">
+            <th t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
+        </th>
+        <td t-if="display_discount" position="replace">
+            <td t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">
+                <span t-field="l.discount"/>
             </td>
+        </td>
 
-            <xpath expr="//div[@class='page']/h2" position='replace'>
-                <h2>
-                    <span t-if="doc.state not in ['draft','sent']">Order # </span>
-                    <span t-if="doc.state in ['draft','sent']">Quotation # </span>
-                    <span t-field="doc.name"/>
-                </h2>
-            </xpath>
+        <xpath expr="//div[@class='page']/h2" position='replace'>
+            <h2>
+                <span t-if="doc.state not in ['draft','sent']">Order # </span>
+                <span t-if="doc.state in ['draft','sent']">Quotation # </span>
+                <span t-field="doc.name"/>
+            </h2>
+        </xpath>
 
-            <xpath expr="//div[@t-if='doc.user_id.name']" position='replace'/>
-            <xpath expr="//div[@name='payment_term']" position='attributes'>
-                <attribute name="style">display:none</attribute>
-            </xpath>
-            <div name="total" position="replace">
-                <div class="row" name="total">
-                    <div class="col-xs-4 pull-right">
-                        <table class="table table-condensed">
-                            <tr class="border-black">
-                                <td><strong>Total Without Taxes</strong></td>
-                                <td class="text-right">
-                                    <span t-field="doc.amount_untaxed"
-                                        t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Taxes</td>
-                                <td class="text-right">
-                                    <span t-field="doc.amount_tax"
-                                        t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
-                                </td>
-                            </tr>
-                            <tr class="border-black">
-                                <td><strong>Total</strong></td>
-                                <td class="text-right">
-                                    <span t-field="doc.amount_total"
-                                        t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+        <xpath expr="//div[@t-if='doc.user_id.name']" position='replace'/>
+        <xpath expr="//div[@name='payment_term']" position='attributes'>
+            <attribute name="style">display:none</attribute>
+        </xpath>
+        <div name="total" position="replace">
+            <div class="row" name="total">
+                <div class="col-xs-4 pull-right">
+                    <table class="table table-condensed">
+                        <tr class="border-black">
+                            <td><strong>Total Without Taxes</strong></td>
+                            <td class="text-right">
+                                <span t-field="doc.amount_untaxed"
+                                    t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Taxes</td>
+                            <td class="text-right">
+                                <span t-field="doc.amount_tax"
+                                    t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
+                            </td>
+                        </tr>
+                        <tr class="border-black">
+                            <td><strong>Total</strong></td>
+                            <td class="text-right">
+                                <span t-field="doc.amount_total"
+                                    t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
+                            </td>
+                        </tr>
+                    </table>
                 </div>
             </div>
-        </template>
-        <!-- Render Report with Header -->
-        <template id="sale.report_saleorder">
-            <t t-call="report.html_container">
-                <t t-set="header" t-value="1"/>
-                <t t-foreach="docs" t-as="doc">
-                    <t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang">
-                    </t>
-                </t>
-            </t>
-        </template>
-        <!-- Render Report without Header -->
-        <template id="report_saleorder_blank">
-            <t t-call="report.html_container">
-                <t t-set="header" t-value="0"/>
-                <t t-foreach="docs" t-as="doc">
-                    <t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang">
-                    </t>
-                </t>
-            </t>
-        </template>
-        <!-- Create new Report -->
-        <report id="dp_report_saleorder_blank"
-            string="Angebot / Bestellung Ohne Logo"
-            model="sale.order"
-            report_type="qweb-pdf"
-            name="dp_report.report_saleorder_blank"
-            file="dp_report.report_saleorder_blank"/>
+        </div>
+    </template>
 
-    </data>
-</openerp>
\ No newline at end of file
+    <!-- Render Report with Header -->
+    <template id="sale.report_saleorder">
+        <t t-call="report.html_container">
+            <t t-set="header" t-value="1"/>
+            <t t-foreach="docs" t-as="doc">
+                <t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang"/>
+            </t>
+        </t>
+    </template>
+
+    <!-- Render Report without Header -->
+    <template id="report_saleorder_blank">
+        <t t-call="report.html_container">
+            <t t-set="header" t-value="0"/>
+            <t t-foreach="docs" t-as="doc">
+                <t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang"/>
+            </t>
+        </t>
+    </template>
+
+    <!-- Create new Report -->
+    <report id="dp_report_saleorder_blank"
+        string="Angebot / Bestellung Ohne Logo"
+        model="sale.order"
+        report_type="qweb-pdf"
+        name="dp_report.report_saleorder_blank"
+        file="dp_report.report_saleorder_blank"/>
+</data>
+</openerp>