From aef3c22f7f3de4bc8ffe7138586796cff3832745 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 5 Dec 2012 19:35:45 +0100 Subject: [PATCH] [IMP] identation and doc bzr revid: abo@openerp.com-20121205183545-uyu9a1t5gl182s1m --- addons/crm/crm_lead.py | 33 +++++++++++++++------------------ addons/crm/crm_phonecall.py | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index b8d6dbf8760..c4414d76edf 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -150,11 +150,7 @@ class crm_lead(base_stage, format_address, osv.osv): def _compute_day(self, cr, uid, ids, fields, args, context=None): """ - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of Openday’s IDs - @return: difference between current date and log date - @param context: A standard dictionary for contextual values + :return dict: difference between current date and log date """ cal_obj = self.pool.get('resource.calendar') res_obj = self.pool.get('resource.resource') @@ -822,17 +818,17 @@ class crm_lead(base_stage, format_address, osv.osv): if not user_id: user_id = lead.user_id and lead.user_id.id or False vals = { - 'name' : call_summary, - 'opportunity_id' : lead.id, - 'user_id' : user_id or False, - 'categ_id' : categ_id or False, - 'description' : desc or '', - 'date' : schedule_time, - 'section_id' : section_id or False, - 'partner_id': lead.partner_id and lead.partner_id.id or False, - 'partner_phone' : phone or lead.phone or (lead.partner_id and lead.partner_id.phone or False), - 'partner_mobile' : lead.partner_id and lead.partner_id.mobile or False, - 'priority': lead.priority, + 'name': call_summary, + 'opportunity_id': lead.id, + 'user_id': user_id or False, + 'categ_id': categ_id or False, + 'description': desc or '', + 'date': schedule_time, + 'section_id': section_id or False, + 'partner_id': lead.partner_id and lead.partner_id.id or False, + 'partner_phone': phone or lead.phone or (lead.partner_id and lead.partner_id.phone or False), + 'partner_mobile': lead.partner_id and lead.partner_id.mobile or False, + 'priority': lead.priority, } new_id = phonecall.create(cr, uid, vals, context=context) phonecall.case_open(cr, uid, [new_id], context=context) @@ -883,8 +879,9 @@ class crm_lead(base_stage, format_address, osv.osv): } def action_makeMeeting(self, cr, uid, ids, context=None): - """ This opens Meeting's calendar view to schedule meeting on current Opportunity - @return : Dictionary value for created Meeting view + """ + Open meeting's calendar view to schedule meeting on current opportunity. + :return dict: dictionary value for created Meeting view """ opportunity = self.browse(cr, uid, ids[0], context) res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 9f75a3b198f..2acca586f97 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -246,7 +246,7 @@ class crm_phonecall(base_state, osv.osv): def action_make_meeting(self, cr, uid, ids, context=None): """ Open meeting's calendar view to schedule a meeting on current phonecall. - @return dict res: dictionary value for created meeting view + :return dict: dictionary value for created meeting view """ phonecall = self.browse(cr, uid, ids[0], context) res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)