[IMP, REM]: Fixed view of company after changes in server, Removed unwanted view

bzr revid: rpa@tinyerp.com-20110513070627-funzvol19b85ahwi

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 286aa81..b0e63f6 100644 (file)
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -217,7 +217,7 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="currency_id" position="after">
+                <field name="rml_footer2" position="after">
                      <newline/>
                      <separator string="" colspan="4"/>
                      <group colspan="4" col="2">

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index aa39f27..f6b353b 100644 (file)
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,53 +1,5 @@
 <openerp>
   <data>
-    <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Company Configuration</field>
-      <field name="model">base.setup.company</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Company Configuration</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company Information</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>25</attribute>
-                    <attribute name='string'></attribute>
-          </xpath>
-          <group string="res_config_contents" position="replace">
-              <group colspan="5">
-                  <group colspan="2">
-                    <field name="company_id" invisible="1"/>
-                    <field name="name" required="True"/><field name="website"/>
-                    <field name="street"/><field name="street2"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="state_id"/>
-                    <field name="phone"/>
-                    <field name="email"/>
-                    <field name="account_no"/>
-                    <field name="currency" widget="selection"/>
-                </group>
-                <newline/>
-                <group colspan="2">
-                    <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"/>
-                  </group>
-            </group>
-           </group>
-
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
-        </data>
-      </field>
-    </record>
 
     <record id="action_base_setup_company" model="ir.actions.act_window">
       <field name="name">Company Configuration</field>