[MERGE]

bzr revid: hmo@tinyerp.com-20101104071140-6r068lrv1pldrnnq

addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py

@@ -692,6 +692,7 @@ def CreateCase(btnProcessor,*args):
                 flag=flag_error
             if f:
                 win32ui.MessageBox(msg, "Create Document", flag)
+                win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
                 return
             else:
                 win32ui.MessageBox("Error While creating document.\n Document can not be created.", "Create Document", flag_error)
@@ -1717,7 +1718,7 @@ dialog_map = {
                     (DialogCommand,             "ID_CREATE_CONTACT ID_SEARCH_TEXT", "IDD_NEW_CONTACT_DIALOG", set_search_text, ()),
                     (CloseButtonProcessor,      "IDCANCEL"),
                     (CommandButtonProcessor,    "ID_MAKE_ATTACHMENT IDC_NAME_LIST IDD_SYNC", MakeAttachment, ()),
-                    (CommandButtonProcessor,    "ID_CREATE_CASE ID_ATT_METHOD_DROPDOWNLIST IDC_NAME_LIST", CreateCase, ()),
+                    (CommandButtonProcessor,    "ID_CREATE_CASE ID_ATT_METHOD_DROPDOWNLIST IDC_NAME_LIST IDD_SYNC", CreateCase, ()),
                     (ListBoxProcessor,          "IDC_NAME_LIST", SetNameColumn, ())
                 ),
 

addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc

@@ -118,7 +118,7 @@ CAPTION "Push to OpenERP"
 FONT 8, "Tahoma", 1000, 0, 0x0
 BEGIN
 	GROUPBOX        "Link to an Existing Documents ", IDC_STATIC_GROUP, 8,5,250,290,WS_TABSTOP
-	LTEXT           "Search for : ",IDC_STATIC,15,17,40,12
+	LTEXT           "Search : ",IDC_STATIC,15,17,40,12
 	EDITTEXT        ID_SEARCH_TEXT,60,15,120,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
     PUSHBUTTON   	"Search",ID_SEARCH,187,15,40,14,WS_TABSTOP
 	LTEXT           "Documents : ",IDC_STATIC,15,140,100,14

addons/thunderbird/partner/partner.py

@@ -299,11 +299,8 @@ class thunderbird_partner(osv.osv_memory):
             name_get.append('error')
             name_get.append(er_val)
         return name_get
-
-
-
     def list_alldocument(self,cr,user,vals):
-        obj_list= [('crm.lead','Lead'),('project.issue','Project Issue'), ('hr.applicant','HR Recruitment')]
+        obj_list= [('crm.lead','CRM Lead'),('project.issue','Project Issue'), ('hr.applicant','HR Applicant')]
         object=[]
         model_obj = self.pool.get('ir.model')
         for obj in obj_list: