← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)


Hello,
Issue Fixed in this Merge:

  + [BUG-FIX] lp:685977
  + [BUG-FIX] lp:680704

Kindly Check them.
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/42912
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py	2010-12-03 12:44:09 +0000
+++ fetchmail/fetchmail.py	2010-12-07 06:55:06 +0000
@@ -57,9 +57,8 @@
         'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
-        'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]", 
-                                    help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
-        'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model."),
+        'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
+        'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
         'user_id':fields.many2one('res.users', 'User', required=False),
         'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
@@ -82,8 +81,19 @@
                 return False
         return True
 
+    def check_model(self, cr, uid, ids, context = None):
+        if not context:
+            context = {}
+        current_rec = self.read(cr, uid, ids, context)[0]
+        if current_rec:
+            model = self.pool.get(current_rec.get('object_id')[1])
+            if hasattr(model, 'message_new'):
+                return True
+        return False
+
     _constraints = [
-        (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password'])
+        (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password']),
+        (check_model, 'Warning! Record for slected Model can not be created\nPlease choose valid Model', ['object_id'])
     ]
 
     def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):

=== modified file 'thunderbird/__openerp__.py'
--- thunderbird/__openerp__.py	2010-08-11 14:07:26 +0000
+++ thunderbird/__openerp__.py	2010-12-07 06:55:06 +0000
@@ -29,11 +29,11 @@
     "description": """
       This module is required for the thuderbird plug-in to work
       properly.
-
-      This allows you to select an object that you’d like to add
-      to your email and its attachments. You can select a partner, a task,
-      a project, an analytical account, or any other object and attach selected
-      mail as .eml file in attachment of selected record.
+      The Plugin allows you archive email and its attachments to the selected 
+      OpenERP objects. You can select a partner, a task, a project, an analytical
+      account,or any other object and attach selected mail as .eml file in 
+      attachment of selected record. You can create Documents for crm Lead,
+      HR Applicant and project issue from selected mails.
 
       """,
     "init_xml" : [],

=== modified file 'thunderbird/partner/partner.py'
--- thunderbird/partner/partner.py	2010-11-26 16:13:59 +0000
+++ thunderbird/partner/partner.py	2010-12-07 06:55:06 +0000
@@ -131,11 +131,11 @@
 
 class thunderbird_partner(osv.osv_memory):
     _name = "thunderbird.partner"
-    _description="Thunderbid mails"
+    _description="Thunderbid Plugin Tools"
 
     def create_contact(self,cr,user,vals):
         dictcreate = dict(vals)
-        # Set False value if 'undefined'. Thunerbird set 'undefined' if user did not set any value.
+        # Set False value if 'undefined' for record. Id User does not spicify the values, Thunerbird set 'undefined' by default for new contact.
         for key in dictcreate:
             if dictcreate[key] == 'undefined':
                 dictcreate[key] = False

=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	2010-12-03 06:24:24 +0000 and thunderbird/plugin/openerp_plugin.xpi	2010-12-07 06:55:06 +0000 differ