[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20110104050755-shpnclijhsa7kuh4
This commit is contained in:
Mustufa Rangwala
2011-01-04 10:37:55 +05:30
153 changed files with 4661 additions and 4584 deletions
@@ -190,14 +190,14 @@
</field>
<button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
</page>
<page string="Other Info">
<page string="Schedule and Display info">
<group colspan="2" col="2">
<separator string="Constraints" colspan="2"/>
<field name="constraint_date_start"/>
<field name="constraint_date_end"/>
</group>
<group colspan="2" col="2">
<separator string="Scheduling" colspan="2"/>
<separator string="Displaying settings" colspan="2"/>
<field name="sequence"/>
</group>
<separator colspan="4" string="Previous Phases"/>