← Back to branch summary

~openerp-dev/openobject-server/trunk-web-placeholder-rga

« back to all changes in this revision

Viewing changes to openerp/report/report_sxw.py

[MERGE] merged the branch that merges res.partner and res.partner.address objects

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/report/report_sxw.py
299
299
                parse_format = DEFAULT_SERVER_DATETIME_FORMAT
300
300
            if isinstance(value, basestring):
301
301
                # FIXME: the trimming is probably unreliable if format includes day/month names
302
 
                #        and those would need to be translated anyway. 
 
302
                #        and those would need to be translated anyway.
303
303
                date = datetime.strptime(value[:get_date_length(parse_format)], parse_format)
304
304
            elif isinstance(value, time.struct_time):
305
305
                date = datetime(*value[:6])
321
321
        return res
322
322
 
323
323
    def display_address(self, address_browse_record):
324
 
        return self.pool.get('res.partner.address')._display_address(self.cr, self.uid, address_browse_record)
 
324
        return self.pool.get('res.partner')._display_address(self.cr, self.uid, address_browse_record)
325
325
 
326
326
    def repeatIn(self, lst, name,nodes_parent=False):
327
327
        ret_lst = []