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

[MERGE] hr_timesheet_invoice: Not possible to select real employees when printing Timesheet Profit report

Browse Source 
bzr revid: mra@mra-laptop-20110106112641-z7rabfo8294ffndd
This commit is contained in:
Mustufa Rangwala
2011-01-06 16:56:41 +05:30
parent b02074d06e 4726bb5699
commit 227863c2f8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+1 -1
View File
@@ -176,7 +176,7 @@
<blockTable colWidths="159.0,62.0,63.0,68.0,65.0,53.0,52.0" style="Table_Header_Employee">
<tr>
<td>
<para style="terp_tblheader_Details">Employee or Journal Name</para>
<para style="terp_tblheader_Details">User or Journal Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Units</para>
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+1 -1
View File
@@ -30,7 +30,7 @@ class account_analytic_profit(osv.osv_memory):
'date_from': fields.date('From', required=True),
'date_to': fields.date('To', required=True),
'journal_ids': fields.many2many('account.analytic.journal', 'analytic_profit_journal_rel', 'analytic_id', 'journal_id', 'Journal', required=True),
'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'Employee', required=True),
'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'User', required=True),
}
def _date_from(*a):
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+3 -3
View File
@@ -8,13 +8,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet Profit">
<group height="400" width="480">
<group col="4" colspan="6">
<group height="420" width="370">
<group col="4" colspan="4">
<field name="date_from"/>
<field name="date_to"/>
<separator string="Journals" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<separator string="Employees" colspan="4"/>
<separator string="Users" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
<separator colspan="4"/>