Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2-cal_todo_state-kbh into
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-cal_todo_state-kbh/+merge/93553
Hello,
======calendar_todo======
-I have added state field in calendar_todo.py and in calendar_todo_view.xml
Thank you.
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-cal_todo_state-kbh/+merge/93553
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
=== modified file 'calendar_todo/calendar_todo.py'
--- calendar_todo/calendar_todo.py 2012-02-14 13:35:00 +0000
+++ calendar_todo/calendar_todo.py 2012-02-17 10:58:19 +0000
@@ -33,8 +33,14 @@
'event_id': fields.many2one('calendar.event', 'Event'),
'task_id': fields.many2one('project.task', 'Task'),
'planned_hours':fields.related('task_id', 'planned_hours', type='many2one', relation='project.task', string='Planned Hours'),
+ 'state': fields.selection([('draft', 'draft'),
+ ('start', 'Start'),
+ ('stop', 'Stop'), ('pending', 'Pending')], 'State', readonly=True),
}
+ _defaults = {
+ 'state': 'draft',
+ }
def convert_task(self, cr, uid, ids, context=None):
cal_obj = self.pool.get('calendar.todo')
data_obj = self.pool.get('ir.model.data')
@@ -147,3 +153,22 @@
})
return {'value': value}
+ def set_as_draft(self, cr, uid, ids, context=None, *args):
+ """ Makes todo as Tentative
+ """
+ return self.write(cr, uid, ids, {'state': 'draft'}, context)
+
+ def do_pending(self, cr, uid, ids, context=None, *args):
+ """ Makes todo as pending
+ """
+ return self.write(cr, uid, ids, {'state': 'pending'}, context)
+
+ def do_start(self, cr, uid, ids, context=None, *args):
+ """ Makes todo as started
+ """
+ return self.write(cr, uid, ids, {'state': 'start'}, context)
+
+ def do_stop(self, cr, uid, ids, context=None, *args):
+ """ Makes todo as stoped
+ """
+ return self.write(cr, uid, ids, {'state': 'stop'}, context)
=== modified file 'calendar_todo/calendar_todo_view.xml'
--- calendar_todo/calendar_todo_view.xml 2012-02-14 13:35:00 +0000
+++ calendar_todo/calendar_todo_view.xml 2012-02-17 10:58:19 +0000
@@ -43,12 +43,36 @@
<group>
<separator colspan="4" string="Task Information" />
<field name="task_id"/>
- <button string="Convert To Task"
- name="convert_task"
- icon="gtk-index"
+ <button string="Convert To Task"
+ name="convert_task"
+ icon="gtk-index"
type="object"
attrs="{'invisible':[('task_id','!=',False)]}" />
</group>
+ <separator colspan="4" string="" />
+ <group col="8" colspan="4">
+ <field name="state"/>
+ <button name="do_pending"
+ string="Pending"
+ states="draft,start"
+ type="object"
+ icon="gtk-apply"/>
+ <button name="set_as_draft"
+ string="Draft"
+ states="start,stop"
+ type="object"
+ icon="gtk-convert" />
+ <button name="do_stop"
+ string="Stop"
+ states="start,draft,pending"
+ type="object"
+ icon="gtk-cancel"/>
+ <button name="do_start"
+ string="Start"
+ states="draft,pending"
+ type="object"
+ icon="gtk-apply" />
+ </group>
</page>
<page string="Notes">
<field name="description" nolabel="1" colspan="4"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
