odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]change report and made changes in timesheet which is not shown contract record and attrs on the field 

bzr revid: sgo@tinyerp.com-20120604071856-xibj1lz9rjclyzmq
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-06-04 12:48:56 +05:30
parent b9e4ade540
commit 26a574f796
4 changed files with 257 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -235,10 +235,13 @@ class account_analytic_account(osv.osv):
return res
if child_ids:
cr.execute("select hel.analytic_account,SUM(hel.unit_amount*hel.unit_quantity) from hr_expense_line as hel\
LEFT JOIN hr_expense_expense as he ON he.id = hel.expense_id\
where he.state = 'paid' and hel.analytic_account IN %s \
GROUP BY hel.analytic_account",(child_ids,))
cr.execute("SELECT hel.analytic_account,SUM(hel.unit_amount*hel.unit_quantity)\
FROM hr_expense_line AS hel\
LEFT JOIN hr_expense_expense AS he \
ON he.id = hel.expense_id\
WHERE he.state = 'paid' \
AND hel.analytic_account IN %s \
GROUP BY hel.analytic_account",(child_ids,))
for account_id, sum in cr.fetchall():
res[account_id] = sum
res_final = res
@ -254,10 +257,13 @@ class account_analytic_account(osv.osv):
return res
if child_ids:
cr.execute("select hel.analytic_account, SUM(hel.unit_amount*hel.unit_quantity) from hr_expense_line as hel\
LEFT JOIN hr_expense_expense as he ON he.id = hel.expense_id\
where he.state = 'invoiced' and hel.analytic_account IN %s \
GROUP BY hel.analytic_account",(child_ids,))
cr.execute("SELECT hel.analytic_account, SUM(hel.unit_amount*hel.unit_quantity) \
FROM hr_expense_line AS hel\
LEFT JOIN hr_expense_expense AS he \
ON he.id = hel.expense_id\
WHERE he.state = 'invoiced' \
AND hel.analytic_account IN %s \
GROUP BY hel.analytic_account",(child_ids,))
for account_id, sum in cr.fetchall():
res[account_id] = sum
res_final = res

18
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -34,12 +34,6 @@
res_model="sale.order.line"
src_model="account.analytic.account"
/>
<act_window
id="action_timesheet_lines_tree"
name="Timesheet Lines"
res_model="account.analytic.line"
src_model="account.analytic.account"
/>
<record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form.inherit</field>
@ -90,7 +84,7 @@
<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td width="10px"></td>
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
</tr>
<tr>
@ -115,8 +109,8 @@
</table>
</group>
<group colspan="4" class="oe_form_group_label_border">
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
</group>
</xpath>
</field>
@ -138,8 +132,8 @@
</group>
<group colspan="2" col= "2" class="oe_form_group_label_border">
<separator colspan="2" string="Invoice Rate"/>
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','=',0),('charge_expenses','=',0)]}"/>
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
</group>
<group col="6" colspan="2" class="oe_form_group_label_border">
<field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
@ -177,7 +171,7 @@
<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td width="10px"></td>
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
</tr>
<tr>

395
addons/account_analytic_analysis/report/analytic_account.rml
View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template title="Analytic Acounts" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@ -10,55 +10,45 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table10">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@ -66,48 +56,83 @@
<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"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<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"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" 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="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
<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"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<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"/>
</blockTableStyle>
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<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"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<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"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="13.0" leading="16" alignment="JUSTIFY"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="15.0" leading="19" alignment="CENTER"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
<paraStyle name="P6" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.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"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Contents" fontName="Helvetica"/>
<paraStyle name="Table" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<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_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@ -123,8 +148,7 @@
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" 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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@ -137,201 +161,252 @@
</stylesheet>
<story>
<section>
<para style="terp_header_Centre">Analytic <font face="Helvetica">Account</font></para>
<para style="P1">
[[repeatIn(objects,'account')]]
<para style="terp_header_Centre">Analytic Account</para>
<para style="terp_header_Centre">[[repeatIn(objects,'account')]]</para>
<para style="terp_header_Centre">
<font color="white"> </font>
</para>
<blockTable colWidths="120.0,120.0,120.0,121.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details_Centre">Project Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Customer</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Account Manager</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Code/Refrence</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="120.0,120.0,120.0,121.0" style="Table1">
<tr>
<td>
<para style="terp_default_Bold_9">Project Name</para>
<para style="terp_default_Centre_8">[[ account.name ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Customer</para>
<para style="terp_default_Centre_8">[[ account.partner_id.name ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Account Manager</para>
<para style="terp_default_Centre_8">[[ account.user_id.name ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Code/Refrence</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">[[ account.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ account.partner_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ account.user_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ account.code ]]</para>
<para style="terp_default_Centre_8">[[ account.code ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="141.0,75.0,69.0,82.0,115.0" repeatRows="1" style="Table2">
<tr><td><para style="terp_default_Bold_9">Invocing</para></td></tr>
<blockTable colWidths="141.0,75.0,68.0,82.0,116.0" style="Table3">
<tr>
<td>
<para style="Table">
<para style="terp_tblheader_Details">Invoicing</para>
</td>
<td>
<para style="P1">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_8">Total Cost<font face="Helvetica"></font></para>
<para style="P1">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_8">Invoiced</para>
<para style="P1">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_8">Remaining</para>
<para style="P1">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="141.0,75.0,69.0,82.0,115.0" style="Table6">
<tr>
<td>
<para style="P1">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_8">Ready To Invoice</para>
<para style="terp_tblheader_Details_Centre">Total Cost</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Invoiced</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Remaining</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Ready To Invoice</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="141.0,75.0,69.0,82.0,115.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">Fix Price Invoices</para>
</td>
<td>
<para style="terp_default_8">[[ account.amount_max ]]</para>
</td>
<td>
<para style="terp_default_8">[[ account.so_invoiced ]]</para>
</td>
<td>
<para style="terp_default_8">[[ account.remaining_invoiced ]]</para>
</td>
<td>
<para style="terp_default_8">[[ account.so_toinvoice ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_Italic">Fix Price Invoices</para>
<para style="terp_default_8">Invoice on Timesheet</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.amount_max ]]</para>
<para style="terp_default_8">[[ account.timesheet_max ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.so_invoiced ]]</para>
<para style="terp_default_8">[[ account.timesheet_invoiced ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.remaining_invoiced ]]</para>
<para style="terp_default_8">[[ account.remaining_timesheet ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.so_toinvoice ]]</para>
<para style="terp_default_8">[[ account.timesheet_toinvoice ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_Italic">Invoice on Timesheet</para>
<para style="terp_default_8">Charge Expenses</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.timesheet_max ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.timesheet_invoiced ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.remaining_timesheet ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.timesheet_toinvoice ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_Italic">Charge Expenses</para>
</td>
<td>
<para style="terp_default_Center_8">
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Center_8">
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Center_8">
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Center_8">
<para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_Italic">Total</para>
<para style="terp_default_8">Total</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.total_max ]]</para>
<para style="terp_default_8">[[ account.total_max ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.total_invoiced ]]</para>
<para style="terp_default_8">[[ account.total_invoiced ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.total_remaining ]]</para>
<para style="terp_default_8">[[ account.total_remaining ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.total_toinvoice ]]</para>
<para style="terp_default_8">[[ account.total_toinvoice ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" repeatRows="1" style="Table5">
<blockTable colWidths="241.0,241.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_8">Timesheet Invoice Ratio</para>
<para style="terp_tblheader_Details">Timesheet Invoice Ratio</para>
</td>
<td>
<para style="terp_default_Bold_8">Pricelist</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_Center_8">[[ account.to_invoice.name ]]</para>
</td>
<td>
<para style="terp_default_Center_8">[[ account.pricelist_id.name ]] </para>
<para style="terp_tblheader_Details">Pricelist</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="120.0,120.0,120.0,121.0" repeatRows="1" style="Table4">
<tr><td><para style="terp_default_Bold_9">Validity</para></td></tr>
<blockTable colWidths="241.0,241.0" style="Table5">
<tr>
<td>
<para style="terp_default_Centre_9">Date Start</para>
<para style="terp_default_8">[[ account.to_invoice.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">Date End</para>
<para style="terp_default_8">[[ account.pricelist_id.name ]] </para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
<blockTable colWidths="121.0,121.0,121.0,121.0" style="Table8">
<tr>
<td>
<para style="terp_tblheader_Details">Validity</para>
</td>
<td>
<para style="terp_default_Centre_9">Maximum Time</para>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Centre_9">
<font face="Helvetica">Remaining Time</font>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="121.0,121.0,121.0,121.0" style="Table9">
<tr>
<td>
<para style="terp_default_Centre_9">[[ account.date_start ]]</para>
<para style="terp_tblheader_General_Centre">Date Start</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ account.date ]]</para>
<para style="terp_tblheader_General_Centre">Date End</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ account.quantity_max ]]</para>
<para style="terp_tblheader_General_Centre">Maximum Time</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ account.remaining_hours ]]</para>
<para style="terp_tblheader_General_Centre">Remaining Time</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="120.0,120.0,120.0,121.0" style="Table4">
<tr>
<td>
<para style="terp_default_Centre_8">[[ account.date_start ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.date ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.quantity_max ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ account.remaining_hours ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="Standard">
<font color="white"> </font>
</para>
@ -343,4 +418,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>

4
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -43,7 +43,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<field name="account_id" position="replace">
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
<field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
</field>
</field>
</record>
@ -67,7 +67,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
<field name="account_id" position="replace">
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
<field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
</field>
</field>
</record>