← Back to team overview

openerp-dev-web team mailing list archive

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

 

atp(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Sbh (Open ERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/44945

1)ADD security file for crm_partner_assign module.

2)Added graph view in crm_partner_assign module for Opp. Assignment analysis.

3)Remove Graph view in crm claim module.


Thanks
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/44945
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp.
=== modified file 'crm_claim/crm_claim_menu.xml'
--- crm_claim/crm_claim_menu.xml	2010-12-17 13:01:17 +0000
+++ crm_claim/crm_claim_menu.xml	2010-12-31 07:18:25 +0000
@@ -12,7 +12,7 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
@@ -40,12 +40,6 @@
             <field name="act_window_id" ref="crm_case_categ_claim0"/>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-            <field name="act_window_id" ref="crm_case_categ_claim0"/>
-        </record>
 
         <menuitem name="Claims" id="menu_crm_case_claims"
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2010-12-23 05:52:10 +0000
+++ crm_claim/crm_claim_view.xml	2010-12-31 07:18:25 +0000
@@ -226,20 +226,6 @@
             </field>
         </record>
 
-        <!-- Claim Graph view -->
-
-        <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
-            <field name="name">CRM -Graph</field>
-            <field name="model">crm.claim</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
-                    <field name="stage_id"/>
-                    <field name="planned_cost" operator="+"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <!-- Crm claim Search view -->
 

=== modified file 'crm_partner_assign/__openerp__.py'
--- crm_partner_assign/__openerp__.py	2010-09-21 10:15:44 +0000
+++ crm_partner_assign/__openerp__.py	2010-12-31 07:18:25 +0000
@@ -31,6 +31,7 @@
     'author': 'OpenERP SA',
     'depends': ['crm'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'crm_lead_view.xml',

=== modified file 'crm_partner_assign/report/crm_lead_report_view.xml'
--- crm_partner_assign/report/crm_lead_report_view.xml	2010-12-09 12:56:35 +0000
+++ crm_partner_assign/report/crm_lead_report_view.xml	2010-12-31 07:18:25 +0000
@@ -86,7 +86,20 @@
             </field>
         </record>
 
+<!-- Crm Lead Assign report Graph View -->
 
+        <record id="view_report_crm_lead_assign_graph" model="ir.ui.view">
+            <field name="name">crm.lead.assign.graph</field>
+            <field name="model">crm.lead.report.assign</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Lead Assign" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
 
         <record id="view_report_crm_opportunity_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.assign.report.tree</field>
@@ -139,6 +152,13 @@
             <field name="view_id" ref="view_report_crm_opportunity_assign_tree"/>
             <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
        </record>
+       
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_assign_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_assign_graph"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
+       </record>       
 
        <menuitem id="menu_report_crm_opportunities_assign_tree"
            groups="base.group_extended"

=== added directory 'crm_partner_assign/security'
=== added file 'crm_partner_assign/security/ir.model.access.csv'
--- crm_partner_assign/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ crm_partner_assign/security/ir.model.access.csv	2010-12-31 07:18:25 +0000
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ crm_lead_report_assign"," crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
+"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
+"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
+"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1


Follow ups