From d1147c51e9365f4a231f77aaad71b1652c4317f8 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" 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)" 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 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" 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)" 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)" 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)" 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)" 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 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