From d3b700742569e9c0dcb7c057e17e0d1445958e7d Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 8 Apr 2011 12:12:34 +0530
Subject: [PATCH] [IMP]Base:Default Logo Set and Preview Reports,Upload/Change
 Logo btn put under Seprator

bzr revid: aag@tinyerp.co.in-20110408064234-b0jawj9ntdrmae8a
---
 openerp/addons/base/base_update.xml    | 7 +++++--
 openerp/addons/base/res/res_company.py | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 9a4d0993a85..0680dcb4326 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -232,13 +232,16 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
+                        <group colspan="4">
                             <field name="rml_header1" colspan="4"/>
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" colspan="2"/>
+                         </group>
+                            <separator string="" colspan="4"/>
                             <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
                             <button name="%(action_res_company_logo)d"
-                    string="Upload your logo" type="action" icon="gtk-ok"/>
+                    string="Upload/Change Logo" type="action" icon="gtk-open"/>
                         </page>
                         <page string="Header/Footer" groups="base.group_extended">
                             <field colspan="4" name="rml_header" nolabel="1"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index e5d18c00699..5db023d2547 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -73,6 +73,9 @@ class res_company_logo(osv.osv_memory):
     _columns = {
         'logo' : fields.binary('Logo'),
     }
+    _defaults={
+               'logo':lambda self,cr,uid,c: self.pool.get('res.company').browse(cr, uid, uid,c).logo,
+     }
 
     def execute(self, cr, uid, ids, context=None):
         if context is None: