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

[Matjaz Kalic]

[FIX] novaqua_reports/report/sale_order (paragraph layout)

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

318. By Dušan Laznik (Mentis) on 2014-01-28

[FIX] novaqua_reports/report/sale_order (paragraph layout)

=== modified file 'novaqua_reports/report/sale_order.rml'
--- novaqua_reports/report/sale_order.rml	2014-01-28 09:25:55 +0000
+++ novaqua_reports/report/sale_order.rml	2014-01-28 09:38:38 +0000
@@ -104,30 +104,29 @@
     <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="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" 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="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" 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="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" 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="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" textColor="#000000"/>
-    <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -170,37 +169,37 @@
     <blockTable colWidths="270.0,270.0" style="Table_naslov">
       <tr>
         <td>
-          <para style="P13">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P14">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
-          <para style="P14">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+          <para style="P15">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
+          <para style="P15">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="264.0,276.0" style="Table_customer_data">
       <tr>
         <td>
-          <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
-          <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
-          <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
-          <para style="P10">[[ (o.partner_id.country_id.name) or '' ]]</para>
-          <para style="P10">
-            <font color="white"> </font>
-          </para>
-          <para style="P16">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
-          <para style="P10">[[ ((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="P10">[[ ((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="P10">[[ (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="P10">
-            <font color="white"> </font>
-          </para>
-          <para style="P16">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
-          <para style="P10">[[ ((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="P10">[[ ((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="P6">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
+          <para style="P11">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
+          <para style="P11">[[ (o.partner_id.street) or '' ]]</para>
+          <para style="P11">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
+          <para style="P11">[[ (o.partner_id.country_id.name) or '' ]]</para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+          <para style="P17">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>
+          <para style="P11">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+          <para style="P17">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>
+          <para style="P11">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>
+          <para style="P7">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
         </td>
         <td>
           <blockTable colWidths="126.0,144.0" style="Table_order_inf">
@@ -209,7 +208,7 @@
                 <para style="P2">Ljubljana,</para>
               </td>
               <td>
-                <para style="P7">[[ formatLang(o.date_order, date = True) ]]</para>
+                <para style="P8">[[ formatLang(o.date_order, date = True) ]]</para>
               </td>
             </tr>
             <tr>
@@ -217,7 +216,7 @@
                 <para style="P2">Expiration date:</para>
               </td>
               <td>
-                <para style="P7">
+                <para style="P8">
                   <font color="white"> </font>
                 </para>
               </td>
@@ -259,7 +258,7 @@
               </td>
             </tr>
           </blockTable>
-          <para style="P13">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
@@ -272,12 +271,12 @@
       <tr>
         <td>
           <para style="P1">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
-          <para style="P4">
+          <para style="P5">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P20">
+          <para style="P21">
             <font color="white"> </font>
           </para>
         </td>
@@ -286,28 +285,28 @@
     <blockTable colWidths="55.0,216.0,58.0,34.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4">
       <tr>
         <td>
-          <para style="P21">Code</para>
-        </td>
-        <td>
-          <para style="P21">Description</para>
-        </td>
-        <td>
-          <para style="P23">Quantity</para>
-        </td>
-        <td>
-          <para style="P23">UM</para>
-        </td>
-        <td>
-          <para style="P23">Unit Price</para>
-        </td>
-        <td>
-          <para style="P23">Disc.</para>
-        </td>
-        <td>
-          <para style="P22">Taxes (%)</para>
-        </td>
-        <td>
-          <para style="P23">Price (€)</para>
+          <para style="P22">Code</para>
+        </td>
+        <td>
+          <para style="P22">Description</para>
+        </td>
+        <td>
+          <para style="P24">Quantity</para>
+        </td>
+        <td>
+          <para style="P24">UM</para>
+        </td>
+        <td>
+          <para style="P24">Unit Price</para>
+        </td>
+        <td>
+          <para style="P24">Disc.</para>
+        </td>
+        <td>
+          <para style="P23">Taxes (%)</para>
+        </td>
+        <td>
+          <para style="P24">Price (€)</para>
         </td>
       </tr>
     </blockTable>
@@ -316,28 +315,28 @@
       <blockTable colWidths="56.0,216.0,58.0,34.0,58.0,32.0,28.0,54.0" style="Table5">
         <tr>
           <td>
-            <para style="P9">[[ line.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="P8">[[ line.product_id.name_template ]] </para>
-          </td>
-          <td>
-            <para style="P17">[[ line.product_uom_qty ]] </para>
-          </td>
-          <td>
-            <para style="P17">[[ line.product_uom.name ]]</para>
-          </td>
-          <td>
-            <para style="P17">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
-          </td>
-          <td>
-            <para style="P18">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para>
-          </td>
-          <td>
-            <para style="P24">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
-          </td>
-          <td>
-            <para style="P17">[[ 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="P18">[[ line.product_uom_qty ]] </para>
+          </td>
+          <td>
+            <para style="P18">[[ line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="P18">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
+          </td>
+          <td>
+            <para style="P19">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para>
+          </td>
+          <td>
+            <para style="P25">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
+          </td>
+          <td>
+            <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -345,61 +344,60 @@
     <blockTable colWidths="270.0,270.0" style="Table_tax">
       <tr>
         <td>
-          <para style="P5">Net Total:</para>
-        </td>
-        <td>
-          <para style="P19">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P5">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
-        </td>
-        <td>
-          <para style="P19">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P5">Taxes :</para>
-        </td>
-        <td>
-          <para style="P19">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P15">Total :</para>
-        </td>
-        <td>
-          <para style="P25">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
+          <para style="P6">Net Total:</para>
+        </td>
+        <td>
+          <para style="P20">[[ 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="P20">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Taxes :</para>
+        </td>
+        <td>
+          <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">Total :</para>
+        </td>
+        <td>
+          <para style="P26">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P11">-</para>
+    <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="P12">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
+          <para style="P13">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P11">-</para>
-    <para style="P11">-</para>
+    <para style="P12">-</para>
+    <para style="P12">-</para>
     <blockTable colWidths="539.0" style="Table_prosti_opis">
       <tr>
         <td>
-          <para style="P26">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja
-</para>
-          <para style="P26">Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d.</para>
+          <para style="terp_default_9">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja </para>
+          <para style="terp_default_9">Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d.</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="539.0" style="Table_bold">
       <tr>
         <td>
-          <para style="P27">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone]], [[ o.user_id.email ]]</para>
+          <para style="P4">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone]], [[ o.user_id.email ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'novaqua_reports/report/sale_order.sxw'
Binary files novaqua_reports/report/sale_order.sxw	2014-01-28 09:25:55 +0000 and novaqua_reports/report/sale_order.sxw	2014-01-28 09:38:38 +0000 differ