From 51647e7515fee1b6e2131cf082ed91bae6c1fd3c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 27 Mar 2012 12:39:40 +0530
Subject: [IMP] add bollean field in project.project for some module

bzr revid: sgo@tinyerp.com-20120327070940-238ejuwcrmcz6ax3
---
 addons/project_long_term/project_long_term.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..13efe602f79 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -217,6 +217,7 @@ class project(osv.osv):
     _inherit = "project.project"
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
+        'phase' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view")
     }
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
-- 
cgit v1.2.3


From cce28758f59d2199fb377bec4c50e91815ca6478 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 28 Mar 2012 12:40:59 +0530
Subject: [imp]

bzr revid: sgo@tinyerp.com-20120328071059-mrixwtuksf8ezfzq
---
 addons/project_long_term/project_long_term.py | 50 ++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 13efe602f79..d54072f1cc7 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -215,10 +215,58 @@ project_user_allocation()
 
 class project(osv.osv):
     _inherit = "project.project"
+    
+    def _open_phase(self, cr, uid, ids, field_name, arg, context=None):
+        open_phase={}
+        phase_pool=self.pool.get('project.phase')
+        for id in ids:
+            phase_ids = phase_pool.search(cr, uid, [('project_id', '=', id)])
+            open_phase[id] = len(phase_ids)
+        return open_phase
+     
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'phase' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view")
+        'phase' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"),
+        'open_phases' : fields.function(_open_phase , type='integer',string="Open Phases"),
+        
     }
+    
+    def open_phase(self, cr, uid, ids, context=None):
+        #Open the View for the Tasks for the project
+        """
+        This opens Tasks views
+        @return :Dictionary value for task view
+        """
+        if context is None:
+            context = {}
+        value = {}
+        data_obj = self.pool.get('ir.model.data')
+        for project in self.browse(cr, uid, ids, context=context):
+            # Get Task views
+            tree_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_list')
+            form_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_form')
+            calander_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_calendar')
+            search_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_search')
+            context.update({
+                #'search_default_user_id': uid,
+                'search_default_project_id':project.id,
+                #'search_default_open':1,
+            })
+            value = {
+                'name': _('Phase'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'project.phase',
+                'view_id': False,
+                'domain':[('project_id','in',ids)],
+                'context': context,
+                'views': [(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': search_view and search_view[1] or False,
+                'nodestroy': True
+            }
+        return value
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
-- 
cgit v1.2.3


From 100b279d3db2183dc8a071c6c98d6ac05141f302 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 29 Mar 2012 14:21:02 +0530
Subject: [IMP]add default values

bzr revid: sgo@tinyerp.com-20120329085102-tnwh2wp4lrtn0vt0
---
 addons/project_long_term/project_long_term.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index b92449699a8..05605e38a03 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -230,7 +230,9 @@ class project(osv.osv):
         'open_phases' : fields.function(_open_phase , type='integer',string="Open Phases"),
         
     }
-    
+    _defaults = {
+        'phases' : True,
+    }
     def open_phase(self, cr, uid, ids, context=None):
         #Open the View for the Tasks for the project
         """
-- 
cgit v1.2.3


From f782026d24f1b50823255e9ac1710b1c19752eba Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 30 Mar 2012 18:13:12 +0530
Subject: [IMP]default project_id added.

bzr revid: kbh@tinyerp.com-20120330124312-loiwpuur2hq8nivz
---
 addons/project_long_term/project_long_term.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 05605e38a03..6cf7693d611 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -123,6 +123,7 @@ class project_phase(osv.osv):
     _defaults = {
         'state': 'draft',
         'sequence': 10,
+        'project_id':lambda self, cr, uid, context: context.get('active_id',False),
         'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Day'))], context=c)[0]
     }
     _order = "project_id, date_start, sequence"
-- 
cgit v1.2.3


From 7ea9856d0e29907a917f3490c83dc954d920b125 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 24 Apr 2012 17:03:21 +0530
Subject: [IMP] Improve css and py fiel

bzr revid: mma@tinyerp.com-20120424113321-n9b5076z7v8pcfu5
---
 addons/project_long_term/project_long_term.py | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 6cf7693d611..7806bc0abb9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -242,34 +242,19 @@ class project(osv.osv):
         """
         if context is None:
             context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        for project in self.browse(cr, uid, ids, context=context):
-            # Get Task views
-            tree_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_list')
-            form_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_form')
-            calander_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_calendar')
-            search_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_search')
-            context.update({
-                #'search_default_user_id': uid,
-                'search_default_project_id':project.id,
-                #'search_default_open':1,
-            })
-            value = {
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
                 'name': _('Phase'),
-                'context': context,
                 'view_type': 'form',
-                'view_mode': 'form,tree',
+                'view_mode': 'tree,calendar,form',
                 'res_model': 'project.phase',
                 'view_id': False,
                 'domain':[('project_id','in',ids)],
                 'context': context,
-                'views': [(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
-        return value
     
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
-- 
cgit v1.2.3


From 29918c64184ff2812d602db062ab18eed3c2f933 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Wed, 25 Apr 2012 17:39:08 +0530
Subject: [IMP] rename UOM to Unit of Measure everywhere in
 sale,stock,purchase,project_long_term and project_planning

bzr revid: jap@tinyerp.com-20120425120908-z13f1k2an7q01b8j
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..b29bd8cbf22 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -110,7 +110,7 @@ class project_phase(osv.osv):
         'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases', states={'cancelled':[('readonly',True)]}),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of phases."),
         'duration': fields.float('Duration', required=True, help="By default in days", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'product_uom': fields.many2one('product.uom', 'Duration Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
-- 
cgit v1.2.3


From d1147c51e9365f4a231f77aaad71b1652c4317f8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 1 May 2012 18:04:46 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..9de76097c9c 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
-- 
cgit v1.2.3


From a2a05cfc196ce72613501cb3bc5a962c2e359ae2 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 4 May 2012 17:27:48 +0530
Subject: [IMP]:improved titles State by Status everywhere

bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 612bd784bb0..12278fd2980 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -115,7 +115,7 @@ class project_phase(osv.osv):
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The ressources on the project can be computed automatically by the scheduler"),
-        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
-- 
cgit v1.2.3


From bfd96de42bc942fa24158a8c87b9e905c2460b72 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 7 May 2012 12:50:49 +0530
Subject: [IMP]rename all fields which r required in project and another module
 and improve code and

bzr revid: sgo@tinyerp.com-20120507072049-u00lsqra9x34nf73
---
 addons/project_long_term/project_long_term.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 7806bc0abb9..582a5ed8ef0 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -217,7 +217,7 @@ project_user_allocation()
 class project(osv.osv):
     _inherit = "project.project"
     
-    def _open_phase(self, cr, uid, ids, field_name, arg, context=None):
+    def _phase_count(self, cr, uid, ids, field_name, arg, context=None):
         open_phase={}
         phase_pool=self.pool.get('project.phase')
         for id in ids:
@@ -227,12 +227,12 @@ class project(osv.osv):
      
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"),
-        'open_phases' : fields.function(_open_phase , type='integer',string="Open Phases"),
+        'use_phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"),
+        'phase_count' : fields.function(_phase_count , type='integer',string="Open Phases"),
         
     }
     _defaults = {
-        'phases' : True,
+        'use_phases' : True,
     }
     def open_phase(self, cr, uid, ids, context=None):
         #Open the View for the Tasks for the project
-- 
cgit v1.2.3


From a72ea59bd634e2c5fac1ed2242f1c491f7b25265 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 7 May 2012 15:37:42 +0530
Subject: [IMP]improve count method of model improve code

bzr revid: sgo@tinyerp.com-20120507100742-gy5e5ur5b93h1zty
---
 addons/project_long_term/project_long_term.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 582a5ed8ef0..85e821703fc 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -218,12 +218,12 @@ class project(osv.osv):
     _inherit = "project.project"
     
     def _phase_count(self, cr, uid, ids, field_name, arg, context=None):
-        open_phase={}
-        phase_pool=self.pool.get('project.phase')
-        for id in ids:
-            phase_ids = phase_pool.search(cr, uid, [('project_id', '=', id)])
-            open_phase[id] = len(phase_ids)
-        return open_phase
+        res = dict.fromkeys(ids, 0)
+        phase_pool = self.pool.get('project.phase')
+        phase_ids = phase_pool.search(cr, uid, [('project_id', 'in', ids)])
+        for phase in phase_pool.browse(cr, uid, phase_ids, context):
+            res[phase.project_id.id] += 1
+        return res
      
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-- 
cgit v1.2.3


From a6a7276d890488085bc2eec46f57e44425df3a4b Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 8 May 2012 14:51:43 +0530
Subject: [IMP]remove open_model method from project related module and add
 action as per required

bzr revid: sgo@tinyerp.com-20120508092143-ah3siaudwp7jixc8
---
 addons/project_long_term/project_long_term.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 85e821703fc..0e7fcee25fb 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -234,28 +234,7 @@ class project(osv.osv):
     _defaults = {
         'use_phases' : True,
     }
-    def open_phase(self, cr, uid, ids, context=None):
-        #Open the View for the Tasks for the project
-        """
-        This opens Tasks views
-        @return :Dictionary value for task view
-        """
-        if context is None:
-            context = {}
-        if ids:
-            context = dict(context, search_default_project_id=ids[0])
-        return {
-                'name': _('Phase'),
-                'view_type': 'form',
-                'view_mode': 'tree,calendar,form',
-                'res_model': 'project.phase',
-                'view_id': False,
-                'domain':[('project_id','in',ids)],
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'nodestroy': True
-            }
-    
+        
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
-- 
cgit v1.2.3


From 479d6009864daf4fff69e7dbcc84a2c9d3098949 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 9 May 2012 09:26:54 +0200
Subject: [IMP] project_long_term: small code cleanup for project kanban view

bzr revid: rco@openerp.com-20120509072654-mp3uxp2qo8m7qlhi
---
 addons/project_long_term/project_long_term.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 0e7fcee25fb..11656b4bebd 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -216,25 +216,23 @@ project_user_allocation()
 
 class project(osv.osv):
     _inherit = "project.project"
-    
+
     def _phase_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
-        phase_pool = self.pool.get('project.phase')
-        phase_ids = phase_pool.search(cr, uid, [('project_id', 'in', ids)])
-        for phase in phase_pool.browse(cr, uid, phase_ids, context):
+        phase_ids = self.pool.get('project.phase').search(cr, uid, [('project_id', 'in', ids)])
+        for phase in self.pool.get('project.phase').browse(cr, uid, phase_ids, context):
             res[phase.project_id.id] += 1
         return res
-     
+
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"),
-        'phase_count' : fields.function(_phase_count , type='integer',string="Open Phases"),
-        
+        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
+        'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
     _defaults = {
-        'use_phases' : True,
+        'use_phases': True,
     }
-        
+
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
-- 
cgit v1.2.3


From 700061a30a4dea502d6e73f623d4704bdce0e8b0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 9 May 2012 12:08:51 +0200
Subject: [FIX] project_long_term: remove inappropriate (and useless) default
 value

bzr revid: rco@openerp.com-20120509100851-zd29xff7jk9pzuld
---
 addons/project_long_term/project_long_term.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 11656b4bebd..925e4258ed9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -123,7 +123,6 @@ class project_phase(osv.osv):
     _defaults = {
         'state': 'draft',
         'sequence': 10,
-        'project_id':lambda self, cr, uid, context: context.get('active_id',False),
         'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Day'))], context=c)[0]
     }
     _order = "project_id, date_start, sequence"
-- 
cgit v1.2.3


From 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 18:00:54 +0530
Subject: [IMP]add boolean of project,projec_longterm,and project issue and
 create related project

bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
---
 addons/project_long_term/project_long_term.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 19d58f101ef..11ecdd940f9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -225,13 +225,9 @@ class project(osv.osv):
 
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    _defaults = {
-        'use_phases': True,
-    }
-
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -273,6 +269,24 @@ class project(osv.osv):
         return True
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    _columns = {
+        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+    }
+#    _defaults = {
+#        'use_phases': True,
+#    }
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        obj_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if vals.get('use_phases', False):
+            self.project_create(cr, uid, obj_id, vals, context)
+        return obj_id
+account_analytic_account()
+
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-- 
cgit v1.2.3


From b2a5ab368d64559375a861de6270f0d9ef3e5667 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Jun 2012 12:07:31 +0200
Subject: [IMP] account_analytic_analysis: code improved for automation of
 project creation

bzr revid: qdp-launchpad@openerp.com-20120613100731-9so4m41fz7yrtb5w
---
 addons/project_long_term/project_long_term.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 11ecdd940f9..7e50e9a6793 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -275,16 +275,11 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
-#    _defaults = {
-#        'use_phases': True,
-#    }
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        obj_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
-        if vals.get('use_phases', False):
-            self.project_create(cr, uid, obj_id, vals, context)
-        return obj_id
+
+    def _trigger_project_creation(vals):
+        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+        return res or vals.get('use_phases')
+
 account_analytic_account()
 
 class project_task(osv.osv):
-- 
cgit v1.2.3


From dc1edf44be5593f9048f442a8aec68ae5250d953 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 14 Jun 2012 12:09:22 +0200
Subject: [IMP] project: implemented the privacy/visibility record rule in a
 cleaner way + some cleanup and bug fixing related to contract management

bzr revid: qdp-launchpad@openerp.com-20120614100922-5g29ui88nhqojon2
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 7e50e9a6793..a4df1eb6917 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -276,8 +276,8 @@ class account_analytic_account(osv.osv):
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
 
-    def _trigger_project_creation(vals):
-        res= super(account_analytic_account, self)._trigger_project_creation(vals)
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_phases')
 
 account_analytic_account()
-- 
cgit v1.2.3


From 71122ae47ac248053c84464d9307de89689b88f8 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 13 Jul 2012 15:47:51 +0530
Subject: [IMP]tooltip : I have changed the tooltip of fields as suggested

bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a4df1eb6917..7604d43af1b 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -114,7 +114,7 @@ class project_phase(osv.osv):
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
-            help="The ressources on the project can be computed automatically by the scheduler"),
+            help="The resources on the project can be computed automatically by the scheduler."),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
-- 
cgit v1.2.3


From 6dcf691e70315d70a4a79845da51091866b6c77b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 24 Jul 2012 11:53:03 +0530
Subject: [IMP] project_long_term : Override the 'on_change_template' method.

bzr revid: mdi@tinyerp.com-20120724062303-xoc4l9ye72x5lz3f
---
 addons/project_long_term/project_long_term.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a4df1eb6917..25aa98016e9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -275,6 +275,13 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
+    
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_phases'] = template.use_phases
+        return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
         res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
-- 
cgit v1.2.3


From d5713782fe0cab2a40b1e110e79e93c6867b4e85 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Aug 2012 11:49:13 +0200
Subject: [FIX] project_long_term: wording

bzr revid: odo@openerp.com-20120830094913-rhv8iy1jxgd22vmw
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d5ac3868a5e..2eab5fa6ac6 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:
-- 
cgit v1.2.3


From 7cc4c99f84c893732ba4a0e1b15ddd1f70d9594b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 12 Sep 2012 17:25:28 +0530
Subject: [FIX] project_long_term: filtered phases with project_id on task form

lp bug: https://launchpad.net/bugs/1048959 fixed

bzr revid: cha@tinyerp.com-20120912115528-hjjt04o9we2fzea5
---
 addons/project_long_term/project_long_term.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 2eab5fa6ac6..12206c930eb 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -292,7 +292,7 @@ account_analytic_account()
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-        'phase_id': fields.many2one('project.phase', 'Project Phase'),
+        'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"),
     }
 project_task()
 
-- 
cgit v1.2.3


From 1fbb4a5c16232c6130b31d870be4e44ecc743a72 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 24 Sep 2012 18:26:45 +0200
Subject: [IMP] handling of '(copy)' l10n

bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
---
 addons/project_long_term/project_long_term.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 2eab5fa6ac6..5b88d5209c8 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -138,7 +138,7 @@ class project_phase(osv.osv):
         if default is None:
             default = {}
         if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+            default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name))
         return super(project_phase, self).copy(cr, uid, id, default, context)
 
     def set_draft(self, cr, uid, ids, *args):
@@ -227,7 +227,7 @@ class project(osv.osv):
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    
+
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -250,7 +250,7 @@ class project(osv.osv):
                 # Maybe it's better to update than unlink/create if it already exists ?
                 p = getattr(project_gantt, 'Phase_%d' % (phase.id,))
 
-                self.pool.get('project.user.allocation').unlink(cr, uid, 
+                self.pool.get('project.user.allocation').unlink(cr, uid,
                     [x.id for x in phase.user_ids],
                     context=context
                 )
-- 
cgit v1.2.3


From 0b878800299b9a1f7d55d4db5a6bc15826f392e1 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 12 Oct 2012 17:12:58 +0530
Subject: [IMP]all: imporve string state to status

bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
---
 addons/project_long_term/project_long_term.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_long_term/project_long_term.py')

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index b19238200e5..db6c532d503 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -116,8 +116,8 @@ class project_phase(osv.osv):
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The resources on the project can be computed automatically by the scheduler."),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True,
-                                  help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
-                                  \n If the phase is over, the states is set to \'Done\'.'),
+                                  help='If the phase is created the status \'Draft\'.\n If the phase is started, the status becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' status.\
+                                  \n If the phase is over, the status is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
      }
     _defaults = {
-- 
cgit v1.2.3