pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Merge with lp:openobject-addons

Browse Source 
bzr revid: atp@tinyerp.com-20120329045446-6eeu30dt4ng26ubx
This commit is contained in:
Atul Patel (OpenERP)
2012-03-29 10:24:46 +05:30
parent 7d9c9efef5 0403024579
commit d3b0046e59
15 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/board_account_view.xml
+1 -1
View File
@@ -61,7 +61,7 @@
<field name="view_id" ref="board_account_form"/>
</record>
<menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_dasboard" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
addons/auction/board_auction_view.xml
+1 -1
View File
@@ -93,7 +93,7 @@
<field name="view_id" ref="board_auction_form1"/>
</record>
<menuitem name="Auction" id="menu_board_auction" parent="base.menu_dasboard" sequence="40"/>
<menuitem name="Auction" id="menu_board_auction" parent="base.menu_reporting_dashboard" sequence="40"/>
<menuitem
name="Auction DashBoard"
addons/crm/board_crm_statistical_view.xml
+2 -2
View File
@@ -107,10 +107,10 @@
<field name="view_id" ref="board_crm_statistical_form"/>
</record>
<menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
<menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
<menuitem
name="CRM Dashboard" parent="board.menu_sales_dasboard"
name="CRM Dashboard" parent="board.menu_sales_dashboard"
action="open_board_statistical_dash"
sequence="0"
id="menu_board_statistics_dash"
addons/document/board_document_view.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<menuitem
name="Knowledge"
id="menu_reports_document"
parent="base.menu_dasboard"
parent="base.menu_reporting_dashboard"
sequence="45"
groups="base.group_system"/>
addons/event/board_association_view.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<field name="view_id" ref="board_associations_manager_form"/>
</record>
<menuitem id="menus_event_dashboard" name="Events"
parent="base.menu_dasboard" sequence="25"/>
parent="base.menu_reporting_dashboard" sequence="25"/>
<menuitem
name="Event Dashboard" parent="menus_event_dashboard"
action="open_board_associations_manager"
addons/event/event_view.xml
-1
View File
@@ -230,7 +230,6 @@
<field name="res_model">event.event</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{"search_default_section_id": section_id}</field>
<field name="search_view_id" ref="view_event_search"/>
<field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
</record>
addons/hr/hr_board.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
<menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
<menuitem id="menu_hr_dashboard" parent="base.menu_dasboard" name="Human Resources" sequence="35"/>
<menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard" name="Human Resources" sequence="35"/>
<menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
<!-- This board view will be complete by other hr_* modules-->
addons/mrp/board_manufacturing_view.xml
+1 -1
View File
@@ -29,7 +29,7 @@
</record>
<menuitem id="menus_dash_mrp" name="Manufacturing"
parent="base.menu_dasboard" sequence="15"/>
parent="base.menu_reporting_dashboard" sequence="15"/>
<menuitem
action="open_board_manufacturing" icon="terp-graph"
id="menu_board_manufacturing" parent="menus_dash_mrp"
addons/project/board_project_view.xml
+3 -3
View File
@@ -104,17 +104,17 @@
</record>
<menuitem
id="menu_project_dasboard"
id="menu_project_dashboard"
name="Project"
sequence="20"
parent="base.menu_dasboard"
parent="base.menu_reporting_dashboard"
/>
<menuitem
action="open_board_project"
icon="terp-graph"
id="menu_board_project"
parent="menu_project_dasboard"
parent="menu_project_dashboard"
sequence="1"/>
<menuitem
addons/project_issue/board_project_issue_view.xml
+1 -1
View File
@@ -79,7 +79,7 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_project_issue_form"/>
</record>
<menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dasboard"
<menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
icon="terp-graph"
action="open_board_project_issue"/>
addons/project_planning/project_planning_view.xml
+2 -2
View File
@@ -292,11 +292,11 @@
<!-- <field name="context">{"search_default_user_id":uid}</field> -->
<field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
</record>
<menuitem action="action_account_analytic_planning_stat_form"
icon="terp-graph"
id="menu_board_planning"
parent="project.menu_project_dasboard"/>
parent="project.menu_project_dashboard"/>
<!-- Analytic account Form -->
addons/project_scrum/board_project_scrum_view.xml
+1 -1
View File
@@ -98,7 +98,7 @@
</record>
<menuitem
id="menu_deshboard_scurm"
name="Scrum Dashboard" parent="project.menu_project_dasboard"
name="Scrum Dashboard" parent="project.menu_project_dashboard"
icon="terp-graph"
action="open_board_project_scrum"/>
addons/purchase/board_purchase_view.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<menuitem
id="menu_purchase_deshboard"
name="Purchase"
parent="base.menu_dasboard" sequence="5"/>
parent="base.menu_reporting_dashboard" sequence="5"/>
<record id="purchase_draft" model="ir.actions.act_window">
<field name="name">Request for Quotations</field>
addons/sale/board_sale_view.xml
+2 -2
View File
@@ -30,8 +30,8 @@
<field name="view_id" ref="board_sales_manager_form"/>
</record>
<menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dasboard" sequence="0" groups="base.group_sale_manager"/>
<menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dashboard" sequence="0" groups="base.group_sale_manager"/>
<record id="action_quotation_for_sale" model="ir.actions.act_window">
addons/stock/board_warehouse_view.xml
+1 -1
View File
@@ -68,7 +68,7 @@
<field name="view_id" ref="board_warehouse_form"/>
</record>
<menuitem id="menu_dashboard_stock" name="Warehouse" sequence="10" parent="base.menu_dasboard"/>
<menuitem id="menu_dashboard_stock" name="Warehouse" sequence="10" parent="base.menu_reporting_dashboard"/>
<menuitem action="open_board_warehouse" icon="terp-graph" groups="group_stock_manager" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
<menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5" groups="group_stock_manager" action="open_board_warehouse"/>