Merge lp:~therp-nl/eficent-openerp-project-management/6.1-mig_project_communications_mailgate into lp:eficent-openerp-project-management/6.1

[Stefan Rijnhart (Opener)]

Work in progress, not yet tested.

Unmerged revisions

10. By Stefan Rijnhart (Opener) on 2013-01-04

[MIG] Adapt project_communications_mailgate to new mail module

9. By Stefan Rijnhart (Opener) on 2013-01-04

[FIX] Remove mutable defaults from function arguments

=== modified file 'project_category/analytic_account_category.py'
--- project_category/analytic_account_category.py	2012-10-18 23:30:03 +0000
+++ project_category/analytic_account_category.py	2013-01-04 15:10:41 +0000
@@ -40,7 +40,7 @@
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
-        if not context:
+        if context is None:
             context={}
         if name:
             # Be sure name_search is symetric to name_get
@@ -77,4 +77,4 @@
     _parent_order = 'name'
     _order = 'parent_left'
     
-analytic_account_category()
 \ No newline at end of file
+analytic_account_category()
 
=== modified file 'project_communications_mailgate/__init__.py'
--- project_communications_mailgate/__init__.py	2012-10-02 20:55:15 +0000
+++ project_communications_mailgate/__init__.py	2013-01-04 15:10:41 +0000
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
 
=== modified file 'project_communications_mailgate/__openerp__.py'
--- project_communications_mailgate/__openerp__.py	2012-10-02 20:55:15 +0000
+++ project_communications_mailgate/__openerp__.py	2013-01-04 15:10:41 +0000
@@ -26,7 +26,7 @@
     "author": "Jordi Ballester (Eficent)",
     "website": "http://www.eficent.com",
     "category": "Generic Modules/Projects & Services",
-    "depends": ["project", "mail_gateway"],
+    "depends": ["project", "mail"],
     "description": """This module is an interface that synchronises mails with OpenERP Project.
 
 It allows updating projects as soon as a new mail arrives in our configured mail server.
 
=== modified file 'project_communications_mailgate/project.py'
--- project_communications_mailgate/project.py	2012-10-02 20:55:15 +0000
+++ project_communications_mailgate/project.py	2013-01-04 15:10:41 +0000
@@ -19,45 +19,40 @@
 #
 ##############################################################################
 
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import orm
+from openerp.tools.translate import _
 
     
-class project(osv.osv):
+class project(orm.Model):
    
     _inherit = "project.project"
  
-    def set_draft(self, cr, uid, ids, *args, **kwargs):
-        res = super(project, self).set_draft(cr, uid, ids, *args, **kwargs)
-        projects = self.browse(cr, uid, ids)
-        self._history(cr, uid, projects, _('Draft'))
-        return res
-    
-    def set_open(self, cr, uid, ids, *args, **kwargs):
-        res = super(project, self).set_open(cr, uid, ids, *args, **kwargs)
-        projects = self.browse(cr, uid, ids)
-        self._history(cr, uid, projects, _('Open'))
-        return res
-    
-    def set_pending(self, cr, uid, ids, *args, **kwargs):
-        res = super(project, self).set_pending(cr, uid, ids, *args, **kwargs)
-        projects = self.browse(cr, uid, ids)
-        self._history(cr, uid, projects, _('Pending'))
-        return res
-    
-    def set_done(self, cr, uid, ids, *args, **kwargs):
-        res = super(project, self).set_done(cr, uid, ids, *args, **kwargs)
-        projects = self.browse(cr, uid, ids)
-        self._history(cr, uid, projects, _('Done'))
-        return res
-    
-    def set_cancel(self, cr, uid, ids, *args, **kwargs):
-        res = super(project, self).set_cancel(cr, uid, ids, *args, **kwargs)
-        projects = self.browse(cr, uid, ids)
-        self._history(cr, uid, projects, _('Cancel'))
+    def set_draft(self, cr, uid, ids, context=None):
+        res = super(project, self).set_draft(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Draft'), context=context)
+        return res
+    
+    def set_open(self, cr, uid, ids, context=None):
+        res = super(project, self).set_open(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Open'), context=context)
+        return res
+    
+    def set_pending(self, cr, uid, ids, context=None):
+        res = super(project, self).set_pending(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Pending'), context=context)
+        return res
+    
+    def set_done(self, cr, uid, ids, context=None):
+        res = super(project, self).set_done(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Done'), context=context)
+        return res
+    
+    def set_cancel(self, cr, uid, ids, context=None):
+        res = super(project, self).set_cancel(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Cancel'), context=context)
         return res   
-
-
-project()
-
 
=== modified file 'project_communications_mailgate/project_communications_mailgate.py'
--- project_communications_mailgate/project_communications_mailgate.py	2012-10-02 20:55:15 +0000
+++ project_communications_mailgate/project_communications_mailgate.py	2013-01-04 15:10:41 +0000
@@ -19,110 +19,30 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-from tools.translate import _
-import binascii
-
-
-class project_communications_mailgate(osv.osv):
+from openerp.osv import fields, orm
+
+
+class project_communications_mailgate(orm.Model):
     _name = "project.project"
-    _inherit = ['mailgate.thread','project.project']
+    _inherit = ['mail.thread','project.project']
     
     _columns={
-                'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)], readonly=True),
-              }
-    
-    def message_new(self, cr, uid, msg, context=None):
-#        """
-#        Automatically calls when new email message arrives
-#
-#        @param self: The object pointer
-#        @param cr: the current row, from the database cursor,
-#        @param uid: the current user’s ID for security checks
-#        """
+        'message_ids': fields.one2many(
+            'mail.message', 'res_id', 'Messages',
+            domain=[('model','=',_name)], readonly=True),
+        }
+
+    def message_thread_followers(self, cr, uid, ids, context=None):
+        if not ids:
+            return {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         res = {}
-#        mailgate_obj = self.pool.get('email.server.tools')
-#        subject = msg.get('subject')
-#        body = msg.get('body')
-#        msg_from = msg.get('from')
-#        priority = msg.get('priority')
-
-#        data = {      
-#            'name': subject,
-#            'description': body,
-#        }
-#        res = mailgate_obj.get_partner(cr, uid, msg_from)
-#        if res:
-#            data.update(res)
-#        res = self.create(cr, uid, data)    
-        
-#        attachments = msg.get('attachments', [])
-#        for attachment in attachments or []:
-#            data_attach = {
-#                'name': attachment,
-#                'datas':binascii.b2a_base64(str(attachments.get(attachment))),
-#                'datas_fname': attachment,
-#                'description': 'Mail attachment',
-#                'res_model': self._name,
-#                'res_id': res,
-#            }
-#            self.pool.get('ir.attachment').create(cr, uid, data_attach)
-#
-        return res           
-    
-    def message_update(self, cr, uid, id, msg, data={}, context=None): 
-        mailgate_obj = self.pool.get('email.server.tools')
-        subject = data.get('subject')
-        body = data.get('body')
-        msg_from = data.get('from')
-        msg_to = data.get('to')
-        priority = data.get('priority')
-        attachments = data.get('attachments', [])        
-
-#      msg_actions, body_data = mailgate_obj.msg_act_get(msg)           
-#       data.update({
-#           'description': body_data,            
-#       })
-#       act = 'do_'+default_act
-#       if 'state' in msg_actions:
-#           if msg_actions['state'] in ['draft','close','cancel','open','pending']:
-#               act = 'do_' + msg_actions['state']    
-
-#       if 'priority' in msg_actions:
-#           if msg_actions['priority'] in ('1','2','3','4','5'):
-#               data['priority'] = msg_actions['priority']
-#       
-#       self.write(cr, uid, [id], data)
-        msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
-        self._history(cr, uid, id, _(msg_dict['new']), history=True, subject=subject, email=msg_to, details=body, email_from=msg_from, message_id=None, attach=attachments)
-#       getattr(self,act)(cr, uid, [id])
-        return {}    
-
-    def message_followers(self, cr, uid, ids, context=None):
-        res = []
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        for project in self.browse(cr, uid, select, context=context):
-            user_email = (project.user_id and project.user_id.address_id and project.user_id.address_id.email) or False
-            res += [(user_email, False, False, project.priority)]
-        if isinstance(ids, (str, int, long)):
-            return len(res) and res[0] or False
+        for project in self.browse(cr, uid, ids, context=context):
+            user_email = (project.user_id and project.user_id.address_id
+                          and project.user_id.address_id.email) or False
+            if user_email:
+                res.setdefault(project.id, []).append(user_email)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-        return True
-    
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
-        mailgate_pool = self.pool.get('mailgate.thread')
-        return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
-                                       subject=subject, email=email, \
-                                       details=details, email_from=email_from,\
-                                       message_id=message_id, attach=attach, \
-                                       context=context)
-        
-
-project_communications_mailgate()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed directory 'project_communications_mailgate/security'
=== removed file 'project_communications_mailgate/security/ir.model.access.csv'
--- project_communications_mailgate/security/ir.model.access.csv	2012-10-02 20:55:15 +0000
+++ project_communications_mailgate/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_communications_mailgate_message_project_manager","project.mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
-"access_project_communications_mailgate_message_project_user","project.mailgate.message.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,1
 
=== modified file 'project_cost/account_analytic_account.py'
--- project_cost/account_analytic_account.py	2012-10-02 20:55:15 +0000
+++ project_cost/account_analytic_account.py	2013-01-04 15:10:41 +0000
@@ -33,7 +33,9 @@
     _inherit = 'account.analytic.account'
     
     def _compute_level_tree_plan(self, cr, uid, ids, child_ids, res, field_names, context=None):
-        def recursive_computation(account_id, res, repeated_account_ids=[]):
+        def recursive_computation(account_id, res, repeated_account_ids=None):
+            if repeated_account_ids is None:
+                repeated_account_ids = []
             currency_obj = self.pool.get('res.currency')
             account = self.browse(cr, uid, account_id)
             for son in account.child_ids:
@@ -54,7 +56,9 @@
         return res    
     
     def _compute_level_tree_commit(self, cr, uid, ids, child_ids, res, field_names, context=None):
-        def recursive_computation(account_id, res, repeated_account_ids=[]):
+        def recursive_computation(account_id, res, repeated_account_ids=None):
+            if repeated_account_ids is None:
+                repeated_account_ids = []
             currency_obj = self.pool.get('res.currency')
             account = self.browse(cr, uid, account_id)
             for son in account.child_ids:
@@ -200,11 +204,11 @@
         return True
     
     def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
+        if default is None:
             default = {}        
         default['plan_line_ids'] = []
         default['commit_line_ids'] = []
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
     
                 
-account_analytic_account()
 \ No newline at end of file
+account_analytic_account()
 
=== modified file 'project_cost_plan_purchase/account_analytic_line_plan.py'
--- project_cost_plan_purchase/account_analytic_line_plan.py	2012-10-02 20:55:15 +0000
+++ project_cost_plan_purchase/account_analytic_line_plan.py	2013-01-04 15:10:41 +0000
@@ -43,23 +43,23 @@
     }
 
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
         if context is None:
             context = {}
         
-        if not default:
+        if default is None:
             default = {}        
                 
         default['purchase_line_id'] = False
                 
         return super(account_analytic_line_plan, self).copy(cr, uid, id, default, context)
 
-    def copy_data(self, cr, uid, id, default={}, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
 
         if context is None:
             context = {}
         
-        if not default:
+        if default is None:
             default = {}   
                 
         default['purchase_line_id'] = False
 
=== modified file 'project_cost_plan_sale/account_analytic_line_plan.py'
--- project_cost_plan_sale/account_analytic_line_plan.py	2012-10-02 20:55:15 +0000
+++ project_cost_plan_sale/account_analytic_line_plan.py	2013-01-04 15:10:41 +0000
@@ -43,11 +43,11 @@
     }
 
       
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
         if context is None:
             context = {}
         
-        if not default:
+        if default is None:
             default = {}   
         
         default['sale_line_id'] = False
@@ -55,11 +55,11 @@
         res = super(account_analytic_line_plan, self).copy(cr, uid, id, default, context)
         return res
     
-    def copy_data(self, cr, uid, id, default={}, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
 
         if context is None:
             context = {}
-        if not default:
+        if default is None:
             default = {}   
             
         default['sale_line_id'] = False
 
=== modified file 'project_hr_stakeholder/project_hr_stakeholder.py'
--- project_hr_stakeholder/project_hr_stakeholder.py	2012-10-02 20:55:15 +0000
+++ project_hr_stakeholder/project_hr_stakeholder.py	2013-01-04 15:10:41 +0000
@@ -106,7 +106,7 @@
                                                         
     }
     
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
         res = []
 
=== modified file 'project_invoice/invoice.py'
--- project_invoice/invoice.py	2012-10-02 20:55:15 +0000
+++ project_invoice/invoice.py	2013-01-04 15:10:41 +0000
@@ -32,7 +32,7 @@
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
 
-    def _line_analytic_accounts_get(self, cr, uid, ids, field_name, arg, context={}):
+    def _line_analytic_accounts_get(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
         for inv in self.browse(cr, uid, ids, context):
             str_data = ''
 
=== modified file 'project_procurement/purchase_requisition.py'
--- project_procurement/purchase_requisition.py	2012-10-02 20:55:15 +0000
+++ project_procurement/purchase_requisition.py	2013-01-04 15:10:41 +0000
@@ -25,8 +25,8 @@
 class purchase_requisition(osv.osv):
     _inherit = "purchase.requisition"
 
-    def copy_data(self, cr, uid, id, default={}, context=None):
-        if not default:
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if default is None:
             default = {}
         default.update({
             'state':'draft',
 
=== modified file 'project_scope_wbs/project_scope_wbs.py'
--- project_scope_wbs/project_scope_wbs.py	2012-12-13 04:18:54 +0000
+++ project_scope_wbs/project_scope_wbs.py	2013-01-04 15:10:41 +0000
@@ -29,7 +29,7 @@
 class task(osv.osv):
     _inherit = 'project.task'
 
-    def _project_complete_wbs_name(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+    def _project_complete_wbs_name(self, cr, uid, ids, prop, unknow_none, context=None):
         
         if not ids:
             return []
@@ -45,14 +45,14 @@
         for task in tasks:            
             if task.project_id:
                 task_project_id = task.project_id.id
-                data_project = project_obj.read(cr, uid, task_project_id, ['complete_wbs_name'], context=[])            
+                data_project = project_obj.read(cr, uid, task_project_id, ['complete_wbs_name'], context=context)
             if data_project:
                 res.append((task.id, data_project['complete_wbs_name']))
             else:
                 res.append((task.id, ''))
         return dict(res)  
 
-    def _project_complete_wbs_code(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+    def _project_complete_wbs_code(self, cr, uid, ids, prop, unknow_none, context=None):
         
         if not ids:
             return []
@@ -68,7 +68,7 @@
         for task in tasks:            
             if task.project_id:
                 task_project_id = task.project_id.id
-                data_project = project_obj.read(cr, uid, task_project_id, ['complete_wbs_code'], context=[])            
+                data_project = project_obj.read(cr, uid, task_project_id, ['complete_wbs_code'], context=context)
             if data_project:
                 res.append((task.id, data_project['complete_wbs_code']))
             else:
@@ -81,11 +81,11 @@
     _columns = {
         'project_complete_wbs_name': fields.function(_project_complete_wbs_name, method=True, type='char', string='WBS path name', size=250, help='Project Complete WBS path name',
             store={
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['project_id'], 10),               
+                'project.task': (lambda self, cr, uid, ids, c=None: ids, ['project_id'], 10),               
             }),   
         'project_complete_wbs_code': fields.function(_project_complete_wbs_code, method=True, type='char', string='WBS path code', size=250, help='Project Complete WBS path code',
             store={
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['project_id'], 10),               
+                'project.task': (lambda self, cr, uid, ids, c=None: ids, ['project_id'], 10),               
             }),    
                             
      }    
@@ -327,4 +327,4 @@
 
 project()
 
-             
 \ No newline at end of file
+             
 
=== modified file 'project_time_sequence/project_time_sequence.py'
--- project_time_sequence/project_time_sequence.py	2012-10-02 20:55:15 +0000
+++ project_time_sequence/project_time_sequence.py	2013-01-04 15:10:41 +0000
@@ -112,7 +112,7 @@
        
         }
     
-    def do_link_predecessors(self, cr, uid, task_id, link_predecessors_data={}, context=None):
+    def do_link_predecessors(self, cr, uid, task_id, link_predecessors_data, context=None):
         
         task_br = self.browse(cr, uid, task_id, context=context)