openerp-dev-web team mailing list archive

["apa \(Open ERP\)" <apa@xxxxxxxxxxx>]

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.

-- 
https://code.launchpad.net/~openerp-report/openobject-server/report-server-apa/+merge/41678
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 05:01:54 +0000
@@ -203,7 +203,11 @@
         return """
 <header>
 <pageTemplate>
+<<<<<<< TREE
     <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"/>
+>>>>>>> MERGE-SOURCE
     <pageGraphics>
         <fill color="black"/>
         <stroke color="black"/>

=== 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 05:01:54 +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()