+
![]()
@@ -128,7 +129,7 @@
+
-
+
+
+
[[ company.logo or removeParentNode('image') ]]
1.3cm %s 20cm %s
-
[[ company.rml_header1 ]]
-
-
[[ company.partner_id.name ]]
- [[ company.partner_id.street or '' ]]
- [[ company.partner_id.city or '' ]] - [[ company.partner_id.country_id and company.partner_id.country_id.name or '']]
+
+ [[ display_address(company.partner_id) or '' ]]
+
Phone:
[[ company.partner_id.phone or '' ]]
Mail:
[[ company.partner_id.email or '' ]]
1.3cm %s 7cm %s
+
+ produced by OpenERP.com
+ 1.2cm 2.15cm 19.9cm 2.15cm
-
- [[ company.rml_footer1 ]]
- [[ company.rml_footer2 ]]
- Contact : [[ user.name ]] - Page:
+ 1.2cm 2.65cm 19.9cm 2.65cm
+
+ [[ company.rml_footer ]]
+ Contact : [[ user.name ]] - Page:
+
"""
- _header_a4 = _header_main % ('23.0cm', '27.6cm', '27.7cm', '27.7cm', '27.8cm', '27.2cm', '26.8cm', '26.4cm', '26.0cm', '26.0cm', '25.6cm', '25.6cm', '25.5cm', '25.5cm')
- _header_letter = _header_main % ('21.3cm', '25.9cm', '26.0cm', '26.0cm', '26.1cm', '25.5cm', '25.1cm', '24.7cm', '24.3cm', '24.3cm', '23.9cm', '23.9cm', '23.8cm', '23.8cm')
+ _header_a4 = _header_main % ('23.0cm', '27.6cm', '27.7cm', '27.7cm', '27.8cm', '27.4cm', '25.8cm', '26.0cm', '26.0cm', '25.6cm', '25.6cm', '25.5cm', '25.5cm')
+ _header_letter = _header_main % ('21.3cm', '25.9cm', '26.0cm', '26.0cm', '26.1cm', '25.5cm', '25.1cm', '24.3cm', '24.3cm', '23.9cm', '23.9cm', '23.8cm', '23.8cm')
def onchange_paper_format(self, cr, uid, ids, paper_format, context=None):
if paper_format == 'us_letter':
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 1cf32c03753..b8cb12d3dd0 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -31,54 +31,53 @@
-
-
-
+
-
${company.rml_footer1} ${company.rml_footer2} ${company.rml_footer}
-
- % if company['rml_footer1']:
-
-
-
diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index c5c05c1807c..3d6fce8113a 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -109,7 +109,7 @@ class res_partner_bank(osv.osv):
if not context.get('address'):
return value
- for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts(
+ for address in self.pool.get('res.partner').resolve_2many_commands(
cursor, user, 'address', context['address'], ['type', field], context=context):
if address.get('type') == 'default':
@@ -172,38 +172,35 @@ class res_partner_bank(osv.osv):
('required', field.required)]
return res
- def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
+ def _prepare_name_get(self, cr, uid, bank_dicts, context=None):
+ """ Format the name of a res.partner.bank.
+ This function is designed to be inherited to add replacement fields.
+ :param bank_dicts: a list of res.partner.bank dicts, as returned by the method read()
+ :return: [(id, name), ...], as returned by the method name_get()
"""
- Format the name of a res.partner.bank.
- This function is designed to be inherited to add replacement fields.
- :param browse_record bank_type_obj: res.partner.bank.type object
- :param browse_record bank_obj: res.partner.bank object
- :rtype: str
- :return: formatted name of a res.partner.bank record
- """
- return bank_type_obj.format_layout % bank_obj._data[bank_obj.id]
+ # prepare a mapping {code: format_layout} for all bank types
+ bank_type_obj = self.pool.get('res.partner.bank.type')
+ bank_types = bank_type_obj.browse(cr, uid, bank_type_obj.search(cr, uid, []), context=context)
+ bank_code_format = dict((bt.code, bt.format_layout) for bt in bank_types)
+
+ res = []
+ for data in bank_dicts:
+ name = data['acc_number']
+ if data['state'] and bank_code_format.get(data['state']):
+ try:
+ if not data.get('bank_name'):
+ data['bank_name'] = _('BANK')
+ name = bank_code_format[data['state']] % data
+ except Exception:
+ raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format."))
+ res.append((data.get('id', False), name))
+ return res
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
return []
- bank_type_obj = self.pool.get('res.partner.bank.type')
- res = []
- for val in self.browse(cr, uid, ids, context=context):
- result = val.acc_number
- if val.state:
- type_ids = bank_type_obj.search(cr, uid, [('code','=',val.state)])
- if type_ids:
- t = bank_type_obj.browse(cr, uid, type_ids[0], context=context)
- try:
- # avoid the default format_layout to result in "False: ..."
- if not val._data[val.id]['bank_name']:
- val._data[val.id]['bank_name'] = _('BANK')
- result = self._prepare_name_get(cr, uid, t, val, context=context)
- except:
- result += ' [Formatting Error]'
- raise
- res.append((val.id, result))
- return res
+ bank_dicts = self.read(cr, uid, ids, context=context)
+ return self._prepare_name_get(cr, uid, bank_dicts, context=context)
def onchange_company_id(self, cr, uid, ids, company_id, context=None):
result = {}
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 0c88ceeff7c..33b98c690c6 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -90,9 +90,10 @@
- % if company['rml_footer2']:
-
-
+
+
-
+
+
+
+ """,
+ '%(zip)s %(city)s': """
+ +
+
+
+ """,
+ '%(city)s\n%(state_name)s\n%(zip)s': """
+ +
+
+ """
+ }
+ for k,v in layouts.items():
+ if fmt and (k in fmt):
+ doc = etree.fromstring(arch)
+ for node in doc.xpath("//div[@class='address_format']"):
+ tree = etree.fromstring(v)
+ node.getparent().replace(node, tree)
+ arch = etree.tostring(doc)
+ break
+ return arch
+
def _tz_get(self,cr,uid, context=None):
return [(x, x) for x in pytz.all_timezones]
-class res_payterm(osv.osv):
- _description = 'Payment term'
- _name = 'res.payterm'
- _order = 'name'
- _columns = {
- 'name': fields.char('Payment Term (short name)', size=64),
- }
-
class res_partner_category(osv.osv):
def name_get(self, cr, uid, ids, context=None):
@@ -58,20 +92,20 @@ class res_partner_category(osv.osv):
return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
if isinstance(ids, (int, long)):
ids = [ids]
- reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+ reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
res = []
for record in reads:
name = record['name']
if record['parent_id']:
- name = record['parent_id'][1]+' / '+name
+ name = record['parent_id'][1] + ' / ' + name
res.append((record['id'], name))
return res
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
if not args:
- args=[]
+ args = []
if not context:
- context={}
+ context = {}
if name:
# Be sure name_search is symetric to name_get
name = name.split(' / ')[-1]
@@ -85,23 +119,23 @@ class res_partner_category(osv.osv):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
- _description='Partner Categories'
+ _description = 'Partner Categories'
_name = 'res.partner.category'
_columns = {
'name': fields.char('Category Name', required=True, size=64, translate=True),
'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True, ondelete='cascade'),
'complete_name': fields.function(_name_get_fnc, type="char", string='Full Name'),
'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Child Categories'),
- 'active' : fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
- 'parent_left' : fields.integer('Left parent', select=True),
- 'parent_right' : fields.integer('Right parent', select=True),
+ 'active': fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
+ 'parent_left': fields.integer('Left parent', select=True),
+ 'parent_right': fields.integer('Right parent', select=True),
'partner_ids': fields.many2many('res.partner', id1='category_id', id2='partner_id', string='Partners'),
}
_constraints = [
(osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
]
_defaults = {
- 'active' : lambda *a: 1,
+ 'active': lambda *a: 1,
}
_parent_store = True
_parent_order = 'name'
@@ -113,7 +147,7 @@ class res_partner_title(osv.osv):
_columns = {
'name': fields.char('Title', required=True, size=46, translate=True),
'shortcut': fields.char('Abbreviation', size=16, translate=True),
- 'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
+ 'domain': fields.selection([('partner', 'Partner'), ('contact', 'Contact')], 'Domain', required=True, size=24)
}
_defaults = {
'domain': 'contact',
@@ -128,14 +162,14 @@ def _lang_get(self, cr, uid, context=None):
POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
-class res_partner(osv.osv):
- _description='Partner'
+class res_partner(osv.osv, format_address):
+ _description = 'Partner'
_name = "res.partner"
def _address_display(self, cr, uid, ids, name, args, context=None):
- res={}
+ res = {}
for partner in self.browse(cr, uid, ids, context=context):
- res[partner.id] =self._display_address(cr, uid, partner, context=context)
+ res[partner.id] = self._display_address(cr, uid, partner, context=context)
return res
def _get_image(self, cr, uid, ids, name, args, context=None):
@@ -143,7 +177,7 @@ class res_partner(osv.osv):
for obj in self.browse(cr, uid, ids, context=context):
result[obj.id] = tools.image_get_resized_images(obj.image)
return result
-
+
def _set_image(self, cr, uid, id, name, value, args, context=None):
return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
@@ -151,32 +185,35 @@ class res_partner(osv.osv):
_columns = {
'name': fields.char('Name', size=128, required=True, select=True),
'date': fields.date('Date', select=1),
- 'title': fields.many2one('res.partner.title','Title'),
- 'parent_id': fields.many2one('res.partner', 'Owned by'),
+ 'title': fields.many2one('res.partner.title', 'Title'),
+ 'parent_id': fields.many2one('res.partner', 'Company'),
'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('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
+ '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"),
+ 'website': fields.char('Website', size=64, help="Website of Partner or Company"),
'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
+ 'address': fields.one2many('res.partner.address', 'partner_id', 'Addresses',
+ deprecated="The address information is now directly stored on each Partner record. "\
+ "Multiple contacts with their own address can be added via the child_ids relationship. "\
+ "This field will be removed as of OpenERP 7.1."),
'category_id': fields.many2many('res.partner.category', id1='partner_id', id2='category_id', string='Tags'),
'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'),
+ 'type': fields.selection([('default', 'Default'), ('invoice', 'Invoice'),
+ ('delivery', 'Delivery'), ('contact', 'Contact'),
('other', 'Other')], 'Address Type',
help="Used to select automatically the right address according to the context in sales and purchases documents."),
'street': fields.char('Street', size=128),
@@ -185,7 +222,8 @@ class res_partner(osv.osv):
'city': fields.char('City', size=128),
'state_id': fields.many2one("res.country.state", 'State'),
'country_id': fields.many2one('res.country', 'Country'),
- 'country': fields.related('country_id', type='many2one', relation='res.country', string='Country'), # for backward compatibility
+ 'country': fields.related('country_id', type='many2one', relation='res.country', string='Country',
+ deprecated="This field will be removed as of OpenERP 7.1, use country_id instead"),
'email': fields.char('Email', size=240),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
@@ -193,28 +231,28 @@ class res_partner(osv.osv):
'birthdate': fields.char('Birthdate', size=64),
'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"),
'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. The image is base64 encoded, and PIL-supported. "\
- "It is limited to a 1024x1024 px image."),
+ 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 = {
+ store={
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
},
- help="Medium-sized image of the partner. It is automatically "\
- "resized as a 180x180 px image, with aspect ratio preserved. "\
+ 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,
string="Small-sized image", type="binary", multi="_get_image",
- store = {
+ store={
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
},
- help="Small-sized image of the partner. It is automatically "\
- "resized as a 50x50 px image, with aspect ratio preserved. "\
+ 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),
'color': fields.integer('Color Index'),
+ 'user_ids': fields.one2many('res.users', 'partner_id', 'Users'),
'contact_address': fields.function(_address_display, type='char', string='Complete Address'),
}
@@ -225,39 +263,45 @@ class res_partner(osv.osv):
return [context['category_id']]
return False
- def _get_default_image(self, cr, uid, is_company, context=None):
+ def _get_default_image(self, cr, uid, is_company, context=None, colorize=False):
if is_company:
- image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')
+ image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
else:
- image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png')
- return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+ image = tools.image_colorize(open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read())
+ return tools.image_resize_image_big(image.encode('base64'))
+
+ def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+ if (not view_id) and (view_type=='form') and context and context.get('force_email', False):
+ view_id = self.pool.get('ir.model.data').get_object_reference(cr, user, 'base', 'view_partner_simple_form')[1]
+ res = super(res_partner,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+ if view_type == 'form':
+ res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
+ return res
_defaults = {
'active': True,
- 'lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
- 'tz': lambda self, cr, uid, context: context.get('tz', False),
+ 'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'),
+ 'tz': lambda self, cr, uid, ctx: ctx.get('tz', False),
'customer': True,
'category_id': _default_category,
- 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
+ 'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
'color': 0,
'is_company': False,
'type': 'default',
'use_parent_address': True,
- 'image': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
- 'image_small': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
- 'image_medium': lambda self, cr, uid, context: self._get_default_image(cr, uid, False, context),
+ 'image': lambda self, cr, uid, ctx: self._get_default_image(cr, uid, ctx.get('default_is_company', False), ctx),
}
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
name = self.read(cr, uid, [id], ['name'], context)[0]['name']
- default.update({'name': _('%s (copy)')%(name)})
+ 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):
# 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
@@ -323,9 +367,6 @@ class res_partner(osv.osv):
domain_siblings = [('parent_id', '=', vals['parent_id']), ('use_parent_address', '=', True)]
update_ids = [vals['parent_id']] + self.search(cr, uid, domain_siblings, context=context)
self.update_address(cr, uid, update_ids, vals, context)
- if 'image' not in vals :
- image_value = self._get_default_image(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
- vals.update(tools.image_get_resized_images(image_value, return_big=True))
return super(res_partner,self).create(cr, uid, vals, context=context)
def update_address(self, cr, uid, ids, vals, context=None):
@@ -350,37 +391,34 @@ class res_partner(osv.osv):
res.append((record.id, name))
return res
+ def _parse_partner_name(self, text, context=None):
+ """ Supported syntax:
+ - 'Raoul