[FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
This commit is contained in:
parent
34beeaeba7
commit
cca8bb4d64
|
@ -71,7 +71,7 @@ class base_config_settings(osv.osv_memory):
|
||||||
wizard = self.browse(cr, uid, ids, context)[0]
|
wizard = self.browse(cr, uid, ids, context)[0]
|
||||||
if wizard.font:
|
if wizard.font:
|
||||||
user = self.pool.get('res.users').browse(cr, uid, uid, context)
|
user = self.pool.get('res.users').browse(cr, uid, uid, context)
|
||||||
font_name = wizard.font.family
|
font_name = wizard.font.name
|
||||||
user.company_id.write({'font': wizard.font.id,'rml_header': self._change_header(user.company_id.rml_header,font_name), 'rml_header2': self._change_header(user.company_id.rml_header2, font_name), 'rml_header3': self._change_header(user.company_id.rml_header3, font_name)})
|
user.company_id.write({'font': wizard.font.id,'rml_header': self._change_header(user.company_id.rml_header,font_name), 'rml_header2': self._change_header(user.company_id.rml_header2, font_name), 'rml_header3': self._change_header(user.company_id.rml_header3, font_name)})
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
||||||
|
@ -17,9 +17,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
||||||
|
@ -17,9 +17,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
<drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
||||||
|
@ -17,9 +17,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
<drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
<drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
<lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
|
<drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
|
<drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
|
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
|
||||||
|
@ -29,9 +29,9 @@
|
||||||
<!--logo-->
|
<!--logo-->
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
|
<drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
|
<drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
|
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
|
||||||
|
|
|
@ -43,9 +43,9 @@ class survey_analysis(report_rml):
|
||||||
<pageGraphics>
|
<pageGraphics>
|
||||||
<fill color="black"/>
|
<fill color="black"/>
|
||||||
<stroke color="black"/>
|
<stroke color="black"/>
|
||||||
<setFont name="DejaVu Sans" size="8"/>
|
<setFont name="DejaVuSans" size="8"/>
|
||||||
<drawString x="1.3cm" y="28.3cm"> """+to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True))+"""</drawString>
|
<drawString x="1.3cm" y="28.3cm"> """+to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True))+"""</drawString>
|
||||||
<setFont name="DejaVu Sans Bold" size="10"/>
|
<setFont name="DejaVuSans-Bold" size="10"/>
|
||||||
<drawString x="9.8cm" y="28.3cm">"""+ to_xml(company.name) +"""</drawString>
|
<drawString x="9.8cm" y="28.3cm">"""+ to_xml(company.name) +"""</drawString>
|
||||||
<stroke color="#000000"/>
|
<stroke color="#000000"/>
|
||||||
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
|
<lines>1.3cm 28.1cm 20cm 28.1cm</lines>
|
||||||
|
|
Loading…
Reference in New Issue