From 75dd065eaa4670bcc6c742f3780e76e8134b83bf Mon Sep 17 00:00:00 2001
From: Dharmang Soni <dpr@odoo.com>
Date: Mon, 9 Apr 2018 11:35:00 +0200
Subject: [PATCH] [IMP] note: update note default columns

Purpose is to have first column holding all todos and reminders. We then
add a few columns for today / tomorrow / later to help people organize
themselves.
---
 addons/note/data/note_data.xml  | 36 +++++++++++++--------------------
 addons/note/models/res_users.py |  2 +-
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/addons/note/data/note_data.xml b/addons/note/data/note_data.xml
index 292dc9487b8..ead6e3578d2 100644
--- a/addons/note/data/note_data.xml
+++ b/addons/note/data/note_data.xml
@@ -1,36 +1,28 @@
 <?xml version="1.0"?>
 <odoo>
-  <data>
-
+    <data>
     <record model="note.stage" id="note_stage_00">
-      <field name="name">New</field>
-      <field name="sequence" eval="0"/>
-      <field name="user_id" eval="ref('base.user_root')"/>
+        <field name="name">Todo</field>
+        <field name="sequence" eval="0"/>
+        <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
     <record model="note.stage" id="note_stage_01">
-      <field name="name">Today</field>
-      <field name="sequence">1</field>
-      <field name="user_id" eval="ref('base.user_root')"/>
+        <field name="name">Today</field>
+        <field name="sequence">1</field>
+        <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
     <record model="note.stage" id="note_stage_02">
-      <field name="name">This Week</field>
-      <field name="sequence">2</field>
-      <field name="user_id" eval="ref('base.user_root')"/>
+        <field name="name">Tomorrow</field>
+        <field name="sequence">2</field>
+        <field name="user_id" eval="ref('base.user_root')"/>
     </record>
 
     <record model="note.stage" id="note_stage_03">
-      <field name="name">Later</field>
-      <field name="sequence">3</field>
-      <field name="user_id" eval="ref('base.user_root')"/>
+        <field name="name">Later</field>
+        <field name="sequence">3</field>
+        <field name="user_id" eval="ref('base.user_root')"/>
     </record>
-
-    <record model="note.stage" id="note_stage_04">
-      <field name="name">Notes</field>
-      <field name="sequence">4</field>
-      <field name="user_id" eval="ref('base.user_root')"/>
-    </record>
-
-  </data>
+    </data>
 </odoo>
diff --git a/addons/note/models/res_users.py b/addons/note/models/res_users.py
index 4cb4e3757c1..cfeba15922f 100644
--- a/addons/note/models/res_users.py
+++ b/addons/note/models/res_users.py
@@ -14,7 +14,7 @@ class Users(models.Model):
         user = super(Users, self).create(values)
         # for new employee, create his own 5 base note stages
         if user.has_group('base.group_user'):
-            for num in range(5):
+            for num in range(4):
                 stage = self.env.ref('note.note_stage_%02d' % (num,), raise_if_not_found=False)
                 if stage:
                     stage.sudo().copy(default={'user_id': user.id})