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

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9642 rev-id: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku

Browse Source 
bzr revid: dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: dle@openerp.com-20131125160523-hecq5u2uo0mfyoq0
This commit is contained in:
Denis Ledoux
2013-11-25 17:05:23 +01:00
parent 3211a29d9b fd080fb745
commit 7baee28221
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/report/timesheet_report.py
+1 -1
View File
@@ -95,7 +95,7 @@ class timesheet_report(osv.osv):
htss.state
from account_analytic_line as aal
left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id)
group by
aal.account_id,
aal.date,
addons/hr_timesheet_sheet/static/src/css/timesheet.css
-1
View File
@@ -33,7 +33,6 @@
min-width: 130px;
}
.openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input {
padding: 5px 2px !important;
width: 40px;
text-align: right;
min-width: 0 !important;
addons/hr_timesheet_sheet/static/src/css/timesheet.sass
-1
View File
@@ -28,7 +28,6 @@
.oe_timesheet_first_col
min-width: 130px
td input.oe_timesheet_weekly_input
padding: 5px 2px !important
width: 40px
text-align: right
min-width: 0 !important
addons/sale_crm/wizard/crm_make_sale.py
+2 -2
View File
@@ -46,8 +46,8 @@ class crm_make_sale(osv.osv_memory):
if not active_id:
return False
lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
return lead['partner_id']
lead = lead_obj.read(cr, uid, active_id, ['partner_id'], context=context)
return lead['partner_id'][0]
def view_init(self, cr, uid, fields_list, context=None):
return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)