diff --git a/ext/custom-addons/cam_reports/report/account.invoice.rml b/ext/custom-addons/cam_reports/report/account.invoice.rml
index fe1b2cd0..a4a8ec3d 100644
--- a/ext/custom-addons/cam_reports/report/account.invoice.rml
+++ b/ext/custom-addons/cam_reports/report/account.invoice.rml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
-<!--  
-    <reports>
-        <report>account.report_invoice</report>
-    </reports>
--->
 <document filename="Rechnung.pdf">
-  <template pageSize="(595.0,842.0)" title="Sale Order" author="Andreas Brückl" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sale Order" author="Camadeus Consulting" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
@@ -18,87 +13,95 @@
     </para>
     <para>[[repeatIn(objects,'o')]] [[ setLang(o.partner_id.commercial_partner_id.lang)]]</para>
 
-
-    <para style="fett">[[ o.partner_id.commercial_partner_id.name ]]</para>
-    <para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para>
-    <para style="normal">[[ (o.partner_id.street ) or '']]</para>
-    <para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para>
-    <para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para>
-    <para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para>
-    <para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para>
-       
-    <blockTable colWidths="90,110" style="Struktur" hAlign="RIGHT">
-      <tr>
-        <td>
-            <para style="normal">Kundennr.:</para>
-        </td>
-        <td>
-            <para style="normal">[[ o.partner_id.ref or removeParentNode('tr') ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-            <para style="normal">Ihre Referenz:</para>
-        </td>
-        <td>
-            <para style="normal">[[ o.name ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-            <para style="normal">Ansprechpartner:</para>
-        </td>
-        <td>
-            <para style="normal">[[ (o.user_id and o.user_id.name) or '' ]]</para>
-        </td>
-      </tr>  
-      <tr>
-        <td>
-            <para style="normal">Ihre UID:</para>
-        </td>
-        <td>
-            <para style="normal">[[ o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.vat or '' ]]</para>
-        </td>
-      </tr>                                                                                                     
-      <tr>
-        <td>
-            <para style="normal">Datum:</para>
-        </td>
-        <td>
-            <para style="normal">[[ formatLang(o.date_invoice,date = True) ]]</para>
-        </td>
-      </tr>                                       
-    </blockTable>    
+	<blockTable colWidths="270,85,145" style="Struktur">
+		<tr>
+			<td>
+				<section>  
+				    <para style="fett">[[ o.partner_id.commercial_partner_id.name ]]</para>
+                    <para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para>
+				    <para style="normal">[[ (o.partner_id.street ) or '']]</para>
+				    <para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para>
+				    <para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para>
+				    <para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para>
+				    <para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para>
+				    <!-- Für Sichtfenster -->
+				    <section>[[ not (o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]]
+					    <para style="normal">&#160;</para>
+				    </section> 				    
+				</section>
+				<para></para>    				    
+    		</td>
+    		<td>
+			    <para style="normal">Datum:</para>
+			    <para style="normal">Quelldokument:</para>
+			    <para style="normal">Kundenreferenz:</para>
+			    <!--<para style="normal">Kundennummer:</para>-->
+			    <para style="normal">Kunde UID Nr.:</para>   
+				<para style="normal">Ansprechpartner:</para>
+			</td>
+    		<td>
+			    <para style="normal">[[ formatLang(o.date_invoice,date = True) ]]&#160;</para>
+			    <para style="normal">[[ o.origin ]]&#160;</para>
+			    <para style="normal">[[ o.name ]]&#160;</para>
+			    <!--<para style="normal">[[ o.partner_id.commercial_partner_id.ref ]]&#160;</para>-->
+			    <para style="normal">[[ o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.vat or '' ]]&#160;</para>   
+				<para style="normal">[[ (o.user_id and o.user_id.name) or '' ]]&#160;</para>
+			</td>
+		</tr>    
+		<!--  
+		<tr>
+			<td>
+    			<section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]]    
+                    <spacer length="0.5cm"/> 
+				    <para style="normal">Lieferadresse:</para>
+				    <para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para>
+                    <para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para>
+				    <para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para>
+				    <para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
+				    <para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
+				    <para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para>
+				    <para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>    
+				</section>
+				<para style="normal">&#160;</para>
+    		</td>
+    		<td>
+            	<para style="normal">&#160;</para>
+			</td>
+    		<td>
+            	<para style="normal">&#160;</para>
+			</td>
+		</tr>   
+		-->		
+	</blockTable>
     
-
-
-   <para style="ueberschrift"><b>Rechnung [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
-   <para style="ueberschrift"><b>PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</b></para>
-   <para style="ueberschrift"><b>Rechnungsentwurf [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</b></para>
-   <para style="ueberschrift"><b>Stornierte Rechnung [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
-   <para style="ueberschrift"><b>Stornorechnung [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
-   <para style="ueberschrift"><b>Stornorechnung [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
-   <para style="ueberschrift"><b>Rechnung [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
-
+   <spacer length="1.0cm"/>
+	
+   <para style="ueberschrift2"><b>Rechnung [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+   <para style="ueberschrift2"><b>PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</b></para>
+   <para style="ueberschrift2"><b>Rechnungsentwurf [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</b></para>
+   <para style="ueberschrift2"><b>Stornierte Rechnung [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+   <para style="ueberschrift2"><b>Stornorechnung [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+   <para style="ueberschrift2"><b>Stornorechnung [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+   <para style="ueberschrift2"><b>Rechnung [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
     
     <spacer length="0.5cm"/>
     
-    <blockTable colWidths="30,57,203,45,60,40,75" repeatRows="1" style="TabelleHaupt" hAlign="LEFT">
+    <blockTable colWidths="30,57,170,75,63,40,75" repeatRows="1" style="TabelleHaupt" hAlign="LEFT">
       <tr>
         <td>
           <para style="tabelle_header">Pos</para>
         </td>
         <td>
-          <para style="tabelle_header">Art-nr.</para>
+          <para style="tabelle_header">Art.nr.</para>
         </td>
         <td>
           <para style="tabelle_header_links">Bezeichnung</para>
         </td>
         <td>
-          <para style="tabelle_header">Menge</para>
-        </td>        
+          <para style="tabelle_header_links">Menge</para>
+        </td> 
         <td>
-          <para style="tabelle_header_rechts">E-Preis</para>
+          <para style="tabelle_header_rechts">Einzelpreis</para>
         </td>
         <td>
           <para style="tabelle_header"></para>
@@ -125,8 +128,8 @@
             </section>           
         </td>
         <td>
-          <para style="tabelle_daten_center">[[formatLang(line.quantity, digits=2)[-2:]=='00' and formatLang(line.quantity, digits=0) or formatLang(line.quantity, digits=2)]]</para>
-        </td>        
+          <para style="tabelle_daten_links">[[formatLang(line.quantity, digits=2)[-2:]=='00' and formatLang(line.quantity, digits=0) or formatLang(line.quantity, digits=2)]] [[ line.uos_id.name ]]</para>
+        </td>   
         <td>
           <para style="tabelle_daten_rechts">[[ formatLang(line.price_unit,digits=2) ]]</para>
         </td>
@@ -151,15 +154,15 @@
           <para style="schlussrechnung">[[ formatLang(o.amount_untaxed,digits=2 )]]</para>
         </td>
       </tr>
-      <tr>
+      <tr>[[ repeatIn(o.tax_line,'tax') ]]
         <td>
-            <para></para>
+          <para style="schlussrechnung"></para>
         </td>
         <td>
-          <para style="schlussrechnung">MwSt. in €</para>
+          <para style="schlussrechnung">MwSt. [[tax.name.split(" ")[0] or ""]] in €</para>
         </td>
         <td>
-          <para style="schlussrechnung">[[ formatLang(o.amount_tax,digits=2 ) ]]</para>
+          <para style="schlussrechnung">[[ formatLang(tax.tax_amount) ]]</para>
         </td>
       </tr>
       <tr>
@@ -173,7 +176,18 @@
           <para style="schlussrechnung_fett">[[ formatLang(o.amount_total,digits=2 ) ]]</para>
         </td>
       </tr>
-    </blockTable> 
+      <tr>
+        <td>
+            <para></para>
+        </td>
+        <td>
+          <para style="schlussrechnung">Rechnungsbetrag inkl. Skonto in €</para>
+        </td>
+        <td>
+          <para style="schlussrechnung">[[ (o.skonto_betrag_inkl and formatLang(o.skonto_betrag_inkl,digits=2)) or removeParentNode('tr') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
     
     <spacer length="0.5cm"/>
 
@@ -184,8 +198,8 @@
     </section> 
 
     <spacer length="0.5cm"/>
-
-    <blockTable colWidths="110,300" style="Struktur" hAlign="LEFT">
+    
+	<blockTable colWidths="110,390" style="Struktur" hAlign="LEFT">
       <tr>
         <td>
           <para style="normal">Zahlungsbedingungen:</para>
@@ -196,13 +210,27 @@
       </tr>
     </blockTable>
     
+    <!-- 
     <spacer length="0.5cm"/>
-    <para style="normal">Vielen Dank für Ihren Auftrag!</para>
-    <spacer length="0.5cm"/>
-    <para style="normal">
-        Bis zur Bezahlung aller Ansprüche aus den Geschäftsverbindungen behält sich der Verkäufer das Eigentum an seinen Warenlieferungen vor. Es gelten unsere Allgemeinen Geschäftsbedingungen.
-    </para>
 
+    <blockTable colWidths="500" style="Struktur" hAlign="LEFT">
+      <tr>
+        <td>
+          <para style="normal"></para>
+        </td>
+      </tr>
+      <tr>[[ o.date_due and o.payment_term and o.payment_term.skonto_prozent or removeParentNode('tr') ]]
+        <td>
+          <para style="normal">Zahlbar bis [[ formatLang(o.skonto_faelligkeit,date = True) ]] abzüglich [[ formatLang(o.payment_term.skonto_prozent,digits=2) ]]% beträgt [[ formatLang(o.skonto_betrag_inkl,digits=2) ]]€.</para>
+        </td>
+      </tr>
+      <tr>[[ o.date_due or removeParentNode('tr') ]]
+        <td>
+          <para style="normal">Zahlbar bis [[ formatLang(o.date_due,date = True) ]] ohne Abzug.</para>
+        </td>
+      </tr>
+    </blockTable>
+    -->
     
   </story>
 </document>
diff --git a/ext/custom-addons/cam_reports/report/page.rml b/ext/custom-addons/cam_reports/report/page.rml
index eff25669..09710608 100644
--- a/ext/custom-addons/cam_reports/report/page.rml
+++ b/ext/custom-addons/cam_reports/report/page.rml
@@ -38,7 +38,7 @@
         
             <blockTableStyle id="TabelleHaupt">
               <blockAlignment value="LEFT"/>
-              <blockValign value="MIDDLE"/>
+              <blockValign value="TOP"/>
               <lineStyle kind="LINEBELOW" colorName="#000000" thickness="0.5"/>
               <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0" thickness="1"/>
               <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="-1,-1" thickness="1"/>
@@ -48,54 +48,50 @@
               <blockValign value="MIDDLE"/> 
             </blockTableStyle>            
          </stylesheet>
+         
         <pageGraphics>
-            <!-- Logo -->
-            <image x="13cm" y="26.75cm" height="46" width="180" preserveAspectRatio="1" >[[ company.logo]]</image>
-
-            <!-- Absenderkopf -->
-            <place x="1.5cm" y="24.5cm" height="1.5cm" width="14cm">
-                <para style="header"><u>[[ company.partner_id.name ]], [[ company.partner_id.street ]], [[ company.partner_id.zip ]] [[ company.partner_id.city ]]</u></para>
+        	
+        	<!-- Logo Oben 1 -->
+            <place x="1.75cm" y="24.75cm" height="3cm" width="7cm">
+                <para style="footer">[[ company.partner_id.name ]]</para>
+                <para style="footer">[[ company.street ]]</para>
+                <para style="footer">[[ company.zip ]] [[ company.city ]]</para>
+                <para style="footer">[[ company.country_id.name ]]</para>
             </place>
             
-            <!-- Seitenzahl -->
-            <setFont name="Helvetica" size="9"/>
-            <drawRightString x="18.9cm" y="3.5cm">Seite <pageNumber/> </drawRightString>
-
+			<!-- Logo Oben 2 -->
+            <place x="6.90cm" y="24.75cm" height="3cm" width="7cm">
+                <para style="footer">Telefon:</para>
+                <para style="footer">Telefax:</para>
+                <para style="footer">E-Mail:</para>
+                <para style="footer">Web:</para>
+            </place>
+            <place x="8.10cm" y="24.75cm" height="3cm" width="7cm">
+                <para style="footer">[[ company.phone ]]</para>
+                <para style="footer">[[ company.fax ]]</para>
+                <para style="footer">[[ company.partner_id.email ]]</para>
+                <para style="footer">[[ company.partner_id.website ]]</para>
+            </place>
+			
+			<!-- Logo Oben -->
+			<image x="13.80cm" y="26.60cm" height="1.5cm" preserveAspectRatio="1">[[ company.logo]]</image>
+        	
             <!-- Seperator -->
-            <fill color="#000000"/>
-            <rect x="1.4cm" y="3.1cm" width="17.5cm" height="0.01cm" fill="yes" stroke="no"/>             
-            
+            <rect x="1.70cm" y="26.40cm" width="18.00cm" height="0.01cm" fill="yes" stroke="no"/>
+			
+            <!-- Seperator -->
+            <rect x="1.70cm" y="1.85cm" width="18.00cm" height="0.01cm" fill="yes" stroke="no"/>
+            	
             <!-- Footer links -->
-            <place x="1.5cm" y="0cm" height="3cm" width="7cm">
-                <para style="footer">--</para>
-                <para style="footer">--</para>
-                <para style="footer">--</para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-            </place>
-            
-            <!-- Footer Mitte -->
-            <place x="8cm" y="0cm" height="3cm" width="7cm">
-                <para style="footer">[[ company.partner_id.street ]]</para>
-                <para style="footer">[[ company.partner_id.zip ]] [[ company.partner_id.city ]]</para>
-                <para style="footer">UID: [[company.vat ]]</para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
+            <place x="1.75cm" y="0cm" height="1.75cm" width="18cm">
+                <para style="footer">Bankverbindung: BANK, IBAN: AT000000000000000000, BIC: AAAAAAAA</para>
+                <para style="footer">UID: [[company.vat ]], FN: [[ company.company_registry ]]</para>
+                <para style="footer">Die Ware bleibt bis zur vollständigen Bezahlung unser Eigentum.</para>
             </place>            
             
-            <!-- Footer rechts -->
-            <place x="15cm" y="0cm" height="3cm" width="7cm">
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>
-                <para style="footer"></para>            
-            </place>   
+            <!-- Seitenzahl --> 
+            <setFont name="Helvetica" size="8"/>      
+			<drawRightString x="561" y="58">Seite <pageNumber/> </drawRightString>
 
         </pageGraphics>