diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml
index 4d4c88306b5..a1707509256 100644
--- a/openerp/addons/base/ir/ir_config_parameter_view.xml
+++ b/openerp/addons/base/ir/ir_config_parameter_view.xml
@@ -29,8 +29,10 @@
form
-
-
+
+
+
+
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index a0e37b45e5a..6243abb4d5e 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -17,16 +17,14 @@
form
-
+
-
+
-
-
-
-
-
+
+
+
@@ -76,4 +74,4 @@
-
\ No newline at end of file
+
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 15d250a7489..505f5925025 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -278,7 +278,7 @@ class ir_ui_menu(osv.osv):
'menu_id', 'gid', 'Groups', help="If you have groups, the visibility of this menu will be based on these groups. "\
"If this field is empty, OpenERP will compute visibility based on the related object's read access."),
'complete_name': fields.function(_get_full_name,
- string='Complete Name', type='char', size=128),
+ string='Full Path', type='char', size=128),
'icon': fields.selection(tools.icons, 'Icon', size=64),
'icon_pict': fields.function(_get_icon_pict, type='char', size=32),
'web_icon': fields.char('Web Icon File', size=128),
diff --git a/openerp/addons/base/ir/wizard/wizard_menu_view.xml b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
index d99138d00e6..f8666e5421e 100644
--- a/openerp/addons/base/ir/wizard/wizard_menu_view.xml
+++ b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
@@ -1,21 +1,19 @@
-
Create Menuwizard.ir.model.menu.createform
@@ -107,14 +107,14 @@
search
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 29298c2028c..5eb4f1232ef 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -143,7 +143,6 @@ class res_partner(osv.osv):
'comment': fields.text('Notes'),
'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'), # should be removed in version 7, but kept until then for backward compatibility
'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Tags'),
- 'events': fields.one2many('res.partner.event', 'partner_id', 'Events'),
'credit_limit': fields.float(string='Credit Limit'),
'ean13': fields.char('EAN13', size=13),
'active': fields.boolean('Active'),
@@ -205,7 +204,7 @@ class res_partner(osv.osv):
if default is None:
default = {}
name = self.read(cr, uid, [id], ['name'], context)[0]['name']
- default.update({'name': _('%s (copy)')%(name), 'events':[]})
+ default.update({'name': _('%s (copy)')%(name)})
return super(res_partner, self).copy(cr, uid, id, default, context)
def onchange_type(self, cr, uid, ids, is_company, context=None):
diff --git a/openerp/addons/base/res/res_partner_event.py b/openerp/addons/base/res/res_partner_event.py
deleted file mode 100644
index 4425b7e6984..00000000000
--- a/openerp/addons/base/res/res_partner_event.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# 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 .
-#
-##############################################################################
-
-import time
-from osv import osv
-from osv import fields
-
-class res_partner_event(osv.osv):
- _name = "res.partner.event"
- _columns = {
- 'name': fields.char('Events', size=64, required=True),
- 'description': fields.text('Description'),
- 'partner_id': fields.many2one('res.partner', 'Partner', select=True),
- 'date': fields.datetime('Date', size=16),
- 'user_id': fields.many2one('res.users', 'User'),
- }
- _order = 'date desc'
- _defaults = {
- 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
- 'user_id': lambda self, cr, uid, context: uid,
- }
-res_partner_event()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_partner_event_view.xml b/openerp/addons/base/res/res_partner_event_view.xml
deleted file mode 100644
index 4c164176202..00000000000
--- a/openerp/addons/base/res/res_partner_event_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
- res.partner.event.form
- res.partner.event
- form
-
-
-
diff --git a/openerp/addons/base/res/wizard/partner_wizard_ean_check.py b/openerp/addons/base/res/wizard/partner_wizard_ean_check.py
deleted file mode 100644
index 14b863439bb..00000000000
--- a/openerp/addons/base/res/wizard/partner_wizard_ean_check.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# 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 .
-#
-##############################################################################
-
-import math
-from osv import osv
-from tools.misc import UpdateableStr
-import pooler
-
-class partner_wizard_ean_check(osv.osv_memory):
- """ Ean check """
-
- _name = "partner.wizard.ean.check"
- _description = "Ean Check"
-
- def is_pair(x):
- return not x%2
-
- def get_ean_key(string):
- if not string or string=='':
- return '0'
- if len(string)!=12:
- return '0'
- sum = 0
- for i in range(12):
- if is_pair(i):
- sum = sum + int(string[i])
- else:
- sum = sum + 3*int(string[i])
- return str(int(math.ceil(sum/10.0)*10-sum))
-
- def default_get(self, cr, fields, context):
- partner_table = self.pool.get('res.partner')
- ids = context.get('active_ids')
- partners = partner_table.browse(cr, uid, ids)
- _check_arch_lst = ['', '
', '', '','', '']
- for partner in partners:
- if partner['ean13'] and len(partner['ean13'])>11 and len(partner['ean13'])<14:
- _check_arch_lst.append('' % partner['ean13']);
- key = get_ean_key(partner['ean13'][:12])
- _check_arch_lst.append('')
- if len(partner['ean13'])==12:
- _check_arch_lst.append('');
- else:
- _check_arch_lst.append('' % partner['ean13'][12])
- _check_arch_lst.append('' % key)
- _check_arch_lst.append('
-
-
-
-
- Ean check
- ir.actions.act_window
- partner.wizard.ean.check
- form
- form
- new
-
-
-
-
\ No newline at end of file
diff --git a/openerp/addons/base/res/wizard/partner_wizard_massmail.py b/openerp/addons/base/res/wizard/partner_wizard_massmail.py
deleted file mode 100644
index cc1b80a1710..00000000000
--- a/openerp/addons/base/res/wizard/partner_wizard_massmail.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# 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 .
-#
-##############################################################################
-
-from osv import fields, osv
-import re
-import logging
-
-_logger = logging.getLogger(__name__)
-
-class partner_massmail_wizard(osv.osv_memory):
- """ Mass Mailing """
-
- _name = "partner.massmail.wizard"
- _description = "Mass Mailing"
-
- _columns = {
- 'email_from': fields.char("Sender's email", size=256, required=True),
- 'subject': fields.char('Subject', size=256,required=True),
- 'text': fields.text('Message',required=True),
- }
-
- def mass_mail_send(self, cr, uid, ids, context):
- """Send the given mail to all partners whose ids
- are present in ``context['active_ids']``, to
- all addresses with an email set.
-
- :param dict context: ``context['active_ids']``
- should contain the list of
- ids of the partners who should
- receive the mail.
- """
- nbr = 0
- partner_pool = self.pool.get('res.partner')
- data = self.browse(cr, uid, ids[0], context=context)
- event_pool = self.pool.get('res.partner.event')
- assert context['active_model'] == 'res.partner', 'This wizard must be started on a list of Partners'
- active_ids = context.get('active_ids', [])
- partners = partner_pool.browse(cr, uid, active_ids, context)
- subtype = 'plain'
- if re.search('(<(pre)|[pubi].*>)', data.text):
- subtype = 'html'
- ir_mail_server = self.pool.get('ir.mail_server')
- emails_seen = set()
- for partner in partners:
- for adr in partner.child_ids:
- if adr.is_company:
- #we don't want to consider child companies but only the contacts
- continue
- if adr.email and not adr.email in emails_seen:
- try:
- emails_seen.add(adr.email)
- name = adr.name or partner.name
- to = '"%s" <%s>' % (name, adr.email)
- msg = ir_mail_server.build_email(data.email_from, [to], data.subject, data.text, subtype=subtype)
- if ir_mail_server.send_email(cr, uid, msg):
- nbr += 1
- except Exception:
- #ignore failed deliveries, will be logged anyway
- pass
- event_pool.create(cr, uid,
- {'name': 'Email(s) sent through mass mailing',
- 'partner_id': partner.id,
- 'description': data.text })
- _logger.info('Mass-mailing wizard sent %s emails', nbr)
- return {'email_sent': nbr}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/wizard/partner_wizard_massmail_view.xml b/openerp/addons/base/res/wizard/partner_wizard_massmail_view.xml
deleted file mode 100644
index 864550b4396..00000000000
--- a/openerp/addons/base/res/wizard/partner_wizard_massmail_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- Mass Mailing
- partner.massmail.wizard
- form
-
-