From 87040b2390a496a96c2c69e09cfb2f19769b1f27 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:29:34 +0530
Subject: [PATCH 1/9] [IMP]:project:improved project view

bzr revid: apa@tinyerp.com-20120530065934-qpo4hsv4pcyhngjr
---
 addons/project/project_view.xml               | 36 +++++++++++--------
 addons/project/static/src/css/project.css     |  3 ++
 addons/project_issue/project_issue.py         |  2 +-
 addons/project_issue/project_issue_view.xml   | 10 ++++--
 .../project_long_term_view.xml                | 10 ++++--
 .../project_timesheet_view.xml                | 10 ++++--
 6 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..a7291e9f7d3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,21 +33,29 @@
                     <div class="oe_clear"/>
                 </div>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="analytic_account_id" invisible="1" required="0"/>
-                        <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <field name="name" string="Project Name" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <!--<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>-->
+                            <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="progress_rate" widget="progressbar"/>-->
+                        </group>
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <table>
+                                <tr name="use_tasks">
+                                    <th width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
+                                    <td><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                            </table>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <group col="2" colspan="2" name="kanban">
-                                <separator colspan="2" string="Project Management"/>
-                                    <field name="use_tasks"/>
-                            </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
@@ -63,7 +71,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Members">
+                        <page string="Team">
                             <field colspan="4" name="members" nolabel="1">
                                 <tree string="Members">
                                     <field name="name"/>
@@ -72,7 +80,7 @@
                             </field>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
+                            <!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ebab44e225a..7d589675a4a 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,3 +1,6 @@
+.oe_btn_width {
+    width: 100px;
+}
 .oe_kanban_project {
     width: 300px;
 }
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index d49631fb771..0c4b6af0956 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -533,7 +533,7 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
     
     _columns = {
-        'use_issues' : fields.boolean('Issue Tracking:', help="Check this field if this project manages issues"),
+        'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
     }
 #    _defaults = {
 #        'use_issues': True,
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 99b4ecafc57..6d01aabcb96 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -360,9 +360,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-            	<field name="use_tasks" position="after">
-                    <field name="use_issues"/>
-                </field>
+            	<xpath expr='//tr[@name="use_tasks"]' position='after'>
+                    <tr name="use_issues">
+                        <th>Issues Tracking</th>
+                        <td><field name="use_issues" nolabel="1"/></td>
+                        <td><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                     <field name="reply_to"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 2d7412f7e7d..9aaf52e27ff 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,9 +104,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_phases"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks"]' position='after'>
+                    <tr name="use_phases">
+                        <th>Phases Planing</th>
+                        <td><field name="use_phases" nolabel="1"/></td>
+                        <td><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 0a485470bc7..85cdfa18982 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -7,8 +7,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+                <xpath expr='//tr[@name="use_tasks"]' position='after'>
+                    <tr name="use_timesheets">
+                        <th>Timesheets</th>
+                        <td><field name="use_timesheets" nolabel="1"/></td>
+                        <td><button class="oe_btn_width" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
                 <field name="use_tasks" position='after'>
-                    <field name="use_timesheets"/>
                     <field name="amount_to_invoice" invisible="True"/>
                     <field name="time_to_invoice" invisible="True"/>
                 </field>
@@ -58,7 +64,7 @@
             <field name="inherit_id" ref="project_invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
-                    <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
                 </field>
             </field>
         </record>

From 4fc454658fdb4ed9370dcb94bb1706b3609341da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:45:41 +0530
Subject: [PATCH 2/9] improved project view

bzr revid: apa@tinyerp.com-20120530071541-yyriflh6u737zd9b
---
 addons/project/project_view.xml                     | 4 ++--
 addons/project_issue/project_issue_view.xml         | 2 +-
 addons/project_long_term/project_long_term_view.xml | 2 +-
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a7291e9f7d3..7da0277c73f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -39,7 +39,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
-                            <!--<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>-->
+                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->
@@ -49,7 +49,7 @@
                                 <tr name="use_tasks">
                                     <th width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
                         </group>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6d01aabcb96..020db7bba99 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -364,7 +364,7 @@
                     <tr name="use_issues">
                         <th>Issues Tracking</th>
                         <td><field name="use_issues" nolabel="1"/></td>
-                        <td><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
                     </tr>
                 </xpath>
                 <field name="priority" position="before">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9aaf52e27ff..c15c7d5dd23 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -108,7 +108,7 @@
                     <tr name="use_phases">
                         <th>Phases Planing</th>
                         <td><field name="use_phases" nolabel="1"/></td>
-                        <td><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
             </field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 85cdfa18982..107ec456c0a 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -11,7 +11,7 @@
                     <tr name="use_timesheets">
                         <th>Timesheets</th>
                         <td><field name="use_timesheets" nolabel="1"/></td>
-                        <td><button class="oe_btn_width" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
+                        <td style="text-align:right;"><button class="oe_btn_width" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
                     </tr>
                 </xpath>
                 <field name="use_tasks" position='after'>

From 63cf0f61906dcc1726a5e4596666556975c7902c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 13:07:28 +0530
Subject: [PATCH 3/9] [IMP]:project:improved view and code.

bzr revid: apa@tinyerp.com-20120530073728-1rij0covlh0odtl5
---
 addons/project/project_view.xml                 | 11 +++++++----
 addons/project_issue/project_issue_view.xml     | 11 +++++++----
 .../project_long_term_view.xml                  | 11 +++++++----
 .../project_timesheet_view.xml                  | 17 +++++++++--------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7da0277c73f..34c228b4c53 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,10 +45,13 @@
                             <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table>
-                                <tr name="use_tasks">
-                                    <th width="140px">Tasks Management</th>
-                                    <td><field name="use_tasks" nolabel="1"/></td>
+                            <table border="1">
+                                <tr name="use_tasks_row">
+                                    <td>
+                                        <group class="oe_form_group_label_border">
+                                            <field name="use_tasks"/>
+                                        </group>
+                                    </td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 020db7bba99..5016a1a1b4c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -360,10 +360,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-            	<xpath expr='//tr[@name="use_tasks"]' position='after'>
-                    <tr name="use_issues">
-                        <th>Issues Tracking</th>
-                        <td><field name="use_issues" nolabel="1"/></td>
+            	<xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr name="use_issues_row">
+                        <td>
+                            <group class="oe_form_group_label_border">
+                                <field name="use_issues"/>
+                            </group>
+                        </td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
                     </tr>
                 </xpath>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c15c7d5dd23..fef0ef46835 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -104,10 +104,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks"]' position='after'>
-                    <tr name="use_phases">
-                        <th>Phases Planing</th>
-                        <td><field name="use_phases" nolabel="1"/></td>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr name="use_phases_row">
+                        <td>
+                            <group class="oe_form_group_label_border">
+                                <field name="use_phases"/>
+                            </group>
+                        </td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 107ec456c0a..48015412652 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -7,17 +7,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks"]' position='after'>
-                    <tr name="use_timesheets">
-                        <th>Timesheets</th>
-                        <td><field name="use_timesheets" nolabel="1"/></td>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr name="use_timesheets_row">
+                        <td>
+                            <group class="oe_form_group_label_border">
+                                <field name="use_timesheets"/>
+                            </group>
+                        </td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
                     </tr>
                 </xpath>
-                <field name="use_tasks" position='after'>
-                    <field name="amount_to_invoice" invisible="True"/>
-                    <field name="time_to_invoice" invisible="True"/>
-                </field>
                 <field name="warn_customer" position="after">
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Invoicing Data"/>
@@ -25,6 +24,8 @@
                         <field name="to_invoice" widget="selection" string="Invoice Task Work"/>
                         <field name="amount_max"/>
                         <field name="amount_invoiced"/>
+                        <field name="amount_to_invoice" invisible="True"/>
+                        <field name="time_to_invoice" invisible="True"/>
                     </group>
                 </field>
             </field>

From 04d5c34200672f9f83c78bbf99593dc5e01123e2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:20:24 +0530
Subject: [PATCH 4/9] [IMP]:improved project view as new style and format

bzr revid: apa@tinyerp.com-20120530085024-ngddwwoiyonc875c
---
 addons/project/project_view.xml                     | 9 +++------
 addons/project_issue/project_issue_view.xml         | 9 +++------
 addons/project_long_term/project_long_term_view.xml | 7 ++-----
 addons/project_timesheet/project_timesheet_view.xml | 7 ++-----
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 34c228b4c53..399f325667d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,13 +45,10 @@
                             <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table border="1">
+                            <table border="0">
                                 <tr name="use_tasks_row">
-                                    <td>
-                                        <group class="oe_form_group_label_border">
-                                            <field name="use_tasks"/>
-                                        </group>
-                                    </td>
+                                    <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 5016a1a1b4c..1dfd1ed1b5e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -362,12 +362,9 @@
             <field name="arch" type="xml">
             	<xpath expr='//tr[@name="use_tasks_row"]' position='after'>
                     <tr name="use_issues_row">
-                        <td>
-                            <group class="oe_form_group_label_border">
-                                <field name="use_issues"/>
-                            </group>
-                        </td>
-                        <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                        <th style="border-right:1px solid #DDD;" width="140px">Issues Tracking</th>
+                        <td><field name="use_issues" nolabel="1"/></td>
+                        <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
                     </tr>
                 </xpath>
                 <field name="priority" position="before">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fef0ef46835..5117b3f9970 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -106,11 +106,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
                     <tr name="use_phases_row">
-                        <td>
-                            <group class="oe_form_group_label_border">
-                                <field name="use_phases"/>
-                            </group>
-                        </td>
+                        <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
+                        <td><field name="use_phases" nolabel="1"/></td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
                     </tr>
                 </xpath>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 48015412652..c8f531be924 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -9,11 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
                     <tr name="use_timesheets_row">
-                        <td>
-                            <group class="oe_form_group_label_border">
-                                <field name="use_timesheets"/>
-                            </group>
-                        </td>
+                        <th style="border-right:1px solid #DDD;" width="140px">Timesheets</th>
+                        <td><field name="use_timesheets" nolabel="1"/></td>
                         <td style="text-align:right;"><button class="oe_btn_width" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
                     </tr>
                 </xpath>

From 36d176b83de7f7edbd88adfdb2e55708ea914f5d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:49:29 +0530
Subject: [PATCH 5/9] improved project view

bzr revid: apa@tinyerp.com-20120530091929-i6c5vluk9osccd2a
---
 addons/project/project_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 399f325667d..2835c5f542f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -11,6 +11,15 @@
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -170,15 +179,6 @@
             </field>
         </record>
         
-        <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
-
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>

From 36c99ad66348e82cede092baca08ce87609b16dc Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:56:07 +0530
Subject: [PATCH 6/9] improved project view

bzr revid: apa@tinyerp.com-20120530092607-egv156h2k9853xvf
---
 .../project_long_term_view.xml                 | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 5117b3f9970..c8b06426c91 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -97,7 +97,14 @@
     # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
-
+        <act_window id="act_project_phases"
+            name="Phases"
+            src_model="project.project"
+            res_model="project.phase"
+            view_type="form"
+            view_mode="tree,form"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+        
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
@@ -114,15 +121,6 @@
             </field>
         </record>
 
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-        />
-
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>

From fc9e75519f5a3c1a2fda398ba6963f71a8e8a001 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 15:01:39 +0530
Subject: [PATCH 7/9] improved code for wrong inherit project task search view

bzr revid: apa@tinyerp.com-20120530093139-m1k5gm9hfxm6n6af
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c8b06426c91..9497b3ad6ec 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -332,7 +332,7 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <field name="project_id" position="after">
+                <field name="name" position="after">
                     <field name="phase_id" select="1"/>
                 </field>
             </field>

From 63708de91abea8cb389f6e5cb030a2f3a5f84bd5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 17:01:22 +0530
Subject: [PATCH 8/9] [IMP]:improved analytic view

bzr revid: apa@tinyerp.com-20120530113122-jcngf2112sjq31nb
---
 .../account_analytic_analysis_view.xml        | 116 +++++++++++++-----
 1 file changed, 85 insertions(+), 31 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 065a0b4009b..c4c0491193a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -58,38 +58,92 @@
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
-		    <group colspan="4">
-			<group col="2" colspan="1" class="oe_form_group_label_border">
-			    <label string=" "/><label string=" "/>
-			    <field name="fix_price_invoices"/>
-			    <field name="invoice_on_timesheets"/>
-			    <field name="charge_expenses"/>
-			</group>
-			<group col="2" colspan="1">
-			    <label string="Est.Tot"/>
-			    <label string="Invoiced"/>
-			    <field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			    <field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			</group>
-			<group col="2" colspan="1" class="oe_form_group_odd_border">
-			    <label string="Remaining"/>
-			    <label string="To Invoice"/>
-			    <field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			    <field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			</group>
-			<group col="2" colspan="1">
-			    <label string=" "/><label string=" "/>
-			    <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-
-			</group>
+		    <group col="1" colspan="4">
+			<table border="1">
+			    <tr>
+				<th height="20px"></th>
+				<th></th>
+				<th>Est.Tot</th>
+				<th>Invoiced</th>
+				<th>Remaining</th>
+				<th>Ready To Invoice</th>
+				<th></th>
+				<th></th>
+			    </tr>
+			    <tr>
+				<th>Fix Price Invoices</th>
+				<td><field name="fix_price_invoices" nolabel="1"/></td>
+				<td><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th>Invoice On Timesheets</th>
+				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
+				<td><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th>Charge Expenses</th>
+				<td><field name="charge_expenses" nolabel="1"/></td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+			    </tr>
+			    <tr>
+				<th>Total</th>
+				<td></td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td></td>
+				<td></td>
+			    </tr>
+			</table>
 		    </group>
+<!--		    <group colspan="4">-->
+<!--			<group col="2" colspan="1" class="oe_form_group_label_border">-->
+<!--			    <label string=" "/><label string=" "/>-->
+<!--			    <field name="fix_price_invoices"/>-->
+<!--			    <field name="invoice_on_timesheets"/>-->
+<!--			    <field name="charge_expenses"/>-->
+<!--			</group>-->
+<!--			<group col="2" colspan="1">-->
+<!--			    <label string="Est.Tot"/>-->
+<!--			    <label string="Invoiced"/>-->
+<!--			    <field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			    <field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			</group>-->
+<!--			<group col="2" colspan="1" class="oe_form_group_odd_border">-->
+<!--			    <label string="Remaining"/>-->
+<!--			    <label string="To Invoice"/>-->
+<!--			    <field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			    <field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			</group>-->
+<!--			<group col="2" colspan="1">-->
+<!--			    <label string=" "/><label string=" "/>-->
+<!--			    <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!---->
+<!--			</group>-->
+<!--		    </group>-->
 		    
 		    
 		    

From eddbed0f583d5d81ab61759d5e25af3c04181334 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 18:15:35 +0530
Subject: [PATCH 9/9] [IMP]:improved css for contract view

bzr revid: apa@tinyerp.com-20120530124535-d3it3v890juhjkof
---
 .../account_analytic_analysis_view.xml        | 78 ++++++++++---------
 .../static/src/css/account_analytic.css       | 46 +++++------
 2 files changed, 59 insertions(+), 65 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c4c0491193a..aa9df910d61 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -59,56 +59,58 @@
                 <xpath expr='//separator[@name="description"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
 		    <group col="1" colspan="4">
-			<table border="1">
+			<table border="0">
 			    <tr>
-				<th height="20px"></th>
-				<th></th>
-				<th>Est.Tot</th>
-				<th>Invoiced</th>
-				<th>Remaining</th>
-				<th>Ready To Invoice</th>
-				<th></th>
-				<th></th>
+				<th class="oe_th_150px" height="20px"></th>
+				<th width="10px"></th>
+				<th class="oe_th_110px">Est.Tot</th>
+				<th class="oe_th_110px">Invoiced</th>
+				<th class="oe_th_110px">Remaining</th>
+				<th class="oe_th_110px">Ready To Invoice</th>
+				<th width="10px"></th>
+				<th class="oe_th_150px"></th>
+				<th class="oe_th_150px"></th>
 			    </tr>
 			    <tr>
-				<th>Fix Price Invoices</th>
+				<th class="oe_border_right">Fix Price Invoices</th>
 				<td><field name="fix_price_invoices" nolabel="1"/></td>
-				<td><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 			    </tr>
 			    <tr>
-				<th>Invoice On Timesheets</th>
+				<th class="oe_border_right">Invoice On Timesheets</th>
 				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
-				<td><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    </tr>
 			    <tr>
-				<th>Charge Expenses</th>
+				<th class="oe_border_right">Charge Expenses</th>
 				<td><field name="charge_expenses" nolabel="1"/></td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
+				<td class="oe_amount_center oe_th_110px">todo</td>
+				<td class="oe_amount_center oe_th_110px">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_right">todo</td>
+				<td class="oe_amount_center oe_th_110px">todo</td>
+				<td width="10px"></td>
+				<td class="oe_th_150px">todo</td>
+				<td class="oe_th_150px">todo</td>
 			    </tr>
 			    <tr>
-				<th>Total</th>
-				<td></td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td></td>
-				<td></td>
+				<th class="oe_border_right">Total</th>
+				<td width="10px"></td>
+				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
 			    </tr>
 			</table>
 		    </group>
diff --git a/addons/account_analytic_analysis/static/src/css/account_analytic.css b/addons/account_analytic_analysis/static/src/css/account_analytic.css
index b9a043ef346..e627151a342 100644
--- a/addons/account_analytic_analysis/static/src/css/account_analytic.css
+++ b/addons/account_analytic_analysis/static/src/css/account_analytic.css
@@ -1,34 +1,26 @@
-.oe_field_view {
-    width: 80px;
-    text-align: center;
+.oe_th_80px{
+    width:80px;
+    text-align: center !important;
+    vertical-align: middle;
 }
-.oe_float_field_view {
-    width: 110px;
-    text-align: center;
+.oe_th_110px{
+    width:110px;
+    text-align: center !important;
+    vertical-align: middle;
 }
-.oe_title_button_left {
-    min-width: 140px;
-    text-align: left;
-    margin-left: 5px !important;
+.oe_th_150px{
+    width:150px;
+    text-align: right !important;
 }
-
-.oe_title_button_right {
-    min-width: 110px;
-    text-align: right;
-    margin-left: 55px !important;
+.oe_amount_center{
+    text-align: center !important;
 }
-
-.oe_field_label {
-    text-align: left;
+.oe_btn_width{
+    width: 150px;
 }
-
-.oe_totals {
-    width: 110px;
-    text-align: center;
-    border-top:  groove;
+.oe_border_right{
+    border-right: 1px solid #DDD;
 }
-.oe_totals_view {
-    width: 80px;
-    text-align: center;
-    border-top:  groove;
+.oe_border_top{
+    border-top: 1px solid #000000;
 }
\ No newline at end of file