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

[Matjaz Kalic]

[FIX] novaqua_reports (new layout, translations)

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

313. By Dušan Laznik (Mentis) on 2014-01-27

[FIX] novaqua_reports (new layout, translations)

=== modified file 'inovatim_reports/report/purchase_order.rml'
--- inovatim_reports/report/purchase_order.rml	2014-01-22 17:14:14 +0000
+++ inovatim_reports/report/purchase_order.rml	2014-01-27 12:27:10 +0000
@@ -74,13 +74,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_All_Total_Detail">
       <blockAlignment value="LEFT"/>
@@ -99,18 +92,18 @@
     <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" 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="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.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"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" 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-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="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -167,18 +160,18 @@
           <blockTable colWidths="277.0" style="Tableau2">
             <tr>
               <td>
-                <para style="P18">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
-                <para style="P18">[[ (o.partner_id.street) or '' ]]</para>
-                <para style="P18">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
-                <para style="P18">[[ (o.partner_id.country_id.name) or '' ]]</para>
+                <para style="P17">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
+                <para style="P17">[[ (o.partner_id.street) or '' ]]</para>
+                <para style="P17">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
+                <para style="P17">[[ (o.partner_id.country_id.name) or '' ]]</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P18">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
-                <para style="P18">Shipping address :</para>
-                <para style="P18">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
-                <para style="P18">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or <font face="Helvetica">removeParentNode('para')</font>]]</para>
+                <para style="P17">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
+                <para style="P17">Shipping address :</para>
+                <para style="P17">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
+                <para style="P17">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or <font face="Helvetica">removeParentNode('para')</font>]]</para>
               </td>
             </tr>
           </blockTable>
@@ -247,25 +240,25 @@
     <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="P9">Customer reference</para>
-        </td>
-        <td>
-          <para style="P10">Code</para>
-        </td>
-        <td>
-          <para style="P10">Description</para>
-        </td>
-        <td>
-          <para style="P11">Quantity</para>
-        </td>
-        <td>
-          <para style="P11">UM</para>
-        </td>
-        <td>
-          <para style="P12">Unit Price</para>
-        </td>
-        <td>
-          <para style="P12">Net Price (€) </para>
+          <para style="P10">Customer reference</para>
+        </td>
+        <td>
+          <para style="P11">Code</para>
+        </td>
+        <td>
+          <para style="P11">Description</para>
+        </td>
+        <td>
+          <para style="P12">Quantity</para>
+        </td>
+        <td>
+          <para style="P12">UM</para>
+        </td>
+        <td>
+          <para style="P13">Unit Price</para>
+        </td>
+        <td>
+          <para style="P13">Net Price (€) </para>
         </td>
       </tr>
     </blockTable>
@@ -274,62 +267,25 @@
       <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
-            <para style="P14">[[ line.customer_ref ]]</para>
-          </td>
-          <td>
-            <para style="P14">[[ line.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="P13">[[ line.product_id.name_template ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ formatLang(line.product_qty ) ]] </para>
-          </td>
-          <td>
-            <para style="P7">[[ line.product_uom.name ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="terp_default_8_Italic">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_8_Italic">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_8_Italic">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
+            <para style="P15">[[ line.customer_ref ]]</para>
+          </td>
+          <td>
+            <para style="P15">[[ line.product_id.default_code ]]</para>
+          </td>
+          <td>
+            <para style="P14">[[ line.product_id.name_template ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ formatLang(line.product_qty ) ]] </para>
+          </td>
+          <td>
+            <para style="P8">[[ line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -337,18 +293,18 @@
     <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail">
       <tr>
         <td>
-          <para style="P15">Net Total:</para>
+          <para style="P16">Net Total:</para>
         </td>
         <td>
-          <para style="P8">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P15">Taxes:</para>
+          <para style="P16">Taxes:</para>
         </td>
         <td>
-          <para style="P8">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -356,14 +312,14 @@
           <para style="P5">Total:</para>
         </td>
         <td>
-          <para style="P16">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P18">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P17">-</para>
-    <para style="P17">-</para>
+    <para style="P7">-</para>
+    <para style="P7">-</para>
     <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
-    <para style="P17">-</para>
+    <para style="P7">-</para>
     <para style="terp_default_9">Payment terms: [[ (o.payment_term_id and o.payment_term_id.note and format(o.payment_term_id and o.payment_term_id.note)) or removeParentNode('para') ]]</para>
   </story>
 </document>
 
=== modified file 'inovatim_reports/report/purchase_order.sxw'
 Binary files inovatim_reports/report/purchase_order.sxw	2014-01-22 17:14:14 +0000 and inovatim_reports/report/purchase_order.sxw	2014-01-27 12:27:10 +0000 differ
=== modified file 'inovatim_reports/report/sale_order.rml'
--- inovatim_reports/report/sale_order.rml	2014-01-27 10:41:36 +0000
+++ inovatim_reports/report/sale_order.rml	2014-01-27 12:27:10 +0000
@@ -253,7 +253,7 @@
                 <para style="P2">Salesperson:</para>
               </td>
               <td>
-                <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]]</para>
+                <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone ]]</para>
               </td>
             </tr>
             <tr>
@@ -418,7 +418,7 @@
           <para style="P13">-</para>
           <para style="P12">Prevzem je možen na lokaciji podjetja, INOVATIM d.o.o., Koprska ulica 106g, 1000 Ljubljana, od pon-pet, med 8:30 in 16:30 uro, ali v primeru nakupa lesa, v Skladišču Lesnina na Tržaški 135 v Ljubljani od pon-pet, med 7:00 in 14:00 uro.</para>
           <para style="P13">-</para>
-          <para style="P12">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>
+          <para style="P12">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>
           <para style="P13">-</para>
         </td>
       </tr>
 
=== modified file 'inovatim_reports/report/sale_order.sxw'
 Binary files inovatim_reports/report/sale_order.sxw	2014-01-27 10:41:36 +0000 and inovatim_reports/report/sale_order.sxw	2014-01-27 12:27:10 +0000 differ
=== modified file 'novaqua_reports/__init__.py'
--- novaqua_reports/__init__.py	2014-01-20 08:10:25 +0000
+++ novaqua_reports/__init__.py	2014-01-27 12:27:10 +0000
@@ -20,4 +20,5 @@
 ##############################################################################
 
 import report
+import novaqua_reports
 import account_payment_term
 
=== modified file 'novaqua_reports/i18n/en_US.po'
--- novaqua_reports/i18n/en_US.po	2014-01-20 08:10:25 +0000
+++ novaqua_reports/i18n/en_US.po	2014-01-27 12:27:10 +0000
@@ -87,6 +87,7 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:sale.order.novaqua:0
 msgid "Total net weight:"
 msgstr "Total net weight:"
 
@@ -162,16 +163,19 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Taxes:"
 msgstr "Taxes:"
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Total:"
 msgstr "Total:"
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Unit Price"
 msgstr "Unit Price"
 
@@ -241,6 +245,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Net Total:"
 msgstr "Net Total:"
 
@@ -256,6 +261,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Payment terms:"
 msgstr "Payment terms:"
 
@@ -316,6 +322,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "VAT:"
 msgstr "VAT:"
 
@@ -348,83 +355,166 @@
 
 
 
-
-
-
-
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Customer Address:"
-msgstr "Customer Address:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Delivery Order:"
 msgstr "Delivery Order:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Incoming Shipment:"
+msgstr "Incoming Shipment:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Internal Shipment:"
+msgstr "Internal Shipment:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Warehouse Address:"
+msgstr "Warehouse Address:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Scheduled Date:"
+msgstr "Scheduled Date:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Order:"
+msgstr "Order:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Customer reference:"
+msgstr "Customer reference:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Delivery method:"
+msgstr "Delivery method:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Total net weight:"
+msgstr "Total net weight:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Code"
+msgstr "Code"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
 msgid "Description"
 msgstr "Description"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Quantity"
+msgstr "Quantity"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "UM"
+msgstr "UM"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Package"
+msgstr "Package"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Price (€) / unit"
+msgstr "Price (€) / unit"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Issued by:"
 msgstr "Issued by:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order:"
-msgstr "Order:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order quantity"
-msgstr "Order quantity"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Place, date:"
-msgstr "Place, date:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Quantity"
-msgstr "Quantity"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Received by:"
 msgstr "Received by:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Scheduled Date:"
-msgstr "Scheduled Date:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Weight:"
-msgstr "Weight:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Supplier Address:"
-msgstr "Supplier Address:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Warehouse Address:"
-msgstr "Warehouse Address:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Incoming Shipment:"
-msgstr "Incoming Shipment:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Internal Shipment:"
-msgstr "Internal Shipment:"
-
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Place, date:"
+msgstr "Place, date:"
+
+
+
+
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Purchase Order Confirmation:"
+msgstr "Purchase Order Confirmation:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Request for Quotation:"
+msgstr "Request for Quotation:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Order Date:"
+msgstr "Order Date:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Validated By:"
+msgstr "Validated By:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Customer reference"
+msgstr "Customer reference"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Net Price (€)"
+msgstr "Net Price (€)"
 
=== modified file 'novaqua_reports/i18n/novaqua_reports.pot'
--- novaqua_reports/i18n/novaqua_reports.pot	2014-01-20 08:10:25 +0000
+++ novaqua_reports/i18n/novaqua_reports.pot	2014-01-27 12:27:10 +0000
@@ -87,6 +87,7 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:sale.order.novaqua:0
 msgid "Total net weight:"
 msgstr ""
 
@@ -162,16 +163,19 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Taxes:"
 msgstr ""
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Total:"
 msgstr ""
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Unit Price"
 msgstr ""
 
@@ -241,6 +245,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Net Total:"
 msgstr ""
 
@@ -256,6 +261,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Payment terms:"
 msgstr ""
 
@@ -316,6 +322,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "VAT:"
 msgstr ""
 
@@ -348,82 +355,166 @@
 
 
 
-
-
-
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Customer Address:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Delivery Order:"
 msgstr ""
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Incoming Shipment:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Internal Shipment:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Warehouse Address:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Scheduled Date:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Order:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Customer reference:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Delivery method:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Total net weight:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Code"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
 msgid "Description"
 msgstr ""
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Quantity"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "UM"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Package"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Price (€) / unit"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Issued by:"
 msgstr ""
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order quantity"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Place, date:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Quantity"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Received by:"
 msgstr ""
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Scheduled Date:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Weight:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Supplier Address:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Warehouse Address:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Incoming Shipment:"
-msgstr ""
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Internal Shipment:"
-msgstr ""
-
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Place, date:"
+msgstr ""
+
+
+
+
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Purchase Order Confirmation:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Request for Quotation:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Order Date:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Validated By:"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Customer reference"
+msgstr ""
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Net Price (€)"
+msgstr ""
 
=== modified file 'novaqua_reports/i18n/sl.po'
--- novaqua_reports/i18n/sl.po	2014-01-20 08:10:25 +0000
+++ novaqua_reports/i18n/sl.po	2014-01-27 12:27:10 +0000
@@ -87,6 +87,7 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:sale.order.novaqua:0
 msgid "Total net weight:"
 msgstr "Skupaj neto teža:"
 
@@ -162,16 +163,19 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Taxes:"
 msgstr "Davki:"
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Total:"
 msgstr "Skupaj:"
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Unit Price"
 msgstr "Cena enote"
 
@@ -241,6 +245,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Net Total:"
 msgstr "Skupaj neto:"
 
@@ -256,6 +261,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Payment terms:"
 msgstr "Plačilni pogoji:"
 
@@ -316,6 +322,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "VAT:"
 msgstr "ID DDV:"
 
@@ -348,81 +355,166 @@
 
 
 
-
-
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Customer Address:"
-msgstr "Kontaktni naslov:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Delivery Order:"
 msgstr "Dobavnica:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Incoming Shipment:"
+msgstr "Prihajajoče pošiljke:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Internal Shipment:"
+msgstr "Interna pošiljka:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Warehouse Address:"
+msgstr "Naslov skladišča:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Scheduled Date:"
+msgstr "Načrtovani datum:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Order:"
+msgstr "Naročilo:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Customer reference:"
+msgstr "Referenca kupca:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Delivery method:"
+msgstr "Način dostave:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Total net weight:"
+msgstr "Skupaj neto teža:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Code"
+msgstr "Koda"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "UM"
+msgstr "EM"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Package"
+msgstr "Paketi"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Price (€) / unit"
+msgstr "Cena (€) / enoto"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Issued by:"
 msgstr "Izdal:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order:"
-msgstr "Naročilo:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order quantity"
-msgstr "Naročena količina"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Place, date:"
-msgstr "Kraj, datum:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Quantity"
-msgstr "Dobavljena količina"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Received by:"
 msgstr "Prevzel:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Scheduled Date:"
-msgstr "Načrtovani datum:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Weight:"
-msgstr "Teža"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Supplier Address:"
-msgstr "Naslov dobavitelja:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Warehouse Address:"
-msgstr "Naslov skladišča:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Incoming Shipment:"
-msgstr "Prihajajoče pošiljke:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Internal Shipment:"
-msgstr "Interna pošiljka:"
-
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Place, date:"
+msgstr "Kraj, datum:"
+
+
+
+
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Purchase Order Confirmation:"
+msgstr "Nabavni nalog:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Request for Quotation:"
+msgstr "Ponudba:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Order Date:"
+msgstr "Datum naročila:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Validated By:"
+msgstr "Naročnik:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Customer reference"
+msgstr "Kupčeva ref."
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Net Price (€)"
+msgstr "Neto cena (€)"
 
=== modified file 'novaqua_reports/i18n/sl_SI.po'
--- novaqua_reports/i18n/sl_SI.po	2014-01-20 08:10:25 +0000
+++ novaqua_reports/i18n/sl_SI.po	2014-01-27 12:27:10 +0000
@@ -87,6 +87,7 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:sale.order.novaqua:0
 msgid "Total net weight:"
 msgstr "Skupaj neto teža:"
 
@@ -162,16 +163,19 @@
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Taxes:"
 msgstr "Davki:"
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Total:"
 msgstr "Skupaj:"
 
 #. module: novaqua_reports
 #: report:account.invoice.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Unit Price"
 msgstr "Cena enote"
 
@@ -241,6 +245,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Net Total:"
 msgstr "Skupaj neto:"
 
@@ -256,6 +261,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "Payment terms:"
 msgstr "Plačilni pogoji:"
 
@@ -316,6 +322,7 @@
 
 #. module: novaqua_reports
 #: report:sale.order.novaqua:0
+#: report:purchase.order.novaqua:0
 msgid "VAT:"
 msgstr "ID DDV:"
 
@@ -348,81 +355,166 @@
 
 
 
-
-
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Customer Address:"
-msgstr "Kontaktni naslov:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Delivery Order:"
 msgstr "Dobavnica:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Incoming Shipment:"
+msgstr "Prihajajoče pošiljke:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Internal Shipment:"
+msgstr "Interna pošiljka:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Warehouse Address:"
+msgstr "Naslov skladišča:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Scheduled Date:"
+msgstr "Načrtovani datum:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Order:"
+msgstr "Naročilo:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Customer reference:"
+msgstr "Referenca kupca:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Delivery method:"
+msgstr "Način dostave:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Total net weight:"
+msgstr "Skupaj neto teža:"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Code"
+msgstr "Koda"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
 msgid "Description"
 msgstr "Opis"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+#: report:purchase.order.novaqua:0
+msgid "UM"
+msgstr "EM"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Package"
+msgstr "Paketi"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Price (€) / unit"
+msgstr "Cena (€) / enoto"
+
+#. module: novaqua_reports
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Issued by:"
 msgstr "Izdal:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order:"
-msgstr "Naročilo:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Order quantity"
-msgstr "Naročena količina"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Place, date:"
-msgstr "Kraj, datum:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Quantity"
-msgstr "Dobavljena količina"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
 msgid "Received by:"
 msgstr "Prevzel:"
 
 #. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Scheduled Date:"
-msgstr "Načrtovani datum:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Weight:"
-msgstr "Teža"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Supplier Address:"
-msgstr "Naslov dobavitelja:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Warehouse Address:"
-msgstr "Naslov skladišča:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Incoming Shipment:"
-msgstr "Prihajajoče pošiljke:"
-
-#. module: novaqua_reports
-#: report:stock.picking.list.mentis:0
-msgid "Internal Shipment:"
-msgstr "Interna pošiljka:"
-
+#: report:stock.picking.list.novaqua:0
+#: report:stock.picking.list.novaqua.out:0
+#: report:stock.picking.list.novaqua.in:0
+msgid "Place, date:"
+msgstr "Kraj, datum:"
+
+
+
+
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Purchase Order Confirmation:"
+msgstr "Nabavni nalog:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Request for Quotation:"
+msgstr "Ponudba:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Order Date:"
+msgstr "Datum naročila:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Validated By:"
+msgstr "Naročnik:"
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Customer reference"
+msgstr "Kupčeva ref."
+
+#. module: novaqua_reports
+#: report:purchase.order.novaqua:0
+msgid "Net Price (€)"
+msgstr "Neto cena (€)"
 
=== added file 'novaqua_reports/novaqua_reports.py'
--- novaqua_reports/novaqua_reports.py	1970-01-01 00:00:00 +0000
+++ novaqua_reports/novaqua_reports.py	2014-01-27 12:27:10 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Mentis d.o.o.
+#
+#    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 sale_order(osv.osv):
+    _inherit = "sale.order"
+
+    def print_quotation(self, cr, uid, ids, context=None):
+        res = super(sale_order,self).print_quotation(cr, uid, ids, context)
+        if res['report_name'] == 'sale.order':
+            res['report_name'] = 'sale.order.novaqua'
+        return res
+    
+sale_order()
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def invoice_print(self, cr, uid, ids, context=None):
+        res = super(account_invoice,self).invoice_print(cr, uid, ids, context)
+        if res['report_name'] == 'account.invoice':
+            res['report_name'] = 'account.invoice.novaqua'
+        return res
+    
+account_invoice()
+
+class purchase_order(osv.osv):
+    _inherit = "purchase.order"
+
+    def print_quotation(self, cr, uid, ids, context=None):
+        res = super(purchase_order,self).print_quotation(cr, uid, ids, context)
+        if res['report_name'] == 'purchase.quotation':
+            res['report_name'] = 'purchase.order.novaqua'
+        return res
+    
+purchase_order()
+
+class stock_picking(osv.osv):
+    _inherit = 'stock.picking'
+    _columns = {
+        'deliver_id': fields.many2one('res.users', 'User'),
+    }
+
+stock_picking()
+
+class stock_picking_out(osv.osv):
+    _inherit = 'stock.picking.out'
+    _columns = {
+        'deliver_id': fields.many2one('res.users', 'User'),
+    }
+    
+    def action_process(self, cr, uid, ids, context=None):
+        self.pool.get('stock.picking').write(cr, uid, ids, {'deliver_id':uid})
+        return super(stock_picking_out, self).action_process(cr, uid, ids, context=context)
+    
+stock_picking_out()
 
=== modified file 'novaqua_reports/report/__init__.py'
--- novaqua_reports/report/__init__.py	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/__init__.py	2014-01-27 12:27:10 +0000
@@ -22,3 +22,4 @@
 import account_print_invoice
 import sale_order
 import stock_picking
+import purchase_order
 
=== modified file 'novaqua_reports/report/account_print_invoice.py'
--- novaqua_reports/report/account_print_invoice.py	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/account_print_invoice.py	2014-01-27 12:27:10 +0000
@@ -29,8 +29,9 @@
             'time': time,
             'get_total_discount': self._get_total_discount,
             'get_total_net': self._get_total_net,
-            'get_packets': self._get_packets,
+            'get_uom_qty': self._get_uom_qty,
             'get_units': self._get_units,
+            'get_uos_qty': self._get_uos_qty,
             'get_total_weight': self._get_total_weight,
         })
         
@@ -46,10 +47,16 @@
             value_total += line.quantity * line.price_unit
         return value_total
     
-    def _get_packets(self, invoice_line):
+    def _get_uom_qty(self, invoice_line):
         line_obj = self.pool.get('sale.order.line')
         line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
-        res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom_qty']
+        
+        sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0]
+        if sale_line.product_uom.id != invoice_line.uos_id.id:
+            res = sale_line.product_uom_qty
+        else:
+            res = invoice_line.quantity
+        
         if res == 0:
             return ''
         else: 
@@ -58,10 +65,27 @@
     def _get_units(self, invoice_line):
         line_obj = self.pool.get('sale.order.line')
         line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
-        res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom']
-        if res:
-            return res.name
-        else: 
+        
+        sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0]
+        if sale_line.product_uom.id != invoice_line.uos_id.id:
+            #res = sale_line.product_uom.name
+            return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', invoice_line.partner_id.lang, sale_line.product_uom.name)
+        else:
+            #res = invoice_line.uos_id.name
+            return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', invoice_line.partner_id.lang, invoice_line.uos_id.name)
+        
+    def _get_uos_qty(self, invoice_line):
+        line_obj = self.pool.get('sale.order.line')
+        line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)])
+        
+        sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0]
+        if invoice_line.uos_id.id != sale_line.product_uom.id:
+            res = invoice_line.quantity
+            if res == 0:
+                return ''
+            else: 
+                return res
+        else:
             return ''
 
     def _get_total_weight(self, invoice):
 
=== modified file 'novaqua_reports/report/account_print_invoice.rml'
--- novaqua_reports/report/account_print_invoice.rml	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/account_print_invoice.rml	2014-01-27 12:27:10 +0000
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
+      <frame id="first" x1="34.0" y1="57.0" width="530" height="757"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -19,10 +19,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_naslov">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table_invoice_data">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -43,6 +39,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
@@ -67,7 +64,7 @@
       <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/>
       <blockBackground colorName="#e6e6e6" start="7,0" stop="7,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -85,6 +82,10 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_notes">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table_noga">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -97,34 +98,34 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" 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="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P17" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.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"/>
-    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="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" 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="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" 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"/>
@@ -164,6 +165,7 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="17.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -177,49 +179,26 @@
           </para>
         </td>
         <td>
-          <para style="P7">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-          <para style="P6">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
-          <para style="P6">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-          <para style="P6">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-          <para style="P6">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-          <para style="P6">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-          <para style="P6">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+          <para style="P5">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+          <para style="P4">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+          <para style="P4">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P4">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+          <para style="P4">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+          <para style="P4">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+          <para style="P4">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="276.0,56.0,198.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <blockTable colWidths="269.0" style="Table_naslov">
-            <tr>
-              <td>
-                <para style="P9">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P9">[[ (o.partner_id.street) or '' ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P9">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P9">
-                  <font color="white"> </font>
-                </para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P14">
-            <font color="white"> </font>
-          </para>
+          <para style="P8">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="P8">[[ (o.partner_id.street) or '' ]]</para>
+          <para style="P8">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
+          <para style="P8">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
         </td>
         <td>
-          <para style="P8">
+          <para style="P6">
             <font color="white"> </font>
           </para>
         </td>
@@ -227,42 +206,42 @@
           <blockTable colWidths="104.0,87.0" style="Table_invoice_data">
             <tr>
               <td>
-                <para style="P15">Ljubljana:</para>
-              </td>
-              <td>
-                <para style="P15">[[ formatLang(o.date_invoice_creation,date=True) ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P15">Delivery Date:</para>
-              </td>
-              <td>
-                <para style="P15">[[ formatLang(o.date_invoice,date=True) ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P15">Due Date:</para>
-              </td>
-              <td>
-                <para style="P14">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P15">Payment Term:</para>
-              </td>
-              <td>
-                <para style="P15">[[ o.payment_term.name ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P15">Partner phone:</para>
-              </td>
-              <td>
-                <para style="P15">[[ o.partner_id.mobile]]</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>
@@ -281,7 +260,7 @@
     <blockTable colWidths="265.0,265.0" style="Table_Customer_data">
       <tr>
         <td>
-          <para style="P9">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="P7">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="P1">
@@ -290,61 +269,61 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="49.0,216.0,55.0,36.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table7">
+    <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="P16">Code</para>
-        </td>
-        <td>
-          <para style="P16">Description</para>
-        </td>
-        <td>
-          <para style="P18">Quantity</para>
-        </td>
-        <td>
-          <para style="P18">UM</para>
-        </td>
-        <td>
-          <para style="P19">Unit Price </para>
-        </td>
-        <td>
-          <para style="P19">Disc.</para>
-        </td>
-        <td>
-          <para style="P18">DDV (%)</para>
-        </td>
-        <td>
-          <para style="P19">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>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="49.0,216.0,55.0,36.0,57.0,32.0,27.0,57.0" style="Table2">
+      <blockTable colWidths="49.0,220.0,54.0,36.0,54.0,32.0,27.0,57.0" style="Table8">
         <tr>
           <td>
-            <para style="P28">[[ l.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="P27">[[ l.product_id.name_template ]]</para>
-          </td>
-          <td>
-            <para style="P25">[[ get_packets(l) ]] </para>
-          </td>
-          <td>
-            <para style="P25">[[ get_units(l) ]] </para>
-          </td>
-          <td>
-            <para style="P26">[[ formatLang(l.price_unit) ]]</para>
-          </td>
-          <td>
-            <para style="P25">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="P29">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para>
-          </td>
-          <td>
-            <para style="P24">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
+            <para style="P10">[[ l.product_id.default_code ]]</para>
+          </td>
+          <td>
+            <para style="P9">[[ l.product_id.name_template ]]</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>
@@ -368,7 +347,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P20">Taxes:</para>
+          <para style="P26">Taxes:</para>
         </td>
         <td>
           <para style="P13">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para>
@@ -376,76 +355,70 @@
       </tr>
       <tr>
         <td>
-          <para style="P17">Total:</para>
+          <para style="P23">Total:</para>
         </td>
         <td>
-          <para style="P21">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
+          <para style="P28">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Text body"/>
-    <para style="Text body">
-      <font color="white"> </font>
-    </para>
+    <para style="P20">-</para>
     <blockTable colWidths="355.0,175.0" style="Table_te&#x17E;a">
       <tr>
         <td>
-          <para style="P4">Delivery method: [[ o.sale_order_id.incoterm.name ]]</para>
-          <para style="P4">Total net weight: [[ get_total_weight(o) ]] kg</para>
-        </td>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
-    <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('para') ]]</para>
-    <para style="P10">
-      <font color="white"> </font>
-    </para>
+          <para style="terp_default_8">Delivery method: [[ o.sale_order_id.incoterm.name ]]</para>
+          <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
+        </td>
+        <td>
+          <para style="P17">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P20">-</para>
+    <blockTable colWidths="530.0" style="Table_notes">
+      <tr>
+        <td>
+          <para style="P11">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
     <blockTable colWidths="530.0" style="Table_noga">
       <tr>
         <td>
-          <para style="P2">
-            <font face="Helvetica">Garancija:</font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P3">12 mesecev: <font face="Helvetica">na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih
- 14 dni.
-</font></para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P3">3 mesece: <font face="Helvetica">na bazensko folijo in ostali program.
- Garancija se ne upošteva pri fizičnih poškodbah, ki so posledica malomarnega ravnanja z blagom.
-</font></para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P3">Zahvaljujemo se vam za zaupanje!
-</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P3">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o.
-</para>
+          <para style="P2">Garancija:</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">12 mesecev: <font face="Helvetica">na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih 14 dni. </font></para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">3 mesece: <font face="Helvetica">na bazensko folijo in ostali program. Garancija se ne upošteva pri fizičnih poškodbah, ki so posledica malomarnega ravnanja z blagom. </font></para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">Zahvaljujemo se vam za zaupanje! </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o. </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P10">
-      <font color="white"> </font>
-    </para>
-    <para style="P10">
-      <font color="white"> </font>
-    </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>
@@ -454,7 +427,7 @@
           </para>
         </td>
         <td>
-          <para style="P5">Invoice issued by:</para>
+          <para style="P3">Invoice issued by:</para>
         </td>
         <td>
           <para style="P12">[[ o.user_id.name ]]</para>
 
=== modified file 'novaqua_reports/report/account_print_invoice.sxw'
 Binary files novaqua_reports/report/account_print_invoice.sxw	2014-01-20 08:10:25 +0000 and novaqua_reports/report/account_print_invoice.sxw	2014-01-27 12:27:10 +0000 differ
=== added file 'novaqua_reports/report/purchase_order.py'
--- novaqua_reports/report/purchase_order.py	1970-01-01 00:00:00 +0000
+++ novaqua_reports/report/purchase_order.py	2014-01-27 12:27:10 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Mentis d.o.o.
+#
+#    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/>.     
+#
+##############################################################################
+
+import time
+from openerp.report import report_sxw
+from openerp.osv import osv
+
+class order(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({'time': time})
+
+report_sxw.report_sxw('report.purchase.order.novaqua','purchase.order','novaqua_reports/report/purchase_order.rml',parser=order)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== modified file 'novaqua_reports/report/purchase_order.rml'
--- novaqua_reports/report/purchase_order.rml	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/purchase_order.rml	2014-01-27 12:27:10 +0000
@@ -50,15 +50,19 @@
       <lineStyle kind="LINEABOVE" colorName="#666666" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#666666" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#666666" start="5,0" stop="5,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#666666" start="5,0" stop="5,0"/>
       <lineStyle kind="LINEBELOW" colorName="#666666" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#666666" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#666666" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#666666" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="6,-1" stop="6,-1"/>
       <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
       <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
       <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Order_Pur_line_Content">
       <blockAlignment value="LEFT"/>
@@ -69,21 +73,15 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_All_Total_Detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -92,8 +90,20 @@
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" 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-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="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -139,8 +149,8 @@
           </para>
         </td>
         <td>
-          <para style="P2">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</para>
-          <para style="P1">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</para>
+          <para style="P2">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation: [[ o.name ]]</para>
+          <para style="P1">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation: [[ o.name ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -150,18 +160,18 @@
           <blockTable colWidths="277.0" style="Tableau2">
             <tr>
               <td>
-                <para style="P6">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
-                <para style="P6">[[ (o.partner_id.street) or '' ]]</para>
-                <para style="P6">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
-                <para style="P6">[[ (o.partner_id.country_id.name) or '' ]]</para>
+                <para style="P17">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
+                <para style="P17">[[ (o.partner_id.street) or '' ]]</para>
+                <para style="P17">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
+                <para style="P17">[[ (o.partner_id.country_id.name) or '' ]]</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
-                <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
-                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or <font face="Helvetica" size="9.0">removeParentNode('para')</font><font face="Helvetica" size="9.0">]]</font></para>
+                <para style="P17">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
+                <para style="P17">Shipping address :</para>
+                <para style="P17">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
+                <para style="P17">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or <font face="Helvetica">removeParentNode('para')</font>]]</para>
               </td>
             </tr>
           </blockTable>
@@ -170,21 +180,21 @@
           </para>
         </td>
         <td>
-          <blockTable colWidths="104.0,153.0" style="Table_order_data">
+          <blockTable colWidths="146.0,111.0" style="Table_order_data">
             <tr>
               <td>
-                <para style="P5">Order Date:</para>
+                <para style="P6">Order Date:</para>
               </td>
               <td>
-                <para style="P5">[[formatLang(o.date_order,date=True) ]]</para>
+                <para style="P6">[[formatLang(o.date_order,date=True) ]]</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P5">Validated By:</para>
+                <para style="P6">Validated By:</para>
               </td>
               <td>
-                <para style="P5">[[ (o.validator and o.validator.name) or '' ]]</para>
+                <para style="P6">[[ (o.validator and o.validator.name) or '' ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -227,139 +237,89 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="114.0,177.0,81.0,81.0,36.0,45.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Customer ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">UM</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Net Price</para>
+          <para style="P10">Customer reference</para>
+        </td>
+        <td>
+          <para style="P11">Code</para>
+        </td>
+        <td>
+          <para style="P11">Description</para>
+        </td>
+        <td>
+          <para style="P12">Quantity</para>
+        </td>
+        <td>
+          <para style="P12">UM</para>
+        </td>
+        <td>
+          <para style="P13">Unit Price</para>
+        </td>
+        <td>
+          <para style="P13">Net Price (€) </para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="114.0,177.0,81.0,81.0,36.0,45.0" style="Table_Order_Pur_line_Content">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ line.customer_ref ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="terp_default_8_Italic">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_8_Italic">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
+      <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content">
+        <tr>
+          <td>
+            <para style="P15">[[ line.customer_ref ]]</para>
+          </td>
+          <td>
+            <para style="P15">[[ line.product_id.default_code ]]</para>
+          </td>
+          <td>
+            <para style="P14">[[ line.product_id.name_template ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ formatLang(line.product_qty ) ]] </para>
+          </td>
+          <td>
+            <para style="P8">[[ line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="394.0,55.0,85.0" style="Table_All_Total_Detail">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">Net Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">Taxes:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+    <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail">
+      <tr>
+        <td>
+          <para style="P16">Net Total:</para>
+        </td>
+        <td>
+          <para style="P9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">Taxes:</para>
+        </td>
+        <td>
+          <para style="P9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">Total:</para>
+        </td>
+        <td>
+          <para style="P18">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+    <para style="P7">-</para>
+    <para style="P7">-</para>
     <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+    <para style="P7">-</para>
     <para style="terp_default_9">Payment terms: [[ (o.payment_term_id and o.payment_term_id.note and format(o.payment_term_id and o.payment_term_id.note)) or removeParentNode('para') ]]</para>
   </story>
 </document>
 
=== modified file 'novaqua_reports/report/purchase_order.sxw'
 Binary files novaqua_reports/report/purchase_order.sxw	2014-01-20 08:10:25 +0000 and novaqua_reports/report/purchase_order.sxw	2014-01-27 12:27:10 +0000 differ
=== modified file 'novaqua_reports/report/sale_order.py'
--- novaqua_reports/report/sale_order.py	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/sale_order.py	2014-01-27 12:27:10 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013 Mentis d.o.o.
+#    Copyright (C) 2014 Mentis d.o.o.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -30,15 +30,18 @@
             'get_total_discount': self._get_total_discount,
             'get_total_net': self._get_total_net,
 			'get_units': self._get_units,
+            'get_packets': self._get_packets,
+            'get_total_weight': self._get_total_weight,
         })
     
     def _get_total_discount(self, order):
         disc_total = 0
         for line in order.order_line:
-            if line.product_uos:
-                disc_tmp = line.product_uos_qty * line.price_unit * line.discount / 100
-            else:
-                disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100
+            #if line.product_uos:
+            #    disc_tmp = line.product_uos_qty * line.price_unit * line.discount / 100
+            #else:
+            #    disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100
+            disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100
             disc_total += disc_tmp
 
         return disc_total
@@ -63,4 +66,20 @@
         else: 
             return ''
 
+    def _get_total_weight(self, sale):
+        line_obj = self.pool.get('sale.order.line')
+        line_ids = line_obj.search(self.cr, self.uid, [('order_id', '=' , sale.id)])
+        sum = 0
+        for sale_line in line_obj.browse(self.cr, self. uid, line_ids):
+            sum = sum + sale_line.product_uom_qty * sale_line.product_id.weight
+        
+        return sum
+    
+    def _get_packets(self, sale_line):
+        if sale_line.product_uos.id and sale_line.product_uom.id != sale_line.product_uos.id:
+            return sale_line.product_uos_qty
+        else:
+            return ''
+        
+
 report_sxw.report_sxw('report.sale.order.novaqua', 'sale.order', 'novaqua_reports/report/sale_order.rml', parser=order, header="external")
 
=== modified file 'novaqua_reports/report/sale_order.rml'
--- novaqua_reports/report/sale_order.rml	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/sale_order.rml	2014-01-27 12:27:10 +0000
@@ -39,6 +39,7 @@
       <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#666666" start="4,0" stop="4,-1"/>
@@ -85,35 +86,48 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,3" stop="1,3"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_dobava">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table_prosti_opis">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_bold">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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="9.0" leading="11" 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="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" 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="CENTER" spaceBefore="6.0" spaceAfter="6.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="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" 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="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" textColor="#000000"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" 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="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P26" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" 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"/>
@@ -156,46 +170,46 @@
     <blockTable colWidths="270.0,270.0" style="Table_naslov">
       <tr>
         <td>
-          <para style="P10">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P11">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
-          <para style="P11">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+          <para style="P16">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
+          <para style="P16">[[ 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="P5">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
-          <para style="P5">[[ (o.partner_id.street) or '' ]]</para>
-          <para style="P5">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
-          <para style="P5">[[ (o.partner_id.country_id.name) or '' ]]</para>
-          <para style="P5">
-            <font color="white"> </font>
-          </para>
-          <para style="P13">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
-          <para style="P5">[[ ((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="P5">[[ ((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="P5">[[ (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="P5">
-            <font color="white"> </font>
-          </para>
-          <para style="P13">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
-          <para style="P5">[[ ((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="P5">[[ ((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="P1">[[ ((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="P18">[[ (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="P18">[[ 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="148.0,123.0" style="Table_order_inf">
+          <blockTable colWidths="137.0,133.0" style="Table_order_inf">
             <tr>
               <td>
                 <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>
@@ -203,7 +217,7 @@
                 <para style="P2">Expiration date:</para>
               </td>
               <td>
-                <para style="P6">
+                <para style="P8">
                   <font color="white"> </font>
                 </para>
               </td>
@@ -229,7 +243,7 @@
                 <para style="P2">Salesperson:</para>
               </td>
               <td>
-                <para style="P2">[[ o.user_id.name ]],</para>
+                <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone ]]</para>
               </td>
             </tr>
             <tr>
@@ -239,11 +253,13 @@
                 </para>
               </td>
               <td>
-                <para style="P2">tel.:[[ o.user_id.partner_id.mobile ]]</para>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
               </td>
             </tr>
           </blockTable>
-          <para style="P10">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
@@ -256,72 +272,72 @@
       <tr>
         <td>
           <para style="P1">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
-          <para style="P3">
+          <para style="P5">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P9">
+          <para style="P22">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="55.0,220.0,51.0,37.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4">
+    <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="P18">Code</para>
-        </td>
-        <td>
-          <para style="P18">Description</para>
-        </td>
-        <td>
-          <para style="P20">Quantity</para>
-        </td>
-        <td>
-          <para style="P20">UM</para>
-        </td>
-        <td>
-          <para style="P20">Unit Price</para>
-        </td>
-        <td>
-          <para style="P20">Disc.</para>
-        </td>
-        <td>
-          <para style="P19">Taxes (%)</para>
-        </td>
-        <td>
-          <para style="P20">Price (€)</para>
+          <para style="P23">Code</para>
+        </td>
+        <td>
+          <para style="P23">Description</para>
+        </td>
+        <td>
+          <para style="P25">Quantity</para>
+        </td>
+        <td>
+          <para style="P25">UM</para>
+        </td>
+        <td>
+          <para style="P25">Unit Price</para>
+        </td>
+        <td>
+          <para style="P25">Disc.</para>
+        </td>
+        <td>
+          <para style="P24">Taxes (%)</para>
+        </td>
+        <td>
+          <para style="P25">Price (€)</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="56.0,219.0,51.0,37.0,58.0,32.0,28.0,55.0" style="Table5">
+      <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_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>
-          </td>
-          <td>
-            <para style="P21">[[ ', '.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.product_id.name_template ]] </para>
+          </td>
+          <td>
+            <para style="P19">[[ line.product_uom_qty ]] </para>
+          </td>
+          <td>
+            <para style="P19">[[ line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="P19">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
+          </td>
+          <td>
+            <para style="P20">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para>
+          </td>
+          <td>
+            <para style="P26">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
+          </td>
+          <td>
+            <para style="P19">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -329,60 +345,59 @@
     <blockTable colWidths="270.0,270.0" style="Table_tax">
       <tr>
         <td>
-          <para style="P4">Net Total:</para>
-        </td>
-        <td>
-          <para style="P17">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <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>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P4">Taxes :</para>
-        </td>
-        <td>
-          <para style="P17">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P14">Total :</para>
-        </td>
-        <td>
-          <para style="P22">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+          <para style="P6">Net Total:</para>
+        </td>
+        <td>
+          <para style="P21">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
+        </td>
+        <td>
+          <para style="P21">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Taxes :</para>
+        </td>
+        <td>
+          <para style="P21">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Total :</para>
+        </td>
+        <td>
+          <para style="P27">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P12">-</para>
+    <blockTable colWidths="539.0" style="Table_dobava">
+      <tr>
+        <td>
+          <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
+          <para style="P13">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P12">-</para>
+    <para style="P12">-</para>
     <blockTable colWidths="539.0" style="Table_prosti_opis">
       <tr>
         <td>
-          <para style="P9">Za potrditev ponudbe prosimo za plačilo na TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para>
-          <para style="P9">Za več informacij lahko pokličete vašo kontaktno osebo: [[ o.user_id.name ]], telefon: [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
+          <para style="P15">Za potrditev ponudbe prosimo za plačilo na TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table_bold">
       <tr>
         <td>
-          <para style="P12">[[ o.company_id.name in ['Inovatim d.o.o.'] and removeParentNode('para') ]] tekst</para>
+          <para style="P4">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ 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-20 08:10:25 +0000 and novaqua_reports/report/sale_order.sxw	2014-01-27 12:27:10 +0000 differ
=== modified file 'novaqua_reports/report/stock_picking.py'
--- novaqua_reports/report/stock_picking.py	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/stock_picking.py	2014-01-27 12:27:10 +0000
@@ -62,7 +62,7 @@
         line_ids = line_obj.search(self.cr, self.uid, [('id', '=' , move_line.sale_line_id.id)])
         res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom']
         if res:
-            return res.name
+            return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', move_line.partner_id.lang, res.name)
         else: 
             return ''
         
 
=== modified file 'novaqua_reports/report/stock_picking.rml'
--- novaqua_reports/report/stock_picking.rml	2014-01-20 08:10:25 +0000
+++ novaqua_reports/report/stock_picking.rml	2014-01-27 12:27:10 +0000
@@ -26,13 +26,27 @@
     <blockTableStyle id="Move_Line_Header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#666666" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#666666" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#666666" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#666666" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#666666" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#666666" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#666666" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Move_Line_Contect_Assign_State">
       <blockAlignment value="LEFT"/>
@@ -42,8 +56,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -53,8 +65,10 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_notes">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table_noga">
       <blockAlignment value="LEFT"/>
@@ -69,14 +83,23 @@
     </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" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica" 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="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"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -113,6 +136,7 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'picking')]] </para>
+    <para style="terp_default_8">[[ setLang(picking.partner_id.lang) ]]</para>
     <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
       <tr>
         <td>
@@ -121,28 +145,28 @@
           </para>
         </td>
         <td>
-          <para style="P4">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
-          <para style="P4">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
-          <para style="P4">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
+          <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>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="264.0,273.0" style="Table2">
       <tr>
         <td>
-          <para style="P9">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
-          <para style="P9">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
-          <para style="P9">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
-          <para style="P9">[[ picking.partner_id.name ]]</para>
-          <para style="P9">[[ picking.partner_id.street ]]</para>
-          <para style="P9">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
-          <para style="P9">[[ picking.partner_id.country_id.name ]]</para>
+          <para style="P16">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">[[ picking.partner_id.name ]]</para>
+          <para style="P16">[[ picking.partner_id.street ]]</para>
+          <para style="P16">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
+          <para style="P16">[[ picking.partner_id.country_id.name ]]</para>
         </td>
         <td>
-          <blockTable colWidths="175.0,93.0" style="Table_picking_info">
+          <blockTable colWidths="161.0,107.0" style="Table_picking_info">
             <tr>
               <td>
-                <para style="P1">Ljubljana, dne:</para>
+                <para style="P1">Ljubljana:</para>
               </td>
               <td>
                 <para style="P1">[[ formatLang(picking.date,date = True) ]]</para>
@@ -174,7 +198,7 @@
             </tr>
             <tr>
               <td>
-                <para style="P2">Način dostave:</para>
+                <para style="P2">Delivery method:</para>
               </td>
               <td>
                 <para style="P2">[[ picking.sale_id.incoterm.name ]]</para>
@@ -182,14 +206,14 @@
             </tr>
             <tr>
               <td>
-                <para style="P2">Teža:</para>
+                <para style="P2">Total net weight:</para>
               </td>
               <td>
-                <para style="P2">[[ get_total_weight(picking) ]] kg</para>
+                <para style="P2">[[ formatLang(get_total_weight(picking)) ]] kg</para>
               </td>
             </tr>
           </blockTable>
-          <para style="P10">
+          <para style="P7">
             <font color="white"> </font>
           </para>
         </td>
@@ -198,60 +222,44 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="53.0,229.0,51.0,45.0,45.0,36.0,59.0" repeatRows="1" style="Move_Line_Header">
+    <blockTable colWidths="53.0,276.0,66.0,34.0,88.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Units</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Packets</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">LOT</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price/unit</para>
+          <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>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
       <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
-      <blockTable colWidths="54.0,229.0,51.0,45.0,45.0,36.0,62.0" style="Move_Line_Contect_Assign_State">
+      <blockTable colWidths="54.0,276.0,66.0,34.0,91.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
-            <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ move_lines.product_id.name_template ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ get_packets(move_lines) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ get_units(move_lines) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ move_lines.sale_line_id.price_unit ]]</para>
+            <para style="P14">[[ move_lines.product_id.default_code ]]</para>
+          </td>
+          <td>
+            <para style="P13">[[ move_lines.product_id.name_template ]]</para>
+          </td>
+          <td>
+            <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
+          </td>
+          <td>
+            <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>
           </td>
         </tr>
       </blockTable>
@@ -261,119 +269,83 @@
     <section>
       <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
       <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
-      <blockTable colWidths="55.0,229.0,51.0,45.0,45.0,36.0,61.0" style="Table1">
+      <blockTable colWidths="55.0,275.0,66.0,35.0,90.0" style="Table1">
         <tr>
           <td>
-            <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ move_lines.product_id.name_template ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ get_packets(move_lines) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ get_units(move_lines) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ move_lines.sale_line_id.price_unit ]]</para>
+            <para style="P14">[[ move_lines.product_id.default_code ]]</para>
+          </td>
+          <td>
+            <para style="P13">[[ move_lines.product_id.name_template ]]</para>
+          </td>
+          <td>
+            <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
+          </td>
+          <td>
+            <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>
           </td>
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">[[ format(picking.note or '') ]]</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+    <para style="P17">-</para>
+    <blockTable colWidths="538.0" style="Table_notes">
+      <tr>
+        <td>
+          <para style="P12">[[ format(picking.note or '') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P17">-</para>
     <blockTable colWidths="538.0" style="Table_noga">
       <tr>
         <td>
-          <para style="P6">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o. !</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P7">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="P7">Opomba: Kamen in les sta naravna materiala, zato lahko pride do variacij v tonu med vzorcem in končnim proizvodom!</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">Skladišče Lesnina na Tržaški 135 v Ljubljani je odprto od 7:00 – 14:00.</para>
+          <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>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="149.0,179.0,210.0" style="Table_izdal_prejel">
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">-</para>
+    <para style="P17">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="189.0,185.0,163.0" style="Table_izdal_prejel">
       <tr>
         <td>
-          <para style="P3">Issued by: [[ picking.create_uid.name ]]</para>
-        </td>
-        <td>
-          <para style="P3">Received by: ___________________</para>
-        </td>
-        <td>
-          <para style="P3">Place, date: ___________________</para>
+          <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P5">Received by:</para>
+        </td>
+        <td>
+          <para style="P5">Place, date:</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'novaqua_reports/report/stock_picking.sxw'
 Binary files novaqua_reports/report/stock_picking.sxw	2014-01-20 08:10:25 +0000 and novaqua_reports/report/stock_picking.sxw	2014-01-27 12:27:10 +0000 differ