openerp-dev-web team mailing list archive

["Rucha \(Open ERP\)" <rpa@xxxxxxxxxxx>]

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-rework-company-view-imp-rpa into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

Requested reviews:
  qdp (OpenERP) (qdp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-company-view-imp-rpa/+merge/60892
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-company-view-imp-rpa/+merge/60892
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

=== modified file 'base_setup/base_setup_installer.xml'
--- base_setup/base_setup_installer.xml	2011-05-10 04:44:56 +0000
+++ base_setup/base_setup_installer.xml	2011-05-13 10:33:07 +0000
@@ -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">

=== modified file 'base_setup/base_setup_todo.xml'
--- base_setup/base_setup_todo.xml	2011-05-12 19:36:33 +0000
+++ base_setup/base_setup_todo.xml	2011-05-13 10:33:07 +0000
@@ -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>

=== modified file 'base_setup/installer.py'
--- base_setup/installer.py	2011-05-12 12:39:20 +0000
+++ base_setup/installer.py	2011-05-13 10:33:07 +0000
@@ -105,17 +105,7 @@
             progress = 10.
         
         return {'value':value}
-    
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        #Skipping default value as checked for main application, if already installed
-        return super(osv.osv_memory, self).default_get(
-            cr, uid, fields_list, context=context)
-
-    def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
-        #Skipping readonly value for main application, if already installed
-        return super(osv.osv_memory, self).fields_get(
-            cr, uid, fields, context, write_access)
+
 
     def execute(self, cr, uid, ids, context=None):
         if context is None: