[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101124043757-3jpov3rgp41z740h

diff --cc addons/account/report/account_journal.rml
index 0a20da7,c2807a2..487fabb
--- 1/addons/account/report/account_journal.rml
--- 2/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@@ -287,11 -280,11 +280,11 @@@
          <td><para style="P10">Entry No</para></td>
          <td><para style="P10">A/c No.</para></td>
          <td><para style="P10a">Partner</para></td>
-         <td><para style="P10a">Move/Entry label</para></td>
+         <td><para style="P10a">Move/Entry Label</para></td>
          <td><para style="P10b">Debit</para></td>
          <td><para style="P10b">Credit</para></td>
 -              <td><para style="P10b">Balance</para></td>
 -              <td><para style="P10b">Currency</para></td>
 +       <td><para style="P10b">Balance</para></td>
 +    <td><para style="P10b">Currency</para></td>
        </tr>
         <tr>
          <td><para style="P11">[[o.period_id.name ]]</para></td>
@@@ -305,16 -298,15 +298,15 @@@
        </tr>
         <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
        <tr>
 -        <td><para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
 -        <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
 -        <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
 -        <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
 -        <td><para style="terp_default_8">[[ line.move_id.name ]] - [[ line.name ]]</para></td>
 -        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
 -        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
 -        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
 -              <td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
 +        <td><para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para><para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para></td>
 +        <td><para style="terp_default_Centre_8">[[ line['ref'] or '' ]]</para></td>
 +        <td><para style="terp_default_Centre_8">[[ line['account_code'] or '' ]]</para></td>
 +        <td><para style="terp_default_8">[[ line['partner_name'] or '' ]]</para></td>
 +        <td><para style="terp_default_8">[[ line['move_name'] or '' ]] - [[ line['name'] or '' ]]</para></td>
 +        <td><para style="P8">[[ formatLang(line['debit']) ]]</para></td>
 +        <td><para style="P8">[[ formatLang(line['credit']) ]]</para></td>
 +        <td><para style="P8">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
 +    <td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
- 
        </tr>
      </blockTable>
    </story>