openerp-dev-web team mailing list archive

[jam-openerp <jam@xxxxxxxxxxx>]

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

Requested reviews:
  OpenERP Core Team (openerp)


Hello,

   Changes in this Merge Proposal
      + Openlink in Webbrowser with menu 
      + Putting Config in OpenERP Toolbar
     + lp:689284

Kindly Review them,

Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/43505
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml	2010-12-09 12:56:35 +0000
+++ crm/crm_opportunity_view.xml	2010-12-13 10:15:58 +0000
@@ -39,14 +39,15 @@
                             </group>
                             <field name="user_id"/>
 
-                            <button name="action_makeMeeting" type="object"
-                            string="Schedule Meeting" icon="gtk-redo" />
+                            <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
 
                             <field name="planned_revenue"/>
                             <field name="probability"/>
                             <field name="date_deadline"/>
-                            <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
+
+                            <button name="action_makeMeeting" type="object"
+                            string="Schedule Meeting" icon="gtk-redo" />
                             <newline/>
                             <field name="date_action"/>
                             <field name="title_action"/>

=== modified file 'outlook/plugin/openerp-outlook-addin.exe'
Binary files outlook/plugin/openerp-outlook-addin.exe	2010-12-10 05:37:41 +0000 and outlook/plugin/openerp-outlook-addin.exe	2010-12-13 10:15:58 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin/addin.py'
--- outlook/plugin/openerp-outlook-plugin/addin.py	2010-12-09 13:24:10 +0000
+++ outlook/plugin/openerp-outlook-plugin/addin.py	2010-12-13 10:15:58 +0000
@@ -175,6 +175,12 @@
             toolbar = bars.Item("Standard")
             openerp_bar = bars.Item('Open ERP')
 
+            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = self.toolbarButtonConfig = DispatchWithEvents(item, Configuration)
+            item.Caption = "Configuration"
+            item.TooltipText = "Click to configure OpenERP."
+            item.Enabled = True
+
             item = openerp_bar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.toolbarButton = DispatchWithEvents(item, ArchiveEvent)
@@ -198,6 +204,8 @@
             item.TooltipText = "Click to Open Document that has been pushed to server."
             item.Enabled = True
 
+
+
             # Hook events for the item
 #            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
 #            item = self.toolbarButtonPartner = DispatchWithEvents(item, ViewPartners)

=== modified file 'outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py'
--- outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2010-12-10 05:37:41 +0000
+++ outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py	2010-12-13 10:15:58 +0000
@@ -1406,14 +1406,11 @@
     	txtProcessor.init_done=True
     	return
     try:
-        linktopartner = "http://"+web_server+":"+str(web_server_port)+"/openerp/form/view?model=res.partner&id="+str(vals)
-
+        import urllib
+        next =  urllib.urlencode({'next' : '/openerp/form/view?model=res.partner&id=' +str(vals) })
+        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        linktopartner = weburl + '?' + next
         win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, str(linktopartner))
-#        import urllib
-#        encode = urllib.urlencode('/openerp/form/view?model=res.partner&id='+str(vals))
-#        weburl = 'http://'+web_server+':'+str(web_server_port)
-#        linktopartner = weburl + "?next=" + encode
-#    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, linktopartner)
     except Exception,e:
     	win32ui.MessageBox("Error While Opening Partner.\n"+str(e),"Open Partner", flag_error)
     webbrowser.open_new(linktopartner)
@@ -1469,7 +1466,10 @@
         txtProcessor.init_done=True
         return
     try:
-        linktodoc = "http:\\\\" +web_server+ ":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
+        import urllib
+        next =  urllib.urlencode({'next' : '/openerp/form/view?model='+vals[0][1]+'&id='+str(vals[1][1])})
+        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        linktodoc = weburl + '?' + next
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
     except Exception,e:
         win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)