← Back to team overview

openerp-dev-web team mailing list archive

[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


Changed Landscape header for changed the actual size for landscape report.
like General Ledger Landscape,Balance sheet,Profit and Loss etc..
-- 
https://code.launchpad.net/~openerp-report/openobject-server/report-server-apa/+merge/41283
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-10-29 01:01:37 +0000
+++ bin/addons/base/res/res_company.py	2010-11-19 11:09:54 +0000
@@ -203,16 +203,16 @@
         return """
 <header>
 <pageTemplate>
-    <frame id="first" x1="22.0" y1="22.0" width="1080" height="700"/>
+    <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
     <pageGraphics>
         <fill color="black"/>
         <stroke color="black"/>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawString x="25" y="725"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
+        <drawString x="25" y="555"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
-        <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
+        <drawString x="382" y="555">[[ company.partner_id.name ]]</drawString>
         <stroke color="#000000"/>
-        <lines>25 720 1085 720</lines>
+        <lines>25 550 808 550</lines>
     </pageGraphics>
     </pageTemplate>
 </header>"""

=== modified file 'bin/addons/base/res/res_config.py'
--- bin/addons/base/res/res_config.py	2010-11-10 12:46:54 +0000
+++ bin/addons/base/res/res_config.py	2010-11-19 11:09:54 +0000
@@ -113,9 +113,8 @@
         current_user_menu = self.pool.get('res.users')\
             .browse(cr, uid, uid).menu_id
         # return the action associated with the menu
-        return self.pool.get(current_user_menu.type)\
-            .read(cr, uid, current_user_menu.id)
-
+        return {'menu_reload':True, 'type': 'object'}
+        
     def start(self, cr, uid, ids, context=None):
         ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context)
         for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context):


Follow ups