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

[IMP] sprint review: misc. small changes 

bzr revid: qdp-launchpad@tinyerp.com-20100322135923-xv1c44s11r4gqfod
This commit is contained in:
qdp-launchpad@tinyerp.com 2010-03-22 14:59:23 +01:00
parent d4f105df69
commit 04c7b79d65
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/event/wizard/event_registrations_partner.py
View File

@ -19,6 +19,7 @@
#
##############################################################################
from osv import fields, osv
from tools.translate import _
class event_partners_list(osv.osv_memory):
""" Event Partners """
@ -40,7 +41,7 @@ class event_partners_list(osv.osv_memory):
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
return {
'domain': "[('id','in', ["+','.join(map(str, list_partner))+"])]",
'name': 'Event Partners',
'name': _('Event Partners'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'res.partner',
@ -51,4 +52,4 @@ class event_partners_list(osv.osv_memory):
event_partners_list()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/hr/hr.py
View File

@ -102,8 +102,7 @@ class hr_employee(osv.osv):
'address_id': fields.many2one('res.partner.address', 'Working Address'),
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone'),
'work_email': fields.char('Work E-mail', size=240),
# 'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
'work_location': fields.char('Office Location', size=32),
'notes': fields.text('Notes'),

8
addons/hr_evaluation/hr_evaluation.py
View File

@ -75,8 +75,8 @@ class hr_evaluation_plan_phase(osv.osv):
}
_defaults = {
'sequence' : lambda *a: 1,
'email_subject':'''Regarding ''',
'mail_body' : lambda *a:'''
'email_subject':_('''Regarding '''),
'mail_body' : lambda *a:_('''
Date : %(date)s
Dear %(employee_name)s,
@ -90,7 +90,7 @@ Thanks,
--
%(user_signature)s
''',
'''),
}
@ -339,4 +339,4 @@ class hr_evaluation_interview(osv.osv):
hr_evaluation_interview()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1

2
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -123,7 +123,7 @@
<field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
<field name="to_invoice"/>
<field invisible="1" name="journal_id" required="0"/>
<field invisible="1" name="journal_id"/>
<field invisible="1" name="product_id"/>
<field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field name="amount"/>