openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00724
[Merge] lp:~openerp-report/openobject-server/report-server-apa into lp:~openerp-dev/openobject-server/report_server
apa (Open ERP) has proposed merging lp:~openerp-report/openobject-server/report-server-apa into lp:~openerp-dev/openobject-server/report_server.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#645969 [trunk] accounting - GL report (and others) - repeat column headers
https://bugs.launchpad.net/bugs/645969
- added strip_name function for the report and set frame for landscape report.
- Improved internal and internal landscape report header for good alignment.
--
https://code.launchpad.net/~openerp-report/openobject-server/report-server-apa/+merge/41708
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-report/openobject-server/report-server-apa into lp:~openerp-dev/openobject-server/report_server.
=== modified file 'bin/addons/base/res/res_company.py'
--- bin/addons/base/res/res_company.py 2010-11-19 09:41:52 +0000
+++ bin/addons/base/res/res_company.py 2010-11-24 11:13:59 +0000
@@ -203,7 +203,7 @@
return """
<header>
<pageTemplate>
- <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
+ <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
<pageGraphics>
<fill color="black"/>
<stroke color="black"/>
@@ -212,7 +212,7 @@
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="382" y="555">[[ company.partner_id.name ]]</drawString>
<stroke color="#000000"/>
- <lines>25 550 808 550</lines>
+ <lines>25 550 818 550</lines>
</pageGraphics>
</pageTemplate>
</header>"""
@@ -220,16 +220,16 @@
return """
<header>
<pageTemplate>
- <frame id="first" x1="1.3cm" y1="1.5cm" width="18.4cm" height="26.5cm"/>
+ <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
<pageGraphics>
<fill color="black"/>
<stroke color="black"/>
<setFont name="DejaVu Sans" size="8"/>
- <drawString x="1.3cm" y="28.3cm"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]</drawString>
+ <drawString x="1.0cm" y="28.3cm"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]</drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
- <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
+ <drawString x="9.3cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
<stroke color="#000000"/>
- <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
+ <lines>1.0cm 28.1cm 20.1cm 28.1cm</lines>
</pageGraphics>
</pageTemplate>
</header>"""
=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
--- bin/report/render/rml2pdf/trml2pdf.py 2010-11-12 10:39:52 +0000
+++ bin/report/render/rml2pdf/trml2pdf.py 2010-11-24 11:13:59 +0000
@@ -68,7 +68,7 @@
while not self.pages.get(key,False):
key = key + 1
self.setFont("Helvetica", 8)
- self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-43),
+ self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40),
"Page %(this)i of %(total)i" % {
'this': self._pageNumber+1,
'total': self.pages.get(key,False),
=== modified file 'bin/report/report_sxw.py'
--- bin/report/report_sxw.py 2010-11-19 07:27:50 +0000
+++ bin/report/report_sxw.py 2010-11-24 11:13:59 +0000
@@ -164,6 +164,7 @@
'lang' : user.company_id.partner_id.lang,
'translate' : self._translate,
'setHtmlImage' : self.set_html_image,
+ 'strip_name' : self._strip_name,
'time' : time
}
self.localcontext.update(context)
@@ -184,6 +185,14 @@
def setTag(self, oldtag, newtag, attrs=None):
return newtag, attrs
+ def _ellipsis(self, char, size=100, truncation_str='...'):
+ if len(char) <= size:
+ return char
+ return char[:size-len(truncation_str)] + truncation_str
+
+ def _strip_name(self, name, maxlen=50):
+ return self._ellipsis(name, maxlen)
+
def format(self, text, oldtag=None):
return text.strip()
Follow ups