pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: APA branch into dev branch

Browse Source 
bzr revid: jni@tinyerp.com-20101119120545-07e2l9pmri9l7f33
This commit is contained in:
Jni (Open ERP)
2010-11-19 17:35:45 +05:30
parent 762c4bfd91 31de6c01a5
commit 47af4ba8e5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/res/res_company.py
+4 -4
View File
@@ -203,16 +203,16 @@ class res_company(osv.osv):
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>"""
bin/addons/base/res/res_config.py
+1 -1
View File
@@ -393,7 +393,7 @@ class res_config_installer(osv.osv_memory):
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()