Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-improve_crm_gtd-han into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Hardik Ansodariya (OpenERP) (han-tinyerp)
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-improve_crm_gtd-han/+merge/73203
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-improve_crm_gtd-han/+merge/73203
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'crm/crm_installer.py'
--- crm/crm_installer.py 2011-07-27 07:00:32 +0000
+++ crm/crm_installer.py 2011-08-29 05:57:25 +0000
@@ -36,7 +36,11 @@
'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
+<<<<<<< TREE
'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
+=======
+ 'crm_todo': fields.boolean('CRM TODO', help=" add a crm todo list in your Opportunities form."),
+>>>>>>> MERGE-SOURCE
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
=== modified file 'crm/crm_installer_view.xml'
--- crm/crm_installer_view.xml 2011-07-29 14:03:24 +0000
+++ crm/crm_installer_view.xml 2011-08-29 05:57:25 +0000
@@ -7,6 +7,7 @@
<field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
<field name="arch" type="xml">
<data>
+<<<<<<< TREE
<xpath expr="//group[@name='crm']" position="replace">
<newline/>
<separator string="Customer Relationship Management Features" colspan="4"/>
@@ -20,6 +21,46 @@
<field name="thunderbird"/>
<field name="outlook"/>
</xpath>
+=======
+ <form position="attributes">
+ <attribute name="string">CRM Application Configuration</attribute>
+ </form>
+
+ <separator string="title" position="attributes">
+ <attribute name="string">Configure Your CRM Application</attribute>
+ </separator>
+ <xpath expr="//label[@string='description']"
+ position="attributes">
+ <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
+ </xpath>
+ <xpath expr='//separator[@string="vsep"]' position='attributes'>
+ <attribute name='rowspan'>13</attribute>
+ <attribute name='string'></attribute>
+ </xpath>
+ <xpath expr="//button[@string='Install Modules']" position="attributes">
+ <attribute name="string">Configure</attribute>
+ </xpath>
+ <group colspan="8">
+ <group colspan="4" col="4" groups="base.group_extended" name="other">
+ <field name="crm_claim" />
+ <field name="crm_helpdesk" />
+ <field name="crm_fundraising" />
+ <field name="wiki_sale_faq"/>
+ <field name="sale_crm" invisible="1"/>
+ <field name="crm_todo"/>
+ </group>
+ <group colspan="2" col="2">
+ <separator string="Synchronization" colspan="4" />
+ <field name="crm_caldav" />
+ <field name="fetchmail" />
+ </group>
+ <group colspan="2" col="2">
+ <separator string="Plug-In" colspan="4" />
+ <field name="thunderbird" />
+ <field name="outlook" />
+ </group>
+ </group>
+>>>>>>> MERGE-SOURCE
</data>
</field>
</record>
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-08-04 10:26:35 +0000
+++ crm/crm_lead_view.xml 2011-08-29 05:57:25 +0000
@@ -183,7 +183,7 @@
<field colspan="4" name="email_cc" widget="char" size="512"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
- <tree string="History">
+ <tree string="Notes">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@@ -215,7 +215,7 @@
</page>
<page string="Attachments">
- <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+ <field name="attachment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml 2011-08-04 10:26:35 +0000
+++ crm/crm_opportunity_view.xml 2011-08-29 05:57:25 +0000
@@ -57,6 +57,7 @@
string="Contact"
on_change="onchange_partner_address_id(partner_address_id, email_from)"
colspan="1" />
+<<<<<<< TREE
<group col="3" colspan="2">
<field name="email_from" string="Email" />
<button string="Mail"
@@ -64,6 +65,8 @@
context="{'mail':'new', 'model': 'crm.lead'}"
icon="terp-mail-message-new" type="action" />
</group>
+=======
+>>>>>>> MERGE-SOURCE
<field name="phone"/>
</group>
@@ -135,13 +138,40 @@
<field name="optout" on_change="on_change_optout(optout)"/>
</group>
</page>
-
- <page string="Communication & History" groups="base.group_extended">
- <group colspan="4">
+ <page string="Extra Info" groups="base.group_extended">
+ <group col="2" colspan="2">
+ <separator string="Dates" colspan="2"/>
+ <field name="create_date"/>
+ <field name="write_date"/>
+ <field name="date_closed"/>
+ <field name="date_open"/>
+ </group>
+ <group col="2" colspan="2">
+ <separator string="Misc" colspan="2"/>
+ <field name="active"/>
+ <field name="day_open"/>
+ <field name="day_close"/>
+ <field name="referred"/>
+ </group>
+ <separator colspan="4" string="References"/>
+ <field name="ref"/>
+ <field name="ref2"/>
+ </page>
+ </notebook>
+ <group colspan="4">
+ <group col="3" colspan="2">
<field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
</group>
+ <newline/>
+ <group col="3" colspan="2">
+ <field name="email_from" string="Email" />
+ <button string="Send Email"
+ name="%(crm.action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.lead'}"
+ icon="terp-mail-message-new" type="action" />
+ </group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
- <tree string="History">
+ <tree string="Note">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@@ -150,7 +180,7 @@
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
- <form string="History">
+ <form string="Note">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>
@@ -174,7 +204,7 @@
</page>
<page string="Attachments">
- <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+ <field name="attachment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
@@ -187,27 +217,7 @@
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.lead'}"
icon="terp-mail-message-new" type="action" />
- </page>
- <page string="Extra Info" groups="base.group_extended">
- <group col="2" colspan="2">
- <separator string="Dates" colspan="2"/>
- <field name="create_date"/>
- <field name="write_date"/>
- <field name="date_closed"/>
- <field name="date_open"/>
- </group>
- <group col="2" colspan="2">
- <separator string="Misc" colspan="2"/>
- <field name="active"/>
- <field name="day_open"/>
- <field name="day_close"/>
- <field name="referred"/>
- </group>
- <separator colspan="4" string="References"/>
- <field name="ref"/>
- <field name="ref2"/>
- </page>
- </notebook>
+ </group>
</form>
</field>
</record>
=== added directory 'crm_todo'
=== added file 'crm_todo/__init__.py'
--- crm_todo/__init__.py 1970-01-01 00:00:00 +0000
+++ crm_todo/__init__.py 2011-08-29 05:57:25 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import crm_todo
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
=== added file 'crm_todo/__openerp__.py'
--- crm_todo/__openerp__.py 1970-01-01 00:00:00 +0000
+++ crm_todo/__openerp__.py 2011-08-29 05:57:25 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+ 'name': 'TODO - Customer Relationship Management',
+ 'version': '1.0',
+ 'category': 'Sales',
+ 'description': """
+
+ """,
+ 'author': 'OpenERP SA',
+ #'images': ['images/project_gtd.jpeg'],
+ 'depends': ['crm','project_gtd'],
+ 'init_xml': [],
+ 'update_xml': [
+ #'project_todo_view.xml',
+ 'crm_todo_view.xml',
+ #'project_todo_demo.xml',
+
+ ],
+ 'demo_xml': [ ],
+ 'test':[
+
+ ],
+ 'installable': True,
+ 'active': False,
+ #'certificate': '0043525236301',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'crm_todo/crm_todo.py'
--- crm_todo/crm_todo.py 1970-01-01 00:00:00 +0000
+++ crm_todo/crm_todo.py 2011-08-29 05:57:25 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sys
+
+from osv import fields, osv
+import tools
+from tools.translate import _
+
+class crm_todo(osv.osv):
+ """_name = 'crm.todo'"""
+ _description = "TODO"
+ _inherit = 'crm.lead'
+ _columns = {
+ 'todo_ids': fields.one2many('project.gtd.timebox', 'todo_id', 'TODO'),
+ }
+crm_todo()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'crm_todo/crm_todo_demo.xml'
--- crm_todo/crm_todo_demo.xml 1970-01-01 00:00:00 +0000
+++ crm_todo/crm_todo_demo.xml 2011-08-29 05:57:25 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data>
+
+ <record model="project.gtd.timebox" id="timebox_todo">
+ <field name="name">TODO</field>
+ <field name="icon">terp-check</field>
+ </record>
+
+ </data>
+</openerp>
=== added file 'crm_todo/crm_todo_view.xml'
--- crm_todo/crm_todo_view.xml 1970-01-01 00:00:00 +0000
+++ crm_todo/crm_todo_view.xml 2011-08-29 05:57:25 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data>
+
+ <record model="ir.ui.view" id="crm_todo_form">
+ <field name="name">crm.todo.form</field>
+ <field name="model">crm.lead</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Category of ideas">
+ <field name="todo_ids" nolabel="1"/>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="crm_todo_action">
+ <field name="name">CRM TODO</field>
+ <field name="res_model">crm.lead</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ </record>
+ <record id="crm_todo_opportunity_add" model="ir.ui.view">
+ <field name="name">TODO</field>
+ <field name="model">crm.lead</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="/form/group/field[@name = 'message_ids']" position="after">
+ <field name="todo_ids" colspan="4" nolabel="1"/>
+
+ </xpath>
+
+ </data>
+ </field>
+ </record>
+ <menuitem name="TODOs" id="menu_crm_todo" parent="base.menu_sales" action="crm_todo_action"/>
+ </data>
+</openerp>
=== added file 'crm_todo/project_todo_view.xml'
--- crm_todo/project_todo_view.xml 1970-01-01 00:00:00 +0000
+++ crm_todo/project_todo_view.xml 2011-08-29 05:57:25 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <record model="ir.ui.view" id="project_todo_form">
+ <field name="name">project.todo.form</field>
+ <field name="model">project.todo</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="TODO">
+ <field name="name"/>
+ <field name="sequence"/>
+ <field name="icon"/>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="project_todo_tree">
+ <field name="name">project.todo.tree</field>
+ <field name="model">project.todo</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="TODO">
+ <field name="name"/>
+ <field name="sequence" invisible="1"/>
+ <field name="icon"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="project_todo_search" model="ir.ui.view">
+ <field name="name">project.todo.search</field>
+ <field name="model">project.todo</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="TODO">
+
+ </search>
+ </field>
+ </record>
+
+ <!--<record id="action_view_project_todo" model="ir.actions.act_window">
+ <field name="name">Project TODO</field>
+ <field name="res_model">project.todo</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>-->
+
+ <record model="ir.actions.act_window" id="open_project_todo_tree">
+ <field name="name">Title</field>
+ <field name="res_model">project.todo</field>
+ <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field>
+ </record>
+
+ <menuitem name="TODO" id="menu_open_todo" parent="project.menu_tasks_config" action="open_project_todo_tree"/>
+
+ <record model="ir.ui.view" id="project_todo_task_tree">
+ <field name="name">project.task.todo</field>
+ <field name="model">project.task</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="project.view_task_tree2" />
+ <field name="arch" type="xml">
+ <field name="remaining_hours" position="before">
+ <field string="TODO" name="todo_id"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="project_todo_task">
+ <field name="name">project.todo.form</field>
+ <field name="model">project.task</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="project.view_task_form2" />
+ <field name="arch" type="xml">
+ <field name="progress" position="before">
+ <field name="todo_id" widget="selection"/>
+ </field>
+ </field>
+ </record>
+ </data>
+</openerp>
=== modified file 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py 2011-08-03 10:06:02 +0000
+++ mail_gateway/mail_gateway.py 2011-08-29 05:57:25 +0000
@@ -263,24 +263,29 @@
_description = 'Mailgateway Message'
_order = 'date desc'
_columns = {
- 'name':fields.text('Subject', readonly=True),
+ 'name':fields.text('Subject'),
'model': fields.char('Object Name', size=128, select=1, readonly=True),
'res_id': fields.integer('Resource ID', select=1, readonly=True),
'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
- 'date': fields.datetime('Date', readonly=True),
+ 'date': fields.datetime('Date'),
'history': fields.boolean('Is History?', readonly=True),
- 'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+ 'user_id': fields.many2one('res.users', 'User Responsible'),
'message': fields.text('Message', readonly=True),
- 'email_from': fields.char('From', size=128, help="Email From", readonly=True),
- 'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
- 'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
- 'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
- 'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
- 'references': fields.text('References', readonly=True, help="References emails."),
- 'description': fields.text('Description', readonly=True),
+ 'email_from': fields.char('From', size=128, help="Email From"),
+ 'email_to': fields.char('To', help="Email Recipients", size=256),
+ 'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
+ 'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
+ 'message_id': fields.char('Message Id', size=1024, help="Message Id on Email.", select=True),
+ 'references': fields.text('References', help="References emails."),
+ 'description': fields.text('Description'),
'partner_id': fields.many2one('res.partner', 'Partner', required=False),
+<<<<<<< TREE
'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
'display_text': fields.function(_get_display_text, type='text', size="512", string='Display Text'),
+=======
+ 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+ 'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Notes'),
+>>>>>>> MERGE-SOURCE
}
def init(self, cr):
=== modified file 'mail_gateway/mail_gateway_view.xml'
--- mail_gateway/mail_gateway_view.xml 2011-01-14 00:11:01 +0000
+++ mail_gateway/mail_gateway_view.xml 2011-08-29 05:57:25 +0000
@@ -12,8 +12,8 @@
<field name="arch" type="xml">
<form string="mailgate message">
<group colspan="4" col="6">
- <field name="name" string="Subject" required="1" select="1" widget="char" size="512"/>
- <field name="date" required="1" select="1"/>
+ <field name="name" string="Subject" select="1" widget="char" size="512"/>
+ <field name="date" select="1"/>
<field name="user_id" string="Owner" select="1"/>
<field name="partner_id" readonly="1" />
</group>
=== modified file 'project/installer.py'
--- project/installer.py 2011-05-04 06:55:49 +0000
+++ project/installer.py 2011-08-29 05:57:25 +0000
@@ -45,6 +45,7 @@
"in the SCRUM methodology."),
'project_gtd': fields.boolean('Methodology: Getting Things Done',
help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+ 'project_todo': fields.boolean('Project TODO', help=" add a todo list in your Opportunities form."),
}
project_installer()
=== modified file 'project/project_installer.xml'
--- project/project_installer.xml 2011-06-08 14:21:49 +0000
+++ project/project_installer.xml 2011-08-29 05:57:25 +0000
@@ -10,6 +10,7 @@
<data>
<xpath expr="//group[@name='project']" position="replace">
<newline/>
+<<<<<<< TREE
<separator string="Project Management Features" colspan="4" />
<field name="project_issue" />
<field name="project_long_term" />
@@ -19,6 +20,13 @@
<field name="project_scrum" />
<field name="project_gtd" />
</xpath>
+=======
+ <separator string="Methodologies" colspan="4"/>
+ <field name="project_scrum"/>
+ <field name="project_gtd"/>
+ <field name="project_todo"/>
+ </group>
+>>>>>>> MERGE-SOURCE
</data>
</field>
</record>
=== modified file 'project_gtd/project_gtd.py'
--- project_gtd/project_gtd.py 2011-01-14 00:11:01 +0000
+++ project_gtd/project_gtd.py 2011-08-29 05:57:25 +0000
@@ -47,6 +47,7 @@
'name': fields.char('Timebox', size=64, required=True, select=1, translate=1),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of timebox."),
'icon': fields.selection(tools.icons, 'Icon', size=64),
+ 'todo_id': fields.many2one('crm.lead','TODO'),
}
project_gtd_timebox()
@@ -108,7 +109,7 @@
if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]), context=context)
search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
- search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
+ search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s" />''' % (_('Inbox'),)
search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Getting things done" string="%s"/>''' % (_('GTD'),)
search_extended += '''<separator orientation="vertical"/>'''
for time in tt:
=== added directory 'project_todo'
=== added file 'project_todo/__init__.py'
--- project_todo/__init__.py 1970-01-01 00:00:00 +0000
+++ project_todo/__init__.py 2011-08-29 05:57:25 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+#import project_todo
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
=== added file 'project_todo/__openerp__.py'
--- project_todo/__openerp__.py 1970-01-01 00:00:00 +0000
+++ project_todo/__openerp__.py 2011-08-29 05:57:25 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+ 'name': 'TODO - Project Management Module',
+ 'version': '1.0',
+ 'category': 'Project Management',
+ 'description': """
+
+ """,
+ 'author': 'OpenERP SA',
+ #'images': ['images/project_gtd.jpeg'],
+ 'depends': ['project','project_gtd'],
+ 'init_xml': [],
+ 'update_xml': [
+ #'project_todo_view.xml',
+ 'project_todo_gtd_view.xml',
+ #'project_todo_demo.xml',
+
+ ],
+ 'demo_xml': ['project_todo_demo.xml',],
+ 'test':[
+
+ ],
+ 'installable': True,
+ 'active': False,
+ #'certificate': '0043525236301',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'project_todo/project_todo.py'
--- project_todo/project_todo.py 1970-01-01 00:00:00 +0000
+++ project_todo/project_todo.py 2011-08-29 05:57:25 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sys
+
+from osv import fields, osv
+import tools
+from tools.translate import _
+
+class project_gtd_timebox(osv.osv):
+ _inherit = "project.gtd.timebox"
+ _description = "TODO"
+ _columns = {
+ 'name': fields.char('Title', size=128, required=True, select=1, translate=1),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
+ 'icon': fields.selection(tools.icons, 'Icon', size=64),
+ }
+ _defaults = {
+ 'sequence': 1
+ }
+ _order = "sequence, name"
+
+project_gtd_timebox()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'project_todo/project_todo_demo.xml'
--- project_todo/project_todo_demo.xml 1970-01-01 00:00:00 +0000
+++ project_todo/project_todo_demo.xml 2011-08-29 05:57:25 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data>
+
+ <record model="project.gtd.timebox" id="timebox_todo">
+ <field name="name">TODO</field>
+ <field name="icon">terp-check</field>
+ </record>
+ </data>
+</openerp>
=== added file 'project_todo/project_todo_gtd_view.xml'
--- project_todo/project_todo_gtd_view.xml 1970-01-01 00:00:00 +0000
+++ project_todo/project_todo_gtd_view.xml 2011-08-29 05:57:25 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data>
+
+ <record model="ir.ui.view" id="project_task_todo_tree">
+ <field name="name">project.task.tree.timebox</field>
+ <field name="model">project.task</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="project.view_task_tree2" />
+ <field name="arch" type="xml">
+ <field name="remaining_hours" position="after">
+
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="project_task_todo_form">
+ <field name="name">project.task.form.timebox</field>
+ <field name="model">project.task</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="project.view_task_form2" />
+ <field name="arch" type="xml">
+ <field name="progress" position="after">
+
+ </field>
+ </field>
+ </record>
+
+ <record id="view_task_search_todo" model="ir.ui.view">
+ <field name="name">project.task.search.todo</field>
+ <field name="model">project.task</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Task Edition">
+ <group col="20" colspan="4">
+ <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+ <separator orientation="vertical"/>
+ <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+ <separator orientation="vertical"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="open_todo_timebox_tree">
+ <field name="name">TODO</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">project.task</field>
+ <field name="view_type">form</field>
+ <field name="view_id" ref="project_task_todo_tree"/>
+ <field name="search_view_id" ref="view_task_search_todo"/>
+ <field name="context">{"search_default_todo":1,'group_by_no_leaf':1}</field>
+ <field name="help">Timeboxes are defined in the "Getting Things Done" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term.</field>
+ </record>
+
+ <menuitem name="TODO" id="menu_open_todo_time_timeboxes" parent="project.menu_project_management" action="open_todo_timebox_tree"/>
+ </data>
+</openerp>
=== added file 'project_todo/project_todo_view.xml'
--- project_todo/project_todo_view.xml 1970-01-01 00:00:00 +0000
+++ project_todo/project_todo_view.xml 2011-08-29 05:57:25 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <record model="ir.ui.view" id="project_todo_form">
+ <field name="name">project.todo.form</field>
+ <field name="model">project.todo</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="TODO">
+ <field name="name"/>
+ <field name="sequence"/>
+ <field name="icon"/>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="project_todo_tree">
+ <field name="name">project.todo.tree</field>
+ <field name="model">project.todo</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="TODO">
+ <field name="name"/>
+ <field name="sequence" invisible="1"/>
+ <field name="icon"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="project_todo_search" model="ir.ui.view">
+ <field name="name">project.todo.search</field>
+ <field name="model">project.todo</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="TODO">
+
+ </search>
+ </field>
+ </record>
+
+ <!--<record id="action_view_project_todo" model="ir.actions.act_window">
+ <field name="name">Project TODO</field>
+ <field name="res_model">project.todo</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>-->
+
+ <record model="ir.actions.act_window" id="open_project_todo_tree">
+ <field name="name">Title</field>
+ <field name="res_model">project.todo</field>
+ <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field>
+ </record>
+
+ <menuitem name="TODO" id="menu_open_todo" parent="project.menu_tasks_config" action="open_project_todo_tree"/>
+
+ <record model="ir.ui.view" id="project_todo_task_tree">
+ <field name="name">project.task.todo</field>
+ <field name="model">project.task</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="project.view_task_tree2" />
+ <field name="arch" type="xml">
+ <field name="remaining_hours" position="before">
+ <field string="TODO" name="todo_id"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="project_todo_task">
+ <field name="name">project.todo.form</field>
+ <field name="model">project.task</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="project.view_task_form2" />
+ <field name="arch" type="xml">
+ <field name="progress" position="before">
+ <field name="todo_id" widget="selection"/>
+ </field>
+ </field>
+ </record>
+ </data>
+</openerp>
_______________________________________________
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
