openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00556
[Merge] lp:~openerp-dev/openobject-server/report_server into lp:openobject-server
Jni (Open ERP) has proposed merging lp:~openerp-dev/openobject-server/report_server into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
The server changes needed to print the Landscape reports.
--
https://code.launchpad.net/~openerp-dev/openobject-server/report_server/+merge/41290
Your team OpenERP R&D Team is subscribed to branch 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 12:21:35 +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 12:21:35 +0000
@@ -393,7 +393,7 @@
cr, uid,
modules.search(cr, uid, [('name','in',to_install)]),
'to install', ['uninstalled'], context=context)
- cr.commit() #TOFIX: after remove this statement, installation wizard is fail
+ cr.commit() #TOFIX: after remove this statement, installation wizard is fail
pooler.restart_pool(cr.dbname, update_module=True)
res_config_installer()