From fe938a4558313bdd0ddd1537e2f693921d54a188 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 26 Jun 2012 15:18:43 +0530 Subject: [PATCH 1/3] [IMP]add tooltip on type and add date,date_Start in on change template bzr revid: sgo@tinyerp.com-20120626094843-ubz386g7f42jc2d2 --- .../account_analytic_analysis/account_analytic_analysis.py | 2 ++ addons/analytic/analytic.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 0ac783a8c5c..6e15fe1d5a5 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -485,6 +485,8 @@ class account_analytic_account(osv.osv): return {} res = {'value':{}} template = self.browse(cr, uid, template_id, context=context) + res['value']['date_start'] = template.date_start + res['value']['date'] = template.date res['value']['fix_price_invoices'] = template.fix_price_invoices res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets res['value']['quantity_max'] = template.quantity_max diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 35acc4a8508..798f6afa4ff 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -156,7 +156,11 @@ class account_analytic_account(osv.osv): 'name': fields.char('Account Name', size=128, required=True), 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'), 'code': fields.char('Code/Reference', size=24, select=True), - 'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'), + 'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, + help="If you select the View Type, It means you won\'t allow to create journal entries using that account.\n"\ + "If you select Analytic account.It means you can create journal entries using that account.\n"\ + "If you select Contract or Project,It means you create contract for that account.\n"\ + "If you select Template of Project,It means you create Template of project\contract which can be used as a parent of contract."), 'description': fields.text('Description'), 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2), 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'), From 2afd3ef644c5d636129b57dc02dc0352bd658aa0 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 26 Jun 2012 15:53:23 +0530 Subject: [PATCH 2/3] [IMP]change color whrn its on to renew state bzr revid: sgo@tinyerp.com-20120626102323-bgu92k6xpk7yymsz --- addons/account/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 7658ab111d9..e1fc04cef58 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -8,7 +8,7 @@ tree - + From c34ac7f9de769c742b5887f3b1fa92d58dc1d238 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 26 Jun 2012 16:38:10 +0530 Subject: [PATCH 3/3] [IMP]when contracts to renew it should be bold and contracts to renew shows number of contract to renew bzr revid: sgo@tinyerp.com-20120626110810-fnd83hdm77ghcbzm --- addons/account/project/project_view.xml | 3 ++- addons/analytic/analytic.py | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index e1fc04cef58..91a414b87a2 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -8,7 +8,8 @@ tree - + + diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 798f6afa4ff..afcc2e19d52 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -27,7 +27,7 @@ import decimal_precision as dp class account_analytic_account(osv.osv): _name = 'account.analytic.account' - _inherit = ['mail.thread'] + _inherit = ['ir.needaction_mixin','mail.thread'] _description = 'Analytic Account' def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None): @@ -285,6 +285,13 @@ class account_analytic_account(osv.osv): # ------------------------------------------------ # OpenChatter methods and notifications # ------------------------------------------------ + def get_needaction_user_ids(self, cr, uid, ids, context=None): + result = dict.fromkeys(ids, []) + for obj in self.browse(cr, uid, ids, context=context): + if obj.state == 'pending': + result[obj.id] = [obj.user_id.id] + return result + def create_send_note(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids, context=context): self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)