openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01782
[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#695038 OpenOfficeReportDesigner Group to Remove in Trunk
https://bugs.launchpad.net/bugs/695038
#695596 Audit trail module does not creating an audit log for users.
https://bugs.launchpad.net/bugs/695596
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44947
Hello,
Changes in this Merge:
+ Outlook Crate Document ComError Fixed
Kindly Review it,
Thank You.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/44947
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.
=== modified file 'outlook/plugin/openerp-outlook-addin.exe'
Binary files outlook/plugin/openerp-outlook-addin.exe 2010-12-17 06:28:52 +0000 and outlook/plugin/openerp-outlook-addin.exe 2010-12-31 08:34:56 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin/Register-plugin.bat' (properties changed: +x to -x)
=== modified file 'outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat' (properties changed: +x to -x)
=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py'
--- outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py 2010-12-17 06:28:52 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py 2010-12-31 08:34:56 +0000
@@ -1382,12 +1382,11 @@
try:
partner_text = ustr(mail.SenderName).encode('iso-8859-1')
sender_mail = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-
except Exception:
win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
pass
vals = NewConn.SearchPartner(sender_mail)
- if vals == True:
+ if vals:
win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Their is contact related to "+str(partner_text)+" email address, but no partner is linked to contact>")
txtProcessor.init_done=True
return
=== removed file 'outlook/plugin/openerp-outlook-plugin/outlookaddin.iss'
--- outlook/plugin/openerp-outlook-plugin/outlookaddin.iss 2010-12-03 12:24:01 +0000
+++ outlook/plugin/openerp-outlook-plugin/outlookaddin.iss 1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{AF02E62E-3A5A-4E86-B4CF-03F2B2AC25BF}
-AppName=Openerp Outlook Addin
-AppVersion=1.0
-AppVerName=Openerp Outlook Addin 1.0
-AppPublisher=Openerp SA
-AppPublisherURL=http://www.openerp.com/
-AppSupportURL=http://www.openerp.com/
-AppUpdatesURL=http://www.openerp.com/
-DefaultDirName={pf}\Openerp Outlook Addin
-DefaultGroupName=Openerp Outlook Addin
-DisableProgramGroupPage=true
-OutputBaseFilename=openerp-outlook-addin
-Compression=lzma
-SolidCompression=true
-UserInfoPage=true
-UninstallDisplayIcon={app}\*
-VersionInfoVersion=1.0
-VersionInfoCompany=OpenERP
-VersionInfoDescription=OpenERP Outlook Addin
-VersionInfoProductName=OpenERP
-VersionInfoProductVersion=1.0
-ChangesAssociations=true
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
-Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
-Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
-Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
-Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
-Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-
-[Files]
-Source: "C:\workspace\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Messages]
-AboutSetupNote=Inno Setup Preprocessor home page:%nhttp://ispp.sourceforge.net/
-
-
-[Run]
-Filename: "{app}\Register-plugin.bat"; StatusMsg: "Registering Outlook Addin";
-[UninstallDelete]
-Type: files; Name: "{app}\Openerp Outlook Addin\*"
-Type: dirifempty; Name: "{app}\Openerp Outlook Addin"
-
-[UninstallRun]
-Filename: "{app}\Unregister-plugin.bat"; StatusMsg: "Unregistering Outlook Addin";
-
-
-[Code]
-function InitializeSetup(): Boolean;
-begin
- Result := true;
-
- if not RegKeyExists( HKLM, 'Software\Python\PythonCore') then begin
- Result := MsgBox(
- 'Python appears to not be installed.' + #13 + #13 +
- 'This addin requires Python 2.5 or above installed with compatible pywin32 for python for working.'+ #13 + #13 +
- 'If you know that Python is installed, you may with to continue.' + #13 + #13 +
- 'Continue with installation?',
- mbConfirmation, MB_YESNO) = idYes;
- end;
- if not RegKeyExists( HKCU, 'Software\Microsoft\Office\Outlook') then begin
- Result := MsgBox(
- 'Outlook appears to not be installed.' + #13 + #13 +
- 'This addin only works with Microsoft Outlook 2000 and later - it' + #13 +
- 'does not work with Outlook express.' + #13 + #13 +
- 'If you know that Outlook is installed, you may with to continue.' + #13 + #13 +
- 'Continue with installation?',
- mbConfirmation, MB_YESNO) = idYes;
- end;
- while Result do begin
- if not CheckForMutexes('_outlook_mutex_') then
- break;
-
- Result := MsgBox(
- 'You must close Outlook before OpenERP Outlook Addin can be installed.' + #13 + #13 +
- 'Please close all Outlook Windows (using "File->Exit and Log off"' + #13 +
- 'if available) and click Retry, or click Cancel to exit the installation.'+ #13 + #13 +
- 'If this message persists after closing all Outlook windows, you may' + #13 +
- 'need to log off from Windows, and try again.',
- mbConfirmation, MB_RETRYCANCEL) = idRetry;
- end;
-end;
-
=== added file 'outlook/plugin/openerp-outlook-plugin/setup.iss'
--- outlook/plugin/openerp-outlook-plugin/setup.iss 1970-01-01 00:00:00 +0000
+++ outlook/plugin/openerp-outlook-plugin/setup.iss 2010-12-31 08:34:56 +0000
@@ -0,0 +1,105 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{AF02E62E-3A5A-4E86-B4CF-03F2B2AC25BF}
+AppName=Openerp Outlook Addin
+AppVersion=1.0
+AppVerName=Openerp Outlook Addin 1.0
+AppPublisher=Openerp SA
+AppPublisherURL=http://www.openerp.com/
+AppSupportURL=http://www.openerp.com/
+AppUpdatesURL=http://www.openerp.com/
+DefaultDirName={pf}\Openerp Outlook Addin
+DefaultGroupName=Openerp Outlook Addin
+DisableProgramGroupPage=true
+OutputBaseFilename=openerp-outlook-addin
+Compression=lzma
+SolidCompression=true
+UserInfoPage=true
+UninstallDisplayIcon={app}\*
+VersionInfoVersion=1.0
+VersionInfoCompany=OpenERP
+VersionInfoDescription=OpenERP Outlook Addin
+ChangesAssociations=true
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
+Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
+Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
+Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"
+Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
+Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
+Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
+Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
+Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
+Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
+Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
+
+[Files]
+Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Messages]
+AboutSetupNote=Inno Setup Preprocessor home page:%nhttp://ispp.sourceforge.net/
+
+
+[Run]
+Filename: "{app}\Register-plugin.bat"; StatusMsg: "Registering Outlook Addin";
+[UninstallDelete]
+Type: files; Name: "{app}\Openerp Outlook Addin\*"
+Type: dirifempty; Name: "{app}\Openerp Outlook Addin"
+
+[UninstallRun]
+Filename: "{app}\Unregister-plugin.bat"; StatusMsg: "Unregistering Outlook Addin";
+
+
+[Code]
+function InitializeSetup(): Boolean;
+begin
+ Result := true;
+
+ if not RegKeyExists( HKLM, 'Software\Python\PythonCore') then begin
+ Result := MsgBox(
+ 'Python appears to not be installed.' + #13 + #13 +
+ 'This addin requires Python 2.5 or above installed with compatible pywin32 for python for working.'+ #13 + #13 +
+ 'If you know that Python is installed, you may with to continue.' + #13 + #13 +
+ 'Continue with installation?',
+ mbConfirmation, MB_YESNO) = idYes;
+ end;
+ if not RegKeyExists( HKCU, 'Software\Microsoft\Office\Outlook') then begin
+ Result := MsgBox(
+ 'Outlook appears to not be installed.' + #13 + #13 +
+ 'This addin only works with Microsoft Outlook 2000 and later - it' + #13 +
+ 'does not work with Outlook express.' + #13 + #13 +
+ 'If you know that Outlook is installed, you may with to continue.' + #13 + #13 +
+ 'Continue with installation?',
+ mbConfirmation, MB_YESNO) = idYes;
+ end;
+ while Result do begin
+ if not CheckForMutexes('_outlook_mutex_') then
+ break;
+
+ Result := MsgBox(
+ 'You must close Outlook before OpenERP Outlook Addin can be installed.' + #13 + #13 +
+ 'Please close all Outlook Windows (using "File->Exit and Log off"' + #13 +
+ 'if available) and click Retry, or click Cancel to exit the installation.'+ #13 + #13 +
+ 'If this message persists after closing all Outlook windows, you may' + #13 +
+ 'need to log off from Windows, and try again.',
+ mbConfirmation, MB_RETRYCANCEL) = idRetry;
+ end;
+end;
+
=== modified file 'outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py'
--- outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py 2010-12-17 06:28:52 +0000
+++ outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py 2010-12-31 08:34:56 +0000
@@ -284,10 +284,11 @@
headers = {}
strheader = strheader.replace("\n ", " ").splitlines()
for line in strheader:
- split_here = line.find(":")
- headers[line[:split_here]] = line[split_here:]
+ split_here = line.find(":")
+ headers[line[:split_here]] = line[split_here:]
temp1 = headers.get('Message-ID')
temp2 = headers.get('Message-Id')
+ referances = headers.get('References')
if temp1 == None: message_id = temp2
if temp2 == None: message_id = temp1
startCut = message_id.find("<")
Follow ups