← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)


Improvement in Outlook and Thunder Bird Plugin:
Thunder Bird:
  - Contact Name Field is not at Same Place is in Outlook for New Contact.
  - Thunderbird :Name of the Type Document in Create New document List
  - Thunderbird :Create new Contact View Improvement as Outlook.
All above view are re designed according to the Outlook Views 

Outlook: Document Setting View, extra Document are removed and changes required on Sunday is also Done.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/39963
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.
=== modified file 'outlook/doc/Installation Guide to OpenERP Outlook Plug-in.doc'
Binary files outlook/doc/Installation Guide to OpenERP Outlook Plug-in.doc	2010-08-13 06:40:04 +0000 and outlook/doc/Installation Guide to OpenERP Outlook Plug-in.doc	2010-11-03 13:31:36 +0000 differ
=== modified file 'outlook/doc/User Guide to OpenERP Outlook Plug-in.doc'
Binary files outlook/doc/User Guide to OpenERP Outlook Plug-in.doc	2010-09-17 05:56:44 +0000 and outlook/doc/User Guide to OpenERP Outlook Plug-in.doc	2010-11-03 13:31:36 +0000 differ
=== added file 'outlook/plugin/openerp-outlook-plugin.zip'
Binary files outlook/plugin/openerp-outlook-plugin.zip	1970-01-01 00:00:00 +0000 and outlook/plugin/openerp-outlook-plugin.zip	2010-11-03 13:31:36 +0000 differ
=== removed file 'outlook/plugin/openerp-outlook-plugin.zip'
Binary files outlook/plugin/openerp-outlook-plugin.zip	2010-10-30 11:14:16 +0000 and outlook/plugin/openerp-outlook-plugin.zip	1970-01-01 00:00:00 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py'
--- outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2010-10-30 11:14:16 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2010-11-03 13:31:36 +0000
@@ -692,6 +692,7 @@
                 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 @@
                     (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, ())
                 ),
 

=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc'
--- outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc	2010-10-30 11:14:16 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc	2010-11-03 13:31:36 +0000
@@ -118,7 +118,7 @@
 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

=== modified file 'thunderbird/partner/partner.py'
--- thunderbird/partner/partner.py	2010-10-08 06:32:36 +0000
+++ thunderbird/partner/partner.py	2010-11-03 13:31:36 +0000
@@ -299,11 +299,8 @@
             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:

=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	2010-10-08 06:32:36 +0000 and thunderbird/plugin/openerp_plugin.xpi	2010-11-03 13:31:36 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2010-10-08 06:32:36 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2010-11-03 13:31:36 +0000 differ

Follow ups