openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01385
[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:
qdp (OpenERP) (qdp)
apa (Open ERP) (apa-tiny)
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
TASK ID : 956
=============
- add field origin in the print invoice report
- rename document title into 'Description"
- when creating an invoice from a SO, do not copy the origin into the description of the invoice (SO0006 if no description)
TASK ID : 1880
=============
Partner Ledger: - still some modification needed: the column size and add strip_name where needed
account-partner_ledger-other.pdf
- fix row height!
account-partner_ledger.pdf:
- fix row height!
Profit & Loss: - working at our side => no, working only in landscape mode. The non-landscape doesn't display value in row "net profit"
account-profit-loss.pdf
- net profit row doesn't display anything in balance column
TASK ID : 1879
==============
http://pad.openerp.com/apr-report-review
--
https://code.launchpad.net/~openerp-report/openobject-addons/report-dev-apa/+merge/44024
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/report_dev.
=== modified file 'account/report/account_balance_sheet.rml'
--- account/report/account_balance_sheet.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_balance_sheet.rml 2010-12-17 10:49:07 +0000
@@ -253,13 +253,13 @@
</tr>
<tr>
<td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml 2010-11-19 10:25:38 +0000
+++ account/report/account_balance_sheet_horizontal.rml 2010-12-17 10:49:07 +0000
@@ -205,13 +205,15 @@
<para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+ <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
+<font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
+<font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_central_journal.rml'
--- account/report/account_central_journal.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_central_journal.rml 2010-12-17 10:49:07 +0000
@@ -233,7 +233,7 @@
<td><para style="terp_header"><font color="white"> </font></para></td>
</tr>
</blockTable>
- <blockTable colWidths="90.0,80.0,100.0,130.0,100.0" style="Table2">
+ <blockTable colWidths="130.0,80.0,100.0,130.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' 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>
@@ -274,7 +274,7 @@
<para style="P9">
<font color="white"> </font>
</para>
- <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -293,7 +293,7 @@
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
- <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2010-11-25 14:41:27 +0000
+++ account/report/account_general_ledger_landscape.rml 2010-12-17 10:49:07 +0000
@@ -263,11 +263,11 @@
<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_8" fontName="Helvetica" fontSize="8.0" 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_7" fontName="Helvetica-Bold" fontSize="7.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_8" 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_8_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_7_Right" fontName="Helvetica-Bold" fontSize="7.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/>
</stylesheet>
@@ -313,7 +313,7 @@
<para style="terp_tblheader_Details_Right">Currency</para>
</td>
</tr>
- </blockTable>
+ </blockTable>
<blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -496,19 +496,19 @@
<blockTable rowHeights="0.55cm" colWidths="490.0,65.0,65.0,75.0,75.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<tr>
<td>
- <para style="terp_default_Bold_8"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+ <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_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>
@@ -526,7 +526,7 @@
<para style="terp_default_7">[[ line['lcode'] ]]</para>
</td>
<td>
- <para style="terp_default_7">[[ strip_name(line['partner_name'],21) ]]</para>
+ <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
</td>
<td>
<para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
@@ -535,7 +535,7 @@
<para style="terp_default_7">[[ line['move'] ]]</para>
</td>
<td>
- <para style="terp_default_7">[[ strip_name(line['lname'],26) ]]</para>
+ <para style="terp_default_7">[[ strip_name(line['lname'],22) ]]</para>
</td>
<td>
<para style="terp_default_7">[[ strip_name(line['line_corresp'],18) ]]</para>
@@ -598,16 +598,16 @@
<blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td>
- <para style="terp_default_Bold_8"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_8_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -625,7 +625,7 @@
<para style="terp_default_7">[[ line['lcode'] ]]</para>
</td>
<td>
- <para style="terp_default_7">[[ strip_name(line['partner_name'],25) ]]</para>
+ <para style="terp_default_7">[[ strip_name(line['partner_name'],24) ]]</para>
</td>
<td>
<para style="terp_default_7">[[ strip_name(line['lref'],21) ]]</para>
@@ -634,7 +634,7 @@
<para style="terp_default_7">[[ line['move'] ]]</para>
</td>
<td>
- <para style="terp_default_7">[[ strip_name(line['lname'],35) ]]</para>
+ <para style="terp_default_7">[[ strip_name(line['lname'],28) ]]</para>
</td>
<td>
<para style="terp_default_7">[[ strip_name(line['line_corresp'],23) ]]</para>
=== modified file 'account/report/account_journal.rml'
--- account/report/account_journal.rml 2010-11-26 08:40:26 +0000
+++ account/report/account_journal.rml 2010-12-17 10:49:07 +0000
@@ -229,7 +229,7 @@
<para style="P9">
<font color="white"> </font>
</para>
- <blockTable rowHeights="0.55cm" colWidths="40.0,75.0,50.0,50.0,72.0,131.0,68.0,68.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable rowHeights="0.55cm" colWidths="45.0,55.0,55.0,50.0,80.0,120.0,70.0,70.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10a">Ref</para></td>
@@ -256,14 +256,14 @@
<td><para style="terp_default_8">[[ strip_name(line.ref,20) ]]</para></td>
<td><para style="terp_default_8">[[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td>
<td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
- <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,16) ]]</para></td>
- <td><para style="terp_default_8">[[ strip_name(line.name,35) ]]</para></td>
+ <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
+ <td><para style="terp_default_8">[[ strip_name(line.name,27) ]]</para></td>
<td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
- <blockTable rowHeights="0.55cm" colWidths="40.0,75.0,50.0,50.0,72.0,66.0,68.0,68.0,68.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
+ <blockTable rowHeights="0.55cm" colWidths="45.0,50.0,52.0,50.0,70.0,80.0,70.0,70.0,70.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10a">Ref</para></td>
@@ -293,7 +293,7 @@
<td><para style="terp_default_8">[[ strip_name(line.ref,20) ]]</para></td>
<td><para style="terp_default_8">[[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td>
<td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
- <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,16) ]]</para></td>
+ <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,15) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,17) ]]</para></td>
<td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
=== modified file 'account/report/account_partner_ledger.rml'
--- account/report/account_partner_ledger.rml 2010-11-24 11:34:26 +0000
+++ account/report/account_partner_ledger.rml 2010-12-17 10:49:07 +0000
@@ -262,11 +262,11 @@
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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_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="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="11" 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_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <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="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" 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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<images/>
@@ -274,67 +274,65 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
- [[ display_currency(data) == 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_Centre">Ref</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Account</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Entry Label</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>
- <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
- [[ display_currency(data) == 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_Centre">Ref</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Account</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Entry Label</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="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
+ <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_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</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>
+ <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8">
+ <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_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</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>
</pto_header>
<para style="terp_default_8">[[ repeatIn(objects, 'p') ]]</para>
<para style="terp_default_8">[[ setLang(p.lang) ]]</para>
@@ -439,7 +437,7 @@
<para style="terp_default_2">
<font face="Helvetica" color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font>
</para>
- <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+ <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -490,47 +488,47 @@
<blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table5">
<tr>
<td>
- <para style="terp_default_9">Initial Balance</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_8">Initial Balance</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
<section>
<para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table6">
+ <blockTable rowHeights="0.55cm" colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table6">
<tr>
<td>
- <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ line['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['move_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['a_code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -540,7 +538,7 @@
<para style="terp_default_2">
<font face="Helvetica" color="white">[[ display_currency(data) == True or removeParentNode('section') ]]</font>
</para>
- <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+ <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -571,7 +569,7 @@
</td>
</tr>
</blockTable>
- <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table12">
+ <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12">
<tr>
<td>
<para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
@@ -594,7 +592,7 @@
</blockTable>
<section>
<para style="terp_default_2"><font color="white">[[ data['form']['initial_balance']==True or removeParentNode('section') ]]</font></para>
- <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table13">
+ <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table13">
<tr>
<td>
<para style="terp_default_9">Initial Balance</para>
@@ -618,35 +616,35 @@
</section>
<section>
<para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table14">
+ <blockTable rowHeights="0.55cm" colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table14">
<tr>
<td>
- <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ line['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['move_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['a_code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ strip_name(line['ref'],8) ]] - [[ strip_name(line['name'],7) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
- <font face="Helvetica" size="8.0">[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
+ <font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
</para>
</td>
</tr>
@@ -655,4 +653,4 @@
</section>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'account/report/account_partner_ledger_other.rml'
--- account/report/account_partner_ledger_other.rml 2010-11-24 11:34:26 +0000
+++ account/report/account_partner_ledger_other.rml 2010-12-17 10:49:07 +0000
@@ -262,11 +262,11 @@
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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_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="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="11" 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_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <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="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" 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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<images/>
@@ -274,67 +274,67 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
- [[ display_currency(data) == 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_Centre">Ref</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Account</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Entry Label</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>
- <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
- [[ display_currency(data) == 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_Centre">Ref</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Account</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Entry Label</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="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
+ [[ display_currency(data) == 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_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</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>
+ <blockTable colWidths="50.0,30.0,60.0,50.0,70.0,64.0,64.0,79.0,70.0" style="Table8">
+ [[ display_currency(data) == 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_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Entry Label</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>
</pto_header>
<para style="terp_default_8">
@@ -434,7 +434,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+ <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -493,53 +493,53 @@
<blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table5">
<tr>
<td>
- <para style="terp_default_9">Initial Balance</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_8">Initial Balance</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
<section>
<para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table6">
+ <blockTable rowHeights="0.55cm" colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table6">
<tr>
<td>
- <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ line['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['move_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['a_code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
</section>
- <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+ <blockTable colWidths="50.0,30.0,60.0,50.0,70.0,64.0,64.0,79.0,70.0" style="Table8">
[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -578,7 +578,7 @@
<font face="Helvetica" color="white">[[ display_currency(data) == True or removeParentNode('section') ]]</font>
</para>
- <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table12">
+ <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12">
<tr>
<td>
<para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
@@ -601,22 +601,22 @@
</blockTable>
<section>
<para style="terp_default_2"><font color="white">[[ data['form']['initial_balance']==True or removeParentNode('section') ]]</font></para>
- <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table13">
+ <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table13">
<tr>
<td>
- <para style="terp_default_9">Initial Balance</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">
+ <para style="terp_default_8">Initial Balance</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">
<font color="white"> </font>
</para>
</td>
@@ -625,35 +625,35 @@
</section>
<section>
<para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table14">
+ <blockTable rowHeights="0.55cm" colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table14">
<tr>
<td>
- <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ line['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['move_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['a_code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ strip_name(line['ref'],8) ]] - [[ strip_name(line['name'],7) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
- <font face="Helvetica" size="8.0">[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
+ <font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
</para>
</td>
</tr>
@@ -662,4 +662,4 @@
</section>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml 2010-12-14 15:35:58 +0000
+++ account/report/account_print_invoice.rml 2010-12-17 10:49:07 +0000
@@ -181,13 +181,13 @@
<blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
<tr>
<td>
- <para style="terp_tblheader_General_Centre">Document</para>
+ <para style="terp_tblheader_General_Centre">Description</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Invoice Date</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+ <para style="terp_tblheader_General_Centre">Your Reference</para>
</td>
</tr>
</blockTable>
@@ -207,31 +207,31 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
+ <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
<tr>
<td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Taxes</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Quantity</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Unit Price </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Disc.(%)</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Price</para>
+ <para style="terp_tblheader_General">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Disc.(%)</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Price</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
- <blockTable colWidths="202.0,88.0,71.0,57.0,42.0,71.0" style="Table8">
+ <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
@@ -246,7 +246,7 @@
<para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
+ <para style="terp_default_Centre_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
@@ -284,7 +284,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="391.0,54.0,85.0" style="Table10">
+ <blockTable colWidths="385.0,60.0,85.0" style="Table10">
<tr>
<td>
<para style="terp_default_8">
@@ -393,4 +393,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'account/report/account_print_invoice.sxw'
Binary files account/report/account_print_invoice.sxw 2010-11-01 11:06:11 +0000 and account/report/account_print_invoice.sxw 2010-12-17 10:49:07 +0000 differ
=== modified file 'account/report/account_profit_loss.rml'
--- account/report/account_profit_loss.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_profit_loss.rml 2010-12-17 10:49:07 +0000
@@ -231,7 +231,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py 2010-11-10 08:20:11 +0000
+++ account/wizard/account_report_aged_partner_balance.py 2010-12-17 10:49:07 +0000
@@ -89,7 +89,7 @@
}
start = stop + relativedelta(days=1)
data['form'].update(res)
-
+ if data.get('form',False):data['ids']=[data['form'].get('chart_account_id',False)]
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.aged_trial_balance',
=== modified file 'account_analytic_plans/report/crossovered_analytic.rml'
--- account_analytic_plans/report/crossovered_analytic.rml 2010-11-02 13:03:52 +0000
+++ account_analytic_plans/report/crossovered_analytic.rml 2010-12-17 10:49:07 +0000
@@ -150,7 +150,7 @@
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Percentage</para>
+ <para style="terp_tblheader_Details_Right">Perc(%)</para>
</td>
</tr>
</blockTable>
@@ -222,7 +222,7 @@
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Percentage</para>
+ <para style="terp_tblheader_Details_Right">Perc(%)</para>
</td>
</tr>
</blockTable>
@@ -301,4 +301,4 @@
</section>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
--- account_invoice_layout/report/report_account_invoice_layout.rml 2010-11-16 05:50:35 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.rml 2010-12-17 10:49:07 +0000
@@ -240,13 +240,13 @@
<blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
<tr>
<td>
- <para style="terp_tblheader_General_Centre">Document</para>
+ <para style="terp_tblheader_General_Centre">Description</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Invoice Date</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+ <para style="terp_tblheader_General_Centre">Your Reference</para>
</td>
</tr>
</blockTable>
@@ -493,4 +493,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw'
Binary files account_invoice_layout/report/report_account_invoice_layout.sxw 2010-11-01 11:06:11 +0000 and account_invoice_layout/report/report_account_invoice_layout.sxw 2010-12-17 10:49:07 +0000 differ
=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
--- account_invoice_layout/report/special_message_invoice.rml 2010-11-16 05:50:35 +0000
+++ account_invoice_layout/report/special_message_invoice.rml 2010-12-17 10:49:07 +0000
@@ -244,13 +244,13 @@
<blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
<tr>
<td>
- <para style="terp_tblheader_General_Centre">Document</para>
+ <para style="terp_tblheader_General_Centre">Description</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Invoice Date</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+ <para style="terp_tblheader_General_Centre">Your Reference</para>
</td>
</tr>
</blockTable>
@@ -382,7 +382,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="395.0,59.0,85.0" style="Tableau3">
+ <blockTable colWidths="390.0,64.0,85.0" style="Tableau3">
<tr>
<td>
<para style="terp_default_9">
@@ -390,14 +390,14 @@
</para>
</td>
<td>
- <para style="terp_default_9">Net Total:</para>
+ <para style="terp_default_9">Net Total : </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="395.0,59.0,85.0" style="Table4">
+ <blockTable colWidths="390.0,64.0,85.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">
@@ -405,14 +405,14 @@
</para>
</td>
<td>
- <para style="terp_default_9">Taxes:</para>
+ <para style="terp_default_9">Taxes : </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="395.0,59.0,85.0" style="Table6">
+ <blockTable colWidths="390.0,64.0,85.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
@@ -420,7 +420,7 @@
</para>
</td>
<td>
- <para style="terp_default_Bold_9">Total:</para>
+ <para style="terp_default_Bold_9">Total : </para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
@@ -511,4 +511,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'account_invoice_layout/report/special_message_invoice.sxw'
Binary files account_invoice_layout/report/special_message_invoice.sxw 2010-11-01 11:06:11 +0000 and account_invoice_layout/report/special_message_invoice.sxw 2010-12-17 10:49:07 +0000 differ
=== modified file 'account_payment/report/order.rml'
--- account_payment/report/order.rml 2010-11-19 13:45:17 +0000
+++ account_payment/report/order.rml 2010-12-17 10:49:07 +0000
@@ -210,7 +210,7 @@
<para style="terp_default_Centre_8">[[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ get_company_currency() ]]</para>
+ <para style="terp_default_Centre_8">[[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]]</para>
</td>
</tr>
</blockTable>
@@ -287,4 +287,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'delivery/report/shipping.rml'
--- delivery/report/shipping.rml 2010-11-16 05:54:16 +0000
+++ delivery/report/shipping.rml 2010-12-17 10:49:07 +0000
@@ -125,7 +125,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_9">[[ (not(o.sale_id) and o.type== 'out') and 'Error, no sale order attached to this picking !' or removeParentNode('para') ]]</para>
+
<blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
<tr>
<td>
@@ -226,4 +226,4 @@
</section>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'hr_attendance/report/bymonth.xsl'
--- hr_attendance/report/bymonth.xsl 2010-09-15 12:17:12 +0000
+++ hr_attendance/report/bymonth.xsl 2010-12-17 10:49:07 +0000
@@ -29,7 +29,7 @@
<xsl:template name="story">
<spacer length="1cm" />
- <para style="terp_header_Centre" t="1">Attendance By Month</para>
+ <para style="terp_header_Centre" t="1">Attendances By Month</para>
<spacer length="1cm" />
<blockTable>
<xsl:attribute name="style">week</xsl:attribute>
=== modified file 'hr_expense/report/expense.rml'
--- hr_expense/report/expense.rml 2010-11-16 05:54:16 +0000
+++ hr_expense/report/expense.rml 2010-12-17 10:49:07 +0000
@@ -68,10 +68,8 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@@ -113,7 +111,7 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+ <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -122,7 +120,7 @@
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Ref.</para>
+ <para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -131,7 +129,7 @@
<para style="terp_tblheader_Details_Right">Qty</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Total Price</para>
+ <para style="terp_tblheader_Details_Right">Price</para>
</td>
</tr>
</blockTable>
@@ -176,7 +174,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+ <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -185,7 +183,7 @@
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Ref.</para>
+ <para style="terp_tblheader_Details">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -194,7 +192,7 @@
<para style="terp_tblheader_Details_Right">Qty</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Total Price</para>
+ <para style="terp_tblheader_Details_Right">Price</para>
</td>
</tr>
</blockTable>
@@ -203,7 +201,7 @@
</para>
<section>
<para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
- <blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
+ <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_expense_line">
<tr>
<td>
<para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
@@ -256,7 +254,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="57.0,171.0,171.0,32.0,92.0" style="Table_Final_total">
+ <blockTable colWidths="365.0,70.0,100.0" style="Table_Final_total">
<tr>
<td>
<para style="terp_default_8">
@@ -264,17 +262,7 @@
</para>
</td>
<td>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Total:</para>
+ <para style="terp_tblheader_Details">Total:</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
=== modified file 'hr_holidays/report/holidays_summary.xsl'
--- hr_holidays/report/holidays_summary.xsl 2010-10-16 16:47:09 +0000
+++ hr_holidays/report/holidays_summary.xsl 2010-12-17 10:49:07 +0000
@@ -244,7 +244,6 @@
<td>
<para>
<xsl:attribute name="style">digits</xsl:attribute>
- <xsl:value-of select="attribute::id"/>
</para>
</td>
<td>
=== modified file 'hr_payroll/wizard/hr_payroll_employees_detail.py'
--- hr_payroll/wizard/hr_payroll_employees_detail.py 2010-11-10 08:28:46 +0000
+++ hr_payroll/wizard/hr_payroll_employees_detail.py 2010-12-17 10:49:07 +0000
@@ -59,10 +59,10 @@
if context is None:
context = {}
datas = {'ids': context.get('active_ids', [])}
-
res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context)
res = res and res[0] or {}
datas['form'] = res
+ datas['ids'] = res.get('employee_ids',[])
return {
'type': 'ir.actions.report.xml',
'report_name': 'employees.salary',
@@ -71,4 +71,4 @@
hr_payroll_employees_detail()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'hr_payroll/wizard/hr_payroll_year_salary.py'
--- hr_payroll/wizard/hr_payroll_year_salary.py 2010-11-10 08:28:46 +0000
+++ hr_payroll/wizard/hr_payroll_year_salary.py 2010-12-17 10:49:07 +0000
@@ -64,6 +64,7 @@
res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to', 'salary_on'], context=context)
res = res and res[0] or {}
datas['form'] = res
+ datas['ids'] = res.get('employee_ids',[])
return {
'type': 'ir.actions.report.xml',
'report_name': 'year.salary',
@@ -72,4 +73,4 @@
hr_payroll_year_salary()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'hr_timesheet/report/user_timesheet.xsl'
--- hr_timesheet/report/user_timesheet.xsl 2010-09-14 11:40:55 +0000
+++ hr_timesheet/report/user_timesheet.xsl 2010-12-17 10:49:07 +0000
@@ -48,7 +48,7 @@
<xsl:template name="story">
<spacer length="1cm" />
- <para style="title" t="1">Timesheet</para>
+ <para style="title" t="1">Timesheet by Employee</para>
<spacer length="1cm" />
<para style="employee"><xsl:value-of select="/report/employee" /></para>
<spacer length="1cm" />
=== modified file 'lunch/report/order.rml'
--- lunch/report/order.rml 2010-11-16 05:54:16 +0000
+++ lunch/report/order.rml 2010-12-17 10:49:07 +0000
@@ -164,7 +164,7 @@
</blockTable>
</section>
</section>
- <blockTable colWidths="421.0,44.0,63.0" style="Table2">
+ <blockTable colWidths="409.0,50.0,70.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">
@@ -184,4 +184,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'mrp/report/price.py'
--- mrp/report/price.py 2010-11-19 13:48:01 +0000
+++ mrp/report/price.py 2010-12-17 10:49:07 +0000
@@ -129,7 +129,7 @@
<col t='yes'>%s</col>
<col t='yes'>%s</col>
</row>
- """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
+ """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
@@ -176,7 +176,7 @@
xml += "<lines style='lines'>" + xml_tmp + '</lines>'
xml += """<lines style='sub_total'> <row>
- <col> """ + _('Component Cost of ') + str(number) +' '+ product.uom_id.name + """: </col>
+ <col> """ + _('Components Cost of ') + str(number) +' '+ product.uom_id.name + """: </col>
<col/>
<col t='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
=== modified file 'point_of_sale/report/pos_lines.rml'
--- point_of_sale/report/pos_lines.rml 2010-11-02 10:14:17 +0000
+++ point_of_sale/report/pos_lines.rml 2010-12-17 10:49:07 +0000
@@ -199,7 +199,7 @@
</para>
</td>
<td>
- <para style="terp_default_9">Net Total </para>
+ <para style="terp_default_9">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
@@ -212,7 +212,7 @@
</para>
</td>
<td>
- <para style="terp_default_9">Taxes</para>
+ <para style="terp_default_9">Taxes :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
@@ -236,4 +236,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'point_of_sale/wizard/pos_details.py'
--- point_of_sale/wizard/pos_details.py 2010-11-04 12:27:41 +0000
+++ point_of_sale/wizard/pos_details.py 2010-12-17 10:49:07 +0000
@@ -51,6 +51,7 @@
res = self.read(cr, uid, ids, ['date_start', 'date_end'], context=context)
res = res and res[0] or {}
datas['form'] = res
+ if res.get('id',False):datas['ids']=[res['id']]
return {
'type': 'ir.actions.report.xml',
'report_name': 'pos.details',
=== modified file 'point_of_sale/wizard/pos_payment_report_date.py'
--- point_of_sale/wizard/pos_payment_report_date.py 2010-11-04 12:27:41 +0000
+++ point_of_sale/wizard/pos_payment_report_date.py 2010-12-17 10:49:07 +0000
@@ -44,7 +44,7 @@
res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context)
res = res and res[0] or {}
datas['form'] = res
-
+ if res.get('id',False):datas['ids']=[res['id']]
return {
'type': 'ir.actions.report.xml',
'report_name': 'pos.payment.report.date',
=== modified file 'point_of_sale/wizard/pos_sales_user_today.py'
--- point_of_sale/wizard/pos_sales_user_today.py 2010-11-23 07:05:05 +0000
+++ point_of_sale/wizard/pos_sales_user_today.py 2010-12-17 10:49:07 +0000
@@ -47,7 +47,6 @@
res = self.read(cr, uid, ids, ['user_id'], context=context)
res = res and res[0] or {}
datas['form'] = res
-
return {
'type': 'ir.actions.report.xml',
'report_name': 'pos.sales.user.today',
=== modified file 'project_planning/report/report_planning.rml'
--- project_planning/report/report_planning.rml 2010-09-16 07:22:40 +0000
+++ project_planning/report/report_planning.rml 2010-12-17 10:49:07 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="HR Planning" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+<document filename="HR Planning.pdf">
+ <template pageSize="(595.0,842.0)" title="HR Planning" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+ <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
</template>
<stylesheet>
@@ -15,7 +15,6 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#808080" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#808080" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#808080" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
@@ -24,17 +23,21 @@
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
+ <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"/>
+ </blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@@ -42,33 +45,24 @@
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+ </blockTableStyle>
+ <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"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica"/>
- <paraStyle name="P2" fontName="Helvetica" alignment="RIGHT"/>
- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="CENTER"/>
- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="14.0" leading="17"/>
- <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14"/>
- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
- <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
- <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER"/>
- <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
- <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -77,139 +71,149 @@
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10"/>
+ <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER"/>
+ <paraStyle name="terp_default_8_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+ <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+ <paraStyle name="terp_default_12_center_bold" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER"/>
+ <paraStyle name="terp_tbl_header" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+ <paraStyle name="terp_tbl_header_center" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+ <paraStyle name="terp_tbl_header_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+ <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3"/>
<images/>
</stylesheet>
<story>
- <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <para style="P10">HR Planning</para>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="149.0,192.0,141.0" repeatRows="1" style="Table1">
- <tr>
- <td>
- <para style="P1"><font face="Helvetica">Responsible</font>: [[ o.user_id.name ]]</para>
- </td>
- <td>
- <para style="P11">[[ o.name]]</para>
- </td>
- <td>
- <para style="P2"><font face="Helvetica">From</font>: [[ formatLang(o.date_from,date=True) ]]</para>
- <para style="P2"><font face="Helvetica">To</font>: [[ formatLang(o.date_to,date=True) ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P4">
- <font color="white"> </font>
- </para>
- <para style="P5">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="482.0" style="Table6">
- <tr>
- <td>
- <para style="P9">Summary by user</para>
- <para style="P9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="104.0,101.0,113.0,100.0,63.0" style="Table3">
- <tr>
- <td>
- <para style="P7">User</para>
- </td>
- <td>
- <para style="P7">Total Planned Tasks</para>
- </td>
- <td>
- <para style="P7">Remaining tasks</para>
- </td>
- <td>
- <para style="P7">Time without</para>
- <para style="P7">tasks</para>
- </td>
- <td>
- <para style="P8">Timesheet</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(u.plan_tasks) ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(u.tasks) ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(u.free) ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(u.timesheet) ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P5">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="482.0" style="Table5">
- <tr>
- <td>
- <para style="P9">Summary by project</para>
- <para style="P9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="104.0,103.0,112.0,101.0,63.0" style="Table4">
- <tr>
- <td>
- <para style="P13">Project</para>
- </td>
- <td>
- <para style="P7">Total Planned Tasks</para>
- </td>
- <td>
- <para style="P7">Remaining tasks</para>
- </td>
- <td>
- <para style="P7">Time without</para>
- <para style="P7">tasks</para>
- </td>
- <td>
- <para style="P8">Timesheet</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P12"><font face="Helvetica" size="11.0">[[ repeatIn(o.planning_account , 'l') ]] </font>[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(l.plan_tasks) ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(l.tasks) ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(l.plan_open) ]]</para>
- </td>
- <td>
- <para style="P6">[[ formatLang(l.timesheet) ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P3">
- <font color="white"> </font>
- </para>
+ <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_header_center">HR Planning</para>
+ <para style="terp_default_8_center">[[ o.name]]</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="227.0,312.0" repeatRows="1" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_default_9"><font fontName="Helvetica-Bold">Responsible : </font>[[ o.user_id.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_right"><font fontName="Helvetica-Bold">From :</font> [[ formatLang(o.date_from,date=True) ]] <font fontName="Helvetica-Bold"> To : </font>[[ formatLang(o.date_to,date=True) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="539.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_12_center_bold">Summary by user</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_tbl_header">User</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Total planned tasks</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Remaining tasks</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Time without tasks</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Timesheet</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(o.planning_user_ids , 'u') ]]</para>
+ <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table8">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ u.user_id.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(u.plan_tasks) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(u.tasks) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(u.free) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(u.timesheet) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <blockTable colWidths="539.0" style="Table5">
+ <tr>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_12_center_bold">Summary by project</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tbl_header">Project</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Total planned tasks</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Remaining tasks</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Time without tasks</para>
+ </td>
+ <td>
+ <para style="terp_tbl_header_center">Timesheet</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(o.planning_account , 'l') ]] </para>
+ <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_default_9">[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(l.plan_tasks) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(l.tasks) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(l.plan_open) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_center">[[ formatLang(l.timesheet) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'project_planning/report/report_planning.sxw'
Binary files project_planning/report/report_planning.sxw 2010-09-16 07:22:40 +0000 and project_planning/report/report_planning.sxw 2010-12-17 10:49:07 +0000 differ
=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml 2010-11-16 05:57:31 +0000
+++ purchase/report/order.rml 2010-12-17 10:49:07 +0000
@@ -131,25 +131,25 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+ <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
<tr>
<td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Taxes</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Date Req.</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Qty</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Unit Price</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Net Price</para>
+ <para style="terp_tblheader_General">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General">Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General">Date Req.</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Qty</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Net Price</para>
</td>
</tr>
</blockTable>
@@ -251,31 +251,31 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+ <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
<tr>
<td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Taxes</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Date Req.</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Qty</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Unit Price</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Net Price</para>
+ <para style="terp_tblheader_General">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General">Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General">Date Req.</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Qty</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">Net Price</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
- <blockTable colWidths="179.0,85.0,71.0,71.0,57.0,71.0" style="Table_Order_Pur_line_Content">
+ <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" style="Table_Order_Pur_line_Content">
<tr>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
@@ -284,7 +284,7 @@
<para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ formatLang( line.date_planned, date=True) ]]</para>
+ <para style="terp_default_9">[[ formatLang( line.date_planned, date=True) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
@@ -328,7 +328,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="394.0,55.0,85.0" style="Table_All_Total_Detail">
+ <blockTable colWidths="375.0,60.0,100.0" style="Table_All_Total_Detail">
<tr>
<td>
<para style="terp_default_9">
@@ -384,4 +384,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2010-12-14 16:07:29 +0000
+++ sale/report/sale_order.rml 2010-12-17 10:49:07 +0000
@@ -128,7 +128,7 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
+ <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -143,7 +143,7 @@
<para style="terp_tblheader_Details_Right">Unit Price</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+ <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Price</para>
@@ -241,7 +241,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
+ <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -256,7 +256,7 @@
<para style="terp_tblheader_Details_Right">Unit Price</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+ <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Price</para>
@@ -265,7 +265,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
- <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,70.0" style="Table5">
+ <blockTable colWidths="180.0,70.0,80.0,70.0,50.0,85.0" style="Table5">
<tr>
<td>
<para style="terp_default_9">[[ line.name ]] </para>
@@ -274,16 +274,13 @@
<para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]</para>
+ <para style="terp_default_Centre_9">[[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
@@ -326,7 +323,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="387.0,56.0,93.0" style="Table6">
+ <blockTable colWidths="381.0,60.0,93.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
=== modified file 'sale/sale.py'
--- sale/sale.py 2010-12-15 05:11:43 +0000
+++ sale/sale.py 2010-12-17 10:49:07 +0000
@@ -397,7 +397,7 @@
inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
lines.append(inv_line_id)
inv = {
- 'name': order.client_order_ref or order.name,
+ 'name': order.origin or order.client_order_ref or order.name,
'origin': order.name,
'type': 'out_invoice',
'reference': "P%dSO%d" % (order.partner_id.id, order.id),
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2010-11-16 06:20:22 +0000
+++ stock/report/picking.rml 2010-12-17 10:49:07 +0000
@@ -231,7 +231,7 @@
<para style="terp_tblheader_Details_Centre">Lot</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">State</para>
+ <para style="terp_tblheader_Details">State</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Location</para>
@@ -309,4 +309,4 @@
</para>
</pto>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'survey/report/survey_analysis_report.py'
--- survey/report/survey_analysis_report.py 2010-11-15 05:24:09 +0000
+++ survey/report/survey_analysis_report.py 2010-12-17 10:49:07 +0000
@@ -118,7 +118,7 @@
for survey in surv_obj.browse(cr, uid, ids):
rml += """<story>
- <para style="Title">Answer Summary</para>
+ <para style="Title">Answers Summary</para>
<para style="Standard"><font></font></para>
<para style="P2">
<font color="white"> </font>
=== modified file 'survey/report/survey_browse_response.py'
--- survey/report/survey_browse_response.py 2010-11-15 05:24:09 +0000
+++ survey/report/survey_browse_response.py 2010-12-17 10:49:07 +0000
@@ -25,6 +25,7 @@
from tools import to_xml
import tools
import time
+from report import report_sxw
class survey_browse_response(report_rml):
def create(self, cr, uid, ids, datas, context):
@@ -176,6 +177,7 @@
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="12" spaceBefore="0.0" spaceAfter="1.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_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre_simple" fontName="Helvetica" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_right_simple" fontName="Helvetica" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -186,6 +188,7 @@
<images/>
<story>"""
surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
+ rml_obj=report_sxw.rml_parse(cr, uid, surv_resp_obj._name,context)
if datas.has_key('form') and datas['form'].has_key('response_ids'):
response_id = datas['form']['response_ids']
elif context.has_key('response_id') and context['response_id']:
@@ -200,15 +203,22 @@
for response in surv_resp_obj.browse(cr, uid, response_id):
for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
tbl_width = float(_tbl_widths.replace('cm', ''))
- colwidth = "4.6cm,5cm," + str(tbl_width - 16.4) +"cm,4cm,3cm"
+ colwidth = "2.5cm,4.8cm," + str(tbl_width - 15.0) +"cm,3.2cm,4.5cm"
resp_create = tools.ustr(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S')))
rml += """<blockTable colWidths='""" + colwidth + """' style="Table_heading">
<tr>
- <td><para style="terp_tblheader_General_Centre">Answer Create Date:- </para></td>
- <td><para style="terp_tblheader_General_Centre_simple">""" + to_xml(resp_create) + """</para></td>
- <td><para style="terp_tblheader_General_Centre"></para></td>
- <td><para style="terp_tblheader_General_right">Answer By:- </para></td>
- <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login or '') + """</para></td>
+ <td><para style="terp_default_9_Bold">Print Date : </para></td>
+ <td><para style="terp_default_9">""" + to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True)) + """</para></td>
+ <td><para style="terp_default_9"></para></td>
+ <td><para style="terp_default_9_Bold">Answered by : </para></td>
+ <td><para style="terp_default_9">""" + to_xml(response.user_id.login or '') + """</para></td>
+ </tr>
+ <tr>
+ <td><para style="terp_default_9"></para></td>
+ <td><para style="terp_default_9"></para></td>
+ <td><para style="terp_default_9"></para></td>
+ <td><para style="terp_default_9_Bold">Answer Date : </para></td>
+ <td><para style="terp_default_9">""" + to_xml(resp_create) + """</para></td>
</tr>
</blockTable><para style="P2"></para>"""
