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

[odoo/odoo.git] / addons / base_setup / base_setup_todo.xml

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 2a7699b..f6b353b 100644 (file)
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,73 +1,21 @@
 <openerp>
   <data>
-    <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Setup company information</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">Main Company Setup</attribute>
-          </form>
-                 <xpath expr="//label[@string='description']" position="attributes">
-                   <attribute name="string">Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...</attribute>
-             </xpath>
-             <xpath expr='//separator[@string="title"]' position='attributes'>
-                         <attribute name='string'>Configure Your Company</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" colspan="4" required="True"/>
-                           <newline/>
-                           <field name="street"/>
-                           <field name="street2"/>
-                           <field name="zip"/>
-                           <field name="city"/>
-                           <field name="country_id"/>
-                           <field name="state_id"/>
-                           <field name="email"/>
-                           <field name="phone"/>
-                           <field name="currency"/>
-
-                           <separator string="Report Information" colspan="4"/>
-                           <field name="rml_header1" colspan="4"/>
-                           <field name="rml_footer1" colspan="4"/>
-                           <field name="rml_footer2" colspan="4"/>
-
-                           <separator colspan="4"
-                                      string="Your Logo - Use a size of about 450x150 pixels."/>
-                           <field colspan="4" name="logo" widget="image"
-                                  nolabel="1"/>
-                         </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">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.company</field>
-      <field name="view_id" ref="view_base_setup_company"/>
+      <field name="res_model">res.company</field>
+      <field name="view_id" ref="base.view_company_form"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
-      <field name="target">new</field>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">onskip</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
     </record>
+ 
   </data>
 </openerp>