merge

bzr revid: fp@tinyerp.com-20100406161510-u7t9vi4kxlm30l6y

1 files changed, 99 insertions, 94 deletions

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 53eaba2e4a9..af4bc26ba88 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -32,7 +32,7 @@
             </field>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
 
@@ -46,38 +46,43 @@
                         <field name="name" select="1"/>
                         <field name="project_id" on_change="onchange_project(project_id)"/>
                         <field name="responsible_id"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="duration" widget="float_time"/>
-                        <field name="product_uom"/>
                     </group>
                     <notebook colspan="4">
-                    	<page string="Resource Allocation Detail">
-                            <separator colspan="4" string="Resource Allocation"/>
+                        <page string="Resource Allocation Detail">
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Duration"/>
+                                <field name="duration" widget="float_time"/>
+                                <field name="product_uom"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Dates"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                            </group>
                             <field colspan="4" name="resource_ids" nolabel="1">
-                            	 <tree editable="bottom" string="Project Resource Allocation">
+                                 <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                    				<field name="useability"/>
+                                    <field name="useability"/>
                                   </tree>
                                   <form string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                    				<field name="useability"/>
+                                    <field name="useability"/>
                                   </form>
                              </field>
                             <group col="12" colspan="4">
-                            	<field name="state" select="1"/>
-                            	<button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                            	<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
+                                <field name="state" select="1"/>
+                                <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
+                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                                 <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-								<button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Other Info">
                            <group colspan="2" col="2">
                                 <separator string="Constraints" colspan="2"/>
                                 <field name="constraint_date_start"/>
-                        		<field name="constraint_date_end"/>
+                                <field name="constraint_date_end"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Scheduling" colspan="2"/>
@@ -91,46 +96,46 @@
                         <page string="Task Detail">
                             <separator colspan="4" string="Project's Tasks"/>
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
-                            	 <tree editable="bottom" string="Project's Tasks">
+                                 <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
                                     <field name="project_id"/>
                                     <field name="user_id"/>
-                    				<field name="date_start"/>
-                                  	<field name="date_deadline"/>
-                                  	<field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-									<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-									<field name="effective_hours" invisible="1"/>
-									<field name="state"/>
-									<field name="occupation_rate"/>
+                                    <field name="date_start"/>
+                                      <field name="date_deadline"/>
+                                      <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                    <field name="effective_hours" invisible="1"/>
+                                    <field name="state"/>
+                                    <field name="occupation_rate"/>
                                   </tree>
                                   <form string="Project's Tasks">
-                                  	<notebook colspan="4">
-                                  		<page string="Task Detail">
-                                  			<group colspan="4" col="4">
-		                                    	<field name="name"/>
-		                                    	<field name="project_id"/>
-		                                    	<field name="user_id"/>
-		                                    </group>
-		                    				<group colspan="2" col="2">
-		                                  		<separator string="Dates" colspan="2"/>
-		                                  		<field name="date_start"/>
-		                                  		<field name="date_deadline"/>
-		                                  		<field name="occupation_rate"/>
-		                                    </group>
-		                                    <group colspan="2" col="2">
-		                                  		<separator string="Planning" colspan="2"/>
-		                                  		<field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-												<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-												<field name="effective_hours" invisible="1"/>
-		                                    </group>
-		                                    <group colspan="6" col="4">
-												<field name="state"/>
-											</group>
-										</page>
-									</notebook>
+                                      <notebook colspan="4">
+                                          <page string="Task Detail">
+                                              <group colspan="4" col="4">
+                                                <field name="name"/>
+                                                <field name="project_id"/>
+                                                <field name="user_id"/>
+                                            </group>
+                                            <group colspan="2" col="2">
+                                                  <separator string="Dates" colspan="2"/>
+                                                  <field name="date_start"/>
+                                                  <field name="date_deadline"/>
+                                                  <field name="occupation_rate"/>
+                                            </group>
+                                            <group colspan="2" col="2">
+                                                  <separator string="Planning" colspan="2"/>
+                                                  <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                                <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                                <field name="effective_hours" invisible="1"/>
+                                            </group>
+                                            <group colspan="6" col="4">
+                                                <field name="state"/>
+                                            </group>
+                                        </page>
+                                    </notebook>
                                   </form>
                              </field>
-                           	<button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                               <button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -194,15 +199,15 @@
                         <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
-	                    <field name="name"/>
-	                    <field name="project_id" widget="selection">
-		                    <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
-						</field>
-	                    <field name="responsible_id" widget="selection">
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="project_id" widget="selection">
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                        </field>
+                        <field name="responsible_id" widget="selection">
                             <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" default="1"/>
                         </field>
-	                    <field name="date_start"/>
-	                    <!--<field name="date_end"/>-->
+                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -223,51 +228,51 @@
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
 
         <record id="view_phase_project_form1" model="ir.ui.view">
-			<field name="name">phase.project.form1</field>
-			<field name="model">project.project</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.edit_project"/>
-			<field name="arch" type="xml">
-				<field name="priority" position="before">
-					<field name="resource_calendar_id"/>
-				</field>
+            <field name="name">phase.project.form1</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <field name="priority" position="before">
+                    <field name="resource_calendar_id"/>
+                </field>
 
-			</field>
-	   </record>
+            </field>
+       </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
 
-    	<record id="view_project_phase_task_form1" model="ir.ui.view">
-			<field name="name">project.phase.task.form1</field>
-			<field name="model">project.task</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="arch" type="xml">
-				<field name="planned_hours" position="replace">
-					<field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
-				</field>
+        <record id="view_project_phase_task_form1" model="ir.ui.view">
+            <field name="name">project.phase.task.form1</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="planned_hours" position="replace">
+                    <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
+                </field>
 
-			</field>
-	   </record>
+            </field>
+       </record>
 
-		<record id="view_project_phase_task_form2" model="ir.ui.view">
-			<field name="name">project.phase.task.form2</field>
-			<field name="model">project.task</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="arch" type="xml">
-				<field name="date_end" position = "after">
-		  			<field name="occupation_rate"/>
-				</field>
-			</field>
-	   </record>
+        <record id="view_project_phase_task_form2" model="ir.ui.view">
+            <field name="name">project.phase.task.form2</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position = "after">
+                      <field name="occupation_rate"/>
+                </field>
+            </field>
+       </record>
 
         <act_window
         id="project_phase_task_list"
@@ -286,16 +291,16 @@
         view_mode="tree,form"
         view_type="form" />
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Menu Items
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
     </data>
 </openerp>