[Merge]with: lp:~openerp-commiter/openobject-addons/trunk-configuration-imp-dbr-impo-config-account-hsa

bzr revid: dbr@tinyerp.com-20120703050226-bt8e2i42lf3nk1cg

5 files changed, 53 insertions, 49 deletions

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 47d90f0399a..161cb29b173 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -25,14 +25,16 @@
                                 <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
                             </group>
                         </group>
-                        <group string="External Accesses">
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group string="Others">
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                        <group>
+                            <group string="External Accesses">
+                                <field name="module_share"/>
+                                <field name="module_portal"/>
+                            </group>
+                            <group string="Others">
+                                <label for="id" string="Outgoing Mail Servers"/>
+                                <button type="action" name="%(base.action_ir_mail_server_list)d"
                                 string="Configure" icon="gtk-execute"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 48938972f60..921b2cbd981 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -13,22 +13,26 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
+                        <group>
+                            <group string="Manufacturing Order">
+                                <field name="module_mrp_operations"/>
+                                <field name="module_stock_planning"/>
+                                <field name="module_mrp_subproduct"/>
+                                <field name="module_mrp_repair"/>
+                            </group>
+                            <group string="Products">
+                                <field name="module_product_manufacturer"/>
+                            </group>
                         </group>
-                        <group string="Logistics">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
+                        <group>
+                            <group string="Logistics">
+                                <field name="module_mrp_jit"/>
+                                <field name="module_stock_no_autopicking"/>
+                            </group>
+                            <group string="Bill Of Material">
+                                <field name="group_mrp_routings"/>
+                                <field name="group_mrp_properties"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index ff1511d49f2..61c26fa678f 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -26,12 +26,14 @@
                                 <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                             </group>
                         </group>
-                        <group string="Planning">
-                            <field name="module_project_long_term"/>
-                        </group>
-                        <group string="Helpdesk and Support" name="support">
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
+                        <group>
+                            <group string="Planning">
+                                <field name="module_project_long_term"/>
+                            </group>
+                            <group string="Helpdesk and Support" name="support">
+                                <field name="module_project_issue"/>
+                                <field name="module_project_issue_sheet"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 06b06c7bae4..e1ca0b40d3a 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -14,8 +14,8 @@
                     </header>
                     <sheet>
                         <group string="Invoicing">
-                            <field name="default_invoice_method"/>
-                            <field name="decimal_precision"/>
+                            <field name="default_invoice_method" class="oe_inline"/>
+                            <field name="decimal_precision" class="oe_inline"/>
                         </group>
                         <group string="Purchase Order">
                             <group>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 64c151af33c..f5c151056f4 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -14,36 +14,32 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <group string="Traceability">
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        <group>
+                            <group string="Traceability">
+                                <field name="group_stock_production_lot"/>
+                                <field name="group_stock_tracking_lot"/>
+                                <field name="module_product_expiry"
+                                    attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                            </group>
+                            <group string="Partners">
+                                <field name="module_claim_from_delivery"/>
+                            </group>
                         </group>
-                        <group string="Logistics">
-                            <group>
+                        <group>
+                            <group string="Logistics">
                                 <field name="group_stock_multiple_locations"/>
                                 <field name="module_stock_invoice_directly"/>
-                            </group>
-                            <group>
                                 <field name="module_stock_location"/>
-                                <field name="decimal_precision"/>
+                                <field name="decimal_precision" class="oe_inline"/>
                             </group>
-                        </group>
-                        <group string="Products">
-                            <group>
+                            <group string="Products">
                                 <field name="group_stock_packaging"/>
                                 <field name="group_uom"/>
                                 <field name="group_uos"/>
-                            </group>
-                            <group>
-                                <field name="group_stock_inventory_valuation"/>
+                                <field name="group_stock_inventory_valuation" class="oe_inline"/>
                                 <field name="group_product_variant"/>
                             </group>
                         </group>
-                        <group string="Partners">
-                            <field name="module_claim_from_delivery"/>
-                        </group>
                     </sheet>
                 </form>
             </field>