← 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)


Hello,
Changes in this Merge proposal

+ Outlook & Thunder bird plugins Menu Updated named and new Icons.
+ Bug lp:680988

Kindly Check this.
Thank you
jam
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/42812
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.
=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2010-10-16 16:47:09 +0000
+++ crm/crm_view.xml	2010-12-06 06:16:13 +0000
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" 
-            groups="base.group_sale_manager,base.group_sale_salesman"/>
+            groups="base.group_sale_manager,base.group_sale_salesman,base.group_partner_manager"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>

=== modified file 'crm/security/ir.model.access.csv'
--- crm/security/ir.model.access.csv	2010-10-16 16:47:09 +0000
+++ crm/security/ir.model.access.csv	2010-12-06 06:16:13 +0000
@@ -42,3 +42,6 @@
 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
 "access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1
+"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,1,1,1
+"access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1
+"access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1

=== modified file 'mail_gateway/security/ir.model.access.csv'
--- mail_gateway/security/ir.model.access.csv	2010-10-21 12:37:25 +0000
+++ mail_gateway/security/ir.model.access.csv	2010-12-06 06:16:13 +0000
@@ -2,3 +2,4 @@
 "mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","base.group_system",1,1,1,1
 "mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","base.group_system",1,1,1,1
 "mail_gateway_message_internal_user","mail_gateway.mailgate.message.internal","model_mailgate_message","base.group_user",1,0,0,0
+"mail_gateway_mailgate_message_partner_manager","mail_gateway.mailgate.message.partner.manager","model_mailgate_message","base.group_partner_manager",1,1,1,1

=== modified file 'outlook/plugin/openerp-outlook-addin.exe'
Binary files outlook/plugin/openerp-outlook-addin.exe	2010-11-16 10:27:17 +0000 and outlook/plugin/openerp-outlook-addin.exe	2010-12-06 06:16:13 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin/addin.py'
--- outlook/plugin/openerp-outlook-plugin/addin.py	2010-11-18 11:22:24 +0000
+++ outlook/plugin/openerp-outlook-plugin/addin.py	2010-12-06 06:16:13 +0000
@@ -159,14 +159,14 @@
             item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.menu_bar_Button = DispatchWithEvents(item, Configuration)
-            item.Caption="OpenERP Configuration"
+            item.Caption="Configuration"
             item.TooltipText = "Click to configure OpenERP"
             item.Enabled = True
 
             item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.menu_bar_arch_Button = DispatchWithEvents(item, ArchiveEvent)
-            item.Caption="Push to OpenERP"
+            item.Caption="Push"
             item.TooltipText = "Click to push to OpenERP"
             item.Enabled = True
 
@@ -175,7 +175,7 @@
             item = toolbar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.toolbarButton = DispatchWithEvents(item, ArchiveEvent)
-            item.Caption="Push to OpenERP"
+            item.Caption="Push"
             item.TooltipText = "Click to push to OpenERP"
             item.Enabled = True
 
@@ -184,14 +184,14 @@
 
             item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
             item = self.toolbarButtonOpenPartner = DispatchWithEvents(item, OpenPartner)
-            item.Caption = "Open Partners"
+            item.Caption = "Partner"
             item.TooltipText = "Click to Open OpenERP Partner Contact Information."
             item.Enabled = True
 
 
             item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
             item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
-            item.Caption = "Open Document"
+            item.Caption = "Document"
             item.TooltipText = "Click to Open Document that has been pushed to server."
             item.Enabled = True
 
@@ -213,14 +213,14 @@
             item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.menu_bar_openpartner_Button = DispatchWithEvents(item, OpenPartner)
-            item.Caption = "Open Partner"
+            item.Caption = "Partner"
             item.TooltipText = "Click to Open Partner detail"
             item.Enabled = True
 
             item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.menu_bar_opendocument_Button = DispatchWithEvents(item, OpenDocument)
-            item.Caption = "Open Document"
+            item.Caption = "Document"
             item.TooltipText = "Click to Open Document that has been pushed to server."
             item.Enabled = True
 

=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi	2010-11-23 11:27:25 +0000 and thunderbird/plugin/openerp_plugin.xpi	2010-12-06 06:16:13 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2010-11-23 12:35:25 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar	2010-12-06 06:16:13 +0000 differ

Follow ups