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

[MERGE]

Browse Source 
bzr revid: uco@tinyerp.com-20101215045126-oyvn206ryyzfi3ci
This commit is contained in:
uco (OpenERP)
2010-12-15 10:21:26 +05:30
parent 7367af58e0 573d824a3d
commit 9227b2ced6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_view.xml
+1 -1
View File
@@ -375,7 +375,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="parent_id" position="after">
<field name="user_id" position="after">
<field name="section_id" completion="1" widget="selection"
groups="base.group_extended"/>
</field>
addons/project/project.py
+1 -1
View File
@@ -362,7 +362,7 @@ class task(osv.osv):
default['active'] = True
default['type_id'] = False
if not default.get('name', False):
default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
default['name'] = self.browse(cr, uid, id, context=context).name
return super(task, self).copy_data(cr, uid, id, default, context)
def _check_dates(self, cr, uid, ids, context=None):
addons/project_long_term/project_long_term_view.xml
+3 -2
View File
@@ -151,6 +151,7 @@
<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">
<field name="sequence"/>
<field name="name"/>
<field name="user_id"/>
<field name="planned_hours" widget="float_time"/>
@@ -197,9 +198,9 @@
<field name="sequence"/>
</group>
<separator colspan="4" string="Previous Phases"/>
<field colspan="4" name="previous_phase_ids" nolabel="1"/>
<field colspan="4" name="previous_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
<separator colspan="4" string="Next Phases"/>
<field colspan="4" name="next_phase_ids" nolabel="1"/>
<field colspan="4" name="next_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
</page>
</notebook>
<newline/>