From efdbaf40888dbbd8dd1fe1fae06130ccd25de28a Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 15 Jun 2012 16:48:35 +0200 Subject: [IMP] project: version 7.0 for the project form view bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u --- .../analytic_contract_project.py | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 addons/analytic_contract_project/analytic_contract_project.py (limited to 'addons/analytic_contract_project/analytic_contract_project.py') diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py new file mode 100644 index 00000000000..21654868218 --- /dev/null +++ b/addons/analytic_contract_project/analytic_contract_project.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +class project_project(osv.osv): + _inherit = 'project.project' + _columns = { + # 'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"), + } + _defaults = { + 'use_timesheets': True, + } +project_project() -- cgit v1.2.3 From 2f6e1c9dc82cd8820b03c7504420e828c9fb653d Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 18 Jun 2012 19:03:33 +0200 Subject: [FIX] analytic_contract_project: fixed the destination of shortcut buttons in project form view bzr revid: qdp-launchpad@openerp.com-20120618170333-xsml2de6dd18ozwg --- .../analytic_contract_project.py | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'addons/analytic_contract_project/analytic_contract_project.py') diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py index 21654868218..67382e28a8c 100644 --- a/addons/analytic_contract_project/analytic_contract_project.py +++ b/addons/analytic_contract_project/analytic_contract_project.py @@ -20,13 +20,32 @@ ############################################################################## from osv import fields, osv +from tools.translate import _ class project_project(osv.osv): _inherit = 'project.project' - _columns = { - # 'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"), - } + _defaults = { 'use_timesheets': True, } + + def open_sale_order_lines(self,cr,uid,ids,context=None): + account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)] + return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context) + + def open_timesheets_to_invoice(self,cr,uid,ids,context=None): + if context is None: + context = {} + analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id + context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1}) + return { + 'type': 'ir.actions.act_window', + 'name': _('Timesheet Lines to Invoice'), + 'view_type': 'form', + 'view_mode': 'tree,form', + 'context': context, + 'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')], + 'res_model': 'account.analytic.line', + 'nodestroy': True, + } project_project() -- cgit v1.2.3 From 9d705e80819f6ea3aa73a7a08bf6c2016bde63fd Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 18 Jun 2012 19:16:33 +0200 Subject: [FIX] project form view: moved open_timesheets() method from project_timesheet to analytic_contract_project, where the view that call this action belongs bzr revid: qdp-launchpad@openerp.com-20120618171633-h4zyjvqojuau6bal --- .../analytic_contract_project.py | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'addons/analytic_contract_project/analytic_contract_project.py') diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py index 67382e28a8c..12e307c5a81 100644 --- a/addons/analytic_contract_project/analytic_contract_project.py +++ b/addons/analytic_contract_project/analytic_contract_project.py @@ -48,4 +48,27 @@ class project_project(osv.osv): 'res_model': 'account.analytic.line', 'nodestroy': True, } + + def open_timesheets(self, cr, uid, ids, context=None): + """ open Timesheets view """ + project = self.browse(cr, uid, ids[0], context) + try: + journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id + except ValueError: + journal_id = False + view_context = { + 'search_default_account_id': [project.analytic_account_id.id], + 'default_account_id': project.analytic_account_id.id, + 'default_journal_id': journal_id, + } + return { + 'type': 'ir.actions.act_window', + 'name': _('Bill Tasks Works'), + 'res_model': 'account.analytic.line', + 'view_type': 'form', + 'view_mode': 'tree,form', + 'context': view_context, + 'nodestroy': True, + } + project_project() -- cgit v1.2.3 From 352e054068d74c296475c285361964bfb86b4e32 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 25 Jun 2012 10:37:53 +0530 Subject: [IMP]change the place of fields for better view and add note for details bzr revid: sgo@tinyerp.com-20120625050753-lhe0p8xnp5r2g6zp --- addons/analytic_contract_project/analytic_contract_project.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'addons/analytic_contract_project/analytic_contract_project.py') diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py index 12e307c5a81..9ddc75ecf8d 100644 --- a/addons/analytic_contract_project/analytic_contract_project.py +++ b/addons/analytic_contract_project/analytic_contract_project.py @@ -70,5 +70,14 @@ class project_project(osv.osv): 'context': view_context, 'nodestroy': True, } - project_project() + +class task(osv.osv): + _inherit = "project.task" + + def create(self, cr, uid, vals, context=None): + task_id = super(task, self).create(cr, uid, vals, context=context) + task_browse = self.browse(cr,uid,task_id,context) + self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task has been created."), context=context) + return task_id +task() -- cgit v1.2.3 From ea842f4554b41c7f8cadf250480ba364c25f7927 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 25 Jun 2012 17:55:40 +0200 Subject: [REF] code review bzr revid: qdp-launchpad@openerp.com-20120625155540-n0e5lm0rhytsk22t --- addons/analytic_contract_project/analytic_contract_project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/analytic_contract_project/analytic_contract_project.py') diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py index 9ddc75ecf8d..6221617637e 100644 --- a/addons/analytic_contract_project/analytic_contract_project.py +++ b/addons/analytic_contract_project/analytic_contract_project.py @@ -77,7 +77,7 @@ class task(osv.osv): def create(self, cr, uid, vals, context=None): task_id = super(task, self).create(cr, uid, vals, context=context) - task_browse = self.browse(cr,uid,task_id,context) - self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task has been created."), context=context) + task_browse = self.browse(cr, uid, task_id, context=context) + self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task %s has been created.") % (task_browse.name), context=context) return task_id task() -- cgit v1.2.3