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

« back to all changes in this revision

Viewing changes to bin/addons/base/res/res_company.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:
108
108
        <pageGraphics>
109
109
        <fill color="black"/>
110
110
        <stroke color="black"/>
111
 
        <setFont name="Helvetica" size="8"/>
 
111
        <setFont name="DejaVu Sans" size="8"/>
112
112
        <drawString x="1.3cm" y="28.3cm"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
113
 
        <setFont name="Helvetica-Bold" size="10"/>
 
113
        <setFont name="DejaVu Sans Bold" size="10"/>
114
114
        <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
115
 
        <setFont name="Helvetica" size="8"/>
 
115
        <setFont name="DejaVu Sans" size="8"/>
116
116
        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
117
117
        <drawString x="19.8cm" y="28.3cm"><pageCount/></drawString>
118
118
        <stroke color="#000000"/>
131
131
        <pageGraphics>
132
132
            <!-- You Logo - Change X,Y,Width and Height -->
133
133
        <image x="1.3cm" y="27.6cm" height="40.0" >[[company.logo]]</image>
134
 
            <setFont name="Helvetica" size="8"/>
 
134
            <setFont name="DejaVu Sans" size="8"/>
135
135
            <fill color="black"/>
136
136
            <stroke color="black"/>
137
137
            <lines>1.3cm 27.7cm 20cm 27.7cm</lines>