[IMP]: base_setup: Removed logo field from company setup wizard as we have a new...

bzr revid: rpa@tinyerp.com-20110429064008-7v5rvc87vogu10da

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7467cad..e4beabe 100644 (file)
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -40,11 +40,6 @@
                     <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
                     <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
                     <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
-
-                    <separator colspan="4"
-                               string="Your Logo - Use a size of about 450x150 pixels."/>
-                    <field colspan="5" name="logo" widget="image"
-                           nolabel="1"/>
                   </group>
             </group>
            </group>

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index f5c8c8d..5cf3eb0 100644 (file)
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -72,7 +72,7 @@ class base_setup_company(osv.osv_memory):
             return defaults
 
         defaults['currency'] = company.currency_id.id
-        for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
+        for field in ['name','rml_header1','rml_footer1','rml_footer2']:
             defaults[field] = company[field]
 
         if company.partner_id.address:
@@ -109,7 +109,6 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''')
             help='''This sentence will appear at the bottom of your reports.
 We suggest you to put bank information here:
 IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
-        'logo':fields.binary('Logo'),
         'account_no':fields.char('Bank Account No', size=64),
         'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"),
     }
@@ -126,7 +125,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
             'rml_header1':payload.rml_header1,
             'rml_footer1':payload.rml_footer1,
             'rml_footer2':payload.rml_footer2,
-            'logo':payload.logo,
             'currency_id':payload.currency.id,
             'account_no':payload.account_no,
         })