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

[MERGE]

Browse Source 
bzr revid: sgo@tinyerp.com-20120329112826-xfobiob5ypl8op2a
bzr revid: sgo@tinyerp.com-20120329122203-bx2bhd1yfbjhlj2v
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-03-29 17:52:03 +05:30
parent 8759b2eed3 9aa3b59b2f
commit 3756d72dd3
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+9 -8
View File
@@ -186,6 +186,10 @@
<td width="60px" align="center" valign="top">
<button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
<div class="manager"><field name="user_id"/></div>
<t t-if="record.date.raw_value">
<kbd class="user">Deadline</kbd>
<div class="manager"><field name="date"/></div>
</t>
</td>
<td align="left" valign="middle" width="220px">
<div class="oe_project_border">
@@ -204,26 +208,23 @@
</div>
</td>
<td width="70px" valign="top" align="right">
<t t-if="record.date.raw_value">
<div class="sequence">
<kbd class="user">Deadline</kbd>
<div class="manager"><field name="date"/></div>
<div id="sequence">
<!--<kbd class="user">Deadline</kbd>-->
<!--<div class="manager"><field name="date"/></div>-->
</div>
</t>
</td>
</tr>
</table>
<table border="0" width="350px">
<tr>
<td align="left" width="120px" valign="middle">
<td align="left" width="120px" valign="bottom">
<div class="progress invoiced">
<t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
<progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
<t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
</div>
</td>
<td align="right" valign="middle" width="130px">
<td align="right" valign="bottom" width="130px" height="20px">
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
</t>
addons/project/static/src/css/project.css
+13 -1
View File
@@ -1,3 +1,14 @@
.oe_to_invoice_buttons {
min-height: 60px;
min-width: 50px;
vertical-align: top;
}
.oe_to_invoice_buttons:hover {
cursor: pointer;
}
.oe_project_border{
border-right: groove;
@@ -16,6 +27,7 @@
}
.sequence {
padding-bottom: 4px !important;
border-bottom: groove;
/*font-size: 20px;*/
text-align: center;
@@ -74,5 +86,5 @@
}
div.oe_fold_column{
padding:2px !important;
padding:0px !important;
}
addons/project_timesheet/project_timesheet.py
+2 -2
View File
@@ -63,7 +63,7 @@ class project_project(osv.osv):
search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
context.update({
#'search_default_user_id': uid,
'search_default_project_id':project.id,
'search_default_account_id':project.id,
#'search_default_open':1,
})
value = {
@@ -74,7 +74,7 @@ class project_project(osv.osv):
'res_model': 'account.analytic.line',
'view_id': False,
# 'domain':[('project_id','=', context.get('active_id',False))],
'context': context,
#'context': context,
'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
'type': 'ir.actions.act_window',
'search_view_id': search_view and search_view[1] or False,
addons/project_timesheet/project_timesheet_view.xml
+11 -9
View File
@@ -46,15 +46,17 @@
<button name="open_timesheets" class="oe_project_buttons" type="object" tooltip="timesheets"><img src="/project_timesheet/static/src/img/timesheet_icon.png" class="project_icon"/></button>
</t>
</xpath>
<xpath expr="//div[@class='sequence']" position="after">
<div class="sequence">
<kbd class="user">To invoice</kbd>
<div class="manager"><field name="amount_invoiced"/> <field name="currency_id"/></div>
</div>
<div class="sequence">
<kbd class="user">Hours</kbd>
<div class="manager"><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</div>
</div>
<xpath expr="//div[@id='sequence']" position="inside">
<div class="sequence">
<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
<small>To invoice</small>
<div class="manager">
<field name="amount_invoiced"/>
</div>
</button>
</div>
</xpath>
</field>
</record>