[IMP] note : split of note module : note module & note_pad module

bzr revid: chm@openerp.com-20120907115604-wmp8rxec0fk9508r

3 files changed, 30 insertions, 34 deletions

diff --git a/addons/note/note.py b/addons/note/note.py
index 6acb3884cd7..985cacd3404 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -52,8 +52,7 @@ class note_tag(osv.osv):
 class note_note(osv.osv):
     """ Note """
     _name = 'note.note'
-    _inherit = ['mail.thread','pad.common']
-    _pad_fields = ['note_pad']
+    _inherit = ['mail.thread']
     _description = "Note"
 
     def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
@@ -104,7 +103,6 @@ class note_note(osv.osv):
     _columns = {
         'name': fields.function(_get_note_first_line, fnct_inv=_set_note_first_line, string='Note Summary', type='text'),
         'note': fields.html('Pad Content'),
-        'note_pad_url': fields.char('Pad Url', size=250),
         'sequence': fields.integer('Sequence'),
         # the stage_id depending on the uid
         'stage_id': fields.many2one('note.stage', 'Stage'),
@@ -125,7 +123,6 @@ class note_note(osv.osv):
     _defaults = {
         'active' : 1,
         'stage_id' : _get_default_stage_id,
-        'note_pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
     }
     _order = 'sequence asc'
     _group_by_full = {
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
index 9c3e0457616..c46846c53f7 100644
--- a/addons/note/note_demo.xml
+++ b/addons/note/note_demo.xml
@@ -4,10 +4,10 @@
 
     <record id="note_1" model="note.note">
       <field name="note"><![CDATA[Customer report #349872
-    * Calendar app in Home
-    *  The base_calendar module should create a menu in Home, like described above.
-    *  This module should become a main application (in the first screen at installation)
-    *  We should use the term Calendar, not Meeting.
+    <br/><br/>* Calendar app in Home
+    <br/>*  The base_calendar module should create a menu in Home, like described above.
+    <br/>*  This module should become a main application (in the first screen at installation)
+    <br/>*  We should use the term Calendar, not Meeting.
      ]]>
       </field>
       <field name="note_pad"></field>
@@ -18,7 +18,7 @@
 
     <record id="note_2" model="note.note">
       <field name="note"><![CDATA[Call Fabien
-    * Followed by the telephone conversation and mail about D.544.3
+    <br/><br/>* Followed by the telephone conversation and mail about D.544.3
     ]]>
       </field>
       <field name="note_pad"></field>
@@ -28,7 +28,7 @@
 
     <record id="note_3" model="note.note">
       <field name="note"><![CDATA[Call Marc
-    ]]>
+    <br/><br/>]]>
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_01"/>
@@ -37,7 +37,7 @@
 
     <record id="note_4" model="note.note">
       <field name="note"><![CDATA[Project N.947.5
-    ]]>
+    <br/><br/>]]>
       </field>
       <field name="note_pad"></field>
       <field name="stage_id" ref="note_stage_02"/>
@@ -46,8 +46,8 @@
 
     <record id="note_5" model="note.note">
       <field name="note"><![CDATA[Shop for family dinner
-    * stuffed turkey
-    * wine
+    <br/>* stuffed turkey
+    <br/>* wine
     ]]>
       </field>
       <field name="note_pad"></field>
@@ -57,7 +57,7 @@
 
     <record id="note_6" model="note.note">
       <field name="note"><![CDATA[Idea to develop
-    * Create a module note_pad
+    <br/><br/>* Create a module note_pad
     it transforms the html editable note text field into widget='pad', similar to project_pad depends on 'note' and 'pad' modules
     ]]>
       </field>
@@ -68,8 +68,8 @@
 
     <record id="note_7" model="note.note">
       <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
-      * Open ERP: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
@@ -79,19 +79,19 @@
 
     <record id="note_8" model="note.note">
       <field name="note"><![CDATA[New computer specs
-      * Motherboard
+      <br/><br/>* Motherboard
       according to processor
-      * Processor
+      <br/>* Processor
       need to decide
-      * Graphic card
+      <br/>* Graphic card
       with great performance for games !
-      * Hard drive
+      <br/>* Hard drive
       big, for lot of internet backups
-      * Tower
+      <br/>* Tower
       silent, better when watching films
-      * Blueray drive ?
+      <br/>* Blueray drive ?
       is it interesting yet ?
-      * Screen
+      <br/>* Screen
       a big one, full of pixels, of course !
       ]]>
       </field>
@@ -103,8 +103,8 @@
 
     <record id="note_9" model="note.note">
       <field name="note"><![CDATA[Read those books
-      * Open ERP: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
@@ -114,8 +114,8 @@
 
     <record id="note_10" model="note.note">
       <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
-      * Open ERP: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
@@ -125,8 +125,8 @@
 
     <record id="note_11" model="note.note">
       <field name="note"><![CDATA[Read those books
-      * Open ERP: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
@@ -137,8 +137,8 @@
 
     <record id="note_12" model="note.note">
       <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
-      * Open ERP: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
@@ -149,8 +149,8 @@
 
     <record id="note_13" model="note.note">
       <field name="note"><![CDATA[Read those books
-      * Open ERP: a modern approach to integrated business management
-      * Open ERP for Retail and Industrial Management
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
       ]]>
       </field>
       <field name="note_pad"></field>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 640b6ce010e..b7e76c5fe5e 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -106,7 +106,6 @@
           </header>
           <field name="note" widget="html" editor_width="100%%" editor_height="400px" nolabel="1"/>
           <field name="tag_ids" widget="many2many_tags" group="group_note_tags" string="Tags"/>
-          <field name="note_pad_url" invisible="1"/>
           <div class="oe_chatter">
               <field name="message_ids" widget="mail_thread"/>
           </div>