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

[MERGE]

Browse Source 
bzr revid: hmo@tinyerp.com-20100125132137-03udfwo90gww5lwc
This commit is contained in:
Harry (Open ERP)
2010-01-25 18:51:37 +05:30
parent 4d519d301c 082129fda8
commit 1069cbcc3f
12 changed files with 80 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auction/auction_wizard.xml
+1 -1
View File
@@ -44,7 +44,7 @@
<menuitem name="Tools Bar Codes"
id="auction_outils_menu"
parent="auction_menu_root" sequence="6"
parent="auction_menu_root" sequence="5"
/>
<menuitem name="Deliveries Management"
addons/crm_project/__terp__.py
+1 -1
View File
@@ -30,7 +30,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['crm','project'],
'depends': ['crm','project','report_crm'],
'init_xml': [
'crm_bugs_data.xml'
],
addons/idea/idea_view.xml
+16 -12
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES" />
<menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
<record model="ir.ui.view" id="view_idea_category_form">
<field name="name">idea.category.form</field>
<field name="model">idea.category</field>
@@ -32,8 +32,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Configuration" parent="menu_tools" id="menu_config"/>
<menuitem name="Ideas" parent="menu_config" id="menu_ideas"/>
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="6"/>
<!-- <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>-->
<menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
<menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category"/>
<record model="ir.actions.act_window" id="action_idea_category_tree">
@@ -42,10 +44,10 @@
<field name="view_type">tree</field>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<menuitem name="Ideas" parent="menu_tools" id="menu_ideas1"/>
<menuitem
name="Ideas by Categories" parent="menu_ideas1"
id="menu_idea_category_tree"
<menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
<menuitem
name="Ideas by Categories" parent="menu_ideas1"
id="menu_idea_category_tree"
action="action_idea_category_tree"/>
@@ -158,7 +160,7 @@
<field name="arch" type="xml">
<tree string="All Ideas">
<field name="category_id" />
<field name="create_date"/>
<field name="create_date"/>
<field name="user_id" />
<field name="title"/>
<field name="vote_avg" />
@@ -168,7 +170,7 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_idea_idea_search">
<field name="name">idea.idea.search</field>
<field name="model">idea.idea</field>
@@ -216,7 +218,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<record model="ir.ui.view" id="view_idea_vote_stat_graph">
@@ -262,8 +264,10 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>
<menuitem name="Vote Statistics" parent="menu_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
<!-- <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>-->
<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
<menuitem name="Vote Statistics" parent="menu_idea_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
<record model="ir.actions.act_window" id="action_idea_vote">
addons/idea/security/idea_security.xml
+7 -7
View File
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<openerp>
<data>
<record id="idea.menu_config" model="ir.ui.menu">
<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
</record>
<record id="idea.menu_reporting" model="ir.ui.menu">
<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
</record>
<!-- <record id="idea.menu_config" model="ir.ui.menu">-->
<!-- <field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
<!-- </record>-->
<!---->
<!-- <record id="idea.menu_reporting" model="ir.ui.menu">-->
<!-- <field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
<!-- </record>-->
</data>
</openerp>
addons/lunch/lunch_view.xml
+8 -8
View File
@@ -6,16 +6,16 @@
<menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
<menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
<menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
<menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>-->
<menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>
<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>-->
<menuitem name="Lunch Order" parent="base.menu_tools" id="menu_lunch" sequence="1"/>
<menuitem name="Reporting" parent="base.menu_tools" id="menu_lunch_reporting" sequence="4"/>
<menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
<menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="5"/>
<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
<menuitem name="Lunch Orders" parent="base.menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
<menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="6"/>
<menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="5"/>
<menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="1"/>
<record model="ir.ui.view" id="view_lunch_order_form">
<field name="name">Order</field>
<field name="model">lunch.order</field>
@@ -54,11 +54,11 @@
<record model="ir.actions.act_window" id="action_lunch_order_form">
<field name="name">Orders</field>
<field name="name">Lunch Orders</field>
<field name="res_model">lunch.order</field>
<field name="view_mode">form,tree</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
<menuitem name="Lunch Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
<!-- <record model="ir.actions.act_window" id="action_lunch_order_day_form">-->
<!-- <field name="name"> Order of the day</field>-->
addons/report_crm/report_crm_view.xml
+11 -11
View File
@@ -15,7 +15,7 @@
<field name="name" />
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id"/>
<field name="nbr"/>
<field name="state"/>
</tree>
@@ -30,7 +30,7 @@
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</form>
@@ -65,16 +65,16 @@
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
<menuitem id="crm.next_id_52" name="Cases" parent="base.next_id_64" sequence="0"/>
<menuitem id="crm.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
<menuitem id="crm.next_id_52" name="Cases" parent="crm.next_id_64" sequence="0"/>
<record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
<field name="name">Cases by User and Section</field>
@@ -94,7 +94,7 @@
<field name="arch" type="xml">
<tree string="Cases by User and Section">
<field name="name"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="month"/>
<field name="nbr"/>
<field name="state"/>
@@ -108,7 +108,7 @@
<field name="arch" type="xml">
<form string="Cases by User and Section">
<field name="name" select="1"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="month" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
@@ -127,7 +127,7 @@
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
@@ -162,7 +162,7 @@
<field name="arch" type="xml">
<tree string="Cases by Section">
<field name="name" select="1"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="month" select="1"/>
<field name="nbr_cases" select="1"/>
<field name="avg_answers"/>
@@ -193,7 +193,7 @@
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="section_id" select="1"/>
<field name="section_id" select="1"/>
<field name="month" select="1"/>
<field name="nbr_cases" select="1"/>
</group>
@@ -243,7 +243,7 @@
</form>
</field>
</record>
<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Stage(Select)</field>
<field name="model">report.crm.case.section.stage</field>
addons/report_intrastat/report_intrastat_view.xml
+1 -1
View File
@@ -67,7 +67,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.menu_config_product"/>
<menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="base.menu_product"/>
<record id="view_report_intrastat_tree" model="ir.ui.view">
addons/report_mrp/report_mrp_view.xml
+14 -14
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_workcenter_load_tree" model="ir.ui.view">
<field name="name">report.workcenter.load.tree</field>
<field name="model">report.workcenter.load</field>
@@ -15,7 +15,7 @@
</tree>
</field>
</record>
<record id="view_workcenter_load_graph" model="ir.ui.view">
<field name="name">report.workcenter.load.graph</field>
<field name="model">report.workcenter.load</field>
@@ -29,8 +29,8 @@
</graph>
</field>
</record>
<record id="view_workcenter_load_form" model="ir.ui.view">
<field name="name">report.workcenter.load.form</field>
<field name="model">report.workcenter.load</field>
@@ -50,11 +50,11 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="100"/>
<menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="49"/>
<menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
<!-- stock.move compared to internal location src/dest -->
<record id="view_report_in_out_picking_tree" model="ir.ui.view">
<field name="name">report.mrp.inout.tree</field>
<field name="model">report.mrp.inout</field>
@@ -66,7 +66,7 @@
</tree>
</field>
</record>
<record id="view_report_in_out_picking_form" model="ir.ui.view">
<field name="name">report.mrp.inout.form</field>
<field name="model">report.mrp.inout</field>
@@ -78,8 +78,8 @@
</form>
</field>
</record>
<record id="view_report_in_out_picking_graph" model="ir.ui.view">
<field name="name">report.mrp.inout.graph</field>
<field name="model">report.mrp.inout</field>
@@ -91,7 +91,7 @@
</graph>
</field>
</record>
<record id="action_report_in_out_picking_tree" model="ir.actions.act_window">
<field name="name">Weekly Stock Value Variation</field>
<field name="res_model">report.mrp.inout</field>
@@ -99,8 +99,8 @@
<field name="view_mode">graph,tree</field>
</record>
<menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="report_mrp.next_id_77"/>
</data>
</openerp>
addons/report_sale/report_sale_graph.xml
+10 -10
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_80"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
<menuitem id="next_id_83" name="Graphs" parent="base.next_id_64"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83" sequence="1"/>
<menuitem icon="STOCK_PRINT" id="ir_ui_menu2" name="Daily Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
<menuitem icon="STOCK_PRINT" id="ir_ui_menu3" name="Monthly Cumulated Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
<!-- reports -->
<record id="ir_report_custom_4" model="ir.report.custom">
<field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
@@ -15,7 +15,7 @@
<field name="type">bar</field>
<field name="menu_id" ref="ir_ui_menu1"/>
</record>
<record id="ir_report_custom_5" model="ir.report.custom">
<field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
<field name="title">Daily sales turnover over one year</field>
@@ -24,7 +24,7 @@
<field name="type">bar</field>
<field name="menu_id" ref="ir_ui_menu2"/>
</record>
<record id="ir_report_custom_6" model="ir.report.custom">
<field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
<field name="title">Monthly cumulated sales turnover over one year</field>
@@ -33,7 +33,7 @@
<field name="type">bar</field>
<field name="menu_id" ref="ir_ui_menu3"/>
</record>
<!-- fields -->
<record id="ir_report_custom_fields_0" model="ir.report.custom.fields">
<field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
@@ -51,7 +51,7 @@
<field name="report_id" ref="ir_report_custom_4"/>
<field name="name">sales</field>
</record>
<record id="ir_report_custom_fields_2" model="ir.report.custom.fields">
<field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
<field name="sequence">1</field>
@@ -69,7 +69,7 @@
<field name="report_id" ref="ir_report_custom_5"/>
<field name="name">sale</field>
</record>
<record id="ir_report_custom_fields_1" model="ir.report.custom.fields">
<field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
<field name="sequence">1</field>
@@ -87,10 +87,10 @@
<field name="report_id" ref="ir_report_custom_6"/>
<field name="name">sales</field>
</record>
<function eval="[[ir_report_custom_4]]" model="ir.report.custom" name="subscribe"/>
<function eval="[[ir_report_custom_5]]" model="ir.report.custom" name="subscribe"/>
<function eval="[[ir_report_custom_6]]" model="ir.report.custom" name="subscribe"/>
</data>
</openerp>
addons/report_sale/report_sale_view.xml
+5 -4
View File
@@ -77,8 +77,9 @@
<field name="search_view_id" ref="view_order_product_search"/>
</record>
<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"/>
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
<!-- <menuitem id="base.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="base.next_id_64" sequence="3"/>
<!-- Sales by category by month -->
@@ -156,7 +157,7 @@
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_order_category_search"/>
</record>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_80"/>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="base.next_id_64" sequence="4"/>
<!-- Sales of the month -->
<record id="view_order_graph" model="ir.ui.view">
@@ -177,7 +178,7 @@
<field name="view_mode">graph,tree,form</field>
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
</record>
<menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_80"/>
<menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="base.next_id_64" sequence="5"/>
<record id="view_so_pipeline_graph" model="ir.ui.view">
<field name="name">sale.order.dashboard.graph</field>
addons/sale/sale_view.xml
+2 -2
View File
@@ -5,8 +5,8 @@
<!-- groups="group_sale_user"/>-->
<menuitem id="base.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"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
<record id="view_shop_form" model="ir.ui.view">
<field name="name">sale.shop</field>
addons/survey/survey_view.xml
+4 -4
View File
@@ -7,14 +7,14 @@
groups="group_survey_manager,group_survey_user"/>-->
<menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
<menuitem name="Survey" id="main_menu_survey"
icon="terp-crm" sequence="1"
groups="group_survey_manager,group_survey_user" parent="base.menu_tools"/>
icon="terp-crm" sequence="3"
groups="group_survey_manager,group_survey_user" parent="base.menu_tools" />
<!-- <menuitem name="Configuration" id="menu_survey_config"
parent="main_menu_survey" groups="group_survey_manager"/>-->
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="5"/>
id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="6"/>
<menuitem name="survey" id="menu_survey_config"
parent="base.menu_lunch_survey_root" groups="group_survey_manager"/>
parent="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="2"/>
<!--
Survey
-->