openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00690
[Merge] lp:~openerp-report/openobject-addons/report-dev-apa into lp:~openerp-dev/openobject-addons/report_dev
apa (Open ERP) has proposed merging lp:~openerp-report/openobject-addons/report-dev-apa into lp:~openerp-dev/openobject-addons/report_dev.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#645969 [trunk] accounting - GL report (and others) - repeat column headers
https://bugs.launchpad.net/bugs/645969
#667710 Account Trail Balance report rml font-size too large and PDF seems ugly
https://bugs.launchpad.net/bugs/667710
Improved general ledger report for strip_name function and also other reports for actual size for landscape report.
--
https://code.launchpad.net/~openerp-report/openobject-addons/report-dev-apa/+merge/41674
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-report/openobject-addons/report-dev-apa into lp:~openerp-dev/openobject-addons/report_dev.
=== modified file 'account/report/account_general_ledger.py'
--- account/report/account_general_ledger.py 2010-11-24 04:41:16 +0000
+++ account/report/account_general_ledger.py 2010-11-24 04:52:21 +0000
@@ -86,10 +86,10 @@
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_target_move': self._get_target_move,
- 'strip_name': self._strip_name,
})
self.context = context
+<<<<<<< TREE
def _ellipsis(self, char, size=100, truncation_str='...'):
if len(char) <= size:
return char
@@ -98,6 +98,8 @@
def _strip_name(self, name, maxlen=50):
return self._ellipsis(name, maxlen)
+=======
+>>>>>>> MERGE-SOURCE
def _sum_currency_amount_account(self, account):
self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
FROM account_move_line l \
=== modified file 'account/report/account_general_ledger.rml'
--- account/report/account_general_ledger.rml 2010-11-18 10:29:36 +0000
+++ account/report/account_general_ledger.rml 2010-11-24 04:52:21 +0000
@@ -274,10 +274,18 @@
</blockTable>
<section>
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+<<<<<<< TREE
<blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,84.0,86.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="45.0,60.0,60.0,60.0,65.0,85.0,84.0,86.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
+<<<<<<< TREE
<blockTable colWidths="245.0,40.0,84.0,86.0,84.0" style="Table5">
+=======
+ <blockTable rowHeights="0.55cm" colWidths="245.0,40.0,84.0,86.0,84.0" style="Table5">
+>>>>>>> MERGE-SOURCE
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '']] [[ o.name or '']]</para></td>
<td><para style="Standard"></para></td>
@@ -323,10 +331,18 @@
</blockTable>
<section>
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+<<<<<<< TREE
<blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
+<<<<<<< TREE
<blockTable colWidths="230.0,30.0,62.5,62.5,77.5,77.5" style="Table5">
+=======
+ <blockTable rowHeights="0.55cm" colWidths="230.0,30.0,62.5,62.5,77.5,77.5" style="Table5">
+>>>>>>> MERGE-SOURCE
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
<td><para style="Standard"></para></td>
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2010-11-22 13:05:33 +0000
+++ account/report/account_general_ledger_landscape.rml 2010-11-24 04:52:21 +0000
@@ -2,7 +2,11 @@
<document filename="General Ledger.pdf">
<template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
+<<<<<<< TREE
<frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
+=======
+ <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
+>>>>>>> MERGE-SOURCE
</pageTemplate>
</template>
<stylesheet>
@@ -241,6 +245,7 @@
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<<<<<<< TREE
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -266,8 +271,36 @@
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<images/>
+=======
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.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_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+ <images/>
+>>>>>>> MERGE-SOURCE
</stylesheet>
<story>
+<<<<<<< TREE
<pto>
<pto_header>
@@ -628,6 +661,371 @@
</blockTable>
</section>
</section>
+=======
+ <pto>
+ <pto_header>
+ <blockTable colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">JNRL</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Partner</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Move</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Counterpart</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Balance</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Currency</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">JNRL</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Partner</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Move</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Counterpart</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Balance</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
+ <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
+ <para style="terp_header_Centre">General Ledger</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
+ <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Fiscal Year</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Journals</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Display Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Entries Sorted By</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Target Moves</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+ <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_General_Centre">Start Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">End Date</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_General_Centre">Start Period</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">End Period</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">JNRL</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Partner</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Move</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Counterpart</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Balance</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Currency</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+ <blockTable rowHeights="0.55cm" colWidths="508.0,70.0,65.0,75.0,70.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
+ <blockTable rowHeights="0.55cm" colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <tr>
+ <td>
+ <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lcode'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lref'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ line['move'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lname'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),20) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8"><font size="7.0">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ </section>
+ <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">JNRL</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Partner</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Move</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Counterpart</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Balance</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+ <blockTable rowHeights="0.55cm" colWidths="565.0,70.0,70.0,80.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="Standard">[[ repeatIn(lines(o), 'line') ]]</para>
+ <blockTable rowHeights="0.55cm" colWidths="40.0,54.0,118.0,70.0,70.0,144.0,70.0,70.0,70.0,80.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lcode'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lref'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ line['move'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lname'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),20) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ </section>
+>>>>>>> MERGE-SOURCE
</pto>
</story>
</document>
\ No newline at end of file
=== renamed file 'account/report/account_general_ledger_landscape.sxw' => 'account/report/account_general_ledger_landscape.sxw.OTHER'
Binary files account/report/account_general_ledger_landscape.sxw 2010-11-19 09:39:41 +0000 and account/report/account_general_ledger_landscape.sxw.OTHER 2010-11-24 04:52:21 +0000 differ
=== modified file 'account/report/account_partner_ledger.rml'
--- account/report/account_partner_ledger.rml 2010-11-18 11:56:06 +0000
+++ account/report/account_partner_ledger.rml 2010-11-24 04:52:21 +0000
@@ -373,7 +373,11 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+<<<<<<< TREE
<blockTable colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
@@ -409,7 +413,11 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
+<<<<<<< TREE
<blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -478,7 +486,11 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+<<<<<<< TREE
<blockTable colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
@@ -522,7 +534,11 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
+<<<<<<< TREE
<blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -557,7 +573,6 @@
<font color="white"> </font>
</para>
</section>
-
<para style="terp_default_9">
<font color="white"> </font>
</para>
=== modified file 'account/report/account_partner_ledger_other.rml'
--- account/report/account_partner_ledger_other.rml 2010-11-18 11:56:06 +0000
+++ account/report/account_partner_ledger_other.rml 2010-11-24 04:52:21 +0000
@@ -524,7 +524,11 @@
</blockTable>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
+<<<<<<< TREE
<blockTable colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
@@ -557,7 +561,11 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
+<<<<<<< TREE
<blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -621,7 +629,11 @@
<para style="P4"/>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
+<<<<<<< TREE
<blockTable colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -661,7 +673,11 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
+<<<<<<< TREE
<blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+=======
+ <blockTable rowHeights="0.55cm" colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+>>>>>>> MERGE-SOURCE
<tr>
<td>
<para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
=== modified file 'hr_payroll/report/report_employees_detail.rml'
--- hr_payroll/report/report_employees_detail.rml 2010-10-15 07:42:02 +0000
+++ hr_payroll/report/report_employees_detail.rml 2010-11-24 04:52:21 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="Employees Salary Details.pdf">
- <template pageSize="(1120.0,770.0)" title="Employees Salary Details" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(842.0,595.0)" title="Employees Salary Details" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
+ <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
</pageTemplate>
</template>
<stylesheet>
@@ -258,8 +258,57 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Title</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Total</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
- <blockTable colWidths="1063.0" style="Table12">
+ <blockTable colWidths="785.0" style="Table12">
<tr>
<td>
<para style="terp_header_Centre">Employees Salary Details </para>
@@ -270,7 +319,7 @@
<para style="terp_default_Centre_9">
<font color="white"> </font>
</para>
- <blockTable colWidths="135.0,219.0,124.0,218.0,140.0,226.0" style="Table2">
+ <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
<tr>
<td>
<para style="terp_tblheader_Details">Employee Code</para>
@@ -292,7 +341,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="135.0,219.0,124.0,218.0,140.0,226.0" style="Table3">
+ <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Employee Name</para>
@@ -314,7 +363,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="135.0,219.0,124.0,218.0,140.0,226.0" style="Table5">
+ <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
<tr>
<td>
<para style="terp_tblheader_Details">Designation</para>
@@ -341,7 +390,7 @@
</para>
<section>
<para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
- <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table4">
+ <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Title</para>
@@ -387,11 +436,8 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<section>
- <blockTable colWidths="1063.0" style="Table7">
+ <blockTable colWidths="785.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Allowances with Basic: </para>
@@ -400,7 +446,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
- <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table6">
+ <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ e1[0] ]]</para>
@@ -471,7 +517,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="1063.0" style="Table10">
+ <blockTable colWidths="785.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details">Deductions: </para>
@@ -480,7 +526,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
- <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table8">
+ <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ e2[0] ]]</para>
@@ -551,7 +597,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="1063.0" style="Table11">
+ <blockTable colWidths="785.0" style="Table11">
<tr>
<td>
<para style="terp_tblheader_Details">Others: </para>
@@ -560,7 +606,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
- <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table9">
+ <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table9">
<tr>
<td>
<para style="terp_default_9">[[ e3[0] ]]</para>
@@ -632,7 +678,7 @@
</blockTable>
</section>
</section>
- <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table1">
+ <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
@@ -679,5 +725,6 @@
</tr>
</blockTable>
</section>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'hr_payroll/report/report_employees_detail.sxw'
Binary files hr_payroll/report/report_employees_detail.sxw 2010-10-15 07:42:02 +0000 and hr_payroll/report/report_employees_detail.sxw 2010-11-24 04:52:21 +0000 differ
=== modified file 'hr_payroll/report/report_year_report.rml'
--- hr_payroll/report/report_year_report.rml 2010-10-15 07:02:37 +0000
+++ hr_payroll/report/report_year_report.rml 2010-11-24 04:52:21 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="Yearly Salary Details.pdf">
- <template pageSize="(1120.0,770.0)" title="Yearly Salary Details" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(842.0,595.0)" title="Yearly Salary Details" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
+ <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
</pageTemplate>
</template>
<stylesheet>
@@ -137,9 +137,55 @@
<images/>
</stylesheet>
<story>
- <para style="terp_header_Centre">
- <font color="white"> </font>
- </para>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Name</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Total</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_header_Centre">Yearly Salary Details </para>
<para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
<para style="terp_default_space">
@@ -147,7 +193,7 @@
</para>
<section>
<para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
- <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+ <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Name</para>
@@ -195,7 +241,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
- <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
+ <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table1">
<tr>
<td>
<para style="terp_default_9">[[ e[0] ]]</para>
@@ -269,7 +315,7 @@
</section>
<section>
<para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
- <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+ <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">Total</para>
@@ -315,9 +361,7 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
</section>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'hr_payroll/report/report_year_report.sxw'
Binary files hr_payroll/report/report_year_report.sxw 2010-10-15 07:02:37 +0000 and hr_payroll/report/report_year_report.sxw 2010-11-24 04:52:21 +0000 differ
