[IMP]: Remove duplication for mail archive

bzr revid: ksa@tinyerp.co.in-20100914134141-wodgnqknakaosv6k

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 58ef493..fc59d40 100644 (file)
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -152,15 +152,24 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate = dict(vals)\r
         ref_ids = str(dictcreate.get('ref_ids')).split(';')\r
         msg = dictcreate.get('message')\r
+        msg = self.pool.get('email.server.tools').parse_message(msg)\r
         server_tools_pool = self.pool.get('email.server.tools')\r
+        message_id = msg.get('message-id', False)\r
+        msg_pool = self.pool.get('mailgate.message')\r
+        msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)])\r
+        res = {}\r
+        if msg_ids and len(msg_ids):\r
+                return 0\r
+\r
         for ref_id in ref_ids:\r
+            msg_new = dictcreate.get('message')\r
             ref = ref_id.split(',')\r
             model = ref[0]\r
             model_obj = self.pool.get(model)\r
             model_data = model_obj.search(cr, uid,[('name', 'ilike', ref[1])])\r
             if model_data:\r
                 res_id = int(model_data[0])\r
-                server_tools_pool.history_message(cr, uid, model, res_id, msg)\r
+                server_tools_pool.history_message(cr, uid, model, res_id, msg_new)\r
         return True\r
 \r
     def process_email(self, cr, uid, vals):\r
@@ -169,22 +178,6 @@ class thunderbird_partner(osv.osv_memory):
         message = dictcreate.get('message')\r
         return self.pool.get('email.server.tools').process_email(cr, uid, model, message, attach=True, context=None)\r
 \r
-    def search_message(self, cr, uid, message, context=None):\r
-        #@param message: string of mail which is read from EML File\r
-        #@return model,res_id\r
-        msg_pool = self.pool.get('mailgate.message')\r
-        msg = self.pool.get('email.server.tools').parse_message(message)\r
-        message_id = msg.get('message-id', False)\r
-        model = False\r
-        res_id = False\r
-        if message_id:\r
-            msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)])\r
-            if msg_ids and len(msg_ids):\r
-                msg = msg_pool.browse(cr, uid, msg_ids[0])\r
-                model = msg.model\r
-                res_id = msg.res_id\r
-        return (model,res_id)\r
-\r
     def search_contact(self, cr, user, email):\r
         address_pool = self.pool.get('res.partner.address')\r
         address_ids = address_pool.search(cr, user, [('email','=',email)])\r

diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 691314c..8ea517c 100644 (file)
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ

diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 4c7c1e1..e24927e 100644 (file)
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ

diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index fcd22f3..c15be62 100755 (executable)
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -1387,7 +1387,9 @@ function dictcontact(a,b){
 var listArchiveHandler = {
        onResult: function(client, context, result) {
                netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        list_documents = document.getElementById('listSearchBox')
                var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        alert("Mail is Already Archived Successfully.")
 
        },
        onFault: function (client, ctxt, fault) {
@@ -1427,6 +1429,7 @@ function parse_eml(){
                var output = sis.read( sis.available() );
                return output
     }
+    
 }
 function upload_archivemail()
 {

diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index 4d49c4b..a2345f0 100755 (executable)
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -3,7 +3,7 @@
 <!ENTITY tinyarchive "Archive to OpenERP">
 <!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
 <!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp-icon.png">
-<!ENTITY partnericon.value "chrome://openerp_plugin/skin/Partner.png">
+<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner.png">
 <!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
 <!ENTITY tooltip.value "Add To Archive">
 <!ENTITY pluginconfig.value "OpenERP Configuration Settings">