← Back to branch summary

~openerp/openobject-server/trunk-speedup-need_action-tde

« back to all changes in this revision

Viewing changes to bin/addons/base/module/report/ir_module_reference_print.py

  • Committer: Harry (Open ERP)
  • Author(s): xrg
  • Date: 2009-11-20 14:31:04 UTC
  • mfrom: (1119.1.208)
  • mto: (1898.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/addons/base/module/report/ir_module_reference_print.py
29
29
            'time': time,
30
30
            'findobj': self._object_find,
31
31
            'objdoc': self._object_doc,
 
32
            'objdoc2': self._object_doc2,
32
33
            'findflds': self._fields_find,
33
34
        })
34
35
    def _object_doc(self, obj):
35
36
        modobj = self.pool.get(obj)
36
 
        return modobj.__doc__
 
37
        strdocs= modobj.__doc__
 
38
        if not strdocs:
 
39
                return None
 
40
        else:
 
41
                strdocs=strdocs.strip().splitlines(True)
 
42
        res = ''
 
43
        for stre in strdocs:
 
44
                if not stre or stre.isspace():
 
45
                        break
 
46
                res += stre
 
47
        return res
 
48
 
 
49
    def _object_doc2(self, obj):
 
50
        modobj = self.pool.get(obj)
 
51
        strdocs= modobj.__doc__
 
52
        if not strdocs:
 
53
                return None
 
54
        else:
 
55
                strdocs=strdocs.strip().splitlines(True)
 
56
        res = []
 
57
        fou = False
 
58
        for stre in strdocs:
 
59
                if fou:
 
60
                        res.append(stre.strip())
 
61
                elif not stre or stre.isspace():
 
62
                        fou = True
 
63
        return res
37
64
 
38
65
    def _object_find(self, module):
39
66
        ids2 = self.pool.get('ir.model.data').search(self.cr, self.uid, [('module','=',module), ('model','=','ir.model')])