From 39796180244630490dc4e95589a3a7679d5fce40 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 11:25:46 +0530
Subject: [PATCH] [IMP]: crm: Minor code improvements

bzr revid: rpa@tinyerp.com-20100323055546-f0589lfdc4kipfhk
---
 .../wizard/report_open_view.xml               |  4 +-
 addons/crm/crm.py                             | 66 +++++++++----------
 addons/crm/crm_fundraising.py                 | 57 ++++++++--------
 addons/crm/crm_helpdesk.py                    | 29 ++++----
 addons/crm/crm_lead.py                        |  2 +-
 5 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/addons/base_report_creator/wizard/report_open_view.xml b/addons/base_report_creator/wizard/report_open_view.xml
index 337aa988ca5..941bcf73b6e 100644
--- a/addons/base_report_creator/wizard/report_open_view.xml
+++ b/addons/base_report_creator/wizard/report_open_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Report open">
-                       	<separator string="" colspan="4" />
+                   	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel"
                     		string="Cancel" />
@@ -31,4 +31,4 @@
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4740c0fdcf1..a3eb8437546 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -51,6 +51,7 @@ icon_lst = {
     'calendar': 'STOCK_SELECT_COLOR'
 }
 
+
 class crm_case_section(osv.osv):
     """ Cases Section"""
 
@@ -104,8 +105,7 @@ class crm_case_section(osv.osv):
     ]
 
     def name_get(self, cr, uid, ids, context={}):
-
-        """Overrides orm
+        """Overrides orm name_get method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -125,6 +125,7 @@ class crm_case_section(osv.osv):
         return res
 crm_case_section()
 
+
 class crm_case_categ(osv.osv):
     """ Category of Case """
 
@@ -136,6 +137,7 @@ class crm_case_categ(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
+    
     def _find_object_id(self, cr, uid, context=None):
 
         """
@@ -148,12 +150,14 @@ class crm_case_categ(osv.osv):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
-    _defaults = {
+        
+    _defaults = {        
         'object_id' : _find_object_id
     }
 #
 crm_case_categ()
 
+
 class crm_case_resource_type(osv.osv):
     """ Resource Type of case """
 
@@ -166,8 +170,8 @@ class crm_case_resource_type(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
+    
     def _find_object_id(self, cr, uid, context=None):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -206,6 +210,7 @@ class crm_case_stage(osv.osv):
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements')
     }
+    
     def _find_object_id(self, cr, uid, context=None):
 
         """
@@ -228,7 +233,6 @@ class crm_case_stage(osv.osv):
 crm_case_stage()
 
 def _links_get(self, cr, uid, context={}):
-
     """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -296,6 +300,7 @@ class crm_case(osv.osv):
         result = {}
         history_obj = False
         model_obj = self.pool.get('ir.model')
+
         if 'history_line' in field_names:
             history_obj = self.pool.get('crm.case.history')
             name = 'history_line'
@@ -315,6 +320,7 @@ class crm_case(osv.osv):
                 result[case.id] = {name: history_ids}
             else:
                 result[case.id] = {name: []}
+
         return result
 
     _columns = {
@@ -354,6 +360,7 @@ class crm_case(osv.osv):
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
+    
     def _get_default_partner_address(self, cr, uid, context):
 
         """
@@ -400,7 +407,6 @@ class crm_case(osv.osv):
         return user.address_id.email
 
     def _get_default_user(self, cr, uid, context):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -413,7 +419,6 @@ class crm_case(osv.osv):
         return uid
 
     def _get_section(self, cr, uid, context):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -435,6 +440,7 @@ class crm_case(osv.osv):
         'section_id': _get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
     }
+
     _order = 'date_deadline desc, create_date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
@@ -453,7 +459,6 @@ class crm_case(osv.osv):
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
     def stage_next(self, cr, uid, ids, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -471,7 +476,6 @@ class crm_case(osv.osv):
         return True
 
     def get_stage_dict(self, cr, uid, ids, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -491,7 +495,6 @@ class crm_case(osv.osv):
         return s
 
     def stage_previous(self, cr, uid, ids, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -511,7 +514,6 @@ class crm_case(osv.osv):
         return True
 
     def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -538,7 +540,6 @@ class crm_case(osv.osv):
         return {'value': value}
 
     def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -552,7 +553,6 @@ class crm_case(osv.osv):
                                context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -660,9 +660,9 @@ class crm_case(osv.osv):
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
-                'description': False,
-                'som': False,
-                'canal_id': False,
+                'description': False, 
+                'som': False, 
+                'canal_id': False, 
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -676,11 +676,11 @@ class crm_case(osv.osv):
                         _("No E-Mail ID Found for your Company address!"))
 
             tools.email_send(
-                emailfrom,
-                emails,
-                '[' + str(case.id) + '] ' + case.name,
-                self.format_body(body),
-                reply_to = case.section_id.reply_to,
+                emailfrom, 
+                emails, 
+                '[' + str(case.id) + '] ' + case.name, 
+                self.format_body(body), 
+                reply_to = case.section_id.reply_to, 
                 openobject_id = str(case.id)
             )
         return True
@@ -846,14 +846,14 @@ class crm_case_log(osv.osv):
 
     _order = "id desc"
     _columns = {
-        'name': fields.char('Status', size=64),
-        'som': fields.many2one('res.partner.som', 'State of Mind'),
-        'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'model_id': fields.many2one('ir.model', "Model"),
-        'res_id': fields.integer('Resource ID'),
+        'name': fields.char('Status', size=64), 
+        'som': fields.many2one('res.partner.som', 'State of Mind'), 
+        'date': fields.datetime('Date'), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
+        'section_id': fields.many2one('crm.case.section', 'Section'), 
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
+        'model_id': fields.many2one('ir.model', "Model"), 
+        'res_id': fields.integer('Resource ID'), 
     }
 
     _defaults = {
@@ -886,11 +886,11 @@ class crm_case_history(osv.osv):
         return res
 
     _columns = {
-        'description': fields.text('Description'),
-        'note': fields.function(_note_get, method=True, string="Description", type="text"),
-        'email': fields.char('Email', size=84),
+        'description': fields.text('Description'), 
+        'note': fields.function(_note_get, method=True, string="Description", type="text"), 
+        'email': fields.char('Email', size=84), 
         'email_from' : fields.char('From Email', size=84),
-        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'),
+        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'), 
     }
 
 crm_case_history()
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index cc89342df29..927a3d05915 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv, orm
 import crm
 
 class crm_fundraising(osv.osv):
@@ -31,46 +31,45 @@ class crm_fundraising(osv.osv):
     _inherit ='crm.case'
 
     _columns = {
-            'date_closed': fields.datetime('Closed', readonly=True),
-            'date': fields.datetime('Date'),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-            'categ_id': fields.many2one('crm.case.categ','Category', \
+            'date_closed': fields.datetime('Closed', readonly=True), 
+            'date': fields.datetime('Date'), 
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+            'categ_id': fields.many2one('crm.case.categ', 'Category', \
                                 domain="[('section_id','=',section_id),\
-                                ('object_id.model', '=', 'crm.fundraising')]"),
-            'planned_revenue': fields.float('Planned Revenue'),
-            'planned_cost': fields.float('Planned Costs'),
-            'probability': fields.float('Probability (%)'),
-            'partner_name': fields.char("Employee's Name", size=64),
-            'partner_name2': fields.char('Employee Email', size=64),
-            'partner_phone': fields.char('Phone', size=32),
-            'partner_mobile': fields.char('Mobile', size=32),
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                                ('object_id.model', '=', 'crm.fundraising')]"), 
+            'planned_revenue': fields.float('Planned Revenue'), 
+            'planned_cost': fields.float('Planned Costs'), 
+            'probability': fields.float('Probability (%)'), 
+            'partner_name': fields.char("Employee's Name", size=64), 
+            'partner_name2': fields.char('Employee Email', size=64), 
+            'partner_phone': fields.char('Phone', size=32), 
+            'partner_mobile': fields.char('Mobile', size=32), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                              domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.fundraising')]"),
-            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type',\
+                            ('object_id.model', '=', 'crm.fundraising')]"), 
+            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type', \
                              domain="[('section_id','=',section_id),\
-                             ('object_id.model', '=', 'crm.fundraising')]"),
-            'duration': fields.float('Duration'),
-            'ref': fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                             ('object_id.model', '=', 'crm.fundraising')]"), 
+            'duration': fields.float('Duration'), 
+            'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
+            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
+            'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                         help="The channels represent the different communication \
                         modes available with the customer." \
                        " With each commercial opportunity, you can indicate\
-                     the canall which is this opportunity source."),
-            'som': fields.many2one('res.partner.som', 'State of Mind',\
+                     the canall which is this opportunity source."), 
+            'som': fields.many2one('res.partner.som', 'State of Mind', \
                          help="The minds states allow to define a value scale which represents" \
                               "the partner mentality in relation to our services.The scale has" \
                             "to be created with a factor for each level from 0 \
-                             (Very dissatisfied) to 10 (Extremely satisfied)."),
+                             (Very dissatisfied) to 10 (Extremely satisfied)."), 
         }
 
     _defaults = {
-                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-                 'probability':lambda *a:0.0,
-                 'planned_cost':lambda *a:0.0,
-                 'planned_revenue':lambda *a:0.0,
-
+                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+                 'probability':lambda *a:0.0, 
+                 'planned_cost':lambda *a:0.0, 
+                 'planned_revenue':lambda *a:0.0, 
     }
 
 crm_fundraising()
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index c9317b52a3b..9090ef25b5f 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -19,7 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import orm
+from osv import osv
+from osv import fields
+
 import crm
 
 class crm_helpdesk(osv.osv):
@@ -31,25 +34,25 @@ class crm_helpdesk(osv.osv):
     _inherit = 'crm.case'
 
     _columns = {
-            'date_closed': fields.datetime('Closed', readonly=True),
-            'date': fields.datetime('Date'),
-            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+            'date_closed': fields.datetime('Closed', readonly=True), 
+            'date': fields.datetime('Date'), 
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
+            'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                             help="The channels represent the different communication \
                              modes available with the customer." \
                             " With each commercial opportunity, you can indicate\
-                             the canall which is this opportunity source."),
-            'planned_revenue': fields.float('Planned Revenue'),
-            'planned_cost': fields.float('Planned Costs'),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-            'probability': fields.float('Probability (%)'),
+                             the canall which is this opportunity source."), 
+            'planned_revenue': fields.float('Planned Revenue'), 
+            'planned_cost': fields.float('Planned Costs'), 
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+            'probability': fields.float('Probability (%)'), 
             'som': fields.many2one('res.partner.som', 'State of Mind', \
                             help="The minds states allow to define a value scale which represents" \
                                 "the partner mentality in relation to our services.The scale has" \
                                 "to be created with a factor for each level from 0 \
-                                (Very dissatisfied) to 10 (Extremely satisfied)."),
-            'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                                (Very dissatisfied) to 10 (Extremely satisfied)."), 
+            'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration'),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a8a76d6de5f..00cebd4dcbf 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -110,7 +110,7 @@ class crm_lead(osv.osv):
         }
 
     _defaults = {
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }