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

[MERGE] branch merged with trunk-reorganise-menus-sale-crm-mtr 

bzr revid: mtr@tinyerp.com-20120229125818-yke37e4kopy71g64
This commit is contained in:
Meera Trambadia (OpenERP) 2012-02-29 18:28:18 +05:30
parent 318d99d029 b9c1b6057f
commit dd862349d4
10 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -3,7 +3,7 @@
<menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
<field name="name">Time &amp; Costs to Invoice</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -11,7 +11,7 @@
<field name="context">{'search_default_to_invoice': 1}</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced"/>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/>
<record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
<field name="name">account.analytic.account.search</field>
@ -81,7 +81,7 @@
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner"
sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="50" parent="base.menu_sales"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
</data>

15
addons/crm/crm_meeting_menu.xml
View File

@ -87,12 +87,15 @@
<!-- ALL MEETINGS -->
<menuitem name="Meetings" id="menu_meeting_sale"
parent="base.menu_base_partner" sequence="3"/>
<!-- <menuitem name="Meetings" id="menu_meeting_sale"
parent="base.menu_base_partner" sequence="3"/> -->
<menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
parent="base.menu_base_partner"/>
<menuitem name="Meetings" id="menu_crm_case_categ_meet"
action="crm_case_categ_meet" parent="menu_meeting_sale"
sequence="1" />
action="crm_case_categ_meet" parent="base.menu_sales"
sequence="7" />
<record id="action_view_attendee_form" model="ir.actions.act_window">
<field name="name">Meeting Invitations</field>
@ -106,10 +109,10 @@
<field name="help">With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer.</field>
</record>
<menuitem id="menu_attendee_invitations"
<!-- <menuitem id="menu_attendee_invitations"
name="Meeting Invitations" parent="crm.menu_meeting_sale"
sequence="10" action="action_view_attendee_form"
groups="base.group_no_one" />
groups="base.group_no_one" /> -->
</data>
</openerp>

12
addons/crm_caldav/crm_caldav_view.xml
View File

@ -11,14 +11,14 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<menuitem
name="Synchronize This Calendar"
name="Synchronize Your Meetings"
action="action_caldav_browse"
id="menu_caldav_browse"
icon="STOCK_EXECUTE"
parent="crm.menu_meeting_sale" sequence="1"/>
parent="base.menu_import_crm" sequence="10"/>
</data>
</openerp>
</openerp>

3
addons/crm_todo/crm_todo_view.xml
View File

@ -57,7 +57,8 @@
<menuitem
id="menu_crm_todo"
parent="base.menu_sales"
action="crm_todo_action"/>
action="crm_todo_action"
sequence="5"/>
</data>

2
addons/import_base/import_base_view.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Import" id="menu_import_crm" parent="base.menu_base_partner"/>
<menuitem name="Import &amp; Synchronize" id="base.menu_import_crm" parent="base.menu_base_partner" sequence="6"/>
</data>
</openerp>

8
addons/import_google/wizard/import_google_data_view.xml
View File

@ -78,14 +78,14 @@
</record>
<menuitem id="menu_sync_contact"
parent="base.menu_address_book"
parent="base.menu_import_crm"
action="act_google_login_contact_form"
sequence="40" />
sequence="5" />
<menuitem id="menu_sync_calendar"
parent="crm.menu_meeting_sale"
parent="base.menu_import_crm"
action="act_google_login_form"
sequence="20" />
sequence="15" />
</data>
</openerp>

2
addons/import_sugarcrm/import_sugarcrm_view.xml
View File

@ -98,7 +98,7 @@
</record>
<menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
<menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE" sequence="20"/>
</data>
</openerp>

16
addons/sale/sale_view.xml
View File

@ -4,10 +4,6 @@
id="base.menu_base_partner" name="Sales"
sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" sequence="1"
/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
<record id="view_shop_form" model="ir.ui.view">
@ -294,7 +290,7 @@
<field name="context">{}</field>
<field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
@ -319,7 +315,7 @@
<record id="action_order_tree5" model="ir.actions.act_window">
<field name="name">All Quotations</field>
<field name="name">Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
@ -328,6 +324,10 @@
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem id="menu_sale_quotations"
action="action_order_tree5" parent="base.menu_sales"
sequence="3" />
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">Old Quotations</field>
<field name="type">ir.actions.act_window</field>
@ -461,7 +461,7 @@
</record>
<record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Lines to Invoice</field>
<field name="name">Order Lines to Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
@ -499,7 +499,7 @@
groups="base.group_sale_salesman"/>
<menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/>
<menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="2" groups="base.group_no_one"/>
<menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="base.group_no_one"/>
<!-- configartion view -->

2
addons/stock_planning/stock_planning_view.xml
View File

@ -184,7 +184,7 @@
<!-- Forecast section -->
<menuitem id="menu_stock_sale_forecast" name="Sales Forecasts"
parent="base.menu_base_partner" sequence="6" groups="base.group_extended"/>
parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/>
<record id="view_stock_sale_forecast_filter" model="ir.ui.view">
<field name="name">stock.sale.forecast.list.select</field>

4
addons/wiki_sale_faq/wiki_sale_faq_view.xml
View File

@ -27,13 +27,13 @@
</record>
<menuitem
name="Documents"
name="Sales Documents"
action="action_document_form"
id="menu_document_files"
parent="menu_sales"/>
<menuitem parent="menu_sales"
id="menu_action_wiki_wiki" name="FAQ"
id="menu_action_wiki_wiki" name="Sales FAQ"
action="action_wiki_test" />