pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]account_analytic_analysis: Improve report formate

Browse Source 
bzr revid: dbr@tinyerp.com-20120605071555-df1q4eofz2ee4pfm
This commit is contained in:
DBR (OpenERP)
2012-06-05 12:45:55 +05:30
parent 76c35cdfd3
commit bde3acdfc6
1 changed files with 52 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/report/analytic_account.rml
+52 -57
View File
@@ -106,26 +106,16 @@
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" 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="0,3" stop="0,3"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,3" stop="1,3"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,3" stop="2,3"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,3" stop="3,3"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,3" stop="4,3"/>
</blockTableStyle>
<blockTableStyle id="Table11">
<blockAlignment value="LEFT"/>
@@ -142,7 +132,7 @@
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -178,6 +168,13 @@
<paraStyle name="terp_default_Italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Text body indent" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Header left" fontName="Helvetica"/>
<images/>
</stylesheet>
<story>
@@ -187,7 +184,7 @@
<para style="terp_header_Centre">
<font color="white"> </font>
</para>
<blockTable colWidths="80.0,80.0,80.0,80.0,80.0,80.0" style="Table10">
<blockTable colWidths="80.0,80.0,81.0,80.0,80.0,80.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details_Centre">Project Name</para>
@@ -209,7 +206,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="80.0,80.0,80.0,80.0,80.0,80.0" style="Table1">
<blockTable colWidths="80.0,80.0,81.0,80.0,80.0,80.0" style="Table1">
<tr>
<td>
<para style="terp_default_Centre_8">[[ account.name ]]</para>
@@ -231,7 +228,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="121.0,120.0,121.0,121.0" style="Table4">
<blockTable colWidths="121.0,120.0,121.0,120.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Validity</para>
@@ -253,21 +250,19 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="120.0,120.0,120.0,121.0" style="Table5">
<blockTable colWidths="120.0,120.0,121.0,121.0" style="Table5">
<tr>
<td>
<para style="terp_tblheader_General_Centre">
<font face="Helvetica" size="9.0">Date Start</font>
</para>
<para style="terp_tblheader_Details_Centre">Date Start</para>
</td>
<td>
<para style="P3">Date End</para>
<para style="terp_tblheader_Details_Centre">Date End</para>
</td>
<td>
<para style="P3">Maximum Time</para>
<para style="terp_tblheader_Details_Centre">Maximum Time</para>
</td>
<td>
<para style="P3">Remaining Time</para>
<para style="terp_tblheader_Details_Centre">Remaining Time</para>
</td>
</tr>
</blockTable>
@@ -283,7 +278,7 @@
<para style="terp_default_Centre_8">[[ account.quantity_max ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.remaining_hours ]]</para>
<para style="terp_default_Centre_8">[[ account.remaining_hours]]</para>
</td>
</tr>
</blockTable>
@@ -296,35 +291,35 @@
<para style="terp_tblheader_Details_Centre">Invoicing</para>
</td>
<td>
<para style="P4">Total Cost</para>
<para style="P3">Total Cost</para>
</td>
<td>
<para style="P4">Invoiced</para>
<para style="P3">Invoiced</para>
</td>
<td>
<para style="P4">Remaining</para>
<para style="P3">Remaining</para>
</td>
<td>
<para style="P4">Ready To Invoice</para>
<para style="P3">Ready To Invoice</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="118.0,88.0,85.0,87.0,103.0" style="Table2">
<blockTable colWidths="121.0,86.0,85.0,87.0,102.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">Fix Price Invoices</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.amount_max ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.amount_max) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.ca_invoiced ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.ca_invoiced) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.remaining_ca ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.remaining_ca) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.ca_to_invoice ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.ca_to_invoice) ]]</para>
</td>
</tr>
<tr>
@@ -332,16 +327,16 @@
<para style="terp_default_8">Invoice on Timesheet</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.quantity_max]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.quantity_max) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.hours_qtt_invoiced ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.hours_qtt_invoiced) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.remaining_hours ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.remaining_hours) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.hours_qtt_non_invoiced ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(account.hours_qtt_non_invoiced) ]]</para>
</td>
</tr>
<tr>
@@ -349,33 +344,33 @@
<para style="terp_default_8">Charge Expenses</para>
</td>
<td>
<para style="terp_default_Centre_8">[[account.expence_max]]</para>
<para style="terp_default_Centre_8">[[formatLang(account.expense_max) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[account.expence_invoice]]</para>
<para style="terp_default_Centre_8">[[formatLang(account.expense_invoiced) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[account.expence_max]]</para>
<para style="terp_default_Centre_8">[[formatLang(account.expense_max) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[account.expence_max]]</para>
<para style="terp_default_Centre_8">[[formatLang(account.expense_to_invoice) ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">Total</para>
<para style="terp_default_Centre_9_Bold">Total</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.est_total ]]</para>
<para style="terp_default_Centre_9_Bold">[[ formatLang(account.est_total) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.total_invoiced ]]</para>
<para style="terp_default_Centre_9_Bold">[[ formatLang(account.invoiced_total) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.remaining_total ]]</para>
<para style="terp_default_Centre_9_Bold">[[ formatLang(account.remaining_total) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.toinvoice_total ]]</para>
<para style="terp_default_Centre_9_Bold">[[ formatLang(account.toinvoice_total) ]]</para>
</td>
</tr>
</blockTable>
@@ -388,17 +383,17 @@
<para style="terp_tblheader_Details">Terms &amp; Conditions</para>
</td>
<td>
<para style="P1">
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P1">
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P1">
<para style="P4">
<font color="white"> </font>
</para>
</td>