From ce9ddadc9bb9a5e41119ee3ed88aa0c5062aed3e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 21 Jun 2012 18:01:10 +0200
Subject: [PATCH] [FIX] Fixed subtotal footer in project and sale order form
 views

bzr revid: fme@openerp.com-20120621160110-16bp8l8ej2rwagp0
---
 addons/project/project_view.xml | 5 +++--
 addons/sale/sale_view.xml       | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7588de7348f..f883f007bd6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -384,15 +384,16 @@
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
                                 </tree>
                             </field>
-                            <group class="oe_form_subtotal_footer" name="project_hours" groups="project.group_time_work_estimation_tasks">
+                            <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
                                     <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
                                     <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
-                                <field name="total_hours" widget="float_time" class="oe_form_subtotal_footer_separator"/>
+                                <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                             </group>
+                            <div class="oe_clear"/>
                         </page>
                         <page string="Delegations History" groups="project.group_delegate_task">
                             <separator string="Parent Tasks"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index aee5ab0f112..f5b9f42f0a1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -217,12 +217,12 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer" colspan="2" name="sale_total">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <separator string="Notes"/>
+                            <separator string="Notes" class="oe_clear"/>
                             <field name="note" placeholder="Add a global note on the sale order..."/>
                         </page>
                         <page string="Other Information">