order, req and ship mod

bzr revid: nel@silver-20080909092354-4awqpb0rm97tlpaj

diff --cc addons/purchase/report/order.rml
index b374ad8,a3db53e..7dc0689
--- 1/addons/purchase/report/order.rml
--- 2/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@@ -57,7 -57,7 +57,6 @@@
        <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"/>
      </blockTableStyle>
      <blockTableStyle id="Table_Order_Pur_line_Content">
        <blockAlignment value="LEFT"/>
@@@ -142,32 -142,32 +141,32 @@@
          <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.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
--          <para style="terp_default_9">[[ addr.title or '' ]][[ addr.name  ]]</para>
++          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
++          <para style="terp_default_9">[[ addr.title or '' ]] [[ addr.name ]]</para>
            <para style="terp_default_9">[[ addr.street ]]</para>
            <para style="terp_default_9">[[ addr.street2 or '' ]]</para>
--          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font>[[ addr.city or ''  ]]</para>
--          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or ''  ]]</para>
++          <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font> [[ addr.city or '' ]]</para>
++          <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para>
            <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
          </td>
          <td>
--          <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
--          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]</para>
++          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
++          <para style="terp_default_9">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
            <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
            <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
--          <para style="terp_default_9">[[ o.partner_address_id.zip or ''  ]][[ o.partner_address_id.city or '' ]]</para>
--          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or ''  ]]</para>
++          <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
++          <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
            <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
            <para style="terp_default_9">
              <font color="white"> </font>
            </para>
            <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
            <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
--          <para style="terp_default_9">TVA :[[ o.partner_id.vat or ''  ]]</para>
++          <para style="terp_default_9">TVA :[[ o.partner_id.vat or '' ]]</para>
          </td>
        </tr>
      </blockTable>
--    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and ''  ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
++    <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para>
      <blockTable colWidths="136.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl">
        <tr>
          <td>
@@@ -190,25 -190,25 +189,22 @@@
            <para style="terp_default_Centre_9">[[ o.ref or '' ]]</para>
          </td>
          <td>
--          <para style="terp_default_Centre_9">[[ o.partner_ref or ''  ]]</para>
++          <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para>
          </td>
          <td>
            <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
          </td>
          <td>
--          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or ''  ]]</para>
++          <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para>
          </td>
        </tr>
      </blockTable>
      <para style="terp_default_9">
        <font color="white"> </font>
      </para>
--    <blockTable colWidths="44.0,210.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
++    <blockTable colWidths="253.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
        <tr>
          <td>
--          <para style="terp_tblheader_Details">Product</para>
--        </td>
--        <td>
            <para style="terp_tblheader_Details">Description</para>
          </td>
          <td>
@@@ -230,7 -230,7 +226,7 @@@
      </blockTable>
      <section>
        <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
-       <blockTable colWidths="44.0,211.0,52.0,57.0,24.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content">
 -      <blockTable colWidths="44.0,211.0,52.0,57.0,24.0,20.0,57.0,71.0" style="Table_Order_Pur_line_Content">
++      <blockTable colWidths="43.0,211.0,52.0,57.0,24.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content">
          <tr>
            <td>
              <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para>
@@@ -245,7 -245,7 +241,7 @@@
              <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para>
            </td>
            <td>
--            <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]]</para>
++            <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]] </para>
            </td>
            <td>
              <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
@@@ -254,7 -254,7 +250,7 @@@
              <para style="terp_default_Right_9">[[ '%.2f' % line.price_unit ]]</para>
            </td>
            <td>
--            <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal  ]]</para>
++            <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal ]]</para>
            </td>
          </tr>
          <tr>
@@@ -308,10 -308,10 +304,10 @@@
            <para style="terp_default_9">Net Total :</para>
          </td>
          <td>
--          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed  ]]</para>
++          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]]</para>
          </td>
          <td>
--          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
++          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
          </td>
        </tr>
        <tr>
@@@ -324,10 -324,10 +320,10 @@@
            <para style="P1">Taxes :</para>
          </td>
          <td>
--          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax  ]]</para>
++          <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax ]]</para>
          </td>
          <td>
--          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name  ]]</para>
++          <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
          </td>
        </tr>
        <tr>
@@@ -357,8 -357,8 +353,6 @@@
          </td>
        </tr>
      </blockTable>
--    <para style="terp_default_9">
--      <font color="white"> </font>
--    </para>
++    <para style="terp_default_9"/>
    </story>
  </document>