From 22dce019498e609a3c85680a7b1356215c001797 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 28 May 2012 14:49:10 +0530 Subject: [IMP]add sequence file and sequence for analytic account and changes in form view extend type field and made changes in project of account for view an hr_timsheet_invoice and made on change for partner and template ids bzr revid: sgo@tinyerp.com-20120528091910-jw8804dxj4hlbjaa --- addons/analytic/analytic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 7cb61ee22aa..fd5212f8513 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -155,7 +155,7 @@ 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','View'), ('normal','Normal')], 'Account Type', 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', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'), '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'), @@ -197,6 +197,7 @@ class account_analytic_account(osv.osv): _defaults = { 'type': 'normal', 'company_id': _default_company, + 'code' : lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.analytic.account'), 'state': 'open', 'user_id': lambda self, cr, uid, ctx: uid, 'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False), -- cgit v1.2.3 From 81fd7b194641d002a80bbec409a001a511958000 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 28 May 2012 16:13:10 +0530 Subject: [IMP/ADD]create analytic view in analytic and made changes as per needed and improve code and made onchange for partner bzr revid: sgo@tinyerp.com-20120528104310-oquklh2l63fq3muk --- addons/analytic/analytic.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index fd5212f8513..f468ef36f91 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -166,7 +166,7 @@ class account_analytic_account(osv.osv): 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'), - 'partner_id': fields.many2one('res.partner', 'Partner'), + 'partner_id': fields.many2one('res.partner', 'Customer'), 'user_id': fields.many2one('res.users', 'Account Manager'), 'date_start': fields.date('Date Start'), 'date': fields.date('Date End', select=True), @@ -183,6 +183,15 @@ class account_analytic_account(osv.osv): 'res.company': (_get_analytic_account, ['currency_id'], 10), }, string='Currency', type='many2one', relation='res.currency'), } + + def on_change_partner_id(self, cr, uid, id, partner_id, context={}): + res={} + if partner_id: + part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context) + res['name'] = part.name + if part.user_id: + res['user_id'] = part.user_id.id + return {'value': res} def _default_company(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) -- cgit v1.2.3 From 250702de4c45f2a1364c5eaf69e2404bf990232c Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 28 May 2012 16:48:30 +0530 Subject: [IMP]:improved on_change code and add Terma and Condition in analytic view. bzr revid: apa@tinyerp.com-20120528111830-znaex5pikedc3sn7 --- addons/analytic/analytic.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index f468ef36f91..0ba92cb0289 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -184,13 +184,12 @@ class account_analytic_account(osv.osv): }, string='Currency', type='many2one', relation='res.currency'), } - def on_change_partner_id(self, cr, uid, id, partner_id, context={}): + def on_change_partner_id(self, cr, uid, ids,partner_id, context={}): res={} if partner_id: part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context) res['name'] = part.name - if part.user_id: - res['user_id'] = part.user_id.id + if part.user_id:res['user_id'] = part.user_id.id return {'value': res} def _default_company(self, cr, uid, context=None): -- cgit v1.2.3 From 0125e320c98705ec412daf0d154ca84466262687 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 6 Jun 2012 17:36:29 +0200 Subject: [IMP] analytic: misc imp related to project and contract mangement task bzr revid: qdp-launchpad@openerp.com-20120606153629-jlk1k0ze09b7pu6s --- addons/analytic/analytic.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 0ba92cb0289..772dcd57e12 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -171,13 +171,7 @@ class account_analytic_account(osv.osv): 'date_start': fields.date('Date Start'), 'date': fields.date('Date End', select=True), 'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts. - 'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True, - help='* When an account is created its in \'Draft\' state.\ - \n* If any associated partner is there, it can be in \'Open\' state.\ - \n* If any pending balance is there it can be in \'Pending\'. \ - \n* And finally when all the transactions are over, it can be in \'Close\' state. \ - \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\ - \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'), + 'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,), 'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, store = { 'res.company': (_get_analytic_account, ['currency_id'], 10), -- cgit v1.2.3 From 861f6ce70eb7bfdd596c89a7afc47f1d5bea1269 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 7 Jun 2012 11:24:36 +0530 Subject: [IMP]analytic: Improve on_change_partner_id. bzr revid: dbr@tinyerp.com-20120607055436-ipyx4dku1suhxd21 --- addons/analytic/analytic.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 772dcd57e12..dac62cf5e12 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -178,11 +178,12 @@ class account_analytic_account(osv.osv): }, string='Currency', type='many2one', relation='res.currency'), } - def on_change_partner_id(self, cr, uid, ids,partner_id, context={}): + def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}): res={} if partner_id: part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context) - res['name'] = part.name + if not name: + res['name'] = part.name if part.user_id:res['user_id'] = part.user_id.id return {'value': res} -- cgit v1.2.3 From 8cb3df4d4250b362da8919d0f25126b2dfb70174 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 7 Jun 2012 14:39:33 +0530 Subject: [IMP]analytic: Customer field should not be required on Template of Contract form bzr revid: dbr@tinyerp.com-20120607090933-b2bxd8dwa7i5ythd --- addons/analytic/analytic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index dac62cf5e12..0060177cc7e 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -166,7 +166,7 @@ class account_analytic_account(osv.osv): 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'), - 'partner_id': fields.many2one('res.partner', 'Customer'), + 'partner_id': fields.many2one('res.partner', 'Customer', required=True), 'user_id': fields.many2one('res.users', 'Account Manager'), 'date_start': fields.date('Date Start'), 'date': fields.date('Date End', select=True), -- cgit v1.2.3 From 235aa515c549885fa509df9fda81b55c7b5d1e88 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 7 Jun 2012 11:31:59 +0200 Subject: [IMP] analytic: added chatter widget on analytic accounts bzr revid: qdp-launchpad@openerp.com-20120607093159-32qmv70xghw8lbim --- addons/analytic/analytic.py | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index dac62cf5e12..e2c33f0ebd9 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -27,6 +27,7 @@ import decimal_precision as dp class account_analytic_account(osv.osv): _name = 'account.analytic.account' + _inherit = ['mail.thread'] _description = 'Analytic Account' def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None): -- cgit v1.2.3 From 7be4e97126a909c4568eea913f3907cfee6df12f Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 7 Jun 2012 15:44:00 +0530 Subject: [IMP]analytic: Improve form view name lable bzr revid: dbr@tinyerp.com-20120607101400-rlva9kihbbtucqmv --- addons/analytic/analytic.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 0060177cc7e..13b48771582 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -20,6 +20,7 @@ ############################################################################## import time +from lxml import etree from osv import fields, osv from tools.translate import _ @@ -223,6 +224,20 @@ class account_analytic_account(osv.osv): default['line_ids'] = [] return super(account_analytic_account, self).copy(cr, uid, id, default, context=context) + def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + res = super(account_analytic_account, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + if view_type == 'form': + doc = etree.XML(res['arch']) + nodes = doc.xpath("//field[@name='name']") + if context.get('default_type') == 'contract': + for node in nodes: + node.set('string', 'Contract/Project Name') + if context.get('default_type') == 'template': + for node in nodes: + node.set('string', 'Template/Project Name') + res['arch'] = etree.tostring(doc) + return res + def on_change_company(self, cr, uid, id, company_id): if not company_id: return {} -- cgit v1.2.3 From 15b9557943168342022dbc7002fac4ec2b98e0de Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 7 Jun 2012 15:53:51 +0530 Subject: [IMP]:improved contract view in project module bzr revid: apa@tinyerp.com-20120607102351-8mqh6e93ecjqxb8f --- addons/analytic/analytic.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index e2c33f0ebd9..fd893e90c10 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -168,7 +168,8 @@ class account_analytic_account(osv.osv): 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'), 'partner_id': fields.many2one('res.partner', 'Customer'), - 'user_id': fields.many2one('res.users', 'Account Manager'), + 'user_id': fields.many2one('res.users', 'Project Manager'), + 'manager_id': fields.many2one('res.users', 'Account Manager'), 'date_start': fields.date('Date Start'), 'date': fields.date('Date End', select=True), 'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts. @@ -185,7 +186,7 @@ class account_analytic_account(osv.osv): part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context) if not name: res['name'] = part.name - if part.user_id:res['user_id'] = part.user_id.id + if part.user_id:res['manager_id'] = part.user_id.id return {'value': res} def _default_company(self, cr, uid, context=None): -- cgit v1.2.3 From 7db66cfa2da578e2151392575c8ce1ed636d9887 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 8 Jun 2012 11:07:55 +0530 Subject: [IMP]:passed context dict instead of None. bzr revid: apa@tinyerp.com-20120608053755-35ciqc8ubvc4gqru --- addons/analytic/analytic.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 648e2b31ca0..3e8eb808999 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -225,6 +225,8 @@ class account_analytic_account(osv.osv): return super(account_analytic_account, self).copy(cr, uid, id, default, context=context) def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + if context is None:context = {} + res = super(account_analytic_account, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) doc = etree.XML(res['arch']) -- cgit v1.2.3 From f7352c6deade8141dd0c5c62b676fbdbd7d6c2d7 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 8 Jun 2012 11:33:39 +0530 Subject: typo bzr revid: apa@tinyerp.com-20120608060339-ejdgft31hjxbhs4b --- addons/analytic/analytic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 3e8eb808999..19a42c12825 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -237,13 +237,13 @@ class account_analytic_account(osv.osv): curr_node = node[0] if context.get('default_type') == 'contract': curr_node.set('string', 'Contract/Project Name') - curr_node.set('placeholder', 'Contract or Project name') + curr_node.set('placeholder', 'Contract or Project Name') elif context.get('default_type') == 'template': curr_node.set('string', 'Template Name') - curr_node.set('placeholder', 'Template name') + curr_node.set('placeholder', 'Template Name') else: curr_node.set('string', 'Account Name') - curr_node.set('placeholder', 'Account name') + curr_node.set('placeholder', 'Account Name') res['arch'] = etree.tostring(doc) return res -- cgit v1.2.3 From 2d2ee773ac0387e414047e244161ea6a9a9f649a Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Jun 2012 15:45:11 +0200 Subject: [IMP] analytic: if a partner is given and there is no name, automatically fill the name of the analytic account bzr revid: qdp-launchpad@openerp.com-20120614134511-tdjqtx6hvge6h92e --- addons/analytic/analytic.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 19a42c12825..84093af6520 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -184,8 +184,11 @@ class account_analytic_account(osv.osv): def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}): res={} if partner_id: - part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context) - if part.user_id:res['manager_id'] = part.user_id.id + partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) + if partner.user_id: + res['manager_id'] = partner.user_id.id + if not name: + res['name'] = _('Contract: ') + partner.name return {'value': res} def _default_company(self, cr, uid, context=None): -- cgit v1.2.3 From 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 15 Jun 2012 15:10:56 +0200 Subject: [IMP] contract management: misc code cleaning and improvements bzr revid: qdp-launchpad@openerp.com-20120615131056-swbbcy7obbbjjo33 --- addons/analytic/analytic.py | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 84093af6520..fbc2facbb3f 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -20,7 +20,6 @@ ############################################################################## import time -from lxml import etree from osv import fields, osv from tools.translate import _ @@ -227,29 +226,6 @@ class account_analytic_account(osv.osv): default['line_ids'] = [] return super(account_analytic_account, self).copy(cr, uid, id, default, context=context) - def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): - if context is None:context = {} - - res = super(account_analytic_account, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) - - doc = etree.XML(res['arch']) - node = [] - if view_type == 'form':node = doc.xpath("//field[@name='name']") - if view_type == 'tree':node = doc.xpath("//field[@name='complete_name']") - if node: - curr_node = node[0] - if context.get('default_type') == 'contract': - curr_node.set('string', 'Contract/Project Name') - curr_node.set('placeholder', 'Contract or Project Name') - elif context.get('default_type') == 'template': - curr_node.set('string', 'Template Name') - curr_node.set('placeholder', 'Template Name') - else: - curr_node.set('string', 'Account Name') - curr_node.set('placeholder', 'Account Name') - res['arch'] = etree.tostring(doc) - return res - def on_change_company(self, cr, uid, id, company_id): if not company_id: return {} -- cgit v1.2.3 From 015f03776e03384cfa6fe477ef51ef26896a4178 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 19 Jun 2012 14:21:28 +0200 Subject: [IMP] contract management: improved usability, mostly in account.analytic.account form view bzr revid: qdp-launchpad@openerp.com-20120619122128-axj9zn61ahalgg98 --- addons/analytic/analytic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index fbc2facbb3f..cb5ab3ede0f 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -156,7 +156,7 @@ 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', 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.'), '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'), -- cgit v1.2.3 From 95cd61d1f560885bf3161ed49c9779e172fe8643 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 22 Jun 2012 14:40:08 +0530 Subject: [IMP]improve view of contract and open chatter notification added when state changed bzr revid: sgo@tinyerp.com-20120622091008-uy805uph0hz4vk0h --- addons/analytic/analytic.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index cb5ab3ede0f..35acc4a8508 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -272,7 +272,20 @@ class account_analytic_account(osv.osv): else: account = self.search(cr, uid, args, limit=limit, context=context) return self.name_get(cr, uid, account, context=context) - + + def create(self, cr, uid, vals, context=None): + contract = super(account_analytic_account, self).create(cr, uid, vals, context=context) + if contract: + self.create_send_note(cr, uid, [contract], context=context) + return contract + # ------------------------------------------------ + # OpenChatter methods and notifications + # ------------------------------------------------ + 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) + self.message_append_note(cr, uid, [obj.id], body=_("Contract for %s has been created.") % (obj.partner_id.name), context=context) + account_analytic_account() -- cgit v1.2.3 From fe938a4558313bdd0ddd1537e2f693921d54a188 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 26 Jun 2012 15:18:43 +0530 Subject: [IMP]add tooltip on type and add date,date_Start in on change template bzr revid: sgo@tinyerp.com-20120626094843-ubz386g7f42jc2d2 --- addons/analytic/analytic.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') 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'), -- cgit v1.2.3 From c34ac7f9de769c742b5887f3b1fa92d58dc1d238 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 26 Jun 2012 16:38:10 +0530 Subject: [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/analytic/analytic.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') 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) -- cgit v1.2.3 From 1f4d327a72e41e956e21c1dd2aedbf5e49c8368e Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 26 Jun 2012 17:12:40 +0200 Subject: [REV] analytic: removal of the 'need action' feature on analytic accounts, which is finally not wanted bzr revid: qdp-launchpad@openerp.com-20120626151240-fu2inbyo1mz4dqbs --- addons/analytic/analytic.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 1bd09848b03..af8b1615864 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 = ['ir.needaction_mixin','mail.thread'] + _inherit = ['mail.thread'] _description = 'Analytic Account' def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None): @@ -283,13 +283,6 @@ class account_analytic_account(osv.osv): self.create_send_note(cr, uid, [contract], context=context) return contract - 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) -- cgit v1.2.3