[IMP] remove a bunch of wtf comments in XML (horrifying things like === comment === or --- comment ---, without any XML comment tags)

improve identation in a few files
remove some spaces preceding closing tags

bzr revid: abo@openerp.com-20120725181610-oq0ug3u9t7fgpy3h
This commit is contained in:
Antonin Bourguignon 2012-07-25 20:16:10 +02:00
parent 7350bdb271
commit d92994caa6
12 changed files with 187 additions and 261 deletions

View File

@ -1,22 +1,19 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
#--------------------------------------------------------- <!-- Fiscal Year -->
# Fiscal Year <record model="ir.ui.view" id="view_account_invoice_asset_form">
#--------------------------------------------------------- <field name="name">account.invoice.line.form</field>
<field name="model">account.invoice.line</field>
<record model="ir.ui.view" id="view_account_invoice_asset_form"> <field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="name">account.invoice.line.form</field> <field name="type">form</field>
<field name="model">account.invoice.line</field> <field name="arch" type="xml">
<field name="inherit_id" ref="account.view_invoice_line_form"/> <field name="account_id" position="after">
<field name="type">form</field> <field name="asset_category_id"/>
<field name="arch" type="xml"> </field>
<field name="account_id" position="after">
<field name="asset_category_id"/>
</field> </field>
</field> </record>
</record>
</data> </data>
</openerp> </openerp>

View File

@ -2,11 +2,7 @@
<openerp> <openerp>
<data> <data>
<!-- <!-- Department -->
======================
department
======================
-->
<record id="view_department_form" model="ir.ui.view"> <record id="view_department_form" model="ir.ui.view">
<field name="name">hr.department.form</field> <field name="name">hr.department.form</field>
<field name="model">hr.department</field> <field name="model">hr.department</field>
@ -37,7 +33,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_department_filter" model="ir.ui.view"> <record id="view_department_filter" model="ir.ui.view">
<field name="name">Departments</field> <field name="name">Departments</field>
<field name="model">hr.department</field> <field name="model">hr.department</field>
<field name="type">search</field> <field name="type">search</field>
@ -48,7 +44,7 @@
<field name="manager_id" /> <field name="manager_id" />
</search> </search>
</field> </field>
</record> </record>
<record id="open_module_tree_department" model="ir.actions.act_window"> <record id="open_module_tree_department" model="ir.actions.act_window">
<field name="name">Departments</field> <field name="name">Departments</field>
@ -60,5 +56,5 @@
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/> <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
</data> </data>
</openerp> </openerp>

View File

@ -227,12 +227,7 @@
<field name="res_id" ref="hr.menu_open_view_employee_list_my"/> <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
</record> </record>
<!-- <!-- Employee architecture -->
=======================
Employee architecture
=======================
-->
<record id="view_partner_tree2" model="ir.ui.view"> <record id="view_partner_tree2" model="ir.ui.view">
<field name="name">hr.employee.tree</field> <field name="name">hr.employee.tree</field>
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
@ -271,12 +266,7 @@
<field eval="True" name="replace"/> <field eval="True" name="replace"/>
</ir_set> </ir_set>
<!-- <!-- Employee Category -->
============
Employee Category
============
-->
<record id="view_employee_category_form" model="ir.ui.view"> <record id="view_employee_category_form" model="ir.ui.view">
<field name="name">hr.employee.category.form</field> <field name="name">hr.employee.category.form</field>
<field name="model">hr.employee.category</field> <field name="model">hr.employee.category</field>

View File

@ -1,22 +1,21 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<menuitem name="Recruitment"
id="menu_hr_recruitment_recruitment"
parent="hr.menu_hr_configuration"
sequence="40"/>
<act_window <menuitem name="Recruitment"
id="act_hr_applicant_to_meeting" id="menu_hr_recruitment_recruitment"
name="Meetings" parent="hr.menu_hr_configuration"
res_model="crm.meeting" sequence="40"/>
src_model="hr.applicant"
view_mode="tree,form,calendar,graph"
view_type="form"/>
# ------------------------------------------------------ <act_window
# Stage id="act_hr_applicant_to_meeting"
# ------------------------------------------------------ name="Meetings"
res_model="crm.meeting"
src_model="hr.applicant"
view_mode="tree,form,calendar,graph"
view_type="form"/>
<!-- Stage -->
<record id="hr_job_stage_act" model="ir.actions.act_window"> <record id="hr_job_stage_act" model="ir.actions.act_window">
<field name="name">Recruitment / Applicants Stages</field> <field name="name">Recruitment / Applicants Stages</field>
<field name="res_model">hr.recruitment.stage</field> <field name="res_model">hr.recruitment.stage</field>
@ -27,10 +26,7 @@
</record> </record>
# ------------------------------------------------------ <!-- Jobs -->
# Jobs
# ------------------------------------------------------
<!-- Applicant Read/Unread actions --> <!-- Applicant Read/Unread actions -->
<record id="actions_server_applicant_unread" model="ir.actions.server"> <record id="actions_server_applicant_unread" model="ir.actions.server">
<field name="name">Mark unread</field> <field name="name">Mark unread</field>
@ -343,10 +339,7 @@
</field> </field>
</record> </record>
# ------------------------------------------------------ <!-- HR Job -->
# HR Job
# ------------------------------------------------------
<record id="hr_job_survey" model="ir.ui.view"> <record id="hr_job_survey" model="ir.ui.view">
<field name="name">hr.job.form1</field> <field name="name">hr.job.form1</field>
<field name="model">hr.job</field> <field name="model">hr.job</field>

View File

@ -4,19 +4,14 @@
<menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/> <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
<!-- <!-- Marketing Campaign -->
======================
Marketing Campaign
======================
-->
<act_window name="All Segments" <act_window name="All Segments"
res_model="marketing.campaign.segment" res_model="marketing.campaign.segment"
src_model="marketing.campaign" src_model="marketing.campaign"
view_type="form" view_type="form"
view_mode="tree,form" view_mode="tree,form"
id="act_marketing_campaing_segment_opened" id="act_marketing_campaing_segment_opened"
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}" context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
/>
<!-- Campaign Followups --> <!-- Campaign Followups -->
<act_window <act_window
@ -24,7 +19,7 @@
id="act_marketing_campaing_followup" id="act_marketing_campaing_followup"
name="Campaign Follow-up" res_model="marketing.campaign.workitem" name="Campaign Follow-up" res_model="marketing.campaign.workitem"
src_model="marketing.campaign" view_mode="tree,form" src_model="marketing.campaign" view_mode="tree,form"
view_type="form" /> view_type="form"/>
<record model="ir.ui.view" id="view_marketing_campaign_form"> <record model="ir.ui.view" id="view_marketing_campaign_form">
<field name="name">marketing.campaign.form</field> <field name="name">marketing.campaign.form</field>
@ -43,10 +38,10 @@
<div class="oe_right oe_button_box" name="button_box"> <div class="oe_right oe_button_box" name="button_box">
<button type="action" <button type="action"
name="%(act_marketing_campaing_followup)d" name="%(act_marketing_campaing_followup)d"
string="Follow-Up" /> string="Follow-Up"/>
<button type="action" <button type="action"
name="%(act_marketing_campaing_segment_opened)d" name="%(act_marketing_campaing_segment_opened)d"
string="Segments" /> string="Segments"/>
</div> </div>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
@ -61,10 +56,10 @@
<field name="object_id"/> <field name="object_id"/>
<field name="partner_field_id"/> <field name="partner_field_id"/>
<field name="unique_field_id"/> <field name="unique_field_id"/>
</group> </group>
</group> </group>
<separator string="Activities"/> <separator string="Activities"/>
<field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" /> <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}"/>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -146,14 +141,9 @@
</record> </record>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/> <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30" /> <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30"/>
<!--
======================
Marketing Segments
======================
-->
<!-- Marketing Segments -->
<record model="ir.ui.view" id="view_marketing_campaign_segment_form"> <record model="ir.ui.view" id="view_marketing_campaign_segment_form">
<field name="name">marketing.campaign.segment.form</field> <field name="name">marketing.campaign.segment.form</field>
<field name="model">marketing.campaign.segment</field> <field name="model">marketing.campaign.segment</field>
@ -202,7 +192,7 @@
<field name="campaign_id"/> <field name="campaign_id"/>
<field name="date_run"/> <field name="date_run"/>
<field name="sync_last_date"/> <field name="sync_last_date"/>
<field name="state" /> <field name="state"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -248,16 +238,12 @@
<field name="context">{'group_by': []}</field> <field name="context">{'group_by': []}</field>
</record> </record>
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" /> <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20"/>
<!-- <!--
====================== Marketing Activities
Marketing Activities These views are not intended to be used outside the campaign context.
======================
these views are not intended to be used outside the campaign context.
--> -->
<record model="ir.ui.view" id="view_marketing_campaign_activity_form"> <record model="ir.ui.view" id="view_marketing_campaign_activity_form">
<field name="name">marketing.campaign.activity.form</field> <field name="name">marketing.campaign.activity.form</field>
<field name="model">marketing.campaign.activity</field> <field name="model">marketing.campaign.activity</field>
@ -285,7 +271,7 @@
<group> <group>
<field name="type"/> <field name="type"/>
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}" <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
context="{'default_model_id':object_id}" /> context="{'default_model_id':object_id}"/>
<field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/> <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
<field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/> <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
<field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/> <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
@ -344,12 +330,7 @@
</record> </record>
<!-- <!-- Marketing Workitems -->
======================
Marketing Workitems
======================
-->
<record model="ir.ui.view" id="view_marketing_campaign_workitem_tree"> <record model="ir.ui.view" id="view_marketing_campaign_workitem_tree">
<field name="name">marketing.campaign.workitem.tree</field> <field name="name">marketing.campaign.workitem.tree</field>
<field name="model">marketing.campaign.workitem</field> <field name="model">marketing.campaign.workitem</field>
@ -358,10 +339,10 @@
<tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities"> <tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities">
<field name="campaign_id"/> <field name="campaign_id"/>
<field name="segment_id"/> <field name="segment_id"/>
<field name="activity_id" /> <field name="activity_id"/>
<field name="object_id" invisible="1"/> <field name="object_id" invisible="1"/>
<field name="res_id" invisible="1"/> <field name="res_id" invisible="1"/>
<field name="res_name" /> <field name="res_name"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="date"/> <field name="date"/>
<field name="state"/> <field name="state"/>
@ -464,8 +445,7 @@
view_type="form" view_type="form"
view_mode="tree,form" view_mode="tree,form"
id="act_marketing_campaing_segment_opened" id="act_marketing_campaing_segment_opened"
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}" context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
/>
<!-- Campaign Follow-ups --> <!-- Campaign Follow-ups -->
<act_window <act_window
@ -473,7 +453,7 @@
id="act_marketing_campaing_followup" id="act_marketing_campaing_followup"
name="Campaign Follow-up" res_model="marketing.campaign.workitem" name="Campaign Follow-up" res_model="marketing.campaign.workitem"
src_model="marketing.campaign" view_mode="tree,form" src_model="marketing.campaign" view_mode="tree,form"
view_type="form" /> view_type="form"/>
<!-- Campaign Statistics --> <!-- Campaign Statistics -->
<act_window <act_window
@ -481,7 +461,7 @@
id="act_marketing_campaing_stat" id="act_marketing_campaing_stat"
name="Campaign Statistics" res_model="campaign.analysis" name="Campaign Statistics" res_model="campaign.analysis"
src_model="marketing.campaign" view_mode="tree,form" src_model="marketing.campaign" view_mode="tree,form"
view_type="form" /> view_type="form"/>
</data> </data>
</openerp> </openerp>

View File

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- ==================Marketing Campaigns================== --> <!-- Marketing Campaigns -->
<record id="wkf_marketing_campaign" model="workflow"> <record id="wkf_marketing_campaign" model="workflow">
<field name="name">marketing.campaign.basic</field> <field name="name">marketing.campaign.basic</field>
<field name="osv">marketing.campaign</field> <field name="osv">marketing.campaign</field>
<field name="on_create">True</field> <field name="on_create">True</field>
</record> </record>
<!-- Activity --> <!-- Activity -->
<record id="act_marketing_campaign_draft" model="workflow.activity"> <record id="act_marketing_campaign_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_marketing_campaign"/> <field name="wkf_id" ref="wkf_marketing_campaign"/>
<field name="flow_start">True</field> <field name="flow_start">True</field>
@ -32,7 +31,7 @@
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">state_done_set()</field> <field name="action">state_done_set()</field>
</record> </record>
<record id="act_marketing_campaign_cancel" model="workflow.activity"> <record id="act_marketing_campaign_cancel" model="workflow.activity">
<field name="wkf_id" ref="wkf_marketing_campaign"/> <field name="wkf_id" ref="wkf_marketing_campaign"/>
<field name="name">cancel</field> <field name="name">cancel</field>
@ -41,19 +40,19 @@
<field name="action">state_cancel_set()</field> <field name="action">state_cancel_set()</field>
</record> </record>
<!-- Transition --> <!-- Transition -->
<record id="trans_marketing_campaign_draft_running" model="workflow.transition"> <record id="trans_marketing_campaign_draft_running" model="workflow.transition">
<field name="act_from" ref="act_marketing_campaign_draft"/> <field name="act_from" ref="act_marketing_campaign_draft"/>
<field name="act_to" ref="act_marketing_campaign_running"/> <field name="act_to" ref="act_marketing_campaign_running"/>
<field name="signal">state_running_set</field> <field name="signal">state_running_set</field>
</record> </record>
<record id="trans_campaign_running_done" model="workflow.transition"> <record id="trans_campaign_running_done" model="workflow.transition">
<field name="act_from" ref="act_marketing_campaign_running"/> <field name="act_from" ref="act_marketing_campaign_running"/>
<field name="act_to" ref="act_marketing_campaign_done"/> <field name="act_to" ref="act_marketing_campaign_done"/>
<field name="signal">state_done_set</field> <field name="signal">state_done_set</field>
</record> </record>
<record id="trans_campaign_running_cancel" model="workflow.transition"> <record id="trans_campaign_running_cancel" model="workflow.transition">
<field name="act_from" ref="act_marketing_campaign_running"/> <field name="act_from" ref="act_marketing_campaign_running"/>
<field name="act_to" ref="act_marketing_campaign_cancel"/> <field name="act_to" ref="act_marketing_campaign_cancel"/>
@ -72,15 +71,14 @@
<field name="signal">state_draft_set</field> <field name="signal">state_draft_set</field>
</record> </record>
<!-- ==================Marketing Campaign Segment================== --> <!-- Marketing Campaign Segment -->
<record id="wkf_marketing_campaign_segment" model="workflow"> <record id="wkf_marketing_campaign_segment" model="workflow">
<field name="name">marketing.campaign.segment.basic</field> <field name="name">marketing.campaign.segment.basic</field>
<field name="osv">marketing.campaign.segment</field> <field name="osv">marketing.campaign.segment</field>
<field name="on_create">True</field> <field name="on_create">True</field>
</record> </record>
<!-- Activity --> <!-- Activity -->
<record id="act_marketing_campaign_segment_draft" model="workflow.activity"> <record id="act_marketing_campaign_segment_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_marketing_campaign_segment"/> <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
<field name="flow_start">True</field> <field name="flow_start">True</field>
@ -102,7 +100,7 @@
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">state_done_set()</field> <field name="action">state_done_set()</field>
</record> </record>
<record id="act_marketing_campaign_segment_cancel" model="workflow.activity"> <record id="act_marketing_campaign_segment_cancel" model="workflow.activity">
<field name="wkf_id" ref="wkf_marketing_campaign_segment"/> <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
<field name="name">cancel</field> <field name="name">cancel</field>
@ -111,19 +109,19 @@
<field name="flow_stop" eval="False"/> <field name="flow_stop" eval="False"/>
</record> </record>
<!-- Transition --> <!-- Transition -->
<record id="trans_marketing_campaign_segment_draft_running" model="workflow.transition"> <record id="trans_marketing_campaign_segment_draft_running" model="workflow.transition">
<field name="act_from" ref="act_marketing_campaign_segment_draft"/> <field name="act_from" ref="act_marketing_campaign_segment_draft"/>
<field name="act_to" ref="act_marketing_campaign_segment_running"/> <field name="act_to" ref="act_marketing_campaign_segment_running"/>
<field name="signal">state_running_set</field> <field name="signal">state_running_set</field>
</record> </record>
<record id="trans_campaign_segment_running_done" model="workflow.transition"> <record id="trans_campaign_segment_running_done" model="workflow.transition">
<field name="act_from" ref="act_marketing_campaign_segment_running"/> <field name="act_from" ref="act_marketing_campaign_segment_running"/>
<field name="act_to" ref="act_marketing_campaign_segment_done"/> <field name="act_to" ref="act_marketing_campaign_segment_done"/>
<field name="signal">state_done_set</field> <field name="signal">state_done_set</field>
</record> </record>
<record id="trans_campaign_segment_running_cancel" model="workflow.transition"> <record id="trans_campaign_segment_running_cancel" model="workflow.transition">
<field name="act_from" ref="act_marketing_campaign_segment_running"/> <field name="act_from" ref="act_marketing_campaign_segment_running"/>
<field name="act_to" ref="act_marketing_campaign_segment_cancel"/> <field name="act_to" ref="act_marketing_campaign_segment_cancel"/>
@ -141,5 +139,6 @@
<field name="act_to" ref="act_marketing_campaign_segment_draft"/> <field name="act_to" ref="act_marketing_campaign_segment_draft"/>
<field name="signal">state_draft_set</field> <field name="signal">state_draft_set</field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -1,112 +1,106 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
# -----------------------------------------------------------
# Activities
# -----------------------------------------------------------
<!-- Activities -->
<record model="workflow" id="wkf_prod_workcenter"> <record model="workflow" id="wkf_prod_workcenter">
<field name="name">mrp.production.workcenter.line.basic</field> <field name="name">mrp.production.workcenter.line.basic</field>
<field name="osv">mrp.production.workcenter.line</field> <field name="osv">mrp.production.workcenter.line</field>
<field name="on_create">True</field> <field name="on_create">True</field>
</record> </record>
<record model="workflow.activity" id="prod_act_wc_draft"> <record model="workflow.activity" id="prod_act_wc_draft">
<field name="wkf_id" ref="wkf_prod_workcenter"/> <field name="wkf_id" ref="wkf_prod_workcenter"/>
<field name="flow_start">True</field> <field name="flow_start">True</field>
<field name="name">draft</field> <field name="name">draft</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">action_draft()</field> <field name="action">action_draft()</field>
</record> </record>
<record model="workflow.activity" id="prod_act_wc_start"> <record model="workflow.activity" id="prod_act_wc_start">
<field name="wkf_id" ref="wkf_prod_workcenter"/> <field name="wkf_id" ref="wkf_prod_workcenter"/>
<field name="name">startworking</field> <field name="name">startworking</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">action_start_working()</field> <field name="action">action_start_working()</field>
</record> </record>
<record model="workflow.activity" id="prod_act_wc_cancel"> <record model="workflow.activity" id="prod_act_wc_cancel">
<field name="wkf_id" ref="wkf_prod_workcenter"/> <field name="wkf_id" ref="wkf_prod_workcenter"/>
<field name="name">cancel</field> <field name="name">cancel</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">action_cancel()</field> <field name="action">action_cancel()</field>
</record> </record>
<record model="workflow.activity" id="prod_act_wc_pause"> <record model="workflow.activity" id="prod_act_wc_pause">
<field name="wkf_id" ref="wkf_prod_workcenter"/> <field name="wkf_id" ref="wkf_prod_workcenter"/>
<field name="name">pause</field> <field name="name">pause</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">action_pause()</field> <field name="action">action_pause()</field>
</record> </record>
<record model="workflow.activity" id="prod_act_wc_resume"> <record model="workflow.activity" id="prod_act_wc_resume">
<field name="wkf_id" ref="wkf_prod_workcenter"/> <field name="wkf_id" ref="wkf_prod_workcenter"/>
<field name="name">resume</field> <field name="name">resume</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">action_resume()</field> <field name="action">action_resume()</field>
</record> </record>
<record model="workflow.activity" id="prod_act_wc_done"> <record model="workflow.activity" id="prod_act_wc_done">
<field name="wkf_id" ref="wkf_prod_workcenter"/> <field name="wkf_id" ref="wkf_prod_workcenter"/>
<field name="name">done</field> <field name="name">done</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="flow_stop">True</field> <field name="flow_stop">True</field>
<field name="action">action_done()</field> <field name="action">action_done()</field>
</record> </record>
# ----------------------------------------------------------- <!-- Transition -->
# Transition <record model="workflow.transition" id="prod_trans_wc_draft_start">
# ----------------------------------------------------------- <field name="act_from" ref="prod_act_wc_draft"/>
<field name="act_to" ref="prod_act_wc_start"/>
<field name="signal">button_start_working</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_start_done">
<field name="act_from" ref="prod_act_wc_start"/>
<field name="act_to" ref="prod_act_wc_done"/>
<field name="signal">button_done</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_draft_cancel">
<field name="act_from" ref="prod_act_wc_draft"/>
<field name="act_to" ref="prod_act_wc_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_cancel_draft">
<field name="act_from" ref="prod_act_wc_cancel"/>
<field name="act_to" ref="prod_act_wc_draft"/>
<field name="signal">button_draft</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_start_cancel">
<field name="act_from" ref="prod_act_wc_start"/>
<field name="act_to" ref="prod_act_wc_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_start_pause">
<field name="act_from" ref="prod_act_wc_start"/>
<field name="act_to" ref="prod_act_wc_pause"/>
<field name="signal">button_pause</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_draft_start"> <record model="workflow.transition" id="prod_trans_wc_pause_resume">
<field name="act_from" ref="prod_act_wc_draft"/> <field name="act_from" ref="prod_act_wc_pause"/>
<field name="act_to" ref="prod_act_wc_start"/> <field name="act_to" ref="prod_act_wc_resume"/>
<field name="signal">button_start_working</field> <field name="signal">button_resume</field>
</record> </record>
<record model="workflow.transition" id="prod_trans_wc_start_done">
<field name="act_from" ref="prod_act_wc_start"/>
<field name="act_to" ref="prod_act_wc_done"/>
<field name="signal">button_done</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_draft_cancel">
<field name="act_from" ref="prod_act_wc_draft"/>
<field name="act_to" ref="prod_act_wc_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_cancel_draft">
<field name="act_from" ref="prod_act_wc_cancel"/>
<field name="act_to" ref="prod_act_wc_draft"/>
<field name="signal">button_draft</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_start_cancel">
<field name="act_from" ref="prod_act_wc_start"/>
<field name="act_to" ref="prod_act_wc_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_start_pause">
<field name="act_from" ref="prod_act_wc_start"/>
<field name="act_to" ref="prod_act_wc_pause"/>
<field name="signal">button_pause</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_pause_resume">
<field name="act_from" ref="prod_act_wc_pause"/>
<field name="act_to" ref="prod_act_wc_resume"/>
<field name="signal">button_resume</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_resume_pause">
<field name="act_from" ref="prod_act_wc_resume"/>
<field name="act_to" ref="prod_act_wc_pause"/>
<field name="signal">button_pause</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_resume_cancel">
<field name="act_from" ref="prod_act_wc_resume"/>
<field name="act_to" ref="prod_act_wc_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_resume_done">
<field name="act_from" ref="prod_act_wc_resume"/>
<field name="act_to" ref="prod_act_wc_done"/>
<field name="signal">button_done</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_resume_pause">
<field name="act_from" ref="prod_act_wc_resume"/>
<field name="act_to" ref="prod_act_wc_pause"/>
<field name="signal">button_pause</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_resume_cancel">
<field name="act_from" ref="prod_act_wc_resume"/>
<field name="act_to" ref="prod_act_wc_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="prod_trans_wc_resume_done">
<field name="act_from" ref="prod_act_wc_resume"/>
<field name="act_to" ref="prod_act_wc_done"/>
<field name="signal">button_done</field>
</record>
</data> </data>
</openerp> </openerp>

View File

@ -2,9 +2,7 @@
<openerp> <openerp>
<data> <data>
#--------------------------------------------------------- <!-- Product price list -->
# product price list
#---------------------------------------------------------
<record model="ir.ui.view" id="product_pricelist_view_tree"> <record model="ir.ui.view" id="product_pricelist_view_tree">
<field name="name">product.pricelist.tree</field> <field name="name">product.pricelist.tree</field>
<field name="model">product.pricelist</field> <field name="model">product.pricelist</field>
@ -26,5 +24,6 @@
</field> </field>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -337,10 +337,7 @@
</record> </record>
# ------------------------------------------------------ <!-- Feature Requests -->
# Feature Requests
# ------------------------------------------------------
<record model="ir.ui.view" id="project_feature_tree_view"> <record model="ir.ui.view" id="project_feature_tree_view">
<field name="name">Project Issue- Feature Tracker Tree</field> <field name="name">Project Issue- Feature Tracker Tree</field>
<field name="model">project.issue</field> <field name="model">project.issue</field>
@ -390,10 +387,7 @@
view_mode="kanban,tree,form,calendar,graph" view_mode="kanban,tree,form,calendar,graph"
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/> context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
# ------------------------------------------------------ <!-- Project -->
# Project
# ------------------------------------------------------
<record id="view_project_form_inherited" model="ir.ui.view"> <record id="view_project_form_inherited" model="ir.ui.view">
<field name="name">project.project.form.inherited</field> <field name="name">project.project.form.inherited</field>
<field name="model">project.project</field> <field name="model">project.project</field>
@ -446,5 +440,6 @@
</xpath> </xpath>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -2,12 +2,9 @@
<openerp> <openerp>
<data> <data>
<menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/> <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
# ------------------------------------------------------
# Project User Allocation
# ------------------------------------------------------
<!-- Project User Allocation -->
<record id="view_project_user_allocation_gantt" model="ir.ui.view"> <record id="view_project_user_allocation_gantt" model="ir.ui.view">
<field name="name">project.user.allocation.gantt</field> <field name="name">project.user.allocation.gantt</field>
<field name="model">project.user.allocation</field> <field name="model">project.user.allocation</field>
@ -94,9 +91,7 @@
</record> </record>
# ------------------------------------------------------ <!-- Project Phase -->
# Project Phase
# ------------------------------------------------------
<act_window id="act_project_phases" <act_window id="act_project_phases"
name="Phases" name="Phases"
src_model="project.project" src_model="project.project"
@ -182,7 +177,7 @@
<form string="Project Users" version="7.0"> <form string="Project Users" version="7.0">
<group col="4"> <group col="4">
<field name="user_id"/> <field name="user_id"/>
<field name="date_start" /> <field name="date_start"/>
<field name="date_end"/> <field name="date_end"/>
</group> </group>
</form> </form>
@ -195,7 +190,7 @@
<field name="name"/> <field name="name"/>
<field name="user_id"/> <field name="user_id"/>
<field name="date_start"/> <field name="date_start"/>
<field name="date_end" /> <field name="date_end"/>
<field name="planned_hours" widget="float_time"/> <field name="planned_hours" widget="float_time"/>
<field name="project_id" invisible="1"/> <field name="project_id" invisible="1"/>
<field name="total_hours" sum='Total Hours'/> <field name="total_hours" sum='Total Hours'/>
@ -285,7 +280,7 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="project_id"/> <field name="project_id"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@ -317,10 +312,7 @@
</record> </record>
# ------------------------------------------------------ <!-- Project Task -->
# Project Task
# ------------------------------------------------------
<record id="view_phase_task_form2" model="ir.ui.view"> <record id="view_phase_task_form2" model="ir.ui.view">
<field name="name">phase.task.form2</field> <field name="name">phase.task.form2</field>
<field name="model">project.task</field> <field name="model">project.task</field>
@ -368,16 +360,15 @@
</field> </field>
</record> </record>
<act_window <act_window
context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}" context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
id="project_phase_task_list" id="project_phase_task_list"
name="Related Tasks" name="Related Tasks"
res_model="project.task" res_model="project.task"
src_model="project.phase" src_model="project.phase"
view_mode="tree,form" view_mode="tree,form"/>
/>
<record id="analytic_account_inherited_phase_form" model="ir.ui.view"> <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
<field name="name">account.analytic.account.phase.form.inherit</field> <field name="name">account.analytic.account.phase.form.inherit</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
<field name="type">form</field> <field name="type">form</field>
@ -393,10 +384,7 @@
</field> </field>
</record> </record>
# ------------------------------------------------------ <!-- Menu Items -->
# Menu Items
# ------------------------------------------------------
<menuitem action="act_project_phase_list" <menuitem action="act_project_phase_list"
id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/> id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>

View File

@ -1486,9 +1486,7 @@
<field name="act_window_id" ref="action_reception_picking_move"/> <field name="act_window_id" ref="action_reception_picking_move"/>
</record> </record>
# ------------------------------------------------------------- <!-- Stock incoterms -->
# Stock incoterms
# -------------------------------------------------------------
<record id="view_incoterms_tree" model="ir.ui.view"> <record id="view_incoterms_tree" model="ir.ui.view">
<field name="name">stock.incoterms.tree</field> <field name="name">stock.incoterms.tree</field>
<field name="model">stock.incoterms</field> <field name="model">stock.incoterms</field>

View File

@ -3,11 +3,7 @@
<data> <data>
<menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/> <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
<!-- <!-- Subscription Views -->
=======================================================
Subscription Views
=======================================================
-->
<record id="view_subscription_form" model="ir.ui.view"> <record id="view_subscription_form" model="ir.ui.view">
<field name="name">subscription.subscription.form</field> <field name="name">subscription.subscription.form</field>
<field name="model">subscription.subscription</field> <field name="model">subscription.subscription</field>
@ -17,7 +13,7 @@
<header> <header>
<button name="set_process" states="draft" string="Process" type="object" class="oe_highlight"/> <button name="set_process" states="draft" string="Process" type="object" class="oe_highlight"/>
<button name="set_done" states="running" string="Stop" type="object" class="oe_highlight"/> <button name="set_done" states="running" string="Stop" type="object" class="oe_highlight"/>
<button name="set_draft" states="done" string="Set to Draft" type="object" /> <button name="set_draft" states="done" string="Set to Draft" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,running"/> <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
</header> </header>
<sheet> <sheet>
@ -103,7 +99,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_subscription_tree"/> <field name="view_id" ref="view_subscription_tree"/>
<field name="context">{'search_default_User':1}</field> <field name="context">{'search_default_User':1}</field>
<field name="search_view_id" ref="view_subscription_filter" /> <field name="search_view_id" ref="view_subscription_filter"/>
</record> </record>
<menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/> <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
@ -208,11 +204,12 @@
<field name="res_model">subscription.document</field> <field name="res_model">subscription.document</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="document_tree"/> <field name="view_id" ref="document_tree"/>
<field name="search_view_id" ref="view_subscription_document_filter" /> <field name="search_view_id" ref="view_subscription_document_filter"/>
</record> </record>
<menuitem name="Configuration" parent="base.menu_tools" <menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" /> id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
<menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/> <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
<menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/> <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
</data> </data>
</openerp> </openerp>