Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam-openweburl_button-sgo
into lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-outlook.net-jam-openweburl_button-sgo/+merge/81011
hello sir,
I have created error message for weburl open if it is blank. and add label to
create new contact.
Thank you.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-outlook.net-jam-openweburl_button-sgo/+merge/81011
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam.
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/OpenERPClient.csproj'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/OpenERPClient.csproj 2011-09-27 09:39:05 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/OpenERPClient.csproj 2011-11-02 12:43:36 +0000
@@ -35,6 +35,7 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
+ <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
=== 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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Debug/OpenERPClient.pdb 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/bin/Release/OpenERPClient.pdb 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/OpenERPClient.pdb 2011-11-02 12:43:36 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/ResolveAssemblyReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/ResolveAssemblyReference.cache 2011-10-31 12:29:33 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Debug/ResolveAssemblyReference.cache 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPClient/obj/Release/OpenERPClient.pdb 2011-11-02 12:43:36 +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-01 12:41:43 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin.suo 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPClient.pdb 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPClient.pdb 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Release/OpenERPOutlookPlugin.tlb 2011-11-02 12:43:36 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.cs 2011-11-02 11:18:59 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.cs 2011-11-02 12:43:36 +0000
@@ -135,7 +135,6 @@
this.add_item_documentlist(model);
}
}
-
}
catch(Exception ex)
@@ -145,7 +144,6 @@
}
-
private Image Image(string p)
{
throw new NotImplementedException();
@@ -176,7 +174,10 @@
openerp_connect.URL = url;
openerp_connect.DBName = dbname;
openerp_connect.UserId = txt_username.Text;
- openerp_outlook.WebURL = txt_webserver_parameter.Text;
+ if (txt_webserver_parameter.Text == "")
+ {
+ openerp_outlook.WebURL = url;
+ }
openerp_connect.rempwd = chkpwd.Checked;
if (chkpwd.Checked)
{
@@ -226,15 +227,11 @@
{
Connect.isLoggedIn();
Model model = Cache.OpenERPOutlookPlugin.SearchModelByName(this.txtobject_name.Text,this.txtobj_title.Text);
-
- //if Cache.DocumentModelList
this.config_manager.SaveDocumentSettings(model, txtimage_path.Text);
this.add_item_documentlist(model);
txtobj_title.Text = "";
txtobject_name.Text = "";
txtimage_path.Text = "";
-
-
}
catch (Exception ex)
{
@@ -244,7 +241,6 @@
}
-
private void btnloadimage_Click(object sender, EventArgs e)
{
try
@@ -304,7 +300,19 @@
private void btn_webserver_parameter_open_Click(object sender, EventArgs e)
{
- System.Diagnostics.Process.Start(this.txt_webserver_parameter.Text);
+ try
+ {
+ if (this.txt_webserver_parameter.Text == "")
+ {
+ throw new Exception("WebURL not specified!\nFirst configure WebURL.");
+ }
+ System.Diagnostics.Process.Start(this.txt_webserver_parameter.Text);
+
+ }
+ catch (Exception ex)
+ {
+ Connect.handleException(ex);
+ }
}
private void txt_server_config_TextChanged(object sender, EventArgs e)
@@ -344,7 +352,5 @@
}
-
-
}
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_push_mail.designer.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_push_mail.designer.cs 2011-11-01 12:41:43 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_push_mail.designer.cs 2011-11-02 12:43:36 +0000
@@ -47,6 +47,7 @@
this.cmboboxcreate = new System.Windows.Forms.ComboBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btn_create_doc = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
this.grpcontact.SuspendLayout();
this.groupBox1.SuspendLayout();
this.grp_chckbx_object.SuspendLayout();
@@ -55,6 +56,7 @@
//
// grpcontact
//
+ this.grpcontact.Controls.Add(this.label1);
this.grpcontact.Controls.Add(this.btnclose);
this.grpcontact.Controls.Add(this.btn_create_contact);
this.grpcontact.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -84,7 +86,7 @@
this.btn_create_contact.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_create_contact.Image = global::OpenERPOutlookPlugin.Properties.Resources.Create;
this.btn_create_contact.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
- this.btn_create_contact.Location = new System.Drawing.Point(135, 34);
+ this.btn_create_contact.Location = new System.Drawing.Point(170, 34);
this.btn_create_contact.Name = "btn_create_contact";
this.btn_create_contact.Size = new System.Drawing.Size(117, 23);
this.btn_create_contact.TabIndex = 4;
@@ -271,6 +273,15 @@
this.btn_create_doc.UseVisualStyleBackColor = true;
this.btn_create_doc.Click += new System.EventHandler(this.btncreate_Click);
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(13, 38);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(129, 13);
+ this.label1.TabIndex = 5;
+ this.label1.Text = "Create New Contact :";
+ //
// frm_push_mail
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -285,6 +296,7 @@
this.Text = "Push To OpenERP";
this.Load += new System.EventHandler(this.frm_push_mail_Load);
this.grpcontact.ResumeLayout(false);
+ this.grpcontact.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.grp_chckbx_object.ResumeLayout(false);
@@ -314,6 +326,7 @@
private System.Windows.Forms.ComboBox cmboboxcreate;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.CheckedListBox chklst_doc;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
=== 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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb 2011-11-02 12:43:36 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/ResolveAssemblyReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/ResolveAssemblyReference.cache 2011-11-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/ResolveAssemblyReference.cache 2011-11-02 12:43:36 +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-01 12:41:43 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache 2011-11-02 12:43:36 +0000 differ
=== 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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Release/OpenERPOutlookPlugin.dll 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Debug/OpenERPOutlookPluginSetup.msi 2011-11-02 12:43:36 +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-02 07:13:35 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPluginSetup/Release/OpenERPOutlookPluginSetup.msi 2011-11-02 12:43:36 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
