Merge lp:~unifield-team/unifield-wm/uf-1986 into lp:unifield-wm

[jftempo]

=== modified file 'msf_outgoing/report/certificate_donation.rml'
--- msf_outgoing/report/certificate_donation.rml	2012-07-20 12:23:56 +0000
+++ msf_outgoing/report/certificate_donation.rml	2013-06-26 15:16:37 +0000
@@ -280,10 +280,10 @@
     <para style="P9">Parcels details</para>
     <section>
       <para style="P14">[[repeatIn(shipment.pack_family_memory_ids,'pack_family')]]</para>
-      <blockTable colWidths="41.0,81.0,40.0,33.0,33.0,104.0,68.0,68.0,68.0" style="Table8">
+      <blockTable colWidths="61.0,81.0,40.0,33.0,33.0,104.0,68.0,68.0,68.0" style="Table8">
         <tr>
           <td>
-            <para style="terp_default_9">SO ref: [[ pack_family.sale_order_id.name ]]</para>
+            <para style="terp_default_9">FO ref: [[ pack_family.sale_order_id.name ]]</para>
           </td>
           <td>
             <para style="P11">PPL ref: [[ pack_family.ppl_id.name ]]</para>
@@ -307,7 +307,7 @@
             <para style="terp_default_Right_9">Pack Value: [[ pack_family.amount ]] [[ pack_family.currency_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">Total value: [[ pack_family.total_amount ]][[ pack_family.currency_id.name ]]</para>
+            <para style="terp_default_Right_9">Total value: [[ pack_family.total_amount ]] [[ pack_family.currency_id.name ]]</para>
           </td>
         </tr>
       </blockTable>

=== modified file 'msf_outgoing/report/certificate_free_gift.rml'
--- msf_outgoing/report/certificate_free_gift.rml	2012-07-20 12:23:56 +0000
+++ msf_outgoing/report/certificate_free_gift.rml	2013-06-26 15:16:37 +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="15.0" y1="42.0" width="539" height="758"/>
+      <frame id="first" x1="15.0" y1="42.0" width="560" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -66,15 +66,6 @@
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
@@ -88,30 +79,29 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <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="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.5" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="6.0" leading="8"/>
     <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="10.0" leading="13"/>
     <paraStyle name="P7" fontName="Helvetica" alignment="JUSTIFY"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="7.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P14" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="1.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Parcel" fontName="Helvetica" fontSize="7.5" leading="8" alignment="LEFT" spaceBefore="1.5" spaceAfter="1.5" />
     <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"/>
@@ -121,14 +111,14 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Footer" fontName="Helvetica"/>
     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -140,7 +130,7 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.5" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -150,23 +140,11 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'shipment')]]</para>
-    <blockTable colWidths="531.0" style="Table1">
-      <tr>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-          <para style="P1">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_header">Free Gift Certificate - [[ time.strftime('%d/%m/%Y') ]]</para>
-    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table4">
+    <blockTable colWidths="144.0,134.0,147.0,135.0" style="Table4">
       <tr>
         <td>
           <para style="P3">Cargo Manifest Reference</para>
@@ -199,7 +177,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,267.0" style="Table6">
+    <blockTable colWidths="280.0,280.0" style="Table6">
       <tr>
         <td>
           <para style="P3">From:</para>
@@ -226,10 +204,10 @@
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="531.0" style="Table3">
+    <blockTable colWidths="560.0" style="Table3">
       <tr>
         <td>
-          <para style="P8">
+          <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
@@ -276,45 +254,63 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P7">CERTIFICATION: Médecins Sans Frontières declares that no exchange of foreign currency between the country of destination and …...................................................... (the country of origin) is involved in connection with this shipment and that the goods belonging to this shipment will be used for humanitarian purpose only.</para>
-    <para style="P9">Parcels details</para>
+    <para style="P11">CERTIFICATION: Médecins Sans Frontières declares that no exchange of foreign currency between the country of destination and …...................................................... (the country of origin) is involved in connection with this shipment and that the goods belonging to this shipment will be used for humanitarian purpose only.</para>
+    <para style="P12">Parcels details</para>
     <section>
       <para style="P14">[[repeatIn(shipment.pack_family_memory_ids,'pack_family')]]</para>
-      <blockTable colWidths="41.0,81.0,40.0,33.0,33.0,104.0,68.0,68.0,68.0" style="Table8">
+      <blockTable colWidths="95.0,70.0,40.0,42.5,32.5,70.0,69.0,80.0,77.0" style="Table8">
         <tr>
           <td>
-            <para style="terp_default_9">SO ref: [[ pack_family.sale_order_id.name ]]</para>
-          </td>
-          <td>
-            <para style="P11">PPL ref: [[ pack_family.ppl_id.name ]]</para>
-          </td>
-          <td>
-            <para style="P11">#Packs: [[ pack_family.num_of_packs ]]</para>
-          </td>
-          <td>
-            <para style="P11">From p: [[ pack_family.from_pack ]]</para>
-          </td>
-          <td>
-            <para style="P11">To p: [[ pack_family.to_pack ]]</para>
-          </td>
-          <td>
-            <para style="P11">Pack Weight [kg]: [[ pack_family.weight ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">Total Weight [kg]: [[ pack_family.total_weight ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">Pack Value: [[ pack_family.amount ]] [[ pack_family.currency_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">Total value: [[ pack_family.total_amount ]][[ pack_family.currency_id.name ]]</para>
+            <para style="Parcel">FO ref:</para>
+            <para style="Parcel">[[ pack_family.sale_order_id.name ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">PPL ref:</para>
+            <para style="Parcel">[[ pack_family.ppl_id.name ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">#Packs:</para>
+            <para style="Parcel">[[ pack_family.num_of_packs ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">From p:</para>
+            <para style="Parcel">[[ pack_family.from_pack ]]</para>
+          </td>
+          <td>
+              <para style="Parcel">To p:</para>
+              <para style="Parcel">[[ pack_family.to_pack ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">P. Weight [kg]:</para>
+            <para style="Parcel">[[ pack_family.weight ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">∑ Weight [kg]:</para>
+            <para style="Parcel">[[ pack_family.total_weight ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">Pack Value [[ pack_family.currency_id and '[%s]' % pack_family.currency_id.name or '' ]]:</para>
+            <para style="Parcel">[[ pack_family.amount ]] [[ pack_family.currency_id.name ]]</para>
+          </td>
+          <td>
+            <para style="Parcel">∑ Value [[ pack_family.currency_id and '[%s]' % pack_family.currency_id.name or '' ]]:</para>
+            <para style="Parcel">[[ pack_family.total_amount ]] [[ pack_family.currency_id.name ]]</para>
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="115.0,174.0,66.0,51.0,110.0" repeatRows="1" style="Table9">
+      <blockTable colWidths="560.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+	  <blockTable colWidths="115.0,230.0,70.0,55.0,90.0" repeatRows="1" style="Table8">
         <tr>
           <td>
-            <para style="terp_tblheader_Details">Product Code</para>
+            <para style="P12">Product Code</para>
           </td>
           <td>
             <para style="P12">Product Description</para>
@@ -332,10 +328,10 @@
       </blockTable>
       <section>
         <para style="P15">[[repeatIn(pack_family.move_lines,'move')]]</para>
-        <blockTable colWidths="117.0,174.0,66.0,51.0,110.0" style="Table2">
+        <blockTable colWidths="115.0,230.0,70.0,55.0,90.0" style="Table2">
           <tr>
             <td>
-              <para style="terp_default_9">[[ move.product_id.code ]]</para>
+              <para style="P11">[[ move.product_id.code ]]</para>
             </td>
             <td>
               <para style="P11">[[ move.product_id.name ]]</para>
@@ -351,12 +347,9 @@
             </td>
           </tr>
         </blockTable>
-        <para style="P6">
-          <font color="white"> </font>
-        </para>
-        <para style="P6">
-          <font color="white"> </font>
-        </para>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
       </section>
     </section>
   </story>

=== modified file 'msf_profile/i18n/fr_MF.po'
--- msf_profile/i18n/fr_MF.po	2013-05-16 15:30:40 +0000
+++ msf_profile/i18n/fr_MF.po	2013-06-26 15:16:37 +0000
@@ -7106,7 +7106,7 @@
 #: report:invoice:0
 #: report:packing.list:0
 msgid "PPL ref:"
-msgstr "Liste de Pré-Colisage - réf:"
+msgstr "PCL réf:"
 
 #. module: purchase_allocation_report
 #: model:ir.module.module,description:purchase_allocation_report.module_meta_information
@@ -25038,14 +25038,14 @@
 
 #. module: msf_outgoing
 #: report:cargo.manifest:0
-#: report:certificate.donation:0
-#: report:certificate.free.gift:0
 #: report:invoice:0
 msgid "SO ref:"
 msgstr "CdT Réf:"
 
 #. module: msf_outgoing
 #: report:packing.list:0
+#: report:certificate.donation:0
+#: report:certificate.free.gift:0
 msgid "FO ref:"
 msgstr "CdT Réf:"
 
@@ -25588,13 +25588,17 @@
 #. module: msf_outgoing
 #: report:cargo.manifest:0
 #: report:certificate.donation:0
-#: report:certificate.free.gift:0
 #: report:invoice:0
 #: report:pre.packing.list:0
 msgid "Pack Value:"
 msgstr "Colis - Valeur"
 
 #. module: msf_outgoing
+#: report:certificate.free.gift:0
+msgid "P. Value:"
+msgstr "C. Valeur"
+
+#. module: msf_outgoing
 #: report:packing.list:0
 msgid "Pack Val:"
 msgstr "Colis - Val"
@@ -37402,12 +37406,16 @@
 #. module: msf_outgoing
 #: report:cargo.manifest:0
 #: report:certificate.donation:0
-#: report:certificate.free.gift:0
 #: report:invoice:0
 msgid "Total Weight [kg]:"
 msgstr "Poids Total (kg)"
 
 #. module: msf_outgoing
+#: report:certificate.free.gift:0
+msgid "∑ Weight [kg]:"
+msgstr "∑ Poids (kg)"
+
+#. module: msf_outgoing
 #: report:packing.list:0
 msgid "Tot Wt [kg]:"
 msgstr "Poids Tot. (kg)"
@@ -48199,6 +48207,11 @@
 msgstr "Chili"
 
 #. module: msf_outgoing
+#: report:certificate.free.gift:0
+msgid "∑ Value:"
+msgstr "∑ Valeur:"
+
+#. module: msf_outgoing
 #: report:cargo.manifest:0
 #: report:certificate.donation:0
 #: report:certificate.free.gift:0
@@ -52822,8 +52835,8 @@
 #: report:certificate.donation:0
 #: report:certificate.free.gift:0
 #: report:invoice:0
-msgid "Pack Weight [kg]:"
-msgstr "Colis - Poids (kg)"
+msgid "P. Weight [kg]:"
+msgstr "C. Poids (kg)"
 
 #. module: msf_outgoing
 #: report:packing.list:0