pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge from trunk addons

Browse Source 
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
This commit is contained in:
Mustufa Rangwala
2011-01-03 14:38:25 +05:30
parent 5fefd9f529 b7d5d7c008
commit 3bdca04e28
431 changed files with 26163 additions and 4518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project_long_term/project_long_term_view.xml
+15 -12
View File
@@ -63,7 +63,7 @@
<field name="resource_id"/>
<field name="phase_id"/>
<field name="project_id"/>
<field name="useability"/>
<field name="useability" string="Availability"/>
</tree>
</field>
</record>
@@ -117,7 +117,7 @@
</group>
<group colspan="6" col="6">
<field name="date_start"/>
<field name="duration" on_change="onchange_days(project_id)" />
<field name="duration"/>
<field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
<field name="date_end"/>
</group>
@@ -127,15 +127,15 @@
<field colspan="4" name="resource_ids" nolabel="1">
<tree editable="bottom" string="Project Resource Allocation">
<field name="resource_id" context="{'project_id':parent.project_id}"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="useability"/>
<field name="date_start" readonly="1"/>
<field name="date_end" readonly="1"/>
<field name="useability" string="Availability"/>
</tree>
<form string="Project Resource Allocation">
<field name="resource_id" context="{'project_id':parent.project_id}"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="useability"/>
<field name="date_start" readonly="1"/>
<field name="date_end" readonly="1"/>
<field name="useability" string="Availability"/>
</form>
</field>
<separator string="" colspan="4"/>
@@ -148,15 +148,17 @@
<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
</group>
</page>
<page string="Task Detail">
<field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
<tree editable="bottom" string="Project's Tasks">
<page string="Tasks Details">
<field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
<tree string="Project's Tasks">
<field name="sequence"/>
<field name="name"/>
<field name="user_id"/>
<field name="planned_hours" widget="float_time"/>
<field name="project_id" invisible="1"/>
<field name="total_hours" sum='Total Hours'/>
<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
<field name="state"/>
</tree>
<form string="Project's Tasks">
<notebook colspan="4">
@@ -165,6 +167,7 @@
<field name="name"/>
<field name="project_id"/>
<field name="user_id"/>
<field name="sequence"/>
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2"/>
@@ -175,7 +178,7 @@
<separator string="Planning" colspan="2"/>
<field name="planned_hours" widget="float_time"/>
<field name="total_hours" widget="float_time"/>
<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
<field name="remaining_hours" widget="float_time"/>
<field name="effective_hours" invisible="1"/>
</group>
<group colspan="6" col="4">