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

[IMP] 

bzr revid: apa@tinyerp.com-20120329112307-muo085udc4dh3oi5
This commit is contained in:
Amit Patel (OpenERP) 2012-03-29 16:53:07 +05:30
parent 829ec0a2d0
commit 2f042dc433
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/project/static/src/css/project.css
View File

@ -1,3 +1,13 @@
.oe_to_invoice_buttons {
min-height: 30px;
min-width: 50px;
vertical-align: baseline;
}
.oe_to_invoice_buttons:hover {
cursor: pointer;
}
.oe_project_border{ .oe_project_border{
border-right: groove; border-right: groove;

4
addons/project_timesheet/project_timesheet.py
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') search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
context.update({ context.update({
#'search_default_user_id': uid, #'search_default_user_id': uid,
'search_default_project_id':project.id, 'search_default_account_id':project.id,
#'search_default_open':1, #'search_default_open':1,
}) })
value = { value = {
@ -74,7 +74,7 @@ class project_project(osv.osv):
'res_model': 'account.analytic.line', 'res_model': 'account.analytic.line',
'view_id': False, 'view_id': False,
# 'domain':[('project_id','=', context.get('active_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')], 'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'search_view_id': search_view and search_view[1] or False, 'search_view_id': search_view and search_view[1] or False,

15
addons/project_timesheet/project_timesheet_view.xml
View File

@ -45,10 +45,17 @@
</t> </t>
</xpath> </xpath>
<xpath expr="//div[@class='sequence']" position="after"> <xpath expr="//div[@class='sequence']" position="after">
<div class="sequence">
<kbd class="user">To invoice</kbd> <div class="sequence">
<div class="manager"><field name="amount_invoiced"/></div> <button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
</div> <!--<kbd class="to_invoice">To invoice</kbd>-->
<div class="manager">
<code>To invoice</code>
<strong><field name="amount_invoiced"/></strong>
</div>
</button>
</div>
</xpath> </xpath>
</field> </field>
</record> </record>