diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index d6b42e970bf..c24fc11a377 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -37,7 +37,6 @@ class res_config_configurable(osv.osv_memory):
their view inherit from the related res_config_view_base view.
'''
_name = 'res.config'
- _inherit = 'ir.wizard.screen'
def _next_action(self, cr, uid, context=None):
Todos = self.pool['ir.actions.todo']
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index c8046d34eb2..52c8b64ba34 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -73,7 +73,7 @@
-
+
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index fe749c6013b..c5c95276b16 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -22,6 +22,7 @@
import math
import openerp
from osv import osv, fields
+from openerp import SUPERUSER_ID
import re
import tools
from tools.translate import _
@@ -33,7 +34,7 @@ from lxml import etree
class format_address(object):
def fields_view_get_address(self, cr, uid, arch, context={}):
user_obj = self.pool.get('res.users')
- fmt = user_obj.browse(cr, uid, uid,context).company_id.country_id
+ fmt = user_obj.browse(cr, SUPERUSER_ID, uid, context).company_id.country_id
fmt = fmt and fmt.address_format
layouts = {
'%(city)s %(state_code)s\n%(zip)s': """
@@ -189,13 +190,13 @@ class res_partner(osv.osv, format_address):
'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
'ref': fields.char('Reference', size=64, select=1),
'lang': fields.selection(_lang_get, 'Language',
- help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
+ help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."),
'tz': fields.selection(_tz_get, 'Timezone', size=64,
help="The partner's timezone, used to output proper date and time values inside printed reports. "
"It is important to set a value for this field. You should use the same timezone "
"that is otherwise used to pick and render date and time values: your computer's timezone."),
- 'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
- 'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if the partner is subjected to taxes. Used by the some of the legal statements."),
+ 'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this contact if any.'),
+ 'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if this contact is subjected to taxes. Used by the some of the legal statements."),
'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
'website': fields.char('Website', size=64, help="Website of Partner or Company"),
'comment': fields.text('Notes'),
@@ -207,9 +208,9 @@ class res_partner(osv.osv, format_address):
'credit_limit': fields.float(string='Credit Limit'),
'ean13': fields.char('EAN13', size=13),
'active': fields.boolean('Active'),
- 'customer': fields.boolean('Customer', help="Check this box if the partner is a customer."),
- 'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
- 'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
+ 'customer': fields.boolean('Customer', help="Check this box if this contact is a customer."),
+ 'supplier': fields.boolean('Supplier', help="Check this box if this contact is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
+ 'employee': fields.boolean('Employee', help="Check this box if this contact is an Employee."),
'function': fields.char('Job Position', size=128),
'type': fields.selection([('default', 'Default'), ('invoice', 'Invoice'),
('delivery', 'Delivery'), ('contact', 'Contact'),
@@ -232,13 +233,13 @@ class res_partner(osv.osv, format_address):
'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information for this contact"),
# image: all image fields are base64 encoded and PIL-supported
'image': fields.binary("Image",
- help="This field holds the image used as avatar for the partner, limited to 1024x1024px"),
+ help="This field holds the image used as avatar for this contact, limited to 1024x1024px"),
'image_medium': fields.function(_get_image, fnct_inv=_set_image,
string="Medium-sized image", type="binary", multi="_get_image",
store={
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
},
- help="Medium-sized image of the partner. It is automatically "\
+ help="Medium-sized image of this contact. It is automatically "\
"resized as a 128x128px image, with aspect ratio preserved. "\
"Use this field in form views or some kanban views."),
'image_small': fields.function(_get_image, fnct_inv=_set_image,
@@ -246,7 +247,7 @@ class res_partner(osv.osv, format_address):
store={
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
},
- help="Small-sized image of the partner. It is automatically "\
+ help="Small-sized image of this contact. It is automatically "\
"resized as a 64x64px image, with aspect ratio preserved. "\
"Use this field anywhere a small image is required."),
'company_id': fields.many2one('res.company', 'Company', select=1),
@@ -300,7 +301,7 @@ class res_partner(osv.osv, format_address):
def onchange_type(self, cr, uid, ids, is_company, context=None):
# get value as for an onchange on the image
- value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True)
+ value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True, return_medium=False, return_small=False)
value['title'] = False
if is_company:
value['parent_id'] = False
@@ -396,7 +397,7 @@ class res_partner(osv.osv, format_address):
- otherwise: default, everything is set as the name """
match = re.search(r'([^\s,<@]+@[^>\s,]+)', text)
if match:
- email = match.group(1)
+ email = match.group(1)
name = text[:text.index(email)].replace('"','').replace('<','').strip()
else:
name, email = text, ''
@@ -444,7 +445,7 @@ class res_partner(osv.osv, format_address):
def find_or_create(self, cr, uid, email, context=None):
""" Find a partner with the given ``email`` or use :py:method:`~.name_create`
to create one
-
+
:param str email: email-like string, which should contain at least one email,
e.g. ``"Raoul Grosbedon
"``"""
assert email, 'an email is required for find_or_create to work'
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 0b6219ff613..e51c4dc2e6b 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -60,10 +60,6 @@
Company Contact
-
- Manufacturer
-
-
- Partner Titles
+ Titles
ir.actions.act_window
res.partner.title
form
@@ -161,10 +161,10 @@
-
+
-
+