openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05851
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-751329-uco into lp:openobject-addons
Ujjvala Collins (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-751329-uco into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #751329 in OpenERP Addons: "[PS] Wrong label "Parent Project" in the project form view"
https://bugs.launchpad.net/openobject-addons/+bug/751329
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751329-uco/+merge/58927
[FIX] project: Label changed for parent project field for better usability. (lp:751329)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751329-uco/+merge/58927
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-751329-uco.
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2011-01-27 09:49:39 +0000
+++ project/project_view.xml 2011-04-25 05:17:24 +0000
@@ -21,7 +21,7 @@
<form string="Project">
<group colspan="6" col="6">
<field name="name" string="Project Name" select="1"/>
- <field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
+ <field name="parent_id" string="Parent" domain="[('id','!=',active_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'])]}"/>
@@ -122,7 +122,7 @@
<filter string="Manager" name="Manager" icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
<filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
- <filter string="Parent" name="Parent" help="Parent Project" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+ <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
</group>
</search>
</field>
@@ -140,7 +140,7 @@
<field name="name" string="Project Name"/>
<field name="user_id" string="Project Manager"/>
<field name="partner_id" string="Partner"/>
- <field name="parent_id" string="Parent Project" invisible="1"/>
+ <field name="parent_id" string="Parent" invisible="1"/>
<field name="planned_hours" widget="float_time"/>
<field name="total_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/>
Follow ups