summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2012-09-07 13:56:04 +0200
committerChristophe Matthieu <chm@openerp.com>2012-09-07 13:56:04 +0200
commitb49b72f00ec2d818338aa8af008ac8337ba990df (patch)
tree065178ab5412214b3a4d50b04f988f05ca3b393a /addons
parent481c300cc5b98ffca245fa59573063513074a0d8 (diff)
[IMP] note : split of note module : note module & note_pad module
bzr revid: chm@openerp.com-20120907115604-wmp8rxec0fk9508r
Diffstat (limited to 'addons')
-rw-r--r--addons/note/note.py5
-rw-r--r--addons/note/note_demo.xml58
-rw-r--r--addons/note/note_view.xml1
-rw-r--r--addons/note_pad/__init__.py23
-rw-r--r--addons/note_pad/__openerp__.py50
-rw-r--r--addons/note_pad/note_pad.py40
-rw-r--r--addons/note_pad/note_pad_view.xml16
7 files changed, 159 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>
diff --git a/addons/note_pad/__init__.py b/addons/note_pad/__init__.py
new file mode 100644
index 00000000000..44a484adac4
--- /dev/null
+++ b/addons/note_pad/__init__.py
@@ -0,0 +1,23 @@
+# -*- 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 note_pad
+
diff --git a/addons/note_pad/__openerp__.py b/addons/note_pad/__openerp__.py
new file mode 100644
index 00000000000..7eee5eee487
--- /dev/null
+++ b/addons/note_pad/__openerp__.py
@@ -0,0 +1,50 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+ 'name': 'Notes pad',
+ 'version': '0.1',
+ 'category': 'Tools',
+ 'description': """
+This module update notes inside OpenERP for using an external pad
+===================================================================
+
+Use for update your text note in real time with the following user that you invite.
+
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://openerp.com',
+ 'summary': 'Sticky Notes, Collaborative',
+ 'depends': [
+ 'base_tools',
+ 'mail',
+ 'pad',
+ 'note',
+ ],
+ 'data': [
+ 'note_pad_view.xml',
+ ],
+ 'installable': True,
+ 'application': False,
+ 'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note_pad/note_pad.py b/addons/note_pad/note_pad.py
new file mode 100644
index 00000000000..73cc9d76a62
--- /dev/null
+++ b/addons/note_pad/note_pad.py
@@ -0,0 +1,40 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+from tools.translate import _
+
+class note_pad_note(osv.osv):
+ """ Note pad """
+
+ _name = 'note.note'
+ _inherit = ['pad.common','note.note']
+
+ _pad_fields = ['note_pad']
+ _description = "Note pad"
+
+ _columns = {
+ 'note_pad_url': fields.char('Pad Url', size=250),
+ }
+
+ _defaults = {
+ 'note_pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+ }
diff --git a/addons/note_pad/note_pad_view.xml b/addons/note_pad/note_pad_view.xml
new file mode 100644
index 00000000000..fd5c48d7f2a
--- /dev/null
+++ b/addons/note_pad/note_pad_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="view_note_note_pad_form">
+ <field name="name">note_pad.view.form</field>
+ <field name="model">note.note</field>
+ <field name="inherit_id" ref="note.view_note_note_form"/>
+ <field name="arch" type="xml">
+ <field name="note" position="replace">
+ <field name="note_pad_url" invisible="1"/>
+ <field name="name"/>
+ </field>
+ </field>
+ </record>
+ </data>
+</openerp>