Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2-meeting_project_sprint-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-meeting_project_sprint-kbh/+merge/91633
Hello,
=========project_scrum=========
- Added demo data for project.sprint calendar and meeting category.
- Added demo data for project.sprint meeting.
- Added button for schedule meeting in project.sprint form view.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-meeting_project_sprint-kbh/+merge/91633
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
=== modified file 'base_calendar/calendar_data.xml'
--- base_calendar/calendar_data.xml 2012-02-06 09:56:35 +0000
+++ base_calendar/calendar_data.xml 2012-02-06 10:50:47 +0000
@@ -55,6 +55,14 @@
<field name="name">Suppliers</field>
</record>
+ <record id="calendar_event_category_dailyscrummeeting0" model="calendar.event.category">
+ <field name="name">Daily Scrum meeting</field>
+ </record>
+
+ <record id="calendar_event_category_reviewmeeting0" model="calendar.event.category">
+ <field name="name">Review Meeting</field>
+ </record>
+
<record model="res.request.link" id="request_link_meeting">
<field name="name">Event</field>
<field name="object">calendar.event</field>
=== modified file 'project_scrum/__openerp__.py'
--- project_scrum/__openerp__.py 2012-02-02 08:22:32 +0000
+++ project_scrum/__openerp__.py 2012-02-06 10:50:47 +0000
@@ -50,8 +50,8 @@
""",
'author': 'OpenERP SA',
'images': ['images/product_backlogs.jpeg', 'images/project_sprints.jpeg', 'images/scrum_dashboard.jpeg', 'images/scrum_meetings.jpeg'],
- 'depends': ['project', 'process', 'mail'],
- 'init_xml': [],
+ 'depends': ['project', 'process', 'mail','base_calendar'],
+ 'init_xml': ['project_scrum_data.xml'],
'update_xml': [
'security/ir.model.access.csv',
'project_scrum_report.xml',
=== modified file 'project_scrum/project_scrum.py'
--- project_scrum/project_scrum.py 2012-02-02 08:22:32 +0000
+++ project_scrum/project_scrum.py 2012-02-06 10:50:47 +0000
@@ -109,6 +109,7 @@
'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
+ 'user_id': fields.many2one('res.users', 'Sprint'),
}
_defaults = {
'state': 'draft',
@@ -137,6 +138,48 @@
v['date_stop'] = (datetime.now() + relativedelta(days=int(proj.sprint_size or 14))).strftime('%Y-%m-%d')
return {'value':v}
+ def action_makeMeeting(self, cr, uid, ids, context=None):
+ """
+ This opens Meeting's calendar view to schedule meeting on current project scrum
+ @return : Dictionary value for created Meeting view
+ """
+ if context is None:
+ context = {}
+ value = {}
+ cal_pool = self.pool.get('calendar.calendar')
+ data_obj = self.pool.get('ir.model.data')
+ for scrum in self.browse(cr, uid, ids, context=context):
+ # Get meeting views
+ tree_view = data_obj.get_object_reference(cr, uid, 'base_calendar', 'event_tree_view')
+ form_view = data_obj.get_object_reference(cr, uid, 'base_calendar', 'event_form_view')
+ calander_view = data_obj.get_object_reference(cr, uid, 'base_calendar', 'event_calendar_view')
+ search_view = data_obj.get_object_reference(cr, uid, 'base_calendar', 'view_calendar_event_filter')
+ calendar = cal_pool.search(cr, uid, [('user_id', '=', scrum.user_id.id), ('object_id.model','=','project.scrum.sprint')])
+ if calendar:
+ context.update({
+ 'default_calendar_id': calendar[0],
+ 'search_default_calendar_id': calendar[0],
+ })
+ context.update({
+ 'default_user_id': scrum.user_id.id,
+ 'default_state': 'draft',
+ 'default_name': scrum.name,
+ })
+ value = {
+ 'name': _('Meetings'),
+ 'domain': [('calendar_id.object_id.model','=','project.scrum.sprint')],
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'calendar,form,tree',
+ 'res_model': 'calendar.event',
+ 'view_id': False,
+ 'views': [(calander_view and calander_view[1] or False, 'calendar'), (form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': search_view and search_view[1] or False,
+ 'nodestroy': True
+ }
+ return value
+
project_scrum_sprint()
class project_scrum_product_backlog(osv.osv):
=== added file 'project_scrum/project_scrum_data.xml'
--- project_scrum/project_scrum_data.xml 1970-01-01 00:00:00 +0000
+++ project_scrum/project_scrum_data.xml 2012-02-06 10:50:47 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+ <record id="sprint_calendar_administrator0" model="calendar.calendar">
+ <field name="user_id" ref="base.user_admin"/>
+ <field name="name">Project Sprint</field>
+ <field eval="10" name="priority"/>
+ <field name="type">vevent</field>
+ <field name="object_id" ref="model_project_scrum_sprint"/>
+ </record>
+ </data>
+</openerp>
\ No newline at end of file
=== modified file 'project_scrum/project_scrum_demo.xml'
--- project_scrum/project_scrum_demo.xml 2012-02-02 08:22:32 +0000
+++ project_scrum/project_scrum_demo.xml 2012-02-06 10:50:47 +0000
@@ -1,6 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
+ <!-- Resource: project_scrum.sprint meeting demo-->
+ <record id="calendar_event_sprint1" model="calendar.event">
+ <field eval="1.0" name="duration"/>
+ <field name="user_id" ref="base.user_admin"/>
+ <field eval="1" name="notification"/>
+ <field name="state">draft</field>
+ <field name="end_type">forever</field>
+ <field name="date">2012-02-06 11:22:00</field>
+ <field name="calendar_id" ref="project_scrum.sprint_calendar_administrator0"/>
+ <field name="freq">None</field>
+ <field name="show_as">busy</field>
+ <field name="name">Daily Meeting</field>
+ <field name="date_deadline">2012-02-06 12:22:00</field>
+ <field eval="1" name="interval"/>
+ <field name="organizer_id" ref="base.user_admin"/>
+ <field name="rrule_type">none</field>
+ <field name="select1">date</field>
+ </record>
+
+ <record id="calendar_event_sprint2" model="calendar.event">
+ <field eval="1.0" name="duration"/>
+ <field name="user_id" ref="base.user_admin"/>
+ <field eval="1" name="notification"/>
+ <field name="state">draft</field>
+ <field name="end_type">forever</field>
+ <field name="date">2012-02-06 11:27:00</field>
+ <field name="calendar_id" ref="project_scrum.sprint_calendar_administrator0"/>
+ <field name="freq">None</field>
+ <field name="show_as">busy</field>
+ <field name="name">Review Meeting</field>
+ <field name="date_deadline">2012-02-06 12:27:00</field>
+ <field eval="1" name="interval"/>
+ <field name="organizer_id" ref="base.user_admin"/>
+ <field name="rrule_type">none</field>
+ <field name="select1">date</field>
+ </record>
+ <record id="calendar_event_recurrent0" model="calendar.event">
+ <field eval="1" name="active"/>
+ <field eval="1.0" name="duration"/>
+ <field name="user_id" ref="base.user_admin"/>
+ <field eval="1" name="notification"/>
+ <field eval="1" name="recurrency"/>
+ <field name="state">draft</field>
+ <field name="end_date" eval="time.strftime('%Y-%m-28 10:20:00')"/>
+ <field name="end_type">end_date</field>
+ <field eval="0" name="edit_all"/>
+ <field name="date" eval="time.strftime('%Y-%m-20 10:20:00')"/>
+ <field name="date_deadline" eval="time.strftime('%Y-%m-20 12:20:00')"/>
+ <field name="calendar_id" ref="project_scrum.sprint_calendar_administrator0"/>
+ <field name="freq">None</field>
+ <field name="show_as">busy</field>
+ <field name="name">Weekly Meeting</field>
+ <field eval="2" name="interval"/>
+ <field name="organizer_id" ref="base.user_admin"/>
+ <field name="rrule_type">daily</field>
+ <field name="select1">date</field>
+ <field name="rrule">FREQ=DAILY;INTERVAL=2;UNTIL=20120111T235959Z</field>
+ </record>
+
<!-- Resource: project_scrum.sprint -->
<record id="scrum_sprint_0" model="project.scrum.sprint">
@@ -164,7 +223,7 @@
<field name="expected_hours">111.0</field>
<field name="note">The accounting module of OpenERP (financial accounting and management accounting) is being reshaped. New functionalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
<field name="sprint_id" ref="scrum_sprint_1"/>
- <field name="state">open</field>
+ <field name="state">open</field>
<field name="project_id" ref="project.project_project_9"/>
</record>
<record id="scrum_product_backlog_2" model="project.scrum.product.backlog">
@@ -201,7 +260,7 @@
<field name="expected_hours">4.0</field>
<field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
<field name="sprint_id" ref="scrum_sprint_6"/>
- <field name="state">open</field>
+ <field name="state">open</field>
<field name="project_id" ref="project.project_project_9"/>
</record>
@@ -274,7 +333,7 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project.project_project_9"/>
<field name="name">Review all french terms</field>
- <field name="state">done</field>
+ <field name="state">done</field>
<field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
<field name="product_backlog_id" ref="scrum_product_backlog_3"/>
</record>
@@ -283,7 +342,7 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project.project_project_9"/>
<field name="name">Analytic Accounting features</field>
- <field name="state">done</field>
+ <field name="state">done</field>
<field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
<field name="product_backlog_id" ref="scrum_product_backlog_1"/>
</record>
@@ -317,7 +376,7 @@
<field name="description">Cash book, general ledger, accounts list, aged trial balance</field>
<field name="name">Accounting Report General</field>
<field name="state">open</field>
- <field eval="[(6,0,[ref('scrum_task_8')])]" name="child_ids"/>
+ <field eval="[(6,0,[ref('scrum_task_8')])]" name="child_ids"/>
<field name="product_backlog_id" ref="scrum_product_backlog_1"/>
</record>
<record id="scrum_task_10" model="project.task">
@@ -332,7 +391,7 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project.project_project_9"/>
<field name="name">Accounting Report Analytic</field>
- <field name="state">open</field>
+ <field name="state">open</field>
<field name="product_backlog_id" ref="scrum_product_backlog_1"/>
</record>
<record id="scrum_task_12" model="project.task">
@@ -340,7 +399,7 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project.project_project_9"/>
<field name="name">Bugfix - memory leak</field>
- <field name="state">done</field>
+ <field name="state">done</field>
<field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
<field name="product_backlog_id" ref="scrum_product_backlog_4"/>
</record>
@@ -349,8 +408,8 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project.project_project_9"/>
<field name="name">Bugfix - Translations</field>
- <field name="state">open</field>
- <field eval="[(6,0,[ref('scrum_task_12')])]" name="child_ids"/>
+ <field name="state">open</field>
+ <field eval="[(6,0,[ref('scrum_task_12')])]" name="child_ids"/>
<field name="product_backlog_id" ref="scrum_product_backlog_4"/>
</record>
<record id="scrum_task_14" model="project.task">
@@ -373,7 +432,7 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project.project_project_9"/>
<field name="name">Test 3.2.0 before releasing</field>
- <field name="state">open</field>
+ <field name="state">open</field>
<field name="product_backlog_id" ref="scrum_product_backlog_5"/>
</record>
<record id="scrum_task_17" model="project.task">
@@ -382,7 +441,7 @@
<field name="project_id" ref="project.project_project_9"/>
<field name="description">default values, onchange, required, add on top or bottom and shortcuts (Ctrl S, Ctrl X, ...)</field>
<field name="name">Editable trees</field>
- <field name="state">open</field>
+ <field name="state">open</field>
<field name="product_backlog_id" ref="scrum_product_backlog_7"/>
</record>
=== modified file 'project_scrum/project_scrum_view.xml'
--- project_scrum/project_scrum_view.xml 2012-02-02 08:22:32 +0000
+++ project_scrum/project_scrum_view.xml 2012-02-06 10:50:47 +0000
@@ -237,6 +237,9 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="project_id" on_change="onchange_project_id(project_id)"/>
+ <button name="action_makeMeeting" type="object"
+ string="Schedule Meeting" icon="gtk-redo" />
+ <newline/>
</group>
<notebook colspan="4">
<page string="Sprint Info">
_______________________________________________
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
