From ea97d65e39d9618b477dddd43f6692ad31bc4d80 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 16 Nov 2012 15:42:25 +0530
Subject: [PATCH 1/6] [IMP] in messaging/Organizer/Categories rename Categories
 into Stage

bzr revid: fka@tinyerp.com-20121116101225-p8atb8mb1gqkdak5
---
 addons/note/note_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 5aae6204d86..5becd36757e 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -193,7 +193,7 @@
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>
-    <menuitem name="Categories" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
+    <menuitem name="Stage" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
 
   </data>
 </openerp>

From 878ca2e088d4381bfe7d6cdf59910b0bc0915e71 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 16 Nov 2012 16:33:33 +0530
Subject: [PATCH 2/6] [IMP] remove or lable & add close button in footer of
 embed form

bzr revid: fka@tinyerp.com-20121116110333-yh5s9y8krdbx8a2h
---
 addons/share/wizard/share_wizard_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 859245b46a9..26e7fff0243 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -55,8 +55,7 @@
                     </group>
                     <footer>
                         <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Close" class="oe_link" special="cancel" />
                     </footer>
                 </form>
             </field>

From 88312d20f3be0f55f35a47fccc9e9027f1a9969c Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 16 Nov 2012 17:03:55 +0530
Subject: [PATCH 3/6] [IMP] improve code

bzr revid: fka@tinyerp.com-20121116113355-adp2cnobjo9khimv
---
 addons/share/wizard/share_wizard_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 26e7fff0243..1cad761d936 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -55,7 +55,8 @@
                     </group>
                     <footer>
                         <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
-                        <button string="Close" class="oe_link" special="cancel" />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
                 </form>
             </field>
@@ -83,7 +84,7 @@
                         <group string="Use this link">
                             <field name="embed_url"/>
                         </group>
-                        <group string="Or insert the following code where you want to embed your documents">
+                        <group string="insert the following code where you want to embed your documents">
                             <field name="embed_code"/>
                         </group>
                         <group string="Embedded code options">
@@ -95,6 +96,7 @@
                     <footer>
                         <field name="user_type" invisible="1"/>
                         <field name="access_mode" invisible="1"/>
+                        <button string="Close" class="oe_highlight" special="cancel" />
                     </footer>
 
                 </form>

From dc39953b9db3b38263346ef0ede80169bf0e6108 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 16 Nov 2012 17:23:00 +0530
Subject: [PATCH 4/6] [IMP]: Improve string

bzr revid: atp@tinyerp.com-20121116115300-at3bn1qx30xwnj5o
---
 addons/share/wizard/share_wizard_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 1cad761d936..e0e800ab150 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -84,7 +84,7 @@
                         <group string="Use this link">
                             <field name="embed_url"/>
                         </group>
-                        <group string="insert the following code where you want to embed your documents">
+                        <group string="Or insert the following code where you want to embed your documents">
                             <field name="embed_code"/>
                         </group>
                         <group string="Embedded code options">

From 18599ffd701edd2cf5dd7e07bc87c6a1cfccb136 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 29 Jan 2013 14:43:15 +0530
Subject: [PATCH 5/6] [IMP] improve code

bzr revid: fka@tinyerp.com-20130129091315-zrg45gu04ztkt5ve
---
 addons/share/wizard/share_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index aae13f66882..04f893936a2 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -660,7 +660,7 @@ class share_wizard(osv.TransientModel):
         self._assert(wizard_data.action_id and wizard_data.access_mode,
                      _('Action and Access Mode are required to create a shared access.'),
                      context=context)
-        self._assert(self.has_share(cr, uid, context=context),
+        self._assert(self.has_share(cr, uid, False, context=context),
                      _('You must be a member of the Share/User group to use the share wizard.'),
                      context=context)
         if wizard_data.user_type == 'emails':

From 8a6c2a21733a29f9491bd6a89e9209fd7122d6e0 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 15 May 2013 18:03:34 +0530
Subject: [PATCH 6/6] [IMP] rename menu from 'stage' to 'stages'

bzr revid: fka@tinyerp.com-20130515123334-xn0vshyen6dhg8x7
---
 addons/note/note_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 5c39010ae90..68ec6bfc4f7 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -193,7 +193,7 @@
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>
-    <menuitem name="Stage" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
+    <menuitem name="Stages" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
 
   </data>
 </openerp>