openerp-dev-web team mailing list archive

[jam-openerp <jam@xxxxxxxxxxx>]

jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)


Hello,

   Changes in thie Merge Proposal :
    + [BUG-FIX] lp:689583
    + [BUG-FIX] lp:689581
    + [BUG-FIX] lp:681343
   Kindly Review it,

Thank You


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/43627
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'project/project.py'
--- project/project.py	2010-11-26 16:13:59 +0000
+++ project/project.py	2010-12-14 10:15:27 +0000
@@ -362,7 +362,7 @@
         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):

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2010-12-09 12:06:15 +0000
+++ project_long_term/project_long_term_view.xml	2010-12-14 10:15:27 +0000
@@ -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/>