Anto has proposed merging
lp:~openerp-dev/openobject-addons/trunk-client_act_in_menuitems-abo into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-client_act_in_menuitems-abo/+merge/120771
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-client_act_in_menuitems-abo/+merge/120771
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-client_act_in_menuitems-abo.
=== modified file 'account_accountant/account_accountant_data.xml'
--- account_accountant/account_accountant_data.xml 2012-08-05 20:13:22 +0000
+++ account_accountant/account_accountant_data.xml 2012-08-22 13:37:40 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <!-- rename root menu "Accounting" -->
- <record id="account.menu_finance" model="ir.ui.menu">
- <field name="name">Accounting</field>
- </record>
+ <!-- Rename root menu "Accounting" -->
+ <!-- Top menu item -->
+ <menuitem name="Accounting"
+ id="account.menu_finance"/>
</data>
<data noupdate="1">
@@ -22,7 +22,7 @@
</data>
<data noupdate="1">
- <!-- notify all employees of module installation -->
+ <!-- Notify all employees of module installation -->
<function model="mail.group" name="message_append_note">
<!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
<value eval="[ref('mail.group_all_employees')]"/>
=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml 2012-08-08 12:19:50 +0000
+++ crm/crm_meeting_view.xml 2012-08-22 13:37:40 +0000
@@ -3,16 +3,15 @@
<data>
<!-- Calendar Attendee Form View -->
-
<record id="attendee_form_view_inherit" model="ir.ui.view">
- <field name="name">calendar.attendee.form.inherit</field>
- <field name="model">calendar.attendee</field>
- <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
- <field name="arch" type="xml">
- <field name="ref" position="after">
- <field name="categ_id" string="Event Type"/>
- </field>
+ <field name="name">calendar.attendee.form.inherit</field>
+ <field name="model">calendar.attendee</field>
+ <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
+ <field name="arch" type="xml">
+ <field name="ref" position="after">
+ <field name="categ_id" string="Event Type"/>
</field>
+ </field>
</record>
</data>
=== modified file 'crm_todo/crm_todo_view.xml'
--- crm_todo/crm_todo_view.xml 2012-08-08 12:19:50 +0000
+++ crm_todo/crm_todo_view.xml 2012-08-22 13:37:40 +0000
@@ -57,7 +57,7 @@
parent="base.menu_sales"
action="crm_todo_action"
sequence="6"/>
-
+
</data>
</openerp>
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_data.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_data.xml 2012-08-05 20:13:22 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_data.xml 2012-08-22 13:37:40 +0000
@@ -20,13 +20,7 @@
<field eval=""""My Timesheet"""" name="name"/>
</record>
- <record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
- <field name="name">My Current Timesheet</field>
- <field eval="1" name="sequence"/>
- <field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
- <field name="icon">STOCK_JUSTIFY_FILL</field>
- <field name="action" ref="ir_actions_server_timsheet_sheet"/>
- </record>
+ <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
</data>
</openerp>
=== modified file 'mail/mail_group_view.xml'
--- mail/mail_group_view.xml 2012-08-15 19:56:52 +0000
+++ mail/mail_group_view.xml 2012-08-22 13:37:40 +0000
@@ -61,8 +61,8 @@
<field name="image_small" widget='image' class="oe_avatar oe_left"/>
<div class="oe_title">
<div class="oe_edit_only">
- <label for="name" string="Group Name"/>
- </div>
+ <label for="name" string="Group Name"/>
+ </div>
<h1><field name="name"/></h1>
<div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" invisible="1" required="0"/>
@@ -123,7 +123,7 @@
<!-- group record !-->
<record id="action_view_groups" model="ir.actions.act_window">
- <field name="name">Groups</field>
+ <field name="name">Join a group</field>
<field name="res_model">mail.group</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
@@ -132,6 +132,6 @@
<!-- left-side menu: Groups !-->
<menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/>
- <menuitem id="mail_allgroups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+ <menuitem id="mail_allgroups" parent="mail_group_root" sequence="100" action="action_view_groups"/>
</data>
</openerp>
=== modified file 'mail/mail_thread_view.xml'
--- mail/mail_thread_view.xml 2012-07-20 11:56:12 +0000
+++ mail/mail_thread_view.xml 2012-08-22 13:37:40 +0000
@@ -3,7 +3,7 @@
<data>
<!-- Top menu item -->
- <menuitem name="Feeds"
+ <menuitem name="Home"
id="mail_feeds_main"
groups="base.group_user"
sequence="10"/>
@@ -11,18 +11,8 @@
<!-- left-side menu: Feeds !-->
<menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
- <record id="mail_wallfeeds" model="ir.ui.menu">
- <field name="name">News Feed</field>
- <field name="sequence" eval="10"/>
- <field name="action" ref="action_mail_all_feeds"/>
- <field name="parent_id" ref="mail_feeds"/>
- </record>
- <record id="mail_myfeeds" model="ir.ui.menu">
- <field name="name">My Feeds</field>
- <field name="sequence" eval="11"/>
- <field name="action" ref="action_mail_my_feeds"/>
- <field name="parent_id" ref="mail_feeds"/>
- </record>
+ <menuitem id="mail_wallfeeds" name="My Feeds" parent="mail_feeds" action="action_mail_all_feeds" sequence="10"/>
+ <menuitem id="mail_myfeeds" name="My Posts" parent="mail_feeds" action="action_mail_my_feeds" sequence="11"/>
</data>
</openerp>
=== added directory 'note'
=== added file 'note/__init__.py'
--- note/__init__.py 1970-01-01 00:00:00 +0000
+++ note/__init__.py 2012-08-22 13:37:40 +0000
@@ -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
+
=== added file 'note/__openerp__.py'
--- note/__openerp__.py 1970-01-01 00:00:00 +0000
+++ note/__openerp__.py 2012-08-22 13:37:40 +0000
@@ -0,0 +1,60 @@
+# -*- 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',
+ 'version': '0.1',
+ 'category': 'Tools',
+ 'description': """
+This module allows users to create their own notes inside OpenERP
+=================================================================
+
+With this module you can allow users to take notes inside OpenERP.
+These notes can be shared with OpenERP or external users.
+They also can be organized following user dependant categories.
+Notes can be found in the 'Home' main menu, under 'Tool' submenu.
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://openerp.com',
+ 'depends': [
+ 'base_calendar',
+ 'base_tools',
+ 'mail',
+ 'pad',
+ ],
+ 'data': [
+ 'security/note_security.xml',
+ 'security/ir.model.access.csv',
+ 'note_data.xml',
+ 'note_view.xml',
+ ],
+ 'demo': [
+ 'note_demo.xml',
+ ],
+ 'css': [
+ 'static/src/css/note.css',
+ ],
+ 'installable': True,
+ 'application': True,
+ 'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added directory 'note/i18n'
=== added file 'note/note.py'
--- note/note.py 1970-01-01 00:00:00 +0000
+++ note/note.py 2012-08-22 13:37:40 +0000
@@ -0,0 +1,111 @@
+# -*- 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_stage(osv.osv):
+ """ Category of Note """
+
+ _name = "note.stage"
+ _description = "Note Stage"
+ _columns = {
+ 'name': fields.char('Category Name', size=64, required=True),
+ 'sequence': fields.integer('Sequence', help="Used to order the note stages"),
+ 'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, readonly=True),
+ 'fold': fields.boolean('Folded'),
+ }
+
+ _sql_constraints = [
+ ]
+
+ _order = 'sequence asc'
+
+ _defaults = {
+ 'fold': 0,
+ 'user_id': lambda self, cr, uid, ctx: uid,
+ 'sequence' : 1,
+ }
+
+
+class note_note(osv.osv):
+ """ Note """
+ _name = 'note.note'
+ _inherit = ['mail.thread','pad.common']
+ _pad_fields = ['note_pad']
+ _description = "Note"
+
+ def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for note in self.browse(cr, uid, ids, context=context):
+ res[note.id] = note.note.split('\n')[0]
+ return res
+
+ def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
+ #
+ # todo should set the pad first line (as title)
+ #
+ return self.write(cr, uid, [id], {'name': value}, context=context)
+
+
+ def _get_default_stage_id(self,cr,uid,context=None):
+ id = self.pool.get('note.stage').search(cr,uid,[('sequence','=','1')])
+ return id[0]
+
+ def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+ access_rights_uid = access_rights_uid or uid
+ stage_obj = self.pool.get('note.stage')
+
+ # only show stage groups not folded and owned by user
+ search_domain = [('fold', '=', False),('user_id', '=', uid)]
+
+ stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
+ result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
+ return result
+
+ def stage_set(self,cr,uid,ids,stage_id,context=None):
+ self.write(cr,uid,ids,{'stage_id': stage_id})
+
+ _columns = {
+ 'name': fields.function(_get_note_first_line,_fnct_inv=_set_note_first_line, string='Note Summary', type="text", store=True),
+ 'note': fields.text('Pad Content'),
+ 'note_pad_url': fields.char('Pad Url', size=250),
+ 'sequence': fields.integer('Sequence'),
+ 'stage_id': fields.many2one('note.stage', 'Stage'),
+ 'active': fields.boolean('Active'),
+ 'color': fields.integer('Color Index'),
+ 'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")
+ }
+
+ _sql_constraints = [
+ ]
+
+ _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 = {
+ 'stage_id' : _read_group_stage_ids,
+ }
=== added file 'note/note_data.xml'
--- note/note_data.xml 1970-01-01 00:00:00 +0000
+++ note/note_data.xml 2012-08-22 13:37:40 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+ <data noupdate="1">
+
+ <record model="note.stage" id="note_stage_01">
+ <field name="name">Todo 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">Todo later</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">For information</field>
+ <field name="sequence">3</field>
+ <field name="user_id" eval="ref('base.user_root')"/>
+ </record>
+
+ </data>
+</openerp>
=== added file 'note/note_demo.xml'
--- note/note_demo.xml 1970-01-01 00:00:00 +0000
+++ note/note_demo.xml 2012-08-22 13:37:40 +0000
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <record id="note_1" model="note.note">
+ <field name="note"><![CDATA[Buying list
+ * coffee
+ * fruits
+ * ice cream
+ * towels
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_01"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="color">2</field>
+ </record>
+ <record id="note_2" model="note.note">
+ <field name="note"><![CDATA[Buying list
+ * more coffee
+ * tee
+ * sugar
+ * towels
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_01"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ <record id="note_3" model="note.note">
+ <field name="note"><![CDATA[Idea to develop
+ * Phasellus vel eros lorem, vel tristique risus.
+ * Cras elementum risus ut massa bibendum ac sollicitudin quam feugiat.
+ * Phasellus ullamcorper mauris quis lectus volutpat non dignissim elit lacinia.
+
+ Nulla vitae metus risus, nec placerat diam.
+ Proin quis nunc sodales dolor tempus eleifend.
+ Praesent iaculis libero ut orci egestas a dapibus libero ornare.
+
+ * Proin at nisl sit amet ante feugiat euismod nec at orci.
+ * Nam aliquam massa id neque tincidunt eu pellentesque neque euismod.
+ * Proin eget mi sit amet erat tempus pellentesque.
+
+ * Phasellus congue est lectus, vitae semper arcu.
+ * Suspendisse sodales tortor ut odio volutpat fringilla.
+ * Vestibulum mattis est quis risus dignissim sit amet faucibus nisl mattis.
+ * Pellentesque ullamcorper neque neque, vitae rhoncus massa.
+
+ Ut id magna massa, quis scelerisque sapien.
+
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_01"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ <record id="note_4" model="note.note">
+ <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
+ * Open ERP Version 6: a modern approach to integrated business management
+ * Open ERP for Retail and Industrial Management
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_02"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ <record id="note_5" model="note.note">
+ <field name="note"><![CDATA[New computer specs
+ * Motherboard
+ according to processor
+ * Processor
+ need to decide
+ * Graphic card
+ with great performance for games !
+ * Hard drive
+ big, for lot of internet backups
+ * Tower
+ silent, better when watching films
+ * Blueray drive ?
+ is it interesting yet ?
+ * Screen
+ a big one, full of pixels, of course !
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_02"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="color">3</field>
+ </record>
+
+ <record id="note_6" model="note.note">
+ <field name="note"><![CDATA[Read those books
+ * Open ERP Version 6: a modern approach to integrated business management
+ * Open ERP for Retail and Industrial Management
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_02"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ <record id="note_7" model="note.note">
+ <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
+ * Open ERP Version 6: a modern approach to integrated business management
+ * Open ERP for Retail and Industrial Management
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_03"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ <record id="note_8" model="note.note">
+ <field name="note"><![CDATA[Read those books
+ * Open ERP Version 6: a modern approach to integrated business management
+ * Open ERP for Retail and Industrial Management
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_03"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="color">5</field>
+ </record>
+
+ <record id="note_9" model="note.note">
+ <field name="note"><![CDATA[Read some documentation about OpenERP before diving into the code
+ * Open ERP Version 6: a modern approach to integrated business management
+ * Open ERP for Retail and Industrial Management
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_03"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="color">7</field>
+ </record>
+
+ <record id="note_10" model="note.note">
+ <field name="note"><![CDATA[Read those books
+ * Open ERP Version 6: a modern approach to integrated business management
+ * Open ERP for Retail and Industrial Management
+ ]]>
+ </field>
+ <field name="note_pad"></field>
+ <field name="stage_id" ref="note_stage_03"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ </data>
+</openerp>
=== added file 'note/note_view.xml'
--- note/note_view.xml 1970-01-01 00:00:00 +0000
+++ note/note_view.xml 2012-08-22 13:37:40 +0000
@@ -0,0 +1,190 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
+
+ <!-- Override original action to modify its name -->
+ <record id="action_crm_meeting" model="ir.actions.act_window">
+ <field name="name">Calendar</field>
+ <field name="res_model">crm.meeting</field>
+ <field name="view_mode">calendar,tree,form,gantt</field>
+ <field name="view_id" ref="base_calendar.view_crm_meeting_calendar"/>
+ <field name="search_view_id" ref="base_calendar.view_crm_meeting_search"/>
+ <field name="context">{"calendar_default_user_id": uid}</field>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to schedule a new meeting.
+ </p><p>
+ The agenda is shared between employees and fully integrated with
+ other applications such as the employee holidays or the business
+ opportunities.
+ </p>
+ </field>
+ </record>
+ <menuitem name="Calendar" id="note_agenda" parent="note_my_stuff" action="action_crm_meeting" sequence="10"/>
+
+ <!-- Override original action to modify its name and context -->
+ <record id="action_partner_form" model="ir.actions.act_window">
+ <field name="name">Contacts</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">res.partner</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">kanban,tree,form</field>
+ <field name="search_view_id" ref="base.view_res_partner_filter"/>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to add a contact in your address book.
+ </p><p>
+ OpenERP helps you easily track all activities related to
+ a customer; discussions, history of business opportunities,
+ documents, etc.
+ </p>
+ </field>
+ </record>
+ <menuitem name="Contacts" id="note_contacts" parent="note_my_stuff" action="action_partner_form" sequence="30"/>
+
+ <!-- Note Stage Form View -->
+ <record model="ir.ui.view" id="view_note_stage_form">
+ <field name="name">note.stage.form</field>
+ <field name="model">note.stage</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Stage of Notes" version="7.0">
+ <group>
+ <field name="name"/>
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <!-- Note Stage Tree View -->
+ <record model="ir.ui.view" id="view_note_stage_tree">
+ <field name="name">note.stage.tree</field>
+ <field name="model">note.stage</field>
+ <field name="type">tree</field>
+ <field name="field_parent"></field>
+ <field name="arch" type="xml">
+ <tree string="Stages of notes" editable="top">
+ <field name="sequence" invisible="1"/>
+ <field name="name"/>
+ <field name="fold"/>
+ </tree>
+ </field>
+ </record>
+
+ <!-- Note Stage Action -->
+ <record model="ir.actions.act_window" id="action_note_stage">
+ <field name="name">Stages</field>
+ <field name="res_model">note.stage</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="domain">[('user_id','=',uid)]</field>
+ </record>
+
+ <menuitem name="Categories"
+ id="menu_notes_stage" parent="note_my_stuff" action="action_note_stage" sequence="40" groups="base.group_no_one"/>
+
+ <!-- New Note Kanban View -->
+ <record model="ir.ui.view" id="view_note_note_kanban">
+ <field name="name">note.note.kanban</field>
+ <field name="model">note.note</field>
+ <field name="type">kanban</field>
+ <field name="arch" type="xml">
+ <kanban default_group_by="stage_id">
+ <field name="color"/>
+ <field name="sequence"/>
+ <field name="name"/>
+ <field name="stage_id"/>
+ <field name="active"/>
+ <field name="note"/>
+ <field name="follower_ids"/>
+ <templates>
+ <t t-name="kanban-box">
+ <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+ <!-- dropdown menu -->
+ <div class="oe_dropdown_toggle oe_dropdown_kanban">
+ <span class="oe_e">í</span>
+ <ul class="oe_dropdown_menu">
+ <li><a type="edit">Edit...</a></li>
+ <li><a type="delete">Delete</a></li>
+ <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+ </ul>
+ </div>
+
+ <!-- kanban note -->
+ <div class="oe_kanban_content">
+ <!-- title -->
+ <field name="name"/>
+ </div>
+
+ <div class="oe_kanban_project_avatars">
+ <t t-foreach="record.follower_ids.raw_value" t-as="follower">
+ <img t-att-src="kanban_image('res.users', 'image_small', follower)" t-att-data-member_id="follower"/>
+ </t>
+ </div>
+ </div>
+ <div class="oe_clear"></div>
+ </t>
+ </templates>
+ </kanban>
+ </field>
+ </record>
+
+ <!-- New Note Form View -->
+ <record model="ir.ui.view" id="view_note_note_form">
+ <field name="name">note.note.form</field>
+ <field name="model">note.note</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Note" version="7.0">
+ <header>
+ <!-- todo: remove domain -->
+ <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+ </header>
+ <field name="note"/>
+ <field name="note_pad_url"/>
+ <div class="oe_chatter">
+ <field name="message_ids" widget="mail_thread"/>
+ </div>
+ </form>
+ </field>
+ </record>
+
+ <!-- Search Note -->
+ <record model="ir.ui.view" id="view_note_note_filter">
+ <field name="name">note.note.search</field>
+ <field name="model">note.note</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Notes">
+ <field name="note" string="Note"/>
+ <field name="stage_id"/>
+ <group expand="0" string="Group By...">
+ <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
+ <filter icon="terp-stock_symbol-selection" string="Stage" help="By Note Category" context="{'group_by':'stage_id'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <!-- New Note Tree View -->
+ <record model="ir.ui.view" id="view_note_note_tree">
+ <field name="name">note.note.tree</field>
+ <field name="model">note.note</field>
+ <field name="type">tree</field>
+ </record>
+
+ <!-- Note Action -->
+ <record model="ir.actions.act_window" id="action_note_note">
+ <field name="name">Notes</field>
+ <field name="res_model">note.note</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">kanban,tree,form</field>
+ <field name="search_view_id" ref="view_note_note_filter"/>
+ </record>
+
+ <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
+
+ </data>
+</openerp>
=== added directory 'note/security'
=== added file 'note/security/ir.model.access.csv'
--- note/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
+++ note/security/ir.model.access.csv 2012-08-22 13:37:40 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_note_stage_user,note.stage user,model_note_stage,base.group_user,1,1,1,1
+access_note_note_user,note.note user,model_note_note,base.group_user,1,1,1,1
=== added file 'note/security/note_security.xml'
--- note/security/note_security.xml 1970-01-01 00:00:00 +0000
+++ note/security/note_security.xml 2012-08-22 13:37:40 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+ <record id="note_note_global" model="ir.rule">
+ <field name="name">My notes</field>
+ <field ref="model_note_note" name="model_id"/>
+ <field eval="1" name="global"/>
+ <field name="domain_force">[('follower_ids','=',user.id)]</field>
+ </record>
+</data>
+</openerp>
+
=== added directory 'note/static'
=== added directory 'note/static/src'
=== added directory 'note/static/src/css'
=== added file 'note/static/src/css/Makefile'
--- note/static/src/css/Makefile 1970-01-01 00:00:00 +0000
+++ note/static/src/css/Makefile 2012-08-22 13:37:40 +0000
@@ -0,0 +1,3 @@
+note.css: note.sass
+ sass -t expanded note.sass note.css
+
=== added file 'note/static/src/css/note.css'
--- note/static/src/css/note.css 1970-01-01 00:00:00 +0000
+++ note/static/src/css/note.css 2012-08-22 13:37:40 +0000
@@ -0,0 +1,81 @@
+
+
+.openerp .oe_fold_column .oe_kanban_card {
+ text-decoration:none;
+ color:#000;
+ display:block;
+ padding:1em;
+ margin-right: 1em;
+ margin-bottom: 1em;
+
+ -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
+ -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+ box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+}
+
+.oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(-2deg);
+ -o-transform: rotate(-2deg);
+ -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(4deg);
+ -o-transform: rotate(4deg);
+ -moz-transform:rotate(4deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(2deg);
+ -o-transform: rotate(2deg);
+ -moz-transform:rotate(2deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(-3deg);
+ -o-transform: rotate(-3deg);
+ -moz-transform:rotate(-3deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(-2deg);
+ -o-transform: rotate(-2deg);
+ -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(-1deg);
+ -o-transform: rotate(-1deg);
+ -moz-transform:rotate(-1deg);
+}
+
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
+{
+ box-shadow:10px 10px 7px rgba(0,0,0,.7);
+ -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
+ -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
+ -webkit-transform: rotate(0);
+ -moz-transform: rotate(0);
+ -o-transform: rotate(0);
+ position:relative;
+ z-index:5;
+}
=== added file 'note/static/src/css/note.sass'
--- note/static/src/css/note.sass 1970-01-01 00:00:00 +0000
+++ note/static/src/css/note.sass 2012-08-22 13:37:40 +0000
@@ -0,0 +1,137 @@
+@charset "utf-8"
+
+// Variables {{{
+$section-title-color: #8786b7
+$tag-bg-light: #f0f0fa
+$tag-bg-dark: #8786b7
+$tag-border: #afafb6
+$tag-border-selected: #a6a6fe
+$hover-background: #f0f0fa
+$link-color: #8a89ba
+$sheet-max-width: 860px
+// }}}
+// Mixins {{{
+@font-face
+ font-family: 'mnmliconsRegular'
+ src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
+@font-face
+ font-family: 'EntypoRegular'
+ src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+ src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+ src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+ src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
+@mixin reset()
+ border: none
+ padding: 0
+ margin: 0
+ background: none
+ @include radius(none)
+ @include box-shadow(none)
+
+@mixin vertical-gradient($startColor: #555, $endColor: #333)
+ background-color: $startColor
+ background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */
+ background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
+ background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+ background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
+ background-image: linear-gradient(to bottom, $startColor, $endColor)
+
+@mixin radial-gradient($gradient)
+ background-position: center center
+ background-image: -webkit-radial-gradient(circle, $gradient)
+ background-image: -moz-radial-gradient($gradient)
+ background-image: -ms-radial-gradient($gradient)
+ background-image: radial-gradient($gradient)
+
+@mixin radius($radius: 5px)
+ -moz-border-radius: $radius
+ -webkit-border-radius: $radius
+ border-radius: $radius
+
+@mixin box-shadow($bsval: 0px 1px 4px #777)
+ -moz-box-shadow: $bsval
+ -webkit-box-shadow: $bsval
+ box-shadow: $bsval
+
+@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s))
+ -webkit-transition: $transval
+ -moz-transition: $transval
+ -ms-transition: $transval
+ -o-transition: $transval
+ transition: $transval
+
+@mixin opacity($opacity: .5)
+ filter: alpha(opacity=$opacity * 100)
+ opacity: $opacity
+
+@mixin background-clip($clip: padding-box)
+ -webkit-background-clip: $clip
+ -moz-background-clip: $clip
+ background-clip: $clip
+
+@mixin box-sizing($type: content)
+ // type = border || content || padding
+ -webkit-box-sizing: #{$type}-box
+ -moz-box-sizing: #{$type}-box
+ -ms-box-sizing: #{$type}-box
+ box-sizing: #{$type}-box
+
+// Transforms the (readable) text of an inline element into an mmlicons icon,
+// allows for actual readable text in-code (and in readers?) with iconic looks
+@mixin text-to-icon($icon-name, $color: #404040)
+ font-size: 1px
+ letter-spacing: -1px
+ color: transparent
+ &:before
+ font: 21px "mnmliconsRegular"
+ content: $icon-name
+ color: $color
+
+// }}}
+// CSS animation bounces {{{
+@-moz-keyframes bounce
+ 0%
+ -moz-transform: scale(0)
+ opacity: 0
+ 50%
+ -moz-transform: scale(1.3)
+ opacity: 0.4
+ 75%
+ -moz-transform: scale(0.9)
+ opacity: 0.7
+ 100%
+ -moz-transform: scale(1)
+ opacity: 1
+
+@-webkit-keyframes bounce
+ 0%
+ -webkit-transform: scale(0)
+ opacity: 0
+ 50%
+ -webkit-transform: scale(1.3)
+ opacity: 0.4
+ 75%
+ -webkit-transform: scale(0.9)
+ opacity: 0.7
+ 100%
+ -webkit-transform: scale(1)
+ opacity: 1
+// }}}
+
+
+.oe_kanban_color_2
+ background-color:red
+
+// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
+
=== modified file 'project/project.py'
--- project/project.py 2012-08-15 20:51:43 +0000
+++ project/project.py 2012-08-22 13:37:40 +0000
@@ -250,9 +250,6 @@
type='many2many', relation='res.users', string='Followers'),
}
- def dummy(self, cr, uid, ids, context):
- return True
-
def _get_type_common(self, cr, uid, context):
ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
return ids
@@ -526,7 +523,7 @@
mail_alias = self.pool.get('mail.alias')
if not vals.get('alias_id'):
vals.pop('alias_name', None) # prevent errors during copy()
- alias_id = mail_alias.create_unique_alias(cr, uid,
+ alias_id = mail_alias.create_unique_alias(cr, uid,
# Using '+' allows using subaddressing for those who don't
# have a catchall domain setup.
{'alias_name': "project+"+short_name(vals['name'])},
=== modified file 'project_timesheet/__openerp__.py'
--- project_timesheet/__openerp__.py 2012-07-16 09:45:48 +0000
+++ project_timesheet/__openerp__.py 2012-08-22 13:37:40 +0000
@@ -35,12 +35,12 @@
'website': 'http://www.openerp.com',
'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
- 'init_xml': ['project_timesheet_data.xml'],
+ 'init_xml': [],
'update_xml': [
"security/ir.model.access.csv",
"security/project_timesheet_security.xml",
- "process/project_timesheet_process.xml",
- "report/task_report_view.xml",
+ "process/project_timesheet_process.xml",
+ "report/task_report_view.xml",
"project_timesheet_view.xml",
],
'demo_xml': ["project_timesheet_demo.xml"],
=== removed file 'project_timesheet/project_timesheet_data.xml'
--- project_timesheet/project_timesheet_data.xml 2012-02-27 11:05:35 +0000
+++ project_timesheet/project_timesheet_data.xml 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data>
-
- <!-- <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
- <field name="name">Time Tracking</field>
- <field eval="5" name="sequence"/>
- <field name="parent_id" ref="base.menu_main_pm"/>
- </record>
-
- <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
- <field name="name">My Timesheet</field>
- <field eval="5" name="sequence"/>
- <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
- <field name="icon">STOCK_JUSTIFY_FILL</field>
- <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
- </record> -->
-
- </data>
-</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
