openerp-dev-web team mailing list archive

["Atik Agewan\(OpenERP\)" <aag@xxxxxxxxxxx>]

Atik Agewan(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-rework-company-imp-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-company-imp-aag/+merge/62655


Hello 

 In company form button 'preview reports' is smaller and top right on tab header/footer.
 Tab "other" is merged with  Tab "configuration"
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-company-imp-aag/+merge/62655
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-18 12:37:22 +0000
+++ base_setup/base_setup_installer.xml	2011-05-27 11:27:07 +0000
@@ -217,12 +217,12 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
-                     <newline/>
-                     <separator string="" colspan="4"/>
-                     <group colspan="4" col="2">
-                     <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
-                     </group>
+                <field name="rml_header" position="before">
+                    <group colspan="4" col="8">
+                        <label string="" colspan="7"/>
+                        <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
+                        <separator string="" colspan="8"/>
+                    </group>
                 </field>
           </field>
       </record>

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2011-04-07 07:19:56 +0000
+++ point_of_sale/point_of_sale_view.xml	2011-05-27 11:27:07 +0000
@@ -639,12 +639,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Other">
-                      <field  name="company_discount" colspan="4"/>
-                      <field  name="max_diff" colspan="4"/>
-                    </page>
-                </notebook>
+                <field name="currency_id" position="after">
+                    <separator string="Other Information" colspan="4"/>
+                    <field  name="company_discount" />
+                    <newline/>
+                    <field  name="max_diff" />
+                </field>
             </field>
            </record>