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

improvement 

bzr revid: fp@tinyerp.com-20081027214417-smiqxiuq0z7boolt
This commit is contained in:
Fabien Pinckaers 2008-10-27 22:44:17 +01:00
parent 33269606bd
commit 900b647f21
5 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base_contact/base_contact.py
View File

@ -48,7 +48,7 @@ class res_partner_contact(osv.osv):
'title': fields.selection(_title_get, 'Title'),
'website':fields.char('Website',size=120),
'lang_id':fields.many2one('res.lang','Language'),
'job_ids':fields.one2many('res.partner.job','contact_id','Functions'),
'job_ids':fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
'country_id':fields.many2one('res.country','Nationality'),
'birthdate':fields.date('Birth Date'),
'active' : fields.boolean('Active'),
@ -91,7 +91,7 @@ class res_partner_address(osv.osv):
_inherit='res.partner.address'
_description ='Partner Address'
_columns = {
'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
'job_ids':fields.one2many('res.partner.job', 'address_id', 'Functions and Addresses'),
'email': fields.related('job_ids', 'email', type='char', string='Default Email'),
}
res_partner_address()

5
addons/base_contact/base_contact_view.xml
View File

@ -34,9 +34,8 @@
<field name="website"/>
<field name="lang_id"/>
<field name="active"/>
<separator string="Functions" colspan="4"/>
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Functions">
<form string="Functions and Addresses">
<field name="function_id"/>
<field name="address_id"/>
<field name="name"/>
@ -47,7 +46,7 @@
<field name="date_stop" />
<field name="state" />
</form>
<tree string="Functions">
<tree string="Functions and Addresses">
<field name="sequence_contact" string="Seq."/>
<field name="function_id"/>
<field name="name"/>

4
addons/hr/hr.py
View File

@ -134,8 +134,8 @@ class hr_timesheet(osv.osv):
'name' : fields.char("Name", size=64, required=True),
'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week'),
'date_from' : fields.date('Starting date'),
'hour_from' : fields.char('Work from', size=8, required=True),
'hour_to' : fields.char("Work to", size=8, required=True),
'hour_from' : fields.float('Work from', size=8, required=True),
'hour_to' : fields.float("Work to", size=8, required=True),
'tgroup_id' : fields.many2one("hr.timesheet.group", "Employee's timesheet group", select=True),
}
_order = 'dayofweek, hour_from'

40
addons/hr/hr_demo.xml
View File

@ -18,71 +18,71 @@
<record model="hr.timesheet">
<field name="name">Monday morning</field>
<field name="dayofweek">0</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Monday evening</field>
<field name="dayofweek">0</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Tuesday morning</field>
<field name="dayofweek">1</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Tuesday evening</field>
<field name="dayofweek">1</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Wednesday morning</field>
<field name="dayofweek">2</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Wednesday evening</field>
<field name="dayofweek">2</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Thursday morning</field>
<field name="dayofweek">3</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Thursday evening</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="dayofweek">3</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Friday morning</field>
<field name="dayofweek">4</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Friday evening</field>
<field name="dayofweek">4</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>

8
addons/hr/hr_view.xml
View File

@ -196,8 +196,8 @@
<tree string="Working Time">
<field name="name"/>
<field name="dayofweek"/>
<field name="hour_from"/>
<field name="hour_to"/>
<field name="hour_from" widget="float_time"/>
<field name="hour_to" widget="float_time"/>
</tree>
</field>
</record>
@ -210,8 +210,8 @@
<field colspan="4" name="name" select="1"/>
<field name="date_from"/>
<field name="dayofweek" select="1"/>
<field name="hour_from"/>
<field name="hour_to"/>
<field name="hour_from" widget="float_time"/>
<field name="hour_to" widget="float_time"/>
</form>
</field>
</record>