odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MOD] Changes Respective to new menu structure, CRM phone calls,meeting,leads,opportunity are merged with 

sales,partner also merged with sale.

bzr revid: vir@tinyerp.com-20100109062105-w5wa3y2mmogg8r8e
This commit is contained in:
Vir (Open ERP) 2010-01-09 11:51:05 +05:30
parent 6daf68b56b
commit 4a40f3b26f
13 changed files with 175 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_contact/__terp__.py
View File

@ -40,7 +40,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base', 'process'],
'depends': ['base','process','sale'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',

14
addons/base_contact/base_contact_view.xml
View File

@ -117,8 +117,8 @@
<field name="view_id" ref="view_partner_contact_tree"/>
<field name="search_view_id" ref="view_partner_contact_search"/>
</record>
<menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/>
<menuitem name="Partners/Addresses" id="base.menu_partner_address_form"/>
<menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
<menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
<!-- Views for Partners -->
@ -408,11 +408,11 @@
<field name="res_model">res.partner.job</field>
<field name="view_type">form</field>
</record>
<menuitem
name="Partners/Contact's Jobs"
action="action_res_partner_job"
id="menu_action_res_partner_job"
groups="base.group_extended"/>
<!-- <menuitem-->
<!-- name="Partners/Contact's Jobs"-->
<!-- action="action_res_partner_job"-->
<!-- id="menu_action_res_partner_job"-->
<!-- groups="base.group_extended"/>-->
<!-- Act window defining a shorcut on partners to open all his contacts -->
<act_window domain="[('name', '=', active_id)]"

2
addons/base_contact/process/base_contact_process.xml
View File

@ -37,7 +37,7 @@
</record>
<record id="process_node_function0" model="process.node">
<field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>
<!-- <field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>-->
<field name="model_id" ref="base_contact.model_res_partner_job"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Jobs at a same partner address.&quot;&quot;&quot;" name="note"/>

3
addons/crm/__terp__.py
View File

@ -44,7 +44,7 @@ The CRM module has a email gateway for the synchronisation interface
between mails and Open ERP.""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base',
'depends': ['base', 'sale',
'caldav',
'process',
'mail_gateway',
@ -92,6 +92,7 @@ between mails and Open ERP.""",
],
'demo_xml': [
'crm_demo.xml',
'crm_meeting_demo.xml',
'crm_claims_demo.xml',
'crm_fund_demo.xml',
'crm_helpdesk_demo.xml',

26
addons/crm/crm_lead_menu.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>
<!-- <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
<!-- MENU -->
@ -25,23 +25,23 @@
<field name="view_id" ref="crm_case_form_view_leads"/>
<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
</record>
<menuitem parent="menu_presale" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
<menuitem parent="sale.menu_sales" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all" sequence="1"/>
<!-- REPORTS -->
<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
<!--<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
<menuitem name="Leads" id="menu_action_report_crm_case_lead" parent="next_id_64"/>
<!-- <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">-->
<!-- <field name="res_model">report.crm.case.user</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">graph,tree</field>-->
<!-- <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>-->
<!-- <field name="context" eval="{'default_state':'open'}"/>-->
<!-- </record>-->
<!-- <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>-->
<!-- -->
<record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
<field name="res_model">report.crm.case.user</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
<field name="context" eval="{'default_state':'open'}"/>
</record>
<menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
@ -77,5 +77,5 @@
<menuitem name="Cases by Section, Category and Type" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
</data>
--></data>
</openerp>

10
addons/crm/crm_meeting_menu.xml
View File

@ -86,6 +86,7 @@
<field name="view_id" ref="crm_case_calendar_view_meet"/>
<field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="view_crm_case_meetings_filter"/>
<field name="domain" eval="[('section_id.calendar','=',1)]"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
<field name="sequence" eval="1"/>
@ -111,16 +112,13 @@
<field name="view_id" ref="crm_case_gantt_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meet"/>
</record>
<menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>
<menuitem parent="crm.menu_crm_case_category_act_meetings"
name="My Invitations" id="menu_crm_meetings_invitation"
action="caldav.action_view_attendee_form" />
<!-- <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>-->
<!--
ALL MEETINGS
-->
<menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
<menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
<menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
<record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
<field name="name">Next Meetings</field>

30
addons/crm/crm_opportunity_menu.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>
<!-- <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
<field name="name">All Opportunities</field>
@ -26,28 +26,28 @@
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
<field name="sequence" eval="4"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_opportunity"/>
<field name="view_id" ref="crm_case_graph_view_stage_cost"/>
<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
</record>
<menuitem name="Opportunities" id="menu_crm_case_opp" parent="menu_presale" action="crm_case_category_act_oppor11"/>
<menuitem name="Opportunities" id="menu_crm_case_opp" parent="sale.menu_sales" action="crm_case_category_act_oppor11" sequence="2"/><!--
<!-- MENU -->
MENU
REPORTS
<record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
<field name="res_model">report.crm.case.user</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
<field name="context" eval="{'default_state':'open'}"/>
</record>
<!-- REPORTS -->
<!-- <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">-->
<!-- <field name="res_model">report.crm.case.user</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">graph,tree</field>-->
<!-- <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>-->
<!-- <field name="context" eval="{'default_state':'open'}"/>-->
<!-- </record>-->
<!-- -->
<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
<menuitem name="Opportunity" parent="next_id_64" id="menu_action_report_crm_case_oppor"/>
<!-- <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>-->
<menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
<field name="res_model">report.crm.case.section.categ2</field>
@ -82,5 +82,5 @@
<menuitem name="Cases by Opportunities, Category and Type" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
</data>
--></data>
</openerp>

2
addons/crm/crm_phonecall_menu.xml
View File

@ -39,7 +39,7 @@
<field name="view_id" ref="crm_case_phone_form_view"/>
<field name="act_window_id" ref="crm_case_categ_phone0"/>
</record>
<menuitem name="Phone Calls" id="menu_crm_case_phone" parent="crm.menu_crm" action="crm_case_categ_phone0"/>
<menuitem name="Phone Calls" id="menu_crm_case_phone" parent="base.menu_base_partner" action="crm_case_categ_phone0" sequence="5"/>
<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">

2
addons/product/pricelist_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_config_product" sequence="2"/>
<menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" sequence="50"/>
<record id="product_pricelist_version_form_view" model="ir.ui.view">
<field name="name">product.pricelist.version.form</field>

2
addons/report_sale/report_sale_view.xml
View File

@ -77,7 +77,7 @@
<field name="search_view_id" ref="view_order_product_search"/>
</record>
<menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/>
<menuitem id="next_id_80" name="Reporting" parent="base.menu_base_partner" sequence="7"/>
<menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/>
<!-- Sales by category by month -->

23
addons/sale/sale_view.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"
groups="group_sale_user"/>
<!-- <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
<!-- groups="group_sale_user"/>-->
<menuitem id="menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem id="menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="menu_product" sequence="1"/>
<record id="view_shop_form" model="ir.ui.view">
<field name="name">sale.shop</field>
@ -41,8 +45,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_shop_tree"/>
</record>
<menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
<menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
<menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="60"/>
<record id="view_sale_order_calendar" model="ir.ui.view">
<field name="name">sale.order.calendar</field>
@ -251,7 +254,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
<menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sales" sequence="3"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
@ -265,7 +268,7 @@
</record>
<record id="action_order_tree3" model="ir.actions.act_window">
<field name="name">Sales Order To Be Invoiced</field>
<field name="name">Sales To Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
@ -415,8 +418,8 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_sales_order_line_filter"/>
</record>
<menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root"
groups="base.group_extended"/>
<menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sales"
groups="base.group_extended" sequence="4"/>
<record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Uninvoiced Lines</field>
@ -442,6 +445,9 @@
<act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
<menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
<menuitem action="action_order_tree3" id="menu_invoicing_sales_order" parent="menu_invoiced" sequence="1"/>
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
<!-- configartion view -->
<record id="view_config_picking_policy" model="ir.ui.view">
@ -482,6 +488,5 @@
<field name="action_id" ref="action_config_picking_policy"/>
</record>
</data>
</openerp>

2
addons/sale/security/sale_security.xml
View File

@ -10,7 +10,7 @@
</record>
<record model='ir.ui.menu' id='menu_shop_configuration'>
<record model='ir.ui.menu' id='menu_action_shop_form'>
<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
</record>

8
addons/sale_journal/sale_journal_view.xml
View File

@ -31,7 +31,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>-->
<record model="ir.ui.view" id="view_sale_journal_form">
<field name="name">sale_journal.sale.journal.form</field>
@ -118,7 +118,9 @@
<field name="search_view_id" ref="view_sale_journal_search"/>
</record>
<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
<!-- <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>-->
<menuitem id="menu_sale_journal" name="Journal" parent="base.menu_base_config" sequence="60" />
<menuitem name="Sales Journals" id="menu_definition_journal" parent="menu_sale_journal" action="action_definition_journal"/>
<record model="ir.ui.view" id="sale_journal_sale_order">
<field name="name">sale.order.journal.view.form</field>
@ -321,7 +323,7 @@
<field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
</record>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="base.menu_base_partner" sequence="8"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
<act_window name="Monthly sales"