-
-
-
-
-
- |
- |
-
- |
-
-
-
-
-
- 
- |
-
-
-
-
-
-
-
- |
-
-
-
-
-
- 
-
+
- Customers
+ Contacts
ir.actions.act_window
res.partner
form
- kanban
+ tree,form,kanban
{"search_default_customer":1}
A customer is an entity you do business with, like a company or an organization. A customer can have several contacts or addresses which are the people working for this company. You can use the history tab, to follow all transactions related to a customer: sales order, emails, opportunities, claims, etc. If you use the email gateway, the Outlook or the Thunderbird plugin, don't forget to register emails to each contact so that the gateway will automatically attach incoming emails to the right partner.
- tree
- kanban
+
- form
-
+
+ tree
+
+
Customers
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 2617efeb4a2..63892ebd869 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -25,17 +25,20 @@ from functools import partial
import pytz
-import netsvc
-import pooler
-import tools
-from osv import fields,osv
-from osv.orm import browse_record
-from service import security
-from tools.translate import _
-import openerp
-import openerp.exceptions
+import io, StringIO
from lxml import etree
from lxml.builder import E
+import netsvc
+import openerp
+import openerp.exceptions
+from osv import fields,osv
+from osv.orm import browse_record
+from PIL import Image
+import pooler
+import random
+from service import security
+import tools
+from tools.translate import _
_logger = logging.getLogger(__name__)
@@ -110,21 +113,6 @@ class groups(osv.osv):
aid.write({'groups_id': [(4, gid)]})
return gid
- def unlink(self, cr, uid, ids, context=None):
- group_users = []
- for record in self.read(cr, uid, ids, ['users'], context=context):
- if record['users']:
- group_users.extend(record['users'])
- if group_users:
- user_names = [user.name for user in self.pool.get('res.users').browse(cr, uid, group_users, context=context)]
- user_names = list(set(user_names))
- if len(user_names) >= 5:
- user_names = user_names[:5] + ['...']
- raise osv.except_osv(_('Warning !'),
- _('Group(s) cannot be deleted, because some user(s) still belong to them: %s !') % \
- ', '.join(user_names))
- return super(groups, self).unlink(cr, uid, ids, context=context)
-
def get_extended_interface_group(self, cr, uid, context=None):
data_obj = self.pool.get('ir.model.data')
extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')
@@ -203,7 +191,6 @@ class users(osv.osv):
self.write(cr, uid, ids, {'groups_id': [(4, extended_group_id)]}, context=context)
return True
-
def _get_interface_type(self, cr, uid, ids, name, args, context=None):
"""Implementation of 'view' function field getter, returns the type of interface of the users.
@param field_name: Name of the field
@@ -215,6 +202,33 @@ class users(osv.osv):
extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users']
return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids]))
+ def onchange_avatar(self, cr, uid, ids, value, context=None):
+ if not value:
+ return {'value': {'avatar_big': value, 'avatar': value} }
+ return {'value': {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context), 'avatar': self._avatar_resize(cr, uid, value, context=context)} }
+
+ def _set_avatar(self, cr, uid, id, name, value, args, context=None):
+ if not value:
+ vals = {'avatar_big': value}
+ else:
+ vals = {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context)}
+ return self.write(cr, uid, [id], vals, context=context)
+
+ def _avatar_resize(self, cr, uid, avatar, height=180, width=150, context=None):
+ image_stream = io.BytesIO(avatar.decode('base64'))
+ img = Image.open(image_stream)
+ img.thumbnail((height, width), Image.ANTIALIAS)
+ img_stream = StringIO.StringIO()
+ img.save(img_stream, "PNG")
+ return img_stream.getvalue().encode('base64')
+
+ def _get_avatar(self, cr, uid, ids, name, args, context=None):
+ result = dict.fromkeys(ids, False)
+ for user in self.browse(cr, uid, ids, context=context):
+ if user.avatar_big:
+ result[user.id] = self._avatar_resize(cr, uid, user.avatar_big, context=context)
+ return result
+
def _set_new_password(self, cr, uid, id, name, value, args, context=None):
if value is False:
# Do not update the password if no value is provided, ignore silently.
@@ -244,6 +258,11 @@ class users(osv.osv):
"otherwise leave empty. After a change of password, the user has to login again."),
'user_email': fields.char('Email', size=64),
'signature': fields.text('Signature', size=64),
+ 'avatar_big': fields.binary('Big-sized avatar', help="This field holds the image used as avatar for the user. The avatar field is used as an interface to access this field. The image is base64 encoded, and PIL-supported. It is stored as a 540x450 px image, in case a bigger image must be used."),
+ 'avatar': fields.function(_get_avatar, fnct_inv=_set_avatar, string='Avatar', type="binary",
+ store = {
+ 'res.users': (lambda self, cr, uid, ids, c={}: ids, ['avatar_big'], 10),
+ }, help="Image used as avatar for the user. It is automatically resized as a 180x150 px image. This field serves as an interface to the avatar_big field."),
'active': fields.boolean('Active'),
'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
@@ -355,9 +374,15 @@ class users(osv.osv):
pass
return result
+ def _get_avatar(self, cr, uid, context=None):
+ # default avatar file name: avatar0 -> avatar6.png, choose randomly
+ avatar_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
+ return self._avatar_resize(cr, uid, open(avatar_path, 'rb').read().encode('base64'), context=context)
+
_defaults = {
'password' : '',
'context_lang': 'en_US',
+ 'avatar': _get_avatar,
'active' : True,
'menu_id': _get_menu,
'company_id': _get_company,
diff --git a/openerp/addons/base/res/wizard/partner_wizard_massmail.py b/openerp/addons/base/res/wizard/partner_wizard_massmail.py
index 330d585de98..cc1b80a1710 100644
--- a/openerp/addons/base/res/wizard/partner_wizard_massmail.py
+++ b/openerp/addons/base/res/wizard/partner_wizard_massmail.py
@@ -60,7 +60,10 @@ class partner_massmail_wizard(osv.osv_memory):
ir_mail_server = self.pool.get('ir.mail_server')
emails_seen = set()
for partner in partners:
- for adr in partner.address:
+ 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)
diff --git a/openerp/addons/base/security/ir.model.access-1.csv b/openerp/addons/base/security/ir.model.access-1.csv
new file mode 100644
index 00000000000..071458f2b8f
--- /dev/null
+++ b/openerp/addons/base/security/ir.model.access-1.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_res_partner_address_group_partner_manager","res_partner_address group_partner_manager","model_res_partner_address","group_partner_manager",1,1,1,1
+"access_res_partner_address_group_user","res_partner_address group_user","model_res_partner_address","group_user",1,0,0,0
+"access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 59ebafb2f99..5140ac1b144 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -55,8 +55,6 @@
"access_res_lang_group_user","res_lang group_user","model_res_lang","group_system",1,1,1,1
"access_res_partner_group_partner_manager","res_partner group_partner_manager","model_res_partner","group_partner_manager",1,1,1,1
"access_res_partner_group_user","res_partner group_user","model_res_partner","group_user",1,0,0,0
-"access_res_partner_address_group_partner_manager","res_partner_address group_partner_manager","model_res_partner_address","group_partner_manager",1,1,1,1
-"access_res_partner_address_group_user","res_partner_address group_user","model_res_partner_address","group_user",1,0,0,0
"access_res_partner_bank_group_user","res_partner_bank group_user","model_res_partner_bank","group_user",1,0,0,0
"access_res_partner_bank_group_partner_manager","res_partner_bank group_partner_manager","model_res_partner_bank","group_partner_manager",1,1,1,1
"access_res_partner_bank_type_group_partner_manager","res_partner_bank_type group_partner_manager","model_res_partner_bank_type","group_partner_manager",1,1,1,1
@@ -117,7 +115,6 @@
"access_ir_filter all","ir_filters all","model_ir_filters",,1,0,0,0
"access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
"access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
-"access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
"access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1
"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
"access_res_log_all","res.log","model_res_log",,1,1,1,1
diff --git a/openerp/addons/base/static/src/img/avatar0.png b/openerp/addons/base/static/src/img/avatar0.png
new file mode 100644
index 00000000000..2bcc7c8d2e4
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar0.png differ
diff --git a/openerp/addons/base/static/src/img/avatar1.png b/openerp/addons/base/static/src/img/avatar1.png
new file mode 100644
index 00000000000..4f6d2f7e818
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar1.png differ
diff --git a/openerp/addons/base/static/src/img/avatar2.png b/openerp/addons/base/static/src/img/avatar2.png
new file mode 100644
index 00000000000..70d5df7ee60
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar2.png differ
diff --git a/openerp/addons/base/static/src/img/avatar3.png b/openerp/addons/base/static/src/img/avatar3.png
new file mode 100644
index 00000000000..053768aa035
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar3.png differ
diff --git a/openerp/addons/base/static/src/img/avatar4.png b/openerp/addons/base/static/src/img/avatar4.png
new file mode 100644
index 00000000000..1b2a99f05c3
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar4.png differ
diff --git a/openerp/addons/base/static/src/img/avatar5.png b/openerp/addons/base/static/src/img/avatar5.png
new file mode 100644
index 00000000000..0f6c416ecf0
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar5.png differ
diff --git a/openerp/addons/base/static/src/img/avatar6.png b/openerp/addons/base/static/src/img/avatar6.png
new file mode 100644
index 00000000000..d6a18c2779e
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar6.png differ
diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index 618108ef316..fa7a69b74e9 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -68,20 +68,20 @@
-
Testing that some domain expressions work
-
- !python {model: res.partner.address }: |
- ids = self.search(cr, uid, [('partner_id','=','Agrolait')])
+ !python {model: res.partner }: |
+ ids = self.search(cr, uid, [('parent_id','=','Agrolait')])
assert len(ids) >= 1, ids
-
Trying the "in" operator, for scalar value
-
- !python {model: res.partner.address }: |
- ids = self.search(cr, uid, [('partner_id','in','Agrolait')])
+ !python {model: res.partner }: |
+ ids = self.search(cr, uid, [('parent_id','in','Agrolait')])
assert len(ids) >= 1, ids
-
Trying the "in" operator for list value
-
- !python {model: res.partner.address }: |
- ids = self.search(cr, uid, [('partner_id','in',['Agrolait','ASUStek'])])
+ !python {model: res.partner }: |
+ ids = self.search(cr, uid, [('parent_id','in',['Agrolait','ASUStek'])])
assert len(ids) >= 1, ids
-
Check we can use "in" operator for plain fields.
@@ -92,11 +92,11 @@
-
Test one2many operator with empty search list
-
- !assert {model: res.partner, search: "[('address', 'in', [])]", count: 0, string: "Ids should be empty"}
+ !assert {model: res.partner, search: "[('child_ids', 'in', [])]", count: 0, string: "Ids should be empty"}
-
Test one2many operator with False
-
- !assert {model: res.partner, search: "[('address', '=', False)]"}:
+ !assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
- address in (False, None, [])
-
Test many2many operator with empty search list
@@ -110,7 +110,7 @@
-
Filtering on invalid value across x2many relationship should return an empty set
-
- !assert {model: res.partner, search: "[('address.city','=','foo')]", count: 0, string: "Searching for address.city = foo should give empty results"}
+ !assert {model: res.partner, search: "[('child_ids.city','=','foo')]", count: 0, string: "Searching for address.city = foo should give empty results"}
-
Check if many2one works with empty search list
-
@@ -515,7 +515,7 @@
vals = {'category_id': [(6, 0, [ref("base.res_partner_category_8")])],
'name': 'OpenERP Test',
'active': False,
- 'address': [(0, 0, {'country_id': ref("base.be")})]
+ 'child_ids': [(0, 0, {'name': 'address of OpenERP Test', 'country_id': ref("base.be")})]
}
self.create(cr, uid, vals, context=context)
res_ids = self.search(cr, uid, [('category_id', 'ilike', 'supplier'), ('active', '=', False)])
@@ -524,6 +524,6 @@
Testing for One2Many field with country Belgium and active=False
-
!python {model: res.partner }: |
- res_ids = self.search(cr, uid, [('address.country_id','=','Belgium'),('active','=',False)])
+ res_ids = self.search(cr, uid, [('child_ids.country_id','=','Belgium'),('active','=',False)])
assert len(res_ids) != 0, "Record not Found with country Belgium and active False."
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 430512c5260..efc73d44a58 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -24,41 +24,25 @@
"""
-import base64
-import imp
import itertools
import logging
import os
-import re
import sys
import threading
-import zipfile
-import zipimport
-
-from cStringIO import StringIO
-from os.path import join as opj
-from zipfile import PyZipFile, ZIP_DEFLATED
-
import openerp
import openerp.modules.db
import openerp.modules.graph
import openerp.modules.migration
-import openerp.netsvc as netsvc
import openerp.osv as osv
import openerp.pooler as pooler
import openerp.release as release
import openerp.tools as tools
-import openerp.tools.osutil as osutil
import openerp.tools.assertion_report as assertion_report
-from openerp.tools.safe_eval import safe_eval as eval
+from openerp import SUPERUSER_ID
from openerp.tools.translate import _
-from openerp.modules.module import \
- get_modules, get_modules_with_version, \
- load_information_from_description_file, \
- get_module_resource, zip_directory, \
- get_module_path, initialize_sys_path, \
+from openerp.modules.module import initialize_sys_path, \
load_openerp_module, init_module_models
_logger = logging.getLogger(__name__)
@@ -99,7 +83,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
threading.currentThread().testing = True
_load_data(cr, module_name, idref, mode, 'test')
return True
- except Exception, e:
+ except Exception:
_logger.error(
'module %s: an exception occurred in a test', module_name)
return False
@@ -178,7 +162,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
modobj = pool.get('ir.module.module')
if perform_checks:
- modobj.check(cr, 1, [module_id])
+ modobj.check(cr, SUPERUSER_ID, [module_id])
idref = {}
@@ -189,7 +173,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
if package.state=='to upgrade':
# upgrading the module information
- modobj.write(cr, 1, [module_id], modobj.get_values_from_terp(package.data))
+ modobj.write(cr, SUPERUSER_ID, [module_id], modobj.get_values_from_terp(package.data))
load_init_xml(module_name, idref, mode)
load_update_xml(module_name, idref, mode)
load_data(module_name, idref, mode)
@@ -218,9 +202,9 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
ver = release.major_version + '.' + package.data['version']
# Set new modules and dependencies
- modobj.write(cr, 1, [module_id], {'state': 'installed', 'latest_version': ver})
+ modobj.write(cr, SUPERUSER_ID, [module_id], {'state': 'installed', 'latest_version': ver})
# Update translations for all installed languages
- modobj.update_translations(cr, 1, [module_id], None)
+ modobj.update_translations(cr, SUPERUSER_ID, [module_id], None)
package.state = 'installed'
for kind in ('init', 'demo', 'update'):
@@ -257,7 +241,7 @@ def load_marked_modules(cr, graph, states, force, progressdict, report, loaded_m
while True:
cr.execute("SELECT name from ir_module_module WHERE state IN %s" ,(tuple(states),))
module_list = [name for (name,) in cr.fetchall() if name not in graph]
- new_modules_in_graph = graph.add_modules(cr, module_list, force)
+ graph.add_modules(cr, module_list, force)
_logger.debug('Updating graph with %d more modules', len(module_list))
loaded, processed = load_module_graph(cr, graph, progressdict, report=report, skip_modules=loaded_modules)
processed_modules.extend(processed)
@@ -321,15 +305,15 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
mods = [k for k in tools.config['init'] if tools.config['init'][k]]
if mods:
- ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
+ ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
if ids:
- modobj.button_install(cr, 1, ids)
+ modobj.button_install(cr, SUPERUSER_ID, ids)
mods = [k for k in tools.config['update'] if tools.config['update'][k]]
if mods:
- ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
+ ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
if ids:
- modobj.button_upgrade(cr, 1, ids)
+ modobj.button_upgrade(cr, SUPERUSER_ID, ids)
cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
@@ -339,7 +323,11 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
# partially installed modules (i.e. installed/to upgrade), to
# offer a consistent system to the second part: installing
# newly selected modules.
- states_to_load = ['installed', 'to upgrade']
+ # We include the modules 'to remove' in the first step, because
+ # they are part of the "currently installed" modules. They will
+ # be dropped in STEP 6 later, before restarting the loading
+ # process.
+ states_to_load = ['installed', 'to upgrade', 'to remove']
processed = load_marked_modules(cr, graph, states_to_load, force, status, report, loaded_modules)
processed_modules.extend(processed)
if update_module:
@@ -350,9 +338,9 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
# load custom models
cr.execute('select model from ir_model where state=%s', ('manual',))
for model in cr.dictfetchall():
- pool.get('ir.model').instanciate(cr, 1, model['model'], {})
+ pool.get('ir.model').instanciate(cr, SUPERUSER_ID, model['model'], {})
- # STEP 4: Finish and cleanup
+ # STEP 4: Finish and cleanup installations
if processed_modules:
cr.execute("""select model,name from ir_model where id NOT IN (select distinct model_id from ir_model_access)""")
for (model, name) in cr.fetchall():
@@ -377,33 +365,18 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
_logger.warning("Model %s is declared but cannot be loaded! (Perhaps a module was partially removed or renamed)", model)
# Cleanup orphan records
- pool.get('ir.model.data')._process_end(cr, 1, processed_modules)
+ pool.get('ir.model.data')._process_end(cr, SUPERUSER_ID, processed_modules)
for kind in ('init', 'demo', 'update'):
tools.config[kind] = {}
cr.commit()
- if update_module:
- # Remove records referenced from ir_model_data for modules to be
- # removed (and removed the references from ir_model_data).
- cr.execute("select id,name from ir_module_module where state=%s", ('to remove',))
- for mod_id, mod_name in cr.fetchall():
- cr.execute('select model,res_id from ir_model_data where noupdate=%s and module=%s order by id desc', (False, mod_name,))
- for rmod, rid in cr.fetchall():
- uid = 1
- rmod_module= pool.get(rmod)
- if rmod_module:
- # TODO group by module so that we can delete multiple ids in a call
- rmod_module.unlink(cr, uid, [rid])
- else:
- _logger.error('Could not locate %s to remove res=%d' % (rmod,rid))
- cr.execute('delete from ir_model_data where noupdate=%s and module=%s', (False, mod_name,))
- cr.commit()
- # Remove menu items that are not referenced by any of other
- # (child) menu item, ir_values, or ir_model_data.
- # This code could be a method of ir_ui_menu.
- # TODO: remove menu without actions of children
+ # STEP 5: Cleanup menus
+ # Remove menu items that are not referenced by any of other
+ # (child) menu item, ir_values, or ir_model_data.
+ # TODO: This code could be a method of ir_ui_menu. Remove menu without actions of children
+ if update_module:
while True:
cr.execute('''delete from
ir_ui_menu
@@ -419,9 +392,19 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
else:
_logger.info('removed %d unused menus', cr.rowcount)
- # Pretend that modules to be removed are actually uninstalled.
- cr.execute("update ir_module_module set state=%s where state=%s", ('uninstalled', 'to remove',))
- cr.commit()
+ # STEP 6: Uninstall modules to remove
+ if update_module:
+ # Remove records referenced from ir_model_data for modules to be
+ # removed (and removed the references from ir_model_data).
+ cr.execute("SELECT id FROM ir_module_module WHERE state=%s", ('to remove',))
+ mod_ids_to_remove = [x[0] for x in cr.fetchall()]
+ if mod_ids_to_remove:
+ pool.get('ir.module.module').module_uninstall(cr, SUPERUSER_ID, mod_ids_to_remove)
+ # Recursive reload, should only happen once, because there should be no
+ # modules to remove next time
+ cr.commit()
+ _logger.info('Reloading registry once more after uninstalling modules')
+ return pooler.restart_pool(cr.dbname, force_demo, status, update_module)
if report.failures:
_logger.error('At least one test failed when loading the modules.')
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 31a433855af..0a9ee57b621 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -70,6 +70,11 @@ _schema = logging.getLogger(__name__ + '.schema')
# List of etree._Element subclasses that we choose to ignore when parsing XML.
from openerp.tools import SKIPPED_ELEMENT_TYPES
+# Prefixes for external IDs of schema elements
+EXT_ID_PREFIX_FK = "_foreign_key_"
+EXT_ID_PREFIX_M2M_TABLE = "_m2m_rel_table_"
+EXT_ID_PREFIX_CONSTRAINT = "_constraint_"
+
regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I)
regex_object_name = re.compile(r'^[a-z0-9_.]+$')
@@ -100,10 +105,10 @@ def transfer_node_to_modifiers(node, modifiers, context=None, in_tree_view=False
if node.get('states'):
if 'invisible' in modifiers and isinstance(modifiers['invisible'], list):
- # TODO combine with AND or OR, use implicit AND for now.
- modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
+ # TODO combine with AND or OR, use implicit AND for now.
+ modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
else:
- modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
+ modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
for a in ('invisible', 'readonly', 'required'):
if node.get(a):
@@ -864,7 +869,10 @@ class BaseModel(object):
parent_names = [parent_names]
else:
name = cls._name
-
+ # for res.parnter.address compatiblity, should be remove in v7
+ if 'res.partner.address' in parent_names:
+ parent_names.pop(parent_names.index('res.partner.address'))
+ parent_names.append('res.partner')
if not name:
raise TypeError('_name is mandatory in case of multiple inheritance')
@@ -902,6 +910,7 @@ class BaseModel(object):
# If new class defines a constraint with
# same function name, we let it override
# the old one.
+
new[c2] = c
exist = True
break
@@ -2712,6 +2721,14 @@ class BaseModel(object):
_schema.debug("Table '%s': column '%s': dropped NOT NULL constraint",
self._table, column['attname'])
+ # quick creation of ir.model.data entry to make uninstall of schema elements easier
+ def _make_ext_id(self, cr, ext_id):
+ cr.execute('SELECT 1 FROM ir_model_data WHERE name=%s AND module=%s', (ext_id, self._module))
+ if not cr.rowcount:
+ cr.execute("""INSERT INTO ir_model_data (name,date_init,date_update,module,model)
+ VALUES (%s, now() AT TIME ZONE 'UTC', now() AT TIME ZONE 'UTC', %s, %s)""",
+ (ext_id, self._module, self._name))
+
# checked version: for direct m2o starting from `self`
def _m2o_add_foreign_key_checked(self, source_field, dest_model, ondelete):
assert self.is_transient() or not dest_model.is_transient(), \
@@ -2802,7 +2819,6 @@ class BaseModel(object):
update_custom_fields = context.get('update_custom_fields', False)
self._field_create(cr, context=context)
create = not self._table_exist(cr)
-
if getattr(self, '_auto', True):
if create:
@@ -3037,7 +3053,7 @@ class BaseModel(object):
cr.commit() # start a new transaction
- self._add_sql_constraints(cr)
+ self._add_sql_constraints(cr, context["module"])
if create:
self._execute_sql(cr)
@@ -3048,11 +3064,11 @@ class BaseModel(object):
return todo_end
-
def _auto_end(self, cr, context=None):
""" Create the foreign keys recorded by _auto_init. """
for t, k, r, d in self._foreign_keys:
cr.execute('ALTER TABLE "%s" ADD FOREIGN KEY ("%s") REFERENCES "%s" ON DELETE %s' % (t, k, r, d))
+ self._make_ext_id(cr, "%s%s_%s_fkey" % (EXT_ID_PREFIX_FK, t, k))
cr.commit()
del self._foreign_keys
@@ -3131,6 +3147,7 @@ class BaseModel(object):
def _o2m_raise_on_missing_reference(self, cr, f):
# TODO this check should be a method on fields.one2many.
+
other = self.pool.get(f._obj)
if other:
# TODO the condition could use fields_get_keys().
@@ -3138,9 +3155,9 @@ class BaseModel(object):
if f._fields_id not in other._inherit_fields.keys():
raise except_orm('Programming Error', ("There is no reference field '%s' found for '%s'") % (f._fields_id, f._obj,))
-
def _m2m_raise_or_create_relation(self, cr, f):
m2m_tbl, col1, col2 = f._sql_names(self)
+ self._make_ext_id(cr, EXT_ID_PREFIX_M2M_TABLE + m2m_tbl)
cr.execute("SELECT relname FROM pg_class WHERE relkind IN ('r','v') AND relname=%s", (m2m_tbl,))
if not cr.dictfetchall():
if not self.pool.get(f._obj):
@@ -3148,7 +3165,6 @@ class BaseModel(object):
dest_model = self.pool.get(f._obj)
ref = dest_model._table
cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s")) WITH OIDS' % (m2m_tbl, col1, col2, col1, col2))
-
# create foreign key references with ondelete=cascade, unless the targets are SQL views
cr.execute("SELECT relkind FROM pg_class WHERE relkind IN ('v') AND relname=%s", (ref,))
if not cr.fetchall():
@@ -3164,7 +3180,7 @@ class BaseModel(object):
_schema.debug("Create table '%s': m2m relation between '%s' and '%s'", m2m_tbl, self._table, ref)
- def _add_sql_constraints(self, cr):
+ def _add_sql_constraints(self, cr, module):
"""
Modify this model's database table constraints so they match the one in
@@ -3177,9 +3193,9 @@ class BaseModel(object):
for (key, con, _) in self._sql_constraints:
conname = '%s_%s' % (self._table, key)
+ self._make_ext_id(cr, EXT_ID_PREFIX_CONSTRAINT + conname)
cr.execute("SELECT conname, pg_catalog.pg_get_constraintdef(oid, true) as condef FROM pg_constraint where conname=%s", (conname,))
existing_constraints = cr.dictfetchall()
-
sql_actions = {
'drop': {
'execute': False,
@@ -3732,7 +3748,7 @@ class BaseModel(object):
wf_service = netsvc.LocalService("workflow")
for oid in ids:
wf_service.trg_delete(uid, self._name, oid, cr)
-
+
self.check_access_rule(cr, uid, ids, 'unlink', context=context)
pool_model_data = self.pool.get('ir.model.data')
diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py
index 4a713ac3df8..27bd5fa5394 100644
--- a/openerp/report/report_sxw.py
+++ b/openerp/report/report_sxw.py
@@ -299,7 +299,7 @@ class rml_parse(object):
parse_format = DEFAULT_SERVER_DATETIME_FORMAT
if isinstance(value, basestring):
# FIXME: the trimming is probably unreliable if format includes day/month names
- # and those would need to be translated anyway.
+ # and those would need to be translated anyway.
date = datetime.strptime(value[:get_date_length(parse_format)], parse_format)
elif isinstance(value, time.struct_time):
date = datetime(*value[:6])
@@ -321,7 +321,7 @@ class rml_parse(object):
return res
def display_address(self, address_browse_record):
- return self.pool.get('res.partner.address')._display_address(self.cr, self.uid, address_browse_record)
+ return self.pool.get('res.partner')._display_address(self.cr, self.uid, address_browse_record)
def repeatIn(self, lst, name,nodes_parent=False):
ret_lst = []
diff --git a/openerp/tools/import_email.py b/openerp/tools/import_email.py
index b597dab5722..d73c50865a2 100644
--- a/openerp/tools/import_email.py
+++ b/openerp/tools/import_email.py
@@ -86,8 +86,8 @@ class ReceiverEmail2Event(object):
def get_partners(self, headers, msg):
alladdresses = self.get_addresses(headers, msg)
- address_ids = self.rpc(('res.partner.address', 'search', [('email', 'in', alladdresses)]))
- addresses = self.rpc(('res.partner.address', 'read', address_ids))
+ address_ids = self.rpc(('res.partner', 'search', [('email', 'in', alladdresses)]))
+ addresses = self.rpc(('res.partner', 'read', address_ids))
return [x['partner_id'][0] for x in addresses]
def __call__(self, request):
-
+