From 92a4430de26470d8cc61c27083fa05f984d82bde Mon Sep 17 00:00:00 2001
From: Fabien Bourgeois <fabien@yaltik.com>
Date: Fri, 29 Jul 2016 11:37:43 +0200
Subject: [PATCH] [FIX]Notes enhancements : better handling of form hierarchy

---
 note_base/__init__.py         | 16 +++++++++++
 note_base/__openerp__.py      | 30 ++++++++++++++++++++
 note_base/views/note_view.xml | 53 +++++++++++++++++++++++++++++++++++
 note_task/__openerp__.py      |  2 +-
 note_task/note_task_view.xml  | 34 ++++------------------
 5 files changed, 106 insertions(+), 29 deletions(-)
 create mode 100644 note_base/__init__.py
 create mode 100644 note_base/__openerp__.py
 create mode 100644 note_base/views/note_view.xml

diff --git a/note_base/__init__.py b/note_base/__init__.py
new file mode 100644
index 0000000..643d893
--- /dev/null
+++ b/note_base/__init__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    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/>.
diff --git a/note_base/__openerp__.py b/note_base/__openerp__.py
new file mode 100644
index 0000000..7cbed29
--- /dev/null
+++ b/note_base/__openerp__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    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': 'Note Base Template',
+    'summary': 'Note form replacement',
+    'description': '',
+    'version': '0.1',
+    'category': 'Tools',
+    'author': 'Fabien Bourgeois',
+    'license': 'AGPL-3',
+    'application': False,
+    'installable': True,
+    'depends': ['note'],
+    'data': ['views/note_view.xml']
+}
diff --git a/note_base/views/note_view.xml b/note_base/views/note_view.xml
new file mode 100644
index 0000000..ccc3d20
--- /dev/null
+++ b/note_base/views/note_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+
+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/>.
+-->
+
+<openerp>
+  <data>
+    <!-- New form -->
+    <record id="form" model="ir.ui.view">
+      <field name="name">Note Task</field>
+      <field name="model">note.note</field>
+      <field name="inherit_id" ref="note.view_note_note_form" />
+      <field name="arch" type="xml">
+        <form position="replace">
+          <form string="Note">
+            <header>
+              <field name="stage_id" domain="[('user_id','=',uid)]"
+                widget="statusbar" clickable="1" />
+            </header>
+            <sheet>
+              <group>
+                <field name="tag_ids" widget="many2many_tags" string="Tags"/>
+              </group>
+              <group>
+                <field name="memo" widget="html" class="oe_memo"
+                  editor_height="450px" />
+              </group>
+            </sheet>
+            <div class="oe_chatter">
+              <field name="message_follower_ids" widget="mail_followers"/>
+              <field name="message_ids" widget="mail_thread"/>
+            </div>
+          </form>
+        </form>
+      </field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/note_task/__openerp__.py b/note_task/__openerp__.py
index 4ca8936..b52ab87 100644
--- a/note_task/__openerp__.py
+++ b/note_task/__openerp__.py
@@ -24,6 +24,6 @@
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'installable': True,
-    'depends': ['note', 'project'],
+    'depends': ['note_base', 'project'],
     'data': ['note_task_view.xml']
 }
diff --git a/note_task/note_task_view.xml b/note_task/note_task_view.xml
index c03e6e5..b53fed6 100644
--- a/note_task/note_task_view.xml
+++ b/note_task/note_task_view.xml
@@ -19,37 +19,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <openerp>
   <data>
-    <!-- New form -->
-    <record id="note.view_note_note_form" model="ir.ui.view">
+    <!-- Form -->
+    <record id="note_task_form" model="ir.ui.view">
       <field name="name">Note Task</field>
       <field name="model">note.note</field>
+      <field name="inherit_id" ref="note_base.form" />
       <field name="arch" type="xml">
-        <form string="Note">
-          <header>
-            <field
-              name="stage_id"
-              domain="[('user_id','=',uid)]"
-              widget="statusbar"
-              clickable="1" />
-          </header>
-          <sheet>
-            <group>
-              <field name="task_id" string="Linked task" />
-              <field name="tag_ids" widget="many2many_tags" string="Tags"/>
-            </group>
-            <group>
-              <field
-                name="memo"
-                widget="html"
-                class="oe_memo"
-                editor_height="450px" />
-            </group>
-          </sheet>
-          <div class="oe_chatter">
-            <field name="message_follower_ids" widget="mail_followers"/>
-            <field name="message_ids" widget="mail_thread"/>
-          </div>
-        </form>
+        <field name="tag_ids" position="before">
+          <field name="task_id" string="Linked task" />
+        </field>
       </field>
     </record>
     <!-- Kanban extension -->