[MERGE]merge with parent branch and resolve conflicts

bzr revid: sgo@tinyerp.com-20120530130522-f8d6vem8wwlp0z4r

2 files changed, 34 insertions, 23 deletions

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..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">
@@ -33,21 +42,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" 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"/>-->
+                        </group>
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <table border="0">
+                                <tr name="use_tasks_row">
+                                    <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>
+                        </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 +80,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 +89,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/>
@@ -162,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>
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;
 }