1
=== modified file 'openerp/addons/base/res/res_partner.py'
2
--- openerp/addons/base/res/res_partner.py	2013-04-15 17:17:32 +0000
3
+++ openerp/addons/base/res/res_partner.py	2013-04-20 00:50:34 +0000
4
@@ -30,6 +30,7 @@
5
30
from openerp import pooler, tools
30
from openerp import pooler, tools
6
31
from openerp.osv import osv, fields
31
from openerp.osv import osv, fields
7
32
from openerp.tools.translate import _
32
from openerp.tools.translate import _
8
33
from openerp.tools.yaml_import import is_comment
9
33
34
10
34
class format_address(object):
35
class format_address(object):
11
35
    def fields_view_get_address(self, cr, uid, arch, context={}):
36
    def fields_view_get_address(self, cr, uid, arch, context={}):
12
@@ -159,8 +160,9 @@
13
159
    res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
160
    res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
14
160
    return [(r['code'], r['name']) for r in res]
161
    return [(r['code'], r['name']) for r in res]
15
161
162
18
162
POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
163
# fields copy if 'use_parent_address' is checked
19
163
ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
164
ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
20
165
POSTAL_ADDRESS_FIELDS = ADDRESS_FIELDS # deprecated, to remove after 7.0
21
164
166
22
165
class res_partner(osv.osv, format_address):
167
class res_partner(osv.osv, format_address):
23
166
    _description = 'Partner'
168
    _description = 'Partner'
24
@@ -193,13 +195,28 @@
25
193
            result[obj.id] = obj.image != False
195
            result[obj.id] = obj.image != False
26
194
        return result
196
        return result
27
195
197
28
198
    def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
29
199
        """ Returns the partner that is considered the commercial
30
200
        entity of this partner. The commercial entity holds the master data
31
201
        for all commercial fields (see :py:meth:`~_commercial_fields`) """
32
202
        result = dict.fromkeys(ids, False)
33
203
        for partner in self.browse(cr, uid, ids, context=context):
34
204
            current_partner = partner 
35
205
            while not current_partner.is_company and current_partner.parent_id:
36
206
                current_partner = current_partner.parent_id
37
207
            result[partner.id] = current_partner.id
38
208
        return result
39
209
40
210
    # indirection to avoid passing a copy of the overridable method when declaring the function field
41
211
    _commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
42
212
43
196
    _order = "name"
213
    _order = "name"
44
197
    _columns = {
214
    _columns = {
45
198
        'name': fields.char('Name', size=128, required=True, select=True),
215
        'name': fields.char('Name', size=128, required=True, select=True),
46
199
        'date': fields.date('Date', select=1),
216
        'date': fields.date('Date', select=1),
47
200
        'title': fields.many2one('res.partner.title', 'Title'),
217
        'title': fields.many2one('res.partner.title', 'Title'),
48
201
        'parent_id': fields.many2one('res.partner', 'Related Company'),
218
        'parent_id': fields.many2one('res.partner', 'Related Company'),
50
202
        'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
219
        'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override    
51
203
        'ref': fields.char('Reference', size=64, select=1),
220
        'ref': fields.char('Reference', size=64, select=1),
52
204
        'lang': fields.selection(_lang_get, 'Language',
221
        'lang': fields.selection(_lang_get, 'Language',
53
205
            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."),
222
            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."),
54
@@ -264,6 +281,9 @@
55
264
        'color': fields.integer('Color Index'),
281
        'color': fields.integer('Color Index'),
56
265
        'user_ids': fields.one2many('res.users', 'partner_id', 'Users'),
282
        'user_ids': fields.one2many('res.users', 'partner_id', 'Users'),
57
266
        'contact_address': fields.function(_address_display,  type='char', string='Complete Address'),
283
        'contact_address': fields.function(_address_display,  type='char', string='Complete Address'),
58
284
59
285
        # technical field used for managing commercial fields
60
286
        'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity')
61
267
    }
287
    }
62
268
288
63
269
    def _default_category(self, cr, uid, context=None):
289
    def _default_category(self, cr, uid, context=None):
64
@@ -302,8 +322,8 @@
65
302
        'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
322
        'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
66
303
        'color': 0,
323
        'color': 0,
67
304
        'is_company': False,
324
        'is_company': False,
70
305
        'type': 'default',
325
        'type': 'contact', # type 'default' is wildcard and thus inappropriate
71
306
        'use_parent_address': True,
326
        'use_parent_address': False,
72
307
        'image': False,
327
        'image': False,
73
308
    }
328
    }
74
309
329
75
@@ -322,7 +342,6 @@
76
322
        value = {}
342
        value = {}
77
323
        value['title'] = False
343
        value['title'] = False
78
324
        if is_company:
344
        if is_company:
79
325
            value['parent_id'] = False
80
326
            domain = {'title': [('domain', '=', 'partner')]}
345
            domain = {'title': [('domain', '=', 'partner')]}
81
327
        else:
346
        else:
82
328
            domain = {'title': [('domain', '=', 'contact')]}
347
            domain = {'title': [('domain', '=', 'contact')]}
83
@@ -332,11 +351,22 @@
84
332
        def value_or_id(val):
351
        def value_or_id(val):
85
333
            """ return val or val.id if val is a browse record """
352
            """ return val or val.id if val is a browse record """
86
334
            return val if isinstance(val, (bool, int, long, float, basestring)) else val.id
353
            return val if isinstance(val, (bool, int, long, float, basestring)) else val.id
89
335
354
        result = {}
90
336
        if use_parent_address and parent_id:
355
        if parent_id:
91
356
            if ids:
92
357
                partner = self.browse(cr, uid, ids[0], context=context)
93
358
                if partner.parent_id and partner.parent_id.id != parent_id:
94
359
                    result['warning'] = {'title': _('Warning'),
95
360
                                         'message': _('Changing the company of a contact should only be done if it '
96
361
                                                      'was never correctly set. If an existing contact starts working for a new '
97
362
                                                      'company then a new contact should be created under that new '
98
363
                                                      'company. You can use the "Discard" button to abandon this change.')}
99
337
            parent = self.browse(cr, uid, parent_id, context=context)
364
            parent = self.browse(cr, uid, parent_id, context=context)
102
338
            return {'value': dict((key, value_or_id(parent[key])) for key in ADDRESS_FIELDS)}
365
            address_fields = self._address_fields(cr, uid, context=context)
103
339
        return {}
366
            result['value'] = dict((key, value_or_id(parent[key])) for key in address_fields)
104
367
        else:
105
368
            result['value'] = {'use_parent_address': False}
106
369
        return result
107
340
370
108
341
    def onchange_state(self, cr, uid, ids, state_id, context=None):
371
    def onchange_state(self, cr, uid, ids, state_id, context=None):
109
342
        if state_id:
372
        if state_id:
110
@@ -362,56 +392,134 @@
111
362
392
112
363
#   _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
393
#   _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
113
364
394
142
365
    def write(self, cr, uid, ids, vals, context=None):
395
    def _update_fields_values(self, cr, uid, partner, fields, context=None):
143
366
        # Update parent and siblings or children records
396
        """ Returns dict of write() values for synchronizing ``fields`` """
144
367
        if isinstance(ids, (int, long)):
397
        values = {}
145
368
            ids = [ids]
398
        for field in fields:
146
369
        if vals.get('is_company')==False:
399
            column = self._all_columns[field].column
147
370
            vals.update({'child_ids' : [(5,)]})
400
            if column._type == 'one2many':
148
371
        for partner in self.browse(cr, uid, ids, context=context):
401
                raise AssertionError('One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`')
149
372
            update_ids = []
402
            if column._type == 'many2one':
150
373
            if partner.is_company:
403
                values[field] = partner[field].id if partner[field] else False
151
374
                domain_children = [('parent_id', '=', partner.id), ('use_parent_address', '=', True)]
404
            elif column._type == 'many2many':
152
375
                update_ids = self.search(cr, uid, domain_children, context=context)
405
                values[field] = [(6,0,[r.id for r in partner[field] or []])]
125
376
            elif partner.parent_id:
126
377
                 if vals.get('use_parent_address')==True:
127
378
                     domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
128
379
                     update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
129
380
                 if 'use_parent_address' not in vals and  partner.use_parent_address:
130
381
                    domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
131
382
                    update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
132
383
            self.update_address(cr, uid, update_ids, vals, context)
133
384
        return super(res_partner,self).write(cr, uid, ids, vals, context=context)
134
385
135
386
    def create(self, cr, uid, vals, context=None):
136
387
        if context is None:
137
388
            context = {}
138
389
        # Update parent and siblings records
139
390
        if vals.get('parent_id'):
140
391
            if 'use_parent_address' in vals:
141
392
                use_parent_address = vals['use_parent_address']
153
393
            else:
406
            else:
169
394
                use_parent_address = self.default_get(cr, uid, ['use_parent_address'], context=context)['use_parent_address']
407
                values[field] = partner[field]
170
395
408
        return values
171
396
            if use_parent_address:
409
172
397
                domain_siblings = [('parent_id', '=', vals['parent_id']), ('use_parent_address', '=', True)]
410
    def _address_fields(self, cr, uid, context=None):
173
398
                update_ids = [vals['parent_id']] + self.search(cr, uid, domain_siblings, context=context)
411
        """ Returns the list of address fields that are synced from the parent
174
399
                self.update_address(cr, uid, update_ids, vals, context)
412
        when the `use_parent_address` flag is set. """
175
400
413
        return list(ADDRESS_FIELDS)
161
401
                # add missing address keys
162
402
                onchange_values = self.onchange_address(cr, uid, [], use_parent_address,
163
403
                                                        vals['parent_id'], context=context).get('value') or {}
164
404
                vals.update(dict((key, value)
165
405
                            for key, value in onchange_values.iteritems()
166
406
                            if key in ADDRESS_FIELDS and key not in vals))
167
407
168
408
        return super(res_partner, self).create(cr, uid, vals, context=context)
176
409
414
177
410
    def update_address(self, cr, uid, ids, vals, context=None):
415
    def update_address(self, cr, uid, ids, vals, context=None):
179
411
        addr_vals = dict((key, vals[key]) for key in POSTAL_ADDRESS_FIELDS if key in vals)
416
        address_fields = self._address_fields(cr, uid, context=context)
180
417
        addr_vals = dict((key, vals[key]) for key in address_fields if key in vals)
181
412
        if addr_vals:
418
        if addr_vals:
182
413
            return super(res_partner, self).write(cr, uid, ids, addr_vals, context)
419
            return super(res_partner, self).write(cr, uid, ids, addr_vals, context)
183
414
420
184
421
    def _commercial_fields(self, cr, uid, context=None):
185
422
        """ Returns the list of fields that are managed by the commercial entity
186
423
        to which a partner belongs. These fields are meant to be hidden on
187
424
        partners that aren't `commercial entities` themselves, and will be
188
425
        delegated to the parent `commercial entity`. The list is meant to be
189
426
        extended by inheriting classes. """
190
427
        return ['vat']
191
428
192
429
    def _commercial_sync_from_company(self, cr, uid, partner, context=None):
193
430
        """ Handle sync of commercial fields when a new parent commercial entity is set,
194
431
        as if they were related fields """
195
432
        if partner.commercial_partner_id != partner:
196
433
            commercial_fields = self._commercial_fields(cr, uid, context=context)
197
434
            sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
198
435
                                                        commercial_fields, context=context)
199
436
            return self.write(cr, uid, partner.id, sync_vals, context=context)
200
437
201
438
    def _commercial_sync_to_children(self, cr, uid, partner, context=None):
202
439
        """ Handle sync of commercial fields to descendants """
203
440
        commercial_fields = self._commercial_fields(cr, uid, context=context)
204
441
        sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
205
442
                                                   commercial_fields, context=context)
206
443
        sync_children = [c for c in partner.child_ids if not c.is_company]
207
444
        for child in sync_children:
208
445
            self._commercial_sync_to_children(cr, uid, child, context=context)
209
446
        return self.write(cr, uid, [c.id for c in sync_children], sync_vals, context=context)
210
447
211
448
    def _fields_sync(self, cr, uid, partner, update_values, context=None):
212
449
        """ Sync commercial fields and address fields from company and to children after create/update,
213
450
        just as if those were all modeled as fields.related to the parent """
214
451
        # 1. From UPSTREAM: sync from parent
215
452
        if update_values.get('parent_id') or update_values.get('use_company_address'):
216
453
            # 1a. Commercial fields: sync if parent changed
217
454
            if update_values.get('parent_id'):
218
455
                self._commercial_sync_from_company(cr, uid, partner, context=context)
219
456
            # 1b. Address fields: sync if parent or use_parent changed *and* both are now set 
220
457
            if partner.parent_id and partner.use_parent_address:
221
458
                onchange_vals = self.onchange_address(cr, uid, [partner.id],
222
459
                                                      use_parent_address=partner.use_parent_address,
223
460
                                                      parent_id=partner.parent_id.id,
224
461
                                                      context=context).get('value', {})
225
462
                self.update_address(cr, uid, partner.id, onchange_vals, context=context)
226
463
227
464
        # 2. To DOWNSTREAM: sync children 
228
465
        if partner.child_ids:
229
466
            # 2a. Commercial Fields: sync if commercial entity
230
467
            if partner.commercial_partner_id == partner:
231
468
                self._commercial_sync_to_children(cr, uid, partner, context=context)
232
469
            # 2b. Address fields: sync if address changed
233
470
            address_fields = self._address_fields(cr, uid, context=context)
234
471
            if any(field in update_values for field in address_fields):
235
472
                domain_children = [('parent_id', '=', partner.id), ('use_parent_address', '=', True)]
236
473
                update_ids = self.search(cr, uid, domain_children, context=context)
237
474
                self.update_address(cr, uid, update_ids, update_values, context=context)
238
475
239
476
    def _handle_first_contact_creation(self, cr, uid, partner, context=None):
240
477
        """ On creation of first contact for a company (or root) that has no address, assume contact address
241
478
        was meant to be company address """
242
479
        parent = partner.parent_id
243
480
        address_fields = self._address_fields(cr, uid, context=context)
244
481
        if parent and (parent.is_company or not parent.parent_id) and len(parent.child_ids) == 1 and \
245
482
            any(partner[f] for f in address_fields) and not any(parent[f] for f in address_fields):
246
483
            addr_vals = self._update_fields_values(cr, uid, partner, address_fields, context=context)
247
484
            parent.update_address(addr_vals)
248
485
            if not parent.is_company:
249
486
                parent.write({'is_company': True})
250
487
251
488
    def write(self, cr, uid, ids, vals, context=None):
252
489
        if isinstance(ids, (int, long)):
253
490
            ids = [ids]
254
491
        result = super(res_partner,self).write(cr, uid, ids, vals, context=context)
255
492
        for partner in self.browse(cr, uid, ids, context=context):
256
493
            self._fields_sync(cr, uid, partner, vals, context)
257
494
        return result
258
495
259
496
    def create(self, cr, uid, vals, context=None):
260
497
        new_id = super(res_partner, self).create(cr, uid, vals, context=context)
261
498
        partner = self.browse(cr, uid, new_id, context=context)
262
499
        self._fields_sync(cr, uid, partner, vals, context)
263
500
        self._handle_first_contact_creation(cr, uid, partner, context)
264
501
        return new_id
265
502
266
503
    def open_commercial_entity(self, cr, uid, ids, context=None):
267
504
        """ Utility method used to add an "Open Company" button in partner views """
268
505
        partner = self.browse(cr, uid, ids[0], context=context)
269
506
        return {'type': 'ir.actions.act_window',
270
507
                'res_model': 'res.partner',
271
508
                'view_mode': 'form',
272
509
                'res_id': partner.commercial_partner_id.id,
273
510
                'target': 'new',
274
511
                'flags': {'form': {'action_buttons': True}}}
275
512
276
513
    def open_parent(self, cr, uid, ids, context=None):
277
514
        """ Utility method used to add an "Open Parent" button in partner views """
278
515
        partner = self.browse(cr, uid, ids[0], context=context)
279
516
        return {'type': 'ir.actions.act_window',
280
517
                'res_model': 'res.partner',
281
518
                'view_mode': 'form',
282
519
                'res_id': partner.parent_id.id,
283
520
                'target': 'new',
284
521
                'flags': {'form': {'action_buttons': True}}}
285
522
286
415
    def name_get(self, cr, uid, ids, context=None):
523
    def name_get(self, cr, uid, ids, context=None):
287
416
        if context is None:
524
        if context is None:
288
417
            context = {}
525
            context = {}
289
@@ -420,8 +528,8 @@
290
420
        res = []
528
        res = []
291
421
        for record in self.browse(cr, uid, ids, context=context):
529
        for record in self.browse(cr, uid, ids, context=context):
292
422
            name = record.name
530
            name = record.name
295
423
            if record.parent_id:
531
            if record.parent_id and not record.is_company:
296
424
                name =  "%s (%s)" % (name, record.parent_id.name)
532
                name =  "%s, %s" % (record.parent_id.name, name)
297
425
            if context.get('show_address'):
533
            if context.get('show_address'):
298
426
                name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
534
                name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
299
427
                name = name.replace('\n\n','\n')
535
                name = name.replace('\n\n','\n')
300
@@ -460,6 +568,15 @@
301
460
        rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
568
        rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
302
461
        return self.name_get(cr, uid, [rec_id], context)[0]
569
        return self.name_get(cr, uid, [rec_id], context)[0]
303
462
570
304
571
    def _search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
305
572
        """ Override search() to always show inactive children when searching via ``child_of`` operator. The ORM will
306
573
        always call search() with a simple domain of the form [('parent_id', 'in', [ids])]. """
307
574
        # a special ``domain`` is set on the ``child_ids`` o2m to bypass this logic, as it uses similar domain expressions
308
575
        if len(args) == 1 and len(args[0]) == 3 and args[0][:2] == ('parent_id','in'):
309
576
            context = dict(context or {}, active_test=False)
310
577
        return super(res_partner, self)._search(cr, user, args, offset=offset, limit=limit, order=order, context=context,
311
578
                                                count=count, access_rights_uid=access_rights_uid)
312
579
313
463
    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
580
    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
314
464
        if not args:
581
        if not args:
315
465
            args = []
582
            args = []
316
@@ -520,25 +637,42 @@
317
520
            ids = ids[16:]
637
            ids = ids[16:]
318
521
        return True
638
        return True
319
522
639
323
523
    def address_get(self, cr, uid, ids, adr_pref=None):
640
    def address_get(self, cr, uid, ids, adr_pref=None, context=None):
324
524
        if adr_pref is None:
641
        """ Find contacts/addresses of the right type(s) by doing a depth-first-search
325
525
            adr_pref = ['default']
642
        through descendants within company boundaries (stop at entities flagged ``is_company``)
326
643
        then continuing the search at the ancestors that are within the same company boundaries.
327
644
        Defaults to partners of type ``'default'`` when the exact type is not found, or to the
328
645
        provided partner itself if no type ``'default'`` is found either. """
329
646
        adr_pref = set(adr_pref or [])
330
647
        if 'default' not in adr_pref:
331
648
            adr_pref.add('default')
332
526
        result = {}
649
        result = {}
348
527
        # retrieve addresses from the partner itself and its children
650
        visited = set()
349
528
        res = []
651
        for partner in self.browse(cr, uid, filter(None, ids), context=context):
350
529
        # need to fix the ids ,It get False value in list like ids[False]
652
            current_partner = partner
351
530
        if ids and ids[0]!=False:
653
            while current_partner:
352
531
            for p in self.browse(cr, uid, ids):
654
                to_scan = [current_partner]
353
532
                res.append((p.type, p.id))
655
                # Scan descendants, DFS
354
533
                res.extend((c.type, c.id) for c in p.child_ids)
656
                while to_scan:
355
534
        address_dict = dict(reversed(res))
657
                    record = to_scan.pop(0)
356
535
        # get the id of the (first) default address if there is one,
658
                    visited.add(record)
357
536
        # otherwise get the id of the first address in the list
659
                    if record.type in adr_pref and not result.get(record.type):
358
537
        default_address = False
660
                        result[record.type] = record.id
359
538
        if res:
661
                    if len(result) == len(adr_pref):
360
539
            default_address = address_dict.get('default', res[0][1])
662
                        return result
361
540
        for adr in adr_pref:
663
                    to_scan = [c for c in record.child_ids
362
541
            result[adr] = address_dict.get(adr, default_address)
664
                                 if c not in visited
363
665
                                 if not c.is_company] + to_scan
364
666
365
667
                # Continue scanning at ancestor if current_partner is not a commercial entity
366
668
                if current_partner.is_company or not current_partner.parent_id:
367
669
                    break
368
670
                current_partner = current_partner.parent_id
369
671
370
672
        # default to type 'default' or the partner itself
371
673
        default = result.get('default', partner.id)
372
674
        for adr_type in adr_pref:
373
675
            result[adr_type] = result.get(adr_type) or default 
374
542
        return result
676
        return result
375
543
677
376
544
    def view_header_get(self, cr, uid, view_id, view_type, context):
678
    def view_header_get(self, cr, uid, view_id, view_type, context):
377
@@ -580,8 +714,7 @@
378
580
            'country_name': address.country_id and address.country_id.name or '',
714
            'country_name': address.country_id and address.country_id.name or '',
379
581
            'company_name': address.parent_id and address.parent_id.name or '',
715
            'company_name': address.parent_id and address.parent_id.name or '',
380
582
        }
716
        }
383
583
        address_field = ['title', 'street', 'street2', 'zip', 'city']
717
        for field in self._address_fields(cr, uid, context=context):
382
584
        for field in address_field :
384
585
            args[field] = getattr(address, field) or ''
718
            args[field] = getattr(address, field) or ''
385
586
        if without_company:
719
        if without_company:
386
587
            args['company_name'] = ''
720
            args['company_name'] = ''
387
588
721
388
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
389
--- openerp/addons/base/res/res_partner_view.xml	2013-04-09 12:29:54 +0000
390
+++ openerp/addons/base/res/res_partner_view.xml	2013-04-20 00:50:34 +0000
391
@@ -138,8 +138,8 @@
392
138
                        </h1>
138
                        </h1>
393
139
                        <field name="parent_id"
139
                        <field name="parent_id"
394
140
                            placeholder="Company"
140
                            placeholder="Company"
397
141
                            domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
141
                            domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'default_supplier': supplier}"
398
142
                            attrs="{'invisible': [('is_company','=', True)]}"
142
                            attrs="{'invisible': [('is_company','=', True),('parent_id', '=', False)]}"
399
143
                            on_change="onchange_address(use_parent_address, parent_id)"/>
143
                            on_change="onchange_address(use_parent_address, parent_id)"/>
400
144
                        <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
144
                        <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
401
145
                    </div>
145
                    </div>
402
@@ -151,21 +151,24 @@
403
151
                            <div attrs="{'invisible': [('parent_id','=', False)]}" name="div_type">
151
                            <div attrs="{'invisible': [('parent_id','=', False)]}" name="div_type">
404
152
                                <field class="oe_inline"
152
                                <field class="oe_inline"
405
153
                                    name="type"/>
153
                                    name="type"/>
406
154
                                <label for="use_parent_address" class="oe_edit_only"/>
407
155
                                <field name="use_parent_address" class="oe_edit_only oe_inline"
408
156
                                    on_change="onchange_address(use_parent_address, parent_id)"/>
409
157
                            </div>
154
                            </div>
410
158
155
411
159
                            <label for="street" string="Address"/>
156
                            <label for="street" string="Address"/>
412
160
                            <div>
157
                            <div>
415
161
                                <field name="street" placeholder="Street..."/>
158
                                <field name="use_parent_address" class="oe_edit_only oe_inline"
416
162
                                <field name="street2"/>
159
                                       on_change="onchange_address(use_parent_address, parent_id)"
417
160
                                       attrs="{'invisible': [('parent_id','=', False)]}"/>
418
161
                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False)]}"/>
419
162
                                <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
420
163
                                        attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
421
164
                                <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>
422
165
                                <field name="street2"  attrs="{'readonly': [('use_parent_address','=',True)]}"/>
423
163
                                <div class="address_format">
166
                                <div class="address_format">
427
164
                                    <field name="city" placeholder="City" style="width: 40%%"/>
167
                                    <field name="city" placeholder="City" style="width: 40%%" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
428
165
                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
168
                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
429
166
                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
169
                                    <field name="zip" placeholder="ZIP" style="width: 20%%" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
430
167
                                </div>
170
                                </div>
432
168
                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
171
                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}' attrs="{'readonly': [('use_parent_address','=',True)]}"/>
433
169
                            </div>
172
                            </div>
434
170
                            <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
173
                            <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
435
171
                        </group>
174
                        </group>
436
@@ -182,8 +185,8 @@
437
182
                    </group>
185
                    </group>
438
183
186
439
184
                    <notebook colspan="4">
187
                    <notebook colspan="4">
442
185
                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}" autofocus="autofocus">
188
                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', [])]}" autofocus="autofocus">
443
186
                            <field name="child_ids" context="{'default_parent_id': active_id}" mode="kanban">
189
                            <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier}">
444
187
                                <kanban>
190
                                <kanban>
445
188
                                    <field name="color"/>
191
                                    <field name="color"/>
446
189
                                    <field name="name"/>
192
                                    <field name="name"/>
447
@@ -249,17 +252,41 @@
448
249
                                    </templates>
252
                                    </templates>
449
250
                                </kanban>
253
                                </kanban>
450
251
                                <form string="Contact" version="7.0">
254
                                <form string="Contact" version="7.0">
453
252
                                    <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
255
                                    <sheet>
454
253
                                    <div class="oe_title">
256
                                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
455
257
                                        <div class="oe_title">
456
258
                                            <label for="name" class="oe_edit_only"/>
457
259
                                            <h1><field name="name" style="width: 70%%"/></h1>
458
260
                                            <field name="category_id" widget="many2many_tags" placeholder="Tags..." style="width: 70%%"/>
459
261
                                        </div>
460
254
                                        <group>
262
                                        <group>
461
255
                                            <field name="name"/>
462
256
                                            <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
463
257
                                            <field name="function" placeholder="e.g. Sales Director"/>
263
                                            <field name="function" placeholder="e.g. Sales Director"/>
464
258
                                            <field name="email"/>
264
                                            <field name="email"/>
465
259
                                            <field name="phone"/>
265
                                            <field name="phone"/>
466
260
                                            <field name="mobile"/>
266
                                            <field name="mobile"/>
467
261
                                        </group>
267
                                        </group>
469
262
                                    </div>
268
                                        <div>
470
269
                                            <field name="use_parent_address"/><label for="use_parent_address"/>
471
270
                                        </div>
472
271
                                        <group>
473
272
                                            <label for="type"/>
474
273
                                            <div name="div_type">
475
274
                                                <field class="oe_inline" name="type"/>
476
275
                                            </div>
477
276
                                            <label for="street" string="Address" attrs="{'invisible': [('use_parent_address','=', True)]}"/>
478
277
                                            <div attrs="{'invisible': [('use_parent_address','=', True)]}" name="div_address">
479
278
                                                <field name="street" placeholder="Street..."/>
480
279
                                                <field name="street2"/>
481
280
                                                <div class="address_format">
482
281
                                                    <field name="city" placeholder="City" style="width: 40%%"/>
483
282
                                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
484
283
                                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
485
284
                                                </div>
486
285
                                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
487
286
                                            </div>
488
287
                                        </group>
489
288
                                        <field name="supplier" invisible="True"/>
490
289
                                    </sheet>
491
263
                                </form>
290
                                </form>
492
264
                            </field>
291
                            </field>
493
265
                        </page>
292
                        </page>
494
266
293
495
=== modified file 'openerp/addons/base/tests/test_base.py'
496
--- openerp/addons/base/tests/test_base.py	2013-04-15 17:17:32 +0000
497
+++ openerp/addons/base/tests/test_base.py	2013-04-20 00:50:34 +0000
498
@@ -40,6 +40,216 @@
499
40
        self.assertTrue(new_id2 > new_id, 'find_or_create failed - should have created new one again')
40
        self.assertTrue(new_id2 > new_id, 'find_or_create failed - should have created new one again')
500
41
41
501
42
42
502
43
    def test_20_res_partner_address_sync(self):
503
44
        cr, uid = self.cr, self.uid
504
45
        ghoststep = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
505
46
                                                                             {'name': 'GhostStep',
506
47
                                                                              'is_company': True,
507
48
                                                                              'street': 'Main Street, 10',
508
49
                                                                              'phone': '123456789',
509
50
                                                                              'email': 'info@ghoststep.com',
510
51
                                                                              'vat': 'BE0477472701',
511
52
                                                                              'type': 'default'}))
512
53
        p1 = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'Denis Bladesmith <denis.bladesmith@ghoststep.com>')[0])
513
54
        self.assertEqual(p1.type, 'contact', 'Default type must be "contact"')
514
55
        p1phone = '123456789#34'
515
56
        p1.write({'phone': p1phone,
516
57
                  'parent_id': ghoststep.id,
517
58
                  'use_parent_address': True})
518
59
        p1.refresh()
519
60
        self.assertEqual(p1.street, ghoststep.street, 'Address fields must be synced')
520
61
        self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
521
62
        self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync')
522
63
        self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
523
64
        ghoststreet = 'South Street, 25'
524
65
        ghoststep.write({'street': ghoststreet})
525
66
        p1.refresh()
526
67
        self.assertEqual(p1.street, ghoststreet, 'Address fields must be synced automatically')
527
68
        self.assertEqual(p1.phone, p1phone, 'Phone should not be synced')
528
69
        self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
529
70
530
71
        p1street = 'My Street, 11'
531
72
        p1.write({'street': p1street})
532
73
        ghoststep.refresh()
533
74
        self.assertEqual(ghoststep.street, ghoststreet, 'Touching contact should never alter parent')
534
75
535
76
536
77
    def test_30_res_partner_first_contact_sync(self):
537
78
        """ Test initial creation of company/contact pair where contact address gets copied to
538
79
        company """
539
80
        cr, uid = self.cr, self.uid
540
81
        ironshield = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'IronShield')[0])
541
82
        self.assertFalse(ironshield.is_company, 'Partners are not companies by default')
542
83
        self.assertFalse(ironshield.use_parent_address, 'use_parent_address defaults to False')
543
84
        self.assertEqual(ironshield.type, 'contact', 'Default type must be "contact"')
544
85
        ironshield.write({'type': 'default'}) # force default type to double-check sync 
545
86
        p1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
546
87
                                                                      {'name': 'Isen Hardearth',
547
88
                                                                       'street': 'Strongarm Avenue, 12',
548
89
                                                                       'parent_id': ironshield.id}))
549
90
        self.assertEquals(p1.type, 'contact', 'Default type must be "contact", not the copied parent type')
550
91
        ironshield.refresh()
551
92
        self.assertEqual(ironshield.street, p1.street, 'Address fields should be copied to company')
552
93
        self.assertTrue(ironshield.is_company, 'Company flag should be turned on after first contact creation')
553
94
554
95
    def test_40_res_partner_address_getc(self):
555
96
        """ Test address_get address resolution mechanism: it should first go down through descendants,
556
97
        stopping when encountering another is_copmany entity, then go up, stopping again at the first
557
98
        is_company entity or the root ancestor and if nothing matches, it should use the provided partner
558
99
        itself """
559
100
        cr, uid = self.cr, self.uid
560
101
        elmtree = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'Elmtree')[0])
561
102
        branch1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 1',
562
103
                                                                                     'parent_id': elmtree.id,
563
104
                                                                                     'is_company': True}))
564
105
        leaf10 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 10',
565
106
                                                                                    'parent_id': branch1.id,
566
107
                                                                                    'type': 'invoice'}))
567
108
        branch11 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 11',
568
109
                                                                                      'parent_id': branch1.id,
569
110
                                                                                      'type': 'other'}))
570
111
        leaf111 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 111',
571
112
                                                                                    'parent_id': branch11.id,
572
113
                                                                                    'type': 'delivery'}))
573
114
        branch11.write({'is_company': False}) # force is_company after creating 1rst child
574
115
        branch2 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 2',
575
116
                                                                                     'parent_id': elmtree.id,
576
117
                                                                                     'is_company': True}))
577
118
        leaf21 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 21',
578
119
                                                                                    'parent_id': branch2.id,
579
120
                                                                                    'type': 'delivery'}))
580
121
        leaf22 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 22',
581
122
                                                                                    'parent_id': branch2.id}))
582
123
        leaf23 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 23',
583
124
                                                                                    'parent_id': branch2.id,
584
125
                                                                                    'type': 'default'}))
585
126
        # go up, stop at branch1
586
127
        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
587
128
                         {'delivery': leaf111.id,
588
129
                          'invoice': leaf10.id,
589
130
                          'contact': branch1.id,
590
131
                          'other': branch11.id,
591
132
                          'default': leaf111.id}, 'Invalid address resolution')
592
133
        self.assertEqual(self.res_partner.address_get(cr, uid, [branch11.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
593
134
                         {'delivery': leaf111.id,
594
135
                          'invoice': leaf10.id,
595
136
                          'contact': branch1.id,
596
137
                          'other': branch11.id,
597
138
                          'default': branch11.id}, 'Invalid address resolution')
598
139
599
140
        # go down, stop at at all child companies
600
141
        self.assertEqual(self.res_partner.address_get(cr, uid, [elmtree.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
601
142
                         {'delivery': elmtree.id,
602
143
                          'invoice': elmtree.id,
603
144
                          'contact': elmtree.id,
604
145
                          'other': elmtree.id,
605
146
                          'default': elmtree.id}, 'Invalid address resolution')
606
147
607
148
        # go down through children
608
149
        self.assertEqual(self.res_partner.address_get(cr, uid, [branch1.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
609
150
                         {'delivery': leaf111.id,
610
151
                          'invoice': leaf10.id,
611
152
                          'contact': branch1.id,
612
153
                          'other': branch11.id,
613
154
                          'default': branch1.id}, 'Invalid address resolution')
614
155
        self.assertEqual(self.res_partner.address_get(cr, uid, [branch2.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
615
156
                         {'delivery': leaf21.id,
616
157
                          'invoice': leaf23.id,
617
158
                          'contact': branch2.id,
618
159
                          'other': leaf23.id,
619
160
                          'default': leaf23.id}, 'Invalid address resolution')
620
161
621
162
        # go up then down through siblings
622
163
        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf21.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
623
164
                         {'delivery': leaf21.id,
624
165
                          'invoice': leaf23.id,
625
166
                          'contact': branch2.id,
626
167
                          'other': leaf23.id,
627
168
                          'default': leaf23.id
628
169
                          }, 'Invalid address resolution, should scan commercial entity ancestor and its descendants')
629
170
        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf22.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
630
171
                         {'delivery': leaf21.id,
631
172
                          'invoice': leaf23.id,
632
173
                          'contact': leaf22.id,
633
174
                          'other': leaf23.id,
634
175
                          'default': leaf23.id}, 'Invalid address resolution, should scan commercial entity ancestor and its descendants')
635
176
        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf23.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
636
177
                         {'delivery': leaf21.id,
637
178
                          'invoice': leaf23.id,
638
179
                          'contact': branch2.id,
639
180
                          'other': leaf23.id,
640
181
                          'default': leaf23.id}, 'Invalid address resolution, `default` should only override if no partner with specific type exists')
641
182
642
183
        # empty adr_pref means only 'default'
643
184
        self.assertEqual(self.res_partner.address_get(cr, uid, [elmtree.id], []),
644
185
                        {'default': elmtree.id}, 'Invalid address resolution, no default means commercial entity ancestor')
645
186
        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], []),
646
187
                        {'default': leaf111.id}, 'Invalid address resolution, no default means contact itself')
647
188
        branch11.write({'type': 'default'})
648
189
        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], []),
649
190
                        {'default': branch11.id}, 'Invalid address resolution, branch11 should now be default')
650
191
651
192
652
193
    def test_50_res_partner_commercial_sync(self):    
653
194
        cr, uid = self.cr, self.uid
654
195
        p0 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
655
196
                                                                      {'name': 'Sigurd Sunknife',
656
197
                                                                       'email': 'ssunknife@gmail.com'}))
657
198
        sunhelm = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
658
199
                                                                           {'name': 'Sunhelm',
659
200
                                                                            'is_company': True,
660
201
                                                                            'street': 'Rainbow Street, 13',
661
202
                                                                            'phone': '1122334455',
662
203
                                                                            'email': 'info@sunhelm.com',
663
204
                                                                            'vat': 'BE0477472701',
664
205
                                                                            'child_ids': [(4, p0.id),
665
206
                                                                                          (0, 0, {'name': 'Alrik Greenthorn',
666
207
                                                                                                  'email': 'agr@sunhelm.com'})],
667
208
                                                                            }))
668
209
        p1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
669
210
                                                                      {'name': 'Otto Blackwood',
670
211
                                                                       'email': 'otto.blackwood@sunhelm.com',
671
212
                                                                       'parent_id': sunhelm.id}))
672
213
        p11 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
673
214
                                                                      {'name': 'Gini Graywool',
674
215
                                                                       'email': 'ggr@sunhelm.com',
675
216
                                                                       'parent_id': p1.id}))
676
217
        p2 = self.res_partner.browse(cr, uid, self.res_partner.search(cr, uid,
677
218
                                                                      [('email', '=', 'agr@sunhelm.com')])[0])
678
219
679
220
        for p in (p0, p1, p11, p2):
680
221
            p.refresh()
681
222
            self.assertEquals(p.commercial_partner_id, sunhelm, 'Incorrect commercial entity resolution')
682
223
            self.assertEquals(p.vat, sunhelm.vat, 'Commercial fields must be automatically synced')
683
224
        sunhelmvat = 'BE0123456789'
684
225
        sunhelm.write({'vat': sunhelmvat})
685
226
        for p in (p0, p1, p11, p2):
686
227
            p.refresh()
687
228
            self.assertEquals(p.vat, sunhelmvat, 'Commercial fields must be automatically and recursively synced')
688
229
689
230
        p1vat = 'BE0987654321'
690
231
        p1.write({'vat': p1vat})
691
232
        for p in (sunhelm, p0, p11, p2):
692
233
            p.refresh()
693
234
            self.assertEquals(p.vat, sunhelmvat, 'Sync to children should only work downstream and on commercial entities')
694
235
695
236
        # promote p1 to commercial entity
696
237
        vals = p1.onchange_type(is_company=True)['value']
697
238
        p1.write(dict(vals, parent_id=sunhelm.id,
698
239
                      is_company=True,
699
240
                      name='Sunhelm Subsidiary'))
700
241
        p1.refresh()
701
242
        self.assertEquals(p1.vat, p1vat, 'Setting is_company should stop auto-sync of commercial fields')
702
243
        self.assertEquals(p1.commercial_partner_id, p1, 'Incorrect commercial entity resolution after setting is_company')
703
244
704
245
        # writing on parent should not touch child commercial entities
705
246
        sunhelmvat2 = 'BE0112233445'
706
247
        sunhelm.write({'vat': sunhelmvat2})
707
248
        p1.refresh()
708
249
        self.assertEquals(p1.vat, p1vat, 'Setting is_company should stop auto-sync of commercial fields')
709
250
        p0.refresh()
710
251
        self.assertEquals(p0.vat, sunhelmvat2, 'Commercial fields must be automatically synced')
711
252
712
43
class test_partner_recursion(common.TransactionCase):
253
class test_partner_recursion(common.TransactionCase):
713
44
254
714
45
    def setUp(self):
255
    def setUp(self):
715
46
256
716
=== modified file 'openerp/addons/base/tests/test_expression.py'
717
--- openerp/addons/base/tests/test_expression.py	2013-03-21 17:37:37 +0000
718
+++ openerp/addons/base/tests/test_expression.py	2013-04-20 00:50:34 +0000
719
@@ -263,7 +263,7 @@
720
263
            "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect join condition")
263
            "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect join condition")
721
264
        self.assertIn('"res_partner__child_ids"."id"="res_partner__child_ids__bank_ids"."partner_id"', sql_query[1],
264
        self.assertIn('"res_partner__child_ids"."id"="res_partner__child_ids__bank_ids"."partner_id"', sql_query[1],
722
265
            "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect join condition")
265
            "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect join condition")
724
266
        self.assertEqual(set([b_aa, b_ba]), set(sql_query[2]),
266
        self.assertEqual(set([b_aa, b_ba]), set(sql_query[2][-2:]),
725
267
            "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect parameter")
267
            "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect parameter")
726
268
268
727
269
        # --------------------------------------------------
269
        # --------------------------------------------------
Reviewer	Review Type	Date Requested	Status
Joël Grand-Guillaume @ camptocamp (community)	test, no code review		Needs Fixing on 2013-04-18
hbto [Vauxoo] http://www.vauxoo.com (community)			Needs Fixing on 2013-04-11
Moisés López - http://www.vauxoo.com (community)			Needs Fixing on 2013-04-09
Nhomar - Vauxoo (community)			Needs Fixing on 2013-04-09
Stefan Rijnhart (Opener) (community)			Disapprove on 2013-04-09
Yannick Vaucher @ Camptocamp (community)	code, test		Needs Fixing on 2013-04-08
OpenERP Core Team		2013-04-08	Pending
Review via email: mp+157577@code.launchpad.net