Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0

[Matjaz Kalic]

[MOD] novaqua_reports

[lp:~matjaz-6/openerpsl/openerpsl_02_17]

339. By Dušan Laznik (Mentis) on 2014-02-25

[MOD] novaqua_reports

=== modified file 'novaqua_reports/__init__.py'
--- novaqua_reports/__init__.py	2014-01-27 12:26:32 +0000
+++ novaqua_reports/__init__.py	2014-02-25 13:12:03 +0000
@@ -22,3 +22,4 @@
 import report
 import novaqua_reports
 import account_payment_term
+import res_partner

=== modified file 'novaqua_reports/__openerp__.py'
--- novaqua_reports/__openerp__.py	2014-01-20 08:10:25 +0000
+++ novaqua_reports/__openerp__.py	2014-02-25 13:12:03 +0000
@@ -24,12 +24,13 @@
     "version": "1.0",
     "author": "Mentis d.o.o.",
     "category": "Generic Modules",
-    "depends": ['sale','purchase','account','stock'],
+    "depends": ['base','sale','purchase','account','stock'],
     "description": """Novaqua Reports - replacing original OpenERP reports. """,
     "init_xml": [],
     "update_xml": [
 	    'novaqua_reports.xml',
 	    'account_payment_term_view.xml',
+        'res_partner_view.xml',
     ],
     "demo_xml": [],
     "active": False,

=== modified file 'novaqua_reports/report/account_print_invoice.rml'
--- novaqua_reports/report/account_print_invoice.rml	2014-01-28 11:43:49 +0000
+++ novaqua_reports/report/account_print_invoice.rml	2014-02-25 13:12:03 +0000
@@ -106,29 +106,25 @@
     <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
-    <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P22" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P23" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P29" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P32" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -209,42 +205,42 @@
           <blockTable colWidths="104.0,87.0" style="Table_invoice_data">
             <tr>
               <td>
-                <para style="P18">Ljubljana:</para>
-              </td>
-              <td>
-                <para style="P18">[[ formatLang(o.date_invoice_creation,date=True) ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P18">Delivery Date:</para>
-              </td>
-              <td>
-                <para style="P18">[[ formatLang(o.date_invoice,date=True) ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P18">Due Date:</para>
-              </td>
-              <td>
-                <para style="P17">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P18">Payment Term:</para>
-              </td>
-              <td>
-                <para style="P18">[[ o.payment_term.name ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P18">Partner phone:</para>
-              </td>
-              <td>
-                <para style="P18">[[ o.partner_id.mobile or o.partner_id.phone]]</para>
+                <para style="P19">Ljubljana:</para>
+              </td>
+              <td>
+                <para style="P19">[[ formatLang(o.date_invoice_creation,date=True) ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P19">Delivery Date:</para>
+              </td>
+              <td>
+                <para style="P19">[[ formatLang(o.date_invoice,date=True) ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P19">Due Date:</para>
+              </td>
+              <td>
+                <para style="P18">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P19">Payment Term:</para>
+              </td>
+              <td>
+                <para style="P19">[[ o.payment_term.name ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P19">Partner phone:</para>
+              </td>
+              <td>
+                <para style="P19">[[ o.partner_id.mobile or o.partner_id.phone]]</para>
               </td>
             </tr>
           </blockTable>
@@ -275,28 +271,28 @@
     <blockTable colWidths="49.0,220.0,54.0,36.0,54.0,32.0,27.0,57.0" repeatRows="1" style="Table7">
       <tr>
         <td>
-          <para style="P21">Code</para>
-        </td>
-        <td>
-          <para style="P21">Description</para>
-        </td>
-        <td>
-          <para style="P23">Quantity</para>
-        </td>
-        <td>
-          <para style="P23">UM</para>
-        </td>
-        <td>
-          <para style="P24">Unit Price </para>
-        </td>
-        <td>
-          <para style="P24">Disc.</para>
-        </td>
-        <td>
-          <para style="P23">DDV (%)</para>
-        </td>
-        <td>
-          <para style="P24">Price (EUR)</para>
+          <para style="P22">Code</para>
+        </td>
+        <td>
+          <para style="P22">Description</para>
+        </td>
+        <td>
+          <para style="P24">Quantity</para>
+        </td>
+        <td>
+          <para style="P24">UM</para>
+        </td>
+        <td>
+          <para style="P25">Unit Price </para>
+        </td>
+        <td>
+          <para style="P25">Disc.</para>
+        </td>
+        <td>
+          <para style="P24">DDV (%)</para>
+        </td>
+        <td>
+          <para style="P25">Price (EUR)</para>
         </td>
       </tr>
     </blockTable>
@@ -308,25 +304,25 @@
             <para style="P9">[[ l.product_id.default_code ]]</para>
           </td>
           <td>
-            <para style="P8">[[ l.product_id.name_template ]]</para>
-          </td>
-          <td>
-            <para style="P15">[[ formatLang(get_uom_qty(l)) ]] </para>
-          </td>
-          <td>
-            <para style="P14">[[ get_units(l) ]] </para>
-          </td>
-          <td>
-            <para style="P15">[[ formatLang(l.price_unit) ]]</para>
-          </td>
-          <td>
-            <para style="P14">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="P26">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para>
-          </td>
-          <td>
-            <para style="P13">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
+            <para style="P8">[[ l.name ]]</para>
+          </td>
+          <td>
+            <para style="P16">[[ formatLang(get_uom_qty(l)) ]] </para>
+          </td>
+          <td>
+            <para style="P15">[[ get_units(l) ]] </para>
+          </td>
+          <td>
+            <para style="P16">[[ formatLang(l.price_unit) ]]</para>
+          </td>
+          <td>
+            <para style="P15">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="P27">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para>
+          </td>
+          <td>
+            <para style="P14">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -334,38 +330,38 @@
     <blockTable colWidths="280.0,248.0" style="Table10">
       <tr>
         <td>
-          <para style="P10">Net Total:</para>
-        </td>
-        <td>
-          <para style="P12">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P10">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
-        </td>
-        <td>
-          <para style="P12">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P25">Taxes:</para>
-        </td>
-        <td>
-          <para style="P12">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P22">Total:</para>
-        </td>
-        <td>
-          <para style="P27">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
+          <para style="P11">Net Total:</para>
+        </td>
+        <td>
+          <para style="P13">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P11">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
+        </td>
+        <td>
+          <para style="P13">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P26">Taxes:</para>
+        </td>
+        <td>
+          <para style="P13">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P23">Total:</para>
+        </td>
+        <td>
+          <para style="P28">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P19">-</para>
+    <para style="P20">-</para>
     <blockTable colWidths="355.0,175.0" style="Table_te&#x17E;a">
       <tr>
         <td>
@@ -373,18 +369,18 @@
           <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
         </td>
         <td>
-          <para style="P16">
+          <para style="P17">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P19">-</para>
+    <para style="P20">-</para>
     <blockTable colWidths="530.0" style="Table_notes">
       <tr>
         <td>
-          <para style="P10">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para>
-          <para style="P10">
+          <para style="P11">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para>
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
@@ -393,23 +389,22 @@
     <blockTable colWidths="530.0" style="Table_noga">
       <tr>
         <td>
-          <para style="P8">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o.
- Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P31">Garancija:</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P31"><u>12 mesecev</u> na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih 14 dni.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P31"><u>3 mesece</u> na bazensko folijo, napihljive blazine in ostali program.</para>
+          <para style="P8">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o. Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Garancija:</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10"><font face="Helvetica">12 mesecev</font> na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih 14 dni.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10"><font face="Helvetica">3 mesece</font> na bazensko folijo, napihljive blazine in ostali program.</para>
         </td>
       </tr>
       <tr>
@@ -418,11 +413,11 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P20">-</para>
-    <para style="P20">-</para>
-    <para style="P20">-</para>
-    <para style="P20">-</para>
-    <para style="P20">-</para>
+    <para style="P21">-</para>
+    <para style="P21">-</para>
+    <para style="P21">-</para>
+    <para style="P21">-</para>
+    <para style="P21">-</para>
     <blockTable colWidths="293.0,96.0,135.0" style="Fakturiral">
       <tr>
         <td>
@@ -434,7 +429,7 @@
           <para style="P2">Invoice issued by:</para>
         </td>
         <td>
-          <para style="P11">[[ o.user_id.name ]]</para>
+          <para style="P12">[[ o.user_id.name ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'novaqua_reports/report/account_print_invoice.sxw'
Binary files novaqua_reports/report/account_print_invoice.sxw	2014-01-28 11:43:49 +0000 and novaqua_reports/report/account_print_invoice.sxw	2014-02-25 13:12:03 +0000 differ
=== modified file 'novaqua_reports/report/purchase_order.rml'
--- novaqua_reports/report/purchase_order.rml	2014-01-27 12:26:32 +0000
+++ novaqua_reports/report/purchase_order.rml	2014-02-25 13:12:03 +0000
@@ -273,7 +273,7 @@
             <para style="P15">[[ line.product_id.default_code ]]</para>
           </td>
           <td>
-            <para style="P14">[[ line.product_id.name_template ]]</para>
+            <para style="P14">[[ line.name ]]</para>
           </td>
           <td>
             <para style="P8">[[ formatLang(line.product_qty ) ]] </para>

=== modified file 'novaqua_reports/report/purchase_order.sxw'
Binary files novaqua_reports/report/purchase_order.sxw	2014-01-27 12:26:32 +0000 and novaqua_reports/report/purchase_order.sxw	2014-02-25 13:12:03 +0000 differ
=== modified file 'novaqua_reports/report/sale_order.rml'
--- novaqua_reports/report/sale_order.rml	2014-01-28 11:43:49 +0000
+++ novaqua_reports/report/sale_order.rml	2014-02-25 13:12:03 +0000
@@ -105,30 +105,28 @@
     <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P24" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P25" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -171,37 +169,37 @@
     <blockTable colWidths="270.0,270.0" style="Table_naslov">
       <tr>
         <td>
-          <para style="P11">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P12">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
-          <para style="P12">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+          <para style="P15">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
+          <para style="P15">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="264.0,276.0" style="Table_customer_data">
       <tr>
         <td>
-          <para style="P9">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
-          <para style="P9">[[ (o.partner_id.street) or '' ]]</para>
-          <para style="P9">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
-          <para style="P9">[[ (o.partner_id.country_id.name) or '' ]]</para>
-          <para style="P9">
-            <font color="white"> </font>
-          </para>
-          <para style="P14">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
-          <para style="P9">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>
-          <para style="P9">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>
-          <para style="P9">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>
-          <para style="P9">
-            <font color="white"> </font>
-          </para>
-          <para style="P14">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
-          <para style="P9">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>
-          <para style="P9">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>
-          <para style="P5">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
+          <para style="P11">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
+          <para style="P11">[[ (o.partner_id.street) or '' ]]</para>
+          <para style="P11">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
+          <para style="P11">[[ (o.partner_id.country_id.name) or '' ]]</para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+          <para style="P17">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>
+          <para style="P11">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+          <para style="P17">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>
+          <para style="P7">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
         </td>
         <td>
           <blockTable colWidths="126.0,144.0" style="Table_order_inf">
@@ -210,7 +208,7 @@
                 <para style="P2">Ljubljana,</para>
               </td>
               <td>
-                <para style="P6">[[ formatLang(o.date_order, date = True) ]]</para>
+                <para style="P8">[[ formatLang(o.date_order, date = True) ]]</para>
               </td>
             </tr>
             <tr>
@@ -218,7 +216,7 @@
                 <para style="P2">Expiration date:</para>
               </td>
               <td>
-                <para style="P6">
+                <para style="P8">
                   <font color="white"> </font>
                 </para>
               </td>
@@ -260,7 +258,7 @@
               </td>
             </tr>
           </blockTable>
-          <para style="P11">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
@@ -278,7 +276,7 @@
           </para>
         </td>
         <td>
-          <para style="P18">
+          <para style="P21">
             <font color="white"> </font>
           </para>
         </td>
@@ -287,28 +285,28 @@
     <blockTable colWidths="55.0,216.0,58.0,34.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4">
       <tr>
         <td>
-          <para style="P19">Code</para>
-        </td>
-        <td>
-          <para style="P19">Description</para>
-        </td>
-        <td>
-          <para style="P21">Quantity</para>
-        </td>
-        <td>
-          <para style="P21">UM</para>
-        </td>
-        <td>
-          <para style="P21">Unit Price</para>
-        </td>
-        <td>
-          <para style="P21">Disc.</para>
-        </td>
-        <td>
-          <para style="P20">Taxes (%)</para>
-        </td>
-        <td>
-          <para style="P21">Price (€)</para>
+          <para style="P22">Code</para>
+        </td>
+        <td>
+          <para style="P22">Description</para>
+        </td>
+        <td>
+          <para style="P24">Quantity</para>
+        </td>
+        <td>
+          <para style="P24">UM</para>
+        </td>
+        <td>
+          <para style="P24">Unit Price</para>
+        </td>
+        <td>
+          <para style="P24">Disc.</para>
+        </td>
+        <td>
+          <para style="P23">Taxes (%)</para>
+        </td>
+        <td>
+          <para style="P24">Price (€)</para>
         </td>
       </tr>
     </blockTable>
@@ -317,28 +315,28 @@
       <blockTable colWidths="56.0,216.0,58.0,34.0,58.0,32.0,28.0,54.0" style="Table5">
         <tr>
           <td>
-            <para style="P8">[[ line.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ line.product_id.name_template ]] </para>
-          </td>
-          <td>
-            <para style="P15">[[ line.product_uom_qty ]] </para>
-          </td>
-          <td>
-            <para style="P15">[[ line.product_uom.name ]]</para>
-          </td>
-          <td>
-            <para style="P15">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
-          </td>
-          <td>
-            <para style="P16">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para>
-          </td>
-          <td>
-            <para style="P22">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
-          </td>
-          <td>
-            <para style="P15">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
+            <para style="P10">[[ line.product_id.default_code ]]</para>
+          </td>
+          <td>
+            <para style="P9">[[ line.name ]] </para>
+          </td>
+          <td>
+            <para style="P18">[[ line.product_uom_qty ]] </para>
+          </td>
+          <td>
+            <para style="P18">[[ line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="P18">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
+          </td>
+          <td>
+            <para style="P19">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para>
+          </td>
+          <td>
+            <para style="P25">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
+          </td>
+          <td>
+            <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -349,7 +347,7 @@
           <para style="P4">Net Total:</para>
         </td>
         <td>
-          <para style="P17">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
+          <para style="P20">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
       <tr>
@@ -357,7 +355,7 @@
           <para style="P4">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
         </td>
         <td>
-          <para style="P17">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
+          <para style="P20">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
       <tr>
@@ -365,45 +363,45 @@
           <para style="P4">Taxes :</para>
         </td>
         <td>
-          <para style="P17">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
+          <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P13">Total :</para>
+          <para style="P16">Total :</para>
         </td>
         <td>
-          <para style="P23">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
+          <para style="P26">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P10">-</para>
+    <para style="P12">-</para>
     <blockTable colWidths="539.0" style="Table_dobava">
       <tr>
         <td>
           <para style="P4">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
-          <para style="P11">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
+          <para style="P14">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P10">-</para>
-    <para style="P10">-</para>
+    <para style="P12">-</para>
+    <para style="P12">-</para>
     <blockTable colWidths="539.0" style="Table_prosti_opis">
       <tr>
         <td>
-          <para style="P28">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d., oziroma izvedeno plačilo po pogojih plačevanja, predstavljenih v Splošnih prodajnih pogojih na www.bazeni24.si.</para>
+          <para style="P13">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d., oziroma izvedeno plačilo po pogojih plačevanja, predstavljenih v Splošnih prodajnih pogojih na www.bazeni24.si.</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="539.0" style="Table_bold">
       <tr>
         <td>
-          <para style="P25">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi artiklov od fizičnih vzorcev ali predstavljenih artiklov na sliki na spletni strani www.bazeni24.si</para>
+          <para style="P5">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi artiklov od fizičnih vzorcev ali predstavljenih artiklov na sliki na spletni strani www.bazeni24.si</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P26">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone]], [[ o.user_id.email ]]</para>
+          <para style="P6">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone]], [[ o.user_id.email ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'novaqua_reports/report/sale_order.sxw'
Binary files novaqua_reports/report/sale_order.sxw	2014-01-28 11:43:49 +0000 and novaqua_reports/report/sale_order.sxw	2014-02-25 13:12:03 +0000 differ
=== modified file 'novaqua_reports/report/stock_picking.py'
--- novaqua_reports/report/stock_picking.py	2014-01-28 09:25:55 +0000
+++ novaqua_reports/report/stock_picking.py	2014-02-25 13:12:03 +0000
@@ -34,6 +34,7 @@
             'get_total_weight':self._get_total_weight,
             'get_packets': self._get_packets,
             'get_units': self._get_units,
+			'get_price': self._get_price,
         })
     def _get_product_desc(self,move_line):
         if move_line.sale_line_id.name:
@@ -56,6 +57,20 @@
             return ''
         else: 
             return res
+
+	def _get_price(self, move_line):
+        line_obj = self.pool.get('sale.order.line')
+        line_ids = line_obj.search(self.cr, self.uid, [('id', '=' , move_line.sale_line_id.id)])
+        
+        res_prices = line_obj.browse(self.cr, self.uid, line_ids)[0]['order_partner_id'].delivery_prices
+        if res_prices:
+            res = line_obj.browse(self.cr, self.uid, line_ids)[0]['price_unit']
+            if res:
+                return res
+            else: 
+                return ''
+        else:
+            return ''
         
     def _get_units(self, move_line):
         line_obj = self.pool.get('sale.order.line')

=== modified file 'novaqua_reports/report/stock_picking.rml'
--- novaqua_reports/report/stock_picking.rml	2014-01-27 12:26:32 +0000
+++ novaqua_reports/report/stock_picking.rml	2014-02-25 13:12:03 +0000
@@ -83,15 +83,15 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -145,9 +145,9 @@
           </para>
         </td>
         <td>
-          <para style="P6">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
-          <para style="P6">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
-          <para style="P6">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
+          <para style="P7">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
+          <para style="P7">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
+          <para style="P7">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -198,6 +198,14 @@
             </tr>
             <tr>
               <td>
+                <para style="P3">Partner phone:</para>
+              </td>
+              <td>
+                <para style="P3">[[ picking.partner_id.mobile or picking.partner_id.phone]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
                 <para style="P2">Delivery method:</para>
               </td>
               <td>
@@ -213,7 +221,7 @@
               </td>
             </tr>
           </blockTable>
-          <para style="P7">
+          <para style="P8">
             <font color="white"> </font>
           </para>
         </td>
@@ -225,19 +233,19 @@
     <blockTable colWidths="53.0,276.0,66.0,34.0,88.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
-          <para style="P9">Code</para>
-        </td>
-        <td>
-          <para style="P9">Description</para>
-        </td>
-        <td>
-          <para style="P9">Quantity</para>
-        </td>
-        <td>
-          <para style="P9">UM</para>
-        </td>
-        <td>
-          <para style="P10">Price (€) / unit</para>
+          <para style="P10">Code</para>
+        </td>
+        <td>
+          <para style="P10">Description</para>
+        </td>
+        <td>
+          <para style="P10">Quantity</para>
+        </td>
+        <td>
+          <para style="P10">UM</para>
+        </td>
+        <td>
+          <para style="P11">Price (€) / unit</para>
         </td>
       </tr>
     </blockTable>
@@ -250,7 +258,7 @@
             <para style="P14">[[ move_lines.product_id.default_code ]]</para>
           </td>
           <td>
-            <para style="P13">[[ move_lines.product_id.name_template ]]</para>
+            <para style="P13">[[ move_lines.name ]]</para>
           </td>
           <td>
             <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
@@ -259,7 +267,7 @@
             <para style="P15">[[ get_units(move_lines) ]]</para>
           </td>
           <td>
-            <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
+            <para style="P9">[[ formatLang(get_price(move_lines), digits=get_digits(dp='Account')) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -284,7 +292,7 @@
             <para style="P15">[[ get_units(move_lines) ]]</para>
           </td>
           <td>
-            <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
+            <para style="P9">[[ formatLang(get_price(move_lines), digits=get_digits(dp='Account')) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -301,27 +309,27 @@
     <blockTable colWidths="538.0" style="Table_noga">
       <tr>
         <td>
-          <para style="P4">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P4">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P3">Garancija za dobavljeno blago: 12 mesecev od dneva dobave. Garancija se ne upošteva za blago, ki je že uporabljeno oz. montirano v nasprotju z navodili prodajalca.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P19">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P4">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
+          <para style="P5">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P4">Garancija za dobavljeno blago: 12 mesecev od dneva dobave. Garancija se ne upošteva za blago, ki je že uporabljeno oz. montirano v nasprotju z navodili prodajalca.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P19">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
         </td>
       </tr>
     </blockTable>
@@ -342,10 +350,10 @@
           <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para>
         </td>
         <td>
-          <para style="P5">Received by:</para>
+          <para style="P6">Received by:</para>
         </td>
         <td>
-          <para style="P5">Place, date:</para>
+          <para style="P6">Place, date:</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'novaqua_reports/report/stock_picking.sxw'
Binary files novaqua_reports/report/stock_picking.sxw	2014-01-27 12:26:32 +0000 and novaqua_reports/report/stock_picking.sxw	2014-02-25 13:12:03 +0000 differ
=== added file 'novaqua_reports/res_partner.py'
--- novaqua_reports/res_partner.py	1970-01-01 00:00:00 +0000
+++ novaqua_reports/res_partner.py	2014-02-25 13:12:03 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class res_partner(osv.Model):
+    _inherit = 'res.partner'
+    
+    _columns = {
+        'delivery_prices': fields.boolean('Prices on delivery report'),
+    }
+    _defaults = {
+        'delivery_prices': False,
+    }
\ No newline at end of file

=== added file 'novaqua_reports/res_partner_view.xml'
--- novaqua_reports/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ novaqua_reports/res_partner_view.xml	2014-02-25 13:12:03 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_partner_form_inherit" model="ir.ui.view">
+            <field name="name">res.partner.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//form/sheet/notebook/page[@string='Sales &amp; Purchases']/group/group" position="before">
+                	<group>
+                	    <field name="delivery_prices"/>
+                	</group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>