Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-mailplugin-outlookplugin-sync-atp-create_contact-nco
into lp:~openerp-dev/openobject-addons/trunk-mailplugin-outlookplugin-sync-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-mailplugin-outlookplugin-sync-atp-create_contact-nco/+merge/82504
Hello sir,
As per the new design i have change the contact create method, add
create partner method in handler.py
if partner is created
jump to ['url']
else
display 'Create a contact' Form
when click save:
r = contact_create(self, cr, uid, data, partner_id=0):
jump to ['url']
Thanks and regards,
Nimesh Contractor(NCO)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-mailplugin-outlookplugin-sync-atp-create_contact-nco/+merge/82504
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-mailplugin-outlookplugin-sync-atp.
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/Model.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/Model.cs 2011-11-11 06:26:31 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/Model.cs 2011-11-17 06:53:32 +0000
@@ -146,9 +146,9 @@
args.Add(values);
record_id = Convert.ToInt64(this.openerp_connect.Execute(this.model, "create", args.ToArray()));
-
return record_id;
}
+
}
}
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/CookComputing.XmlRpcV2.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/CookComputing.XmlRpcV2.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/CookComputing.XmlRpcV2.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/CookComputing.XmlRpcV2.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/CookComputing.XmlRpcV2.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/CookComputing.XmlRpcV2.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/ResolveAssemblyReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/ResolveAssemblyReference.cache 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/ResolveAssemblyReference.cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin.suo'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin.suo 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin.suo 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/Connect.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/Connect.cs 2011-11-16 06:14:13 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/Connect.cs 2011-11-17 06:53:32 +0000
@@ -318,6 +318,7 @@
foreach (outlook.MailItem mailitem in Tools.MailItems())
{
Cache.OpenERPOutlookPlugin.RedirectPartnerPage(mailitem);
+
}
}
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs 2011-11-16 06:14:13 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs 2011-11-17 06:53:32 +0000
@@ -92,27 +92,13 @@
return object_list;
}
- public void RedirectWeb(Hashtable args)
+ public void RedirectWeb(object web_url)
{
/*
* Will open the url into the web browser.
*/
- string par = "?";
- string WebURL = openerp_connect.URL;
- if (WebURL == "")
- {
- throw new Exception("WebURL is not specified!\nFirst configure WebURL from Configuration.");
- }
- foreach (string key in args.Keys)
- {
- par += key + "=" + args[key].ToString() + "&";
- }
- string web_url = WebURL; // + this.web_home_page;
- web_url += par.Substring(0, par.Length - 1);
- // string encode_url = HttpUtility.UrlEncode(web_url);
- // string web_url = HttpUtility.UrlDecode(encode_url);
- System.Diagnostics.Process.Start(web_url);
+ System.Diagnostics.Process.Start(web_url.ToString());
}
public Record[] SearchMessageRecordByMailItem(outlook.MailItem mail, string model, int thread_id)
@@ -164,7 +150,6 @@
args["id"] = obj.columns["res_id"];
this.RedirectWeb(args);
}
-
}
public void show_partner(outlook.MailItem mailItem)
{
@@ -184,18 +169,18 @@
it will open the contact form to create a partner.
:Param outlook.MailItem mailItem : Outlook Mail item
*/
- string email_id = mail.SenderEmailAddress.ToString();
- int id = (int)this.openerp_connect.Execute("plugin.handler", "partner_get", email_id);
- if (id > 0)
- {
- Hashtable args = new Hashtable();
- args["model"] = "res.partner";
- args["id"] = id;
- this.RedirectWeb(args);
-
- }
- else
- this.show_partner(mail);
+ string email_id = mail.SenderEmailAddress.ToString();
+ Object contact = this.openerp_connect.Execute("plugin.handler", "contact_get", email_id);
+ try
+ {
+ Hashtable args = (Hashtable)contact;
+ this.RedirectWeb(args["url"]);
+
+ }
+ catch
+ {
+ this.show_partner(mail);
+ }
}
public Model AddDefaultModel(string default_model_name)
@@ -416,12 +401,16 @@
*/
Hashtable values = new Hashtable();
Model partner_model = new Model("res.partner");
+ long record_id;
partner_model.Connection = this.Connection;
values.Add("name", name);
values.Add("address", false);
- return partner_model.CreateRecord(values);
+ ArrayList args = new ArrayList();
+ args.Add(values);
+ record_id = Convert.ToInt64(this.openerp_connect.Execute("plugin.handler", "partner_create", args.ToArray()));
+ return record_id;
}
- public long CreateContactRecord(string partner_name, string name, string email_id, string street, string street2, string zip, string city, string office, string mobile, string fax, long country_id, long state_id)
+ public void CreateContactRecord(string partner_name, string name, string email_id, string street, string street2, string zip, string city, string office, string mobile, string fax, long country_id, long state_id)
{
/*
@@ -442,26 +431,10 @@
* It reutns the long value if contact is created : Contact ID
*/
- long partner_id = 0;
- String[] condition = new String[] { "name", "=", partner_name };
- ArrayList condition_list = new ArrayList();
- Model partner_model = new Model("res.partner");
- partner_model.Connection = this.Connection;
Model partner_address_model = new Model("res.partner.address");
partner_address_model.Connection = this.Connection;
- condition_list.Add(condition);
- Record[] object_list = partner_model.SearchRecord(condition_list.ToArray());
- if (object_list.Count() > 0)
- {
- Record partner = (Record)object_list[0];
- partner_id = partner.id;
- }
-
Hashtable values = new Hashtable();
- if (partner_id > 0)
- {
- values.Add("partner_id", partner_id.ToString());
- }
+ values.Add("partner_name", partner_name);
values.Add("name", name);
values.Add("email", email_id);
values.Add("street", street);
@@ -473,7 +446,21 @@
values.Add("phone", office);
values.Add("mobile", mobile);
values.Add("fax", fax);
- return partner_address_model.CreateRecord(values);
+ //return partner_address_model.CreateRecord(values);
+ //string email_id = mail.SenderEmailAddress.ToString();
+ ArrayList args1 = new ArrayList();
+
+ args1.Add(values);
+ Object contact = this.openerp_connect.Execute("plugin.handler", "contact_create", args1.ToArray());
+ try
+ {
+ Hashtable args = (Hashtable)contact;
+ this.RedirectWeb(args["url"]);
+ }
+ catch
+ {
+ }
+
}
public Record[] SearchAttachments(string file_name, string model_name, int res_id)
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/CookComputing.XmlRpcV2.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/CookComputing.XmlRpcV2.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/CookComputing.XmlRpcV2.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/CookComputing.XmlRpcV2.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/CookComputing.XmlRpcV2.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/CookComputing.XmlRpcV2.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.tlb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.tlb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.tlb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_contact.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_contact.cs 2011-11-03 10:36:18 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_contact.cs 2011-11-17 06:53:32 +0000
@@ -103,7 +103,6 @@
}
Cache.OpenERPOutlookPlugin.CreateContactRecord(txt_partner.Text, txt_contactname_create_contact.Text, txtemail.Text, txtstreet.Text, txtstreet2.Text, txtzip.Text, txtcity.Text, txtofice.Text, txtmbl.Text, txtfax.Text, country_id, state_id);
- Connect.displayMessage("Contact created sucessfully.");
this.Close();
}
catch (Exception ex)
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt 2011-11-15 11:59:42 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt 2011-11-17 06:53:32 +0000
@@ -165,3 +165,24 @@
C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.csproj.GenerateResource.Cache
C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.dll
C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.pdb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.pdb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.tlb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPClient.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\CookComputing.XmlRpcV2.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPClient.pdb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\CookComputing.XmlRpcV2.pdb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\ResolveAssemblyReference.cache
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.csproj.ResolveComReference.cache
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_contact.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_create_doc.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_openerp_configuration.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_openerp_connection.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_partner.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_push_mail.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_select_partner.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_choose_document_opt.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.Properties.Resources.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.csproj.GenerateResource.Cache
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.pdb
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.ResolveComReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.ResolveComReference.cache 2011-11-15 11:59:42 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.ResolveComReference.cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache 2011-11-15 10:57:18 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt 2011-11-15 11:59:42 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt 2011-11-17 06:53:32 +0000
@@ -119,3 +119,22 @@
C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.Properties.Resources.resources
C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.csproj.GenerateResource.Cache
C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Release\OpenERPOutlookPlugin.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Release\OpenERPOutlookPlugin.tlb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Release\OpenERPClient.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Release\CookComputing.XmlRpcV2.dll
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Release\OpenERPClient.pdb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Release\CookComputing.XmlRpcV2.pdb
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\ResolveAssemblyReference.cache
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.csproj.ResolveComReference.cache
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_contact.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_create_doc.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_openerp_configuration.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_openerp_connection.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_partner.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_push_mail.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_select_partner.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.frm_choose_document_opt.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.Properties.Resources.resources
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.csproj.GenerateResource.Cache
+C:\Documents and Settings\nco\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Release\OpenERPOutlookPlugin.dll
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.GenerateResource.Cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.ResolveComReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.ResolveComReference.cache 2011-11-15 11:59:42 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.ResolveComReference.cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/ResolveAssemblyReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/ResolveAssemblyReference.cache 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/ResolveAssemblyReference.cache 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Debug/OpenERPOutlookPluginSetup.msi'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Debug/OpenERPOutlookPluginSetup.msi 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Debug/OpenERPOutlookPluginSetup.msi 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Release/OpenERPOutlookPluginSetup.msi'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Release/OpenERPOutlookPluginSetup.msi 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Release/OpenERPOutlookPluginSetup.msi 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/bin/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/bin/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/bin/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/bin/CookComputing.XmlRpcV2.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/bin/CookComputing.XmlRpcV2.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/bin/CookComputing.XmlRpcV2.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Debug/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Debug/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Debug/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Debug/CookComputing.XmlRpcV2.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Debug/CookComputing.XmlRpcV2.pdb 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Debug/CookComputing.XmlRpcV2.pdb 2011-11-17 06:53:32 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Release/CookComputing.XmlRpcV2.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Release/CookComputing.XmlRpcV2.dll 2011-11-16 06:14:13 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/xml-rpc.net.2.5.0/src/obj/Release/CookComputing.XmlRpcV2.dll 2011-11-17 06:53:32 +0000 differ
=== modified file 'plugin/plugin_handler.py'
--- plugin/plugin_handler.py 2011-11-17 05:39:37 +0000
+++ plugin/plugin_handler.py 2011-11-17 06:53:32 +0000
@@ -25,12 +25,20 @@
url = False
if ids:
ids.reverse()
+<<<<<<< TREE
contact = address_obj.browse(cr, uid, ids[0])
if contact.partner_id:
res_id = contact.partner_id.id
url = self._make_url(cr, uid, res_id, 'res.partner')
return {'model':model, 'url': url, 'res_id': res_id}
+=======
+ contact = address_obj.browse(cr, uid, ids[0])
+ if contact.partner_id:
+ res_id = contact.partner_id.id
+ url = self._make_url(cr, uid, res_id, 'res.partner')
+ return {'model':model, 'url': url, 'res_id': res_id}
+>>>>>>> MERGE-SOURCE
def document_get(self, cr, uid, email):
"""
@param email: email is a standard RFC2822 email message
@@ -105,6 +113,15 @@
return thread_id
+ def partner_create(self, cr, uid, data):
+ """
+ @param data : the data use to create the res.partner
+ [('field_name', value)], field name is required
+ """
+ partner_obj = self.pool.get('res.partner')
+ partner_id = partner_obj.create(cr, uid, {'name':data['name']})
+ return partner_id
+
def contact_create(self, cr, uid, data, partner_id=0):
"""
@param data : the data use to create the res.partner.address
@@ -112,10 +129,21 @@
@param partner_id : On which partner the address is attached
if partner_id = 0 then create a new partner with the same name that the address
"""
+ model = False
+ res_id = False
+ url = False
+ dictcreate = dict(data)
partner_obj = self.pool.get('res.partner')
- dictcreate = dict(data)
- if partner_id == 0:
- partner_id = partner_obj.create(cr, uid, {'name':dictcreate.get('name')})
- dictcreate['partner_id']=partner_id
- create_id = self.pool.get('res.partner.address').create(cr, uid, dictcreate)
- return create_id
+ p_id = partner_obj.search(cr,uid,[('name','=',data.get('partner_name'))])
+ if len(p_id) > 0:
+ model = 'res.partner'
+ dictcreate['partner_id']=p_id[0]#data['partner_id']
+ create_id = self.pool.get('res.partner.address').create(cr, uid, dictcreate)
+ res_id = p_id[0]
+ url = self._make_url(cr, uid, res_id, 'res.partner')
+ else:
+ create_id = self.pool.get('res.partner.address').create(cr, uid, dictcreate)
+ res_id = create_id
+ url = self._make_url(cr, uid, create_id, 'res.partner.address')
+ model = 'res.partner.address'
+ return {'model':model, 'url': url, 'res_id': res_id}
\ No newline at end of file
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
