[MERGE]: Merge with latest trunk

bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl

3 files changed, 58 insertions, 0 deletions

diff --git a/addons/pad_project/models/__init__.py b/addons/pad_project/models/__init__.py
new file mode 100644
index 00000000000..098de31a5a4
--- /dev/null
+++ b/addons/pad_project/models/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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_task
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad_project/models/project_task.py b/addons/pad_project/models/project_task.py
new file mode 100644
index 00000000000..c215aed1325
--- /dev/null
+++ b/addons/pad_project/models/project_task.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from tools.translate import _
+from osv import fields, osv
+
+class task(osv.osv):
+    _inherit = "project.task"
+
+    def pad_get(self, cr, uid, ids, context=None):
+        """Get pad action
+        """
+        url = self.pool.get("ir.attachment").pad_get(cr, uid, self._name, ids[0])
+        return {
+            'type': 'ir.actions.act_url',
+            'url': url
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad_project/models/project_task.xml b/addons/pad_project/models/project_task.xml
new file mode 100644
index 00000000000..de944b603b5
--- /dev/null
+++ b/addons/pad_project/models/project_task.xml
@@ -0,0 +1,17 @@
+<openerp>
+    <data>
+        <record id="view_task_kanban_with_pad" model="ir.ui.view">
+            <field name="name">project.task.kanban.pad</field>
+            <field name="model">project.task</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_task_kanban"/>
+            <field name="arch" type="xml">
+                <xpath expr="//a[@type='color']" position="after">
+                    <a name="pad_get" string="Pad" type="object">
+                        <img src="/pad/static/src/img/pad-icon.png" border="0" width="16" height="16"/>
+                    </a>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>