ajay javiya (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-crm-aja into
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-crm-aja/+merge/110806
Hello
Remove cancel button from wizard in crm module and add css class for color on
button.
Thank You
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-crm-aja/+merge/110806
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
=== modified file 'audittrail/wizard/audittrail_view_log_view.xml'
--- audittrail/wizard/audittrail_view_log_view.xml 2012-06-09 23:46:14 +0000
+++ audittrail/wizard/audittrail_view_log_view.xml 2012-06-18 12:49:30 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Audit Logs" version="7.0">
<header>
- <button icon="gtk-cancel" special="cancel" string="Cancel" />
- <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" />
+ <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_form_button_active_flow" />
</header>
<group col="4">
<field name="from"/>
=== modified file 'base_calendar/wizard/base_calendar_invite_attendee_view.xml'
--- base_calendar/wizard/base_calendar_invite_attendee_view.xml 2012-06-09 14:13:14 +0000
+++ base_calendar/wizard/base_calendar_invite_attendee_view.xml 2012-06-18 12:49:30 +0000
@@ -9,7 +9,10 @@
<field name="model">base_calendar.invite.attendee</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Invite People">
+ <form string="Invite People" version="7.0">
+ <header>
+ <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
<separator string="Invite People" colspan="4"/>
<field name="type"/>
<field name="send_mail"/>
@@ -31,10 +34,6 @@
</group>
</page>
</notebook>
- <group col="4" colspan="4">
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
- </group>
</form>
</field>
</record>
=== modified file 'base_module_doc_rst/wizard/generate_relation_graph_view.xml'
--- base_module_doc_rst/wizard/generate_relation_graph_view.xml 2012-02-02 14:28:24 +0000
+++ base_module_doc_rst/wizard/generate_relation_graph_view.xml 2012-06-18 12:49:30 +0000
@@ -7,10 +7,11 @@
<field name="model">create.relation.graph</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Generate Relationship Graph">
+ <form string="Generate Relationship Graph" version="7.0">
+ <header>
+ <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
<separator string="Relationship Graphs" colspan="6"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok"/>
</form>
</field>
</record>
=== modified file 'base_module_record/wizard/base_module_record_data_view.xml'
--- base_module_record/wizard/base_module_record_data_view.xml 2011-09-08 06:45:23 +0000
+++ base_module_record/wizard/base_module_record_data_view.xml 2012-06-18 12:49:30 +0000
@@ -7,18 +7,16 @@
<field name="model">base.module.data</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Data Recording">
+ <form string="Data Recording" version="7.0">
+ <header>
+ <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_form_button_active_flow"/>
+ </header>
<field name="check_date"/>
<newline/>
<field name="filter_cond"/>
<separator string="Choose objects to record" colspan="4"/>
<field name="objects" colspan="4" nolabel="1"/>
<group><field name="info_yaml"/></group>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <button icon="gtk-cancel" string="Cancel" special="cancel"/>
- <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
- </group>
</form>
</field>
</record>
@@ -57,11 +55,6 @@
<form string="Data Recording">
<separator string="Result, paste this to your module's xml" colspan="4" />
<field name="res_text" nolabel="1" colspan="4"/>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <label string=""/>
- <button icon="gtk-close" string="Close" special="cancel"/>
- </group>
</form>
</field>
</record>
=== modified file 'base_module_record/wizard/base_module_record_object_view.xml'
--- base_module_record/wizard/base_module_record_object_view.xml 2012-05-16 16:01:15 +0000
+++ base_module_record/wizard/base_module_record_object_view.xml 2012-06-18 12:49:30 +0000
@@ -7,18 +7,16 @@
<field name="model">base.module.record</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Objects Recording">
+ <form string="Objects Recording" version="7.0">
+ <header>
+ <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_form_button_active_flow"/>
+ </header>
<field name="check_date"/>
<newline/>
<field name="filter_cond"/>
<separator string="Choose objects to record" colspan="4"/>
<field name="objects" colspan="4" nolabel="1"/>
<group><field name="info_yaml"/></group>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <button icon="gtk-cancel" string="Cancel" special="cancel"/>
- <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
- </group>
</form>
</field>
</record>
@@ -66,11 +64,6 @@
<separator string="Information" colspan="4"/>
<label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
<label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <label string=""/>
- <button icon="gtk-close" string="Close" special="cancel"/>
- </group>
</form>
</field>
</record>
@@ -89,7 +82,10 @@
<field name="model">base.module.record.objects</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Module Recording">
+ <form string="Module Recording" version="7.0">
+ <header>
+ <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
<separator string="Module Information" colspan="4"/>
<field name="name"/>
<field name="directory_name"/>
@@ -100,11 +96,6 @@
<field name="data_kind"/>
<newline/>
<field name="description" colspan="4"/>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <button icon="gtk-cancel" string="Cancel" special="cancel"/>
- <button string="Continue" name="inter_call" type="object" icon="gtk-ok"/>
- </group>
</form>
</field>
</record>
@@ -116,11 +107,6 @@
<field name="arch" type="xml">
<form string="Module Recording">
<label string="Thanks For using Module Recorder" colspan="4" align="0.0"/>
- <separator string="" colspan="4"/>
- <group colspan="4" col="2">
- <label string=""/>
- <button icon="gtk-ok" string="OK" special="cancel"/>
- </group>
</form>
</field>
</record>
@@ -134,11 +120,6 @@
<separator string="YAML file successfully created !" colspan="4"/>
<newline/>
<field name="yaml_file" filename="module_filename"/>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <label string=""/>
- <button icon="gtk-close" string="Close" special="cancel"/>
- </group>
</form>
</field>
</record>
=== modified file 'base_module_record/wizard/base_module_save_view.xml'
--- base_module_record/wizard/base_module_save_view.xml 2011-09-08 07:11:14 +0000
+++ base_module_record/wizard/base_module_save_view.xml 2012-06-18 12:49:30 +0000
@@ -7,16 +7,14 @@
<field name="model">base.module.save</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Module Recording">
+ <form string="Module Recording" version="7.0">
+ <header>
+ <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_form_button_active_flow"/>
+ </header>
<separator string="Recording Information" colspan="4"/>
<field name="info_status"/>
<field name="info_text" colspan="4" nolabel="1"/>
<field name="info_yaml" colspan="4"/>
- <separator colspan="4"/>
- <group colspan="4" col="2">
- <button icon="gtk-cancel" string="Cancel" special="cancel"/>
- <button name="record_save" icon="gtk-ok" string="Continue" type="object"/>
- </group>
</form>
</field>
</record>
=== modified file 'base_report_designer/base_report_designer_installer.xml'
--- base_report_designer/base_report_designer_installer.xml 2012-06-09 14:13:14 +0000
+++ base_report_designer/base_report_designer_installer.xml 2012-06-18 12:49:30 +0000
@@ -8,19 +8,18 @@
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
- <form position="attributes">
+ <form position="attributes" version="7.0">
+ <header>
+ <xpath expr="//button[@string='Install Modules']" position="replace">
+ <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_form_button_active_flow"/>
+ </xpath>
+ </header>
<attribute name="string">OpenERP Report Designer Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
</separator>
- <xpath expr="//button[@string='Install Modules']" position="replace">
- <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
- <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
- </xpath>
- <xpath expr="//button[@string='Cancel']" position="replace">
- <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
- </xpath>
+
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
<field name="name" invisible="1"/>
=== modified file 'base_report_designer/wizard/base_report_design_view.xml'
--- base_report_designer/wizard/base_report_design_view.xml 2012-06-09 14:13:14 +0000
+++ base_report_designer/wizard/base_report_design_view.xml 2012-06-18 12:49:30 +0000
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
-
<record id="view_base_report_sxw" model="ir.ui.view">
<field name="name">Base Report sxw</field>
<field name="model">base.report.sxw</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Get a report">
+ <form string="Get a report" version="7.0">
+ <header>
+ <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+ </header>
<separator string="Select your report" colspan="4"/>
<field name="report_id"/>
- <separator string="" colspan="4"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
</form>
</field>
</record>
@@ -41,10 +40,6 @@
<field name="file_sxw_upload"/>
<newline/>
<label colspan="4" string="This is the template of your requested report. Save it as a .SXW file and open it with OpenOffice. Don't forget to install the OpenERP SA OpenOffice package to modify it. Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
- <separator string="" colspan="4"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward"/>
-
</form>
</field>
</record>
@@ -53,13 +48,10 @@
<field name="model">base.report.rml.save</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Save RML FIle">
- <separator string="The RML Report" colspan="4"/>
- <field name="file_rml"/>
- <newline/>
- <separator string="" colspan="4"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- </form>
+ <form string="Save RML FIle">
+ <separator string="The RML Report" colspan="4"/>
+ <field name="file_rml"/>
+ </form>
</field>
</record>
=== modified file 'base_setup/base_setup_views.xml'
--- base_setup/base_setup_views.xml 2012-06-09 14:13:14 +0000
+++ base_setup/base_setup_views.xml 2012-06-18 12:49:30 +0000
@@ -39,8 +39,7 @@
<field name="arch" type="xml">
<form string="Configure Sales" version="7.0">
<header>
- <button string="Apply" type="object" name="execute"/>
- <button string="Cancel" special="cancel"/>
+ <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
</header>
<sheet>
<group>
=== modified file 'base_setup/res_config_view.xml'
--- base_setup/res_config_view.xml 2012-06-09 14:13:14 +0000
+++ base_setup/res_config_view.xml 2012-06-18 12:49:30 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="General Settings" version="7.0">
<header>
- <button string="Apply" type="object" name="execute"/>
- <button string="Cancel" special="cancel"/>
+ <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
</header>
<group>
<group string="Company Settings">
=== modified file 'board/wizard/board_menu_create_view.xml'
--- board/wizard/board_menu_create_view.xml 2012-06-09 21:56:28 +0000
+++ board/wizard/board_menu_create_view.xml 2012-06-18 12:49:30 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Create Menu For Dashboard" version="7.0">
<header>
- <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" />
- <button icon="gtk-cancel" special="cancel" string="Cancel" />
+ <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4" string="Menu Information">
<field name="menu_name"/>
=== modified file 'caldav/wizard/caldav_browse_view.xml'
--- caldav/wizard/caldav_browse_view.xml 2012-05-10 12:49:11 +0000
+++ caldav/wizard/caldav_browse_view.xml 2012-06-18 12:49:30 +0000
@@ -13,11 +13,6 @@
<field name="url" colspan="4" />
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" nolabel="1"/>
- <separator colspan="4"/>
- <group col="4" colspan="4">
- <label string="" colspan="2"/>
- <button special="cancel" string="_Close" icon="gtk-close"/>
- </group>
</group>
</form>
</field>
@@ -28,18 +23,16 @@
<field name="model">user.preference</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Caldav's host name configuration">
+ <form string="Caldav's host name configuration" version="7.0">
+ <header>
+ <button name="next_window" string="Next" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+ </header>
<label string="Configure your openerp hostname. For example : " colspan="4"></label>
<newline/>
<label string="database.my.openerp.com or companyserver.com" colspan="4"/>
<newline/>
<separator colspan="4"/>
<field name="host_name" colspan="4" width="250" />
- <separator colspan="4"/>
- <group col="4" colspan="4">
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
- <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
- </group>
</form>
</field>
</record>
@@ -49,19 +42,15 @@
<field name="model">user.preference</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="User Preference">
+ <form string="User Preference" version="7.0">
+ <header>
+ <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
<separator string="" colspan="4"/>
<field name="service" colspan="4" width="250" readonly="1"/>
<field name="collection" colspan="4" width="250" invisible="1" />
<field name="calendar" colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device" colspan="4" width="250" />
- <separator colspan="4"/>
-
- <group col="4" colspan="4">
- <label string="" colspan="2"/>
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
- <button name="open_window" string="_Open" type="object" icon="gtk-ok"/>
- </group>
</form>
</field>
</record>
=== modified file 'caldav/wizard/calendar_event_export_view.xml'
--- caldav/wizard/calendar_event_export_view.xml 2011-01-14 00:11:01 +0000
+++ caldav/wizard/calendar_event_export_view.xml 2012-06-18 12:49:30 +0000
@@ -11,11 +11,6 @@
<field name="name"/>
<field name="file_path" colspan="4" width="300"/>
</group>
- <separator string="" colspan="4" />
- <group colspan="4" col="6">
- <label string=""/>
- <button icon="gtk-close" special="cancel" string="_Close"/>
- </group>
</form>
</field>
</record>
=== modified file 'caldav/wizard/calendar_event_import_view.xml'
--- caldav/wizard/calendar_event_import_view.xml 2012-04-24 06:05:32 +0000
+++ caldav/wizard/calendar_event_import_view.xml 2012-06-18 12:49:30 +0000
@@ -6,16 +6,15 @@
<field name="model">calendar.event.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Import ICS">
+ <form string="Import ICS" version="7.0">
+ <header>
+ <button icon="gtk-ok" name="process_imp_ics" string="_Import" type="object" class=
+"oe_form_button_active_flow"/>
+ </header>
<group colspan="4" >
<separator string="Select ICS File"/>
<field name="file_path" colspan="4" width="500" nolabel="1"/>
</group>
- <separator string="" colspan="4" />
- <group colspan="4" col="6">
- <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
- <button icon="gtk-ok" name="process_imp_ics" string="_Import" type="object"/>
- </group>
</form>
</field>
</record>
@@ -29,10 +28,6 @@
<group colspan="4" >
<field name="msg" colspan="4" width="300" nolabel="1"/>
</group>
- <separator string="" colspan="4" />
- <group colspan="4">
- <button icon="gtk-ok" special="cancel" string="Ok"/>
- </group>
</form>
</field>
</record>
@@ -42,6 +37,5 @@
res_model="calendar.event.import" src_model="basic.calendar"
view_id="view_calendar_event_import"
view_mode="form" target="new" view_type="form" />
-
</data>
</openerp>
=== modified file 'caldav/wizard/calendar_event_subscribe_view.xml'
--- caldav/wizard/calendar_event_subscribe_view.xml 2012-04-24 06:05:32 +0000
+++ caldav/wizard/calendar_event_subscribe_view.xml 2012-06-18 12:49:30 +0000
@@ -6,16 +6,14 @@
<field name="model">calendar.event.subscribe</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Subscribe to Remote Calendar">
+ <form string="Subscribe to Remote Calendar" version="7.0">
+ <header>
+ <button icon="gtk-ok" name="process_imp_ics" string="_Subscribe" type="object" class="oe_form_button_active_flow"/>
+ </header>
<group colspan="4" >
<separator string="Provide Path for Remote Calendar"/>
<field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
</group>
- <separator string="" colspan="4" />
- <group colspan="4" col="6">
- <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
- <button icon="gtk-ok" name="process_imp_ics" string="_Subscribe" type="object"/>
- </group>
</form>
</field>
</record>
@@ -29,10 +27,6 @@
<group colspan="4" >
<field name="msg" colspan="4" width="300" nolabel="1"/>
</group>
- <separator string="" colspan="4" />
- <group colspan="4">
- <button icon="gtk-ok" special="cancel" string="Ok"/>
- </group>
</form>
</field>
</record>
=== modified file 'crm/wizard/crm_add_note_view.xml'
--- crm/wizard/crm_add_note_view.xml 2012-06-09 22:28:49 +0000
+++ crm/wizard/crm_add_note_view.xml 2012-06-18 12:49:30 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Add Note" version="7.0">
<header>
- <button name="action_add" type="object" string="_Add" icon="gtk-ok" />
- <button string="_Cancel" icon="gtk-close" special="cancel" />
+ <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Add Note"/>
<field name="body"/>
=== modified file 'crm/wizard/crm_lead_to_opportunity_view.xml'
--- crm/wizard/crm_lead_to_opportunity_view.xml 2012-04-24 06:05:32 +0000
+++ crm/wizard/crm_lead_to_opportunity_view.xml 2012-06-18 12:49:30 +0000
@@ -1,37 +1,31 @@
<openerp>
<data>
-
<record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
<field name="name">crm.lead2opportunity.partner.form</field>
<field name="model">crm.lead2opportunity.partner</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Convert to Opportunity">
-
- <field name="action"/>
- <group attrs="{'invisible':[('action','!=','exist')]}">
- <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
- </group>
- <separator string="Convert to Opportunity" colspan="4"/>
- <field name="name" colspan="4"/>
- <group col="4" colspan="4" attrs="{'invisible': [('name', '=', 'convert')]}" >
- <separator string="Select Opportunities" colspan="4" />
- </group>
- <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
- <tree>
- <field name="name" />
- <field name="partner_id" />
- <field name="user_id" />
- <field name="section_id" />
- </tree>
- </field>
-
- <separator string="" colspan="4" />
- <group col="4" colspan="4">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
- </group>
-
+ <form string="Convert to Opportunity" version="7.0">
+ <header>
+ <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
+ <field name="action"/>
+ <group attrs="{'invisible':[('action','!=','exist')]}">
+ <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+ </group>
+ <separator string="Convert to Opportunity" colspan="4"/>
+ <field name="name" colspan="4"/>
+ <group col="4" colspan="4" attrs="{'invisible': [('name', '=', 'convert')]}" >
+ <separator string="Select Opportunities" colspan="4" />
+ </group>
+ <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
+ <tree>
+ <field name="name" />
+ <field name="partner_id" />
+ <field name="user_id" />
+ <field name="section_id" />
+ </tree>
+ </field>
</form>
</field>
</record>
@@ -41,27 +35,22 @@
<field name="model">crm.lead2opportunity.partner.mass</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Convert to Opportunity">
-
- <field name="action"/>
- <field name="name" colspan="4"/>
-
- <separator string="Assigned Opportunities to" colspan="4" />
- <field name="section_id" />
- <group col="4" colspan="4">
- <separator string="Select Salesman" colspan="4" />
- </group>
- <field name="user_ids" nolabel="1" colspan="4">
- <tree>
- <field name="name" />
- </tree>
- </field>
- <separator string="" colspan="4" />
- <group col="4" colspan="4">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok"/>
- </group>
-
+ <form string="Convert to Opportunity" version="7.0">
+ <header>
+ <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
+ <field name="action"/>
+ <field name="name" colspan="4"/>
+ <separator string="Assigned Opportunities to" colspan="4" />
+ <field name="section_id" />
+ <group col="4" colspan="4">
+ <separator string="Select Salesman" colspan="4" />
+ </group>
+ <field name="user_ids" nolabel="1" colspan="4">
+ <tree>
+ <field name="name" />
+ </tree>
+ </field>
</form>
</field>
</record>
=== modified file 'crm/wizard/crm_lead_to_partner_view.xml'
--- crm/wizard/crm_lead_to_partner_view.xml 2012-06-09 22:28:49 +0000
+++ crm/wizard/crm_lead_to_partner_view.xml 2012-06-18 12:49:30 +0000
@@ -10,8 +10,7 @@
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+ <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Create a Partner"/>
<group col="4">
=== modified file 'crm/wizard/crm_merge_opportunities_view.xml'
--- crm/wizard/crm_merge_opportunities_view.xml 2012-06-09 22:28:49 +0000
+++ crm/wizard/crm_merge_opportunities_view.xml 2012-06-18 12:49:30 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Merge Opportunities" version="7.0">
<header>
- <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" />
- <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+ <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Select Opportunities"/>
<field name="opportunity_ids">
=== modified file 'crm/wizard/crm_opportunity_to_phonecall_view.xml'
--- crm/wizard/crm_opportunity_to_phonecall_view.xml 2012-06-13 09:06:57 +0000
+++ crm/wizard/crm_opportunity_to_phonecall_view.xml 2012-06-18 12:49:30 +0000
@@ -11,9 +11,8 @@
<field name="arch" type="xml">
<form string="Schedule/Log a Call" layout="manual" version="7.0">
<header>
- <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
- <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+ <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_form_button_active_flow"/>
+ <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_form_button_active_flow"/>
</header>
<group>
<group>
=== modified file 'crm/wizard/crm_partner_to_opportunity_view.xml'
--- crm/wizard/crm_partner_to_opportunity_view.xml 2012-06-13 09:06:57 +0000
+++ crm/wizard/crm_partner_to_opportunity_view.xml 2012-06-18 12:49:30 +0000
@@ -10,8 +10,7 @@
<field name="arch" type="xml">
<form string="Create Opportunity" version="7.0">
<header>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
+ <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="name"/>
=== modified file 'crm/wizard/crm_phonecall_to_meeting_view.xml'
--- crm/wizard/crm_phonecall_to_meeting_view.xml 2012-06-09 14:18:49 +0000
+++ crm/wizard/crm_phonecall_to_meeting_view.xml 2012-06-18 12:49:30 +0000
@@ -10,12 +10,10 @@
<field name="model">crm.phonecall2meeting</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Convert To Meeting">
+ <form string="Convert To Meeting" version="7.0">
<header>
- <button name="action_cancel" string="_Cancel"
- icon="gtk-cancel" special="cancel" />
<button name="action_make_meeting" type="object"
- string="_Schedule" icon="gtk-go-forward" />
+ string="_Schedule" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
<label string="Are you sure to schedule a Meeting for this Phonecall?"/>
</form>
=== modified file 'crm/wizard/crm_phonecall_to_opportunity_view.xml'
--- crm/wizard/crm_phonecall_to_opportunity_view.xml 2012-06-09 22:28:49 +0000
+++ crm/wizard/crm_phonecall_to_opportunity_view.xml 2012-06-18 12:49:30 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Convert To Opportunity " version="7.0">
<header>
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
- <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" />
+ <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="name"/>
=== modified file 'crm/wizard/crm_phonecall_to_partner_view.xml'
--- crm/wizard/crm_phonecall_to_partner_view.xml 2012-06-09 22:28:49 +0000
+++ crm/wizard/crm_phonecall_to_partner_view.xml 2012-06-18 12:49:30 +0000
@@ -11,7 +11,6 @@
<form string="Create a Partner" version="7.0">
<header>
<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<label string="Are you sure you want to create a partner based on this Phonecall ?"/>
<label string="You may have to verify that this partner does not exist already."/>
@@ -28,8 +27,7 @@
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
- <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="action"/>
@@ -49,7 +47,5 @@
<field name="view_id" ref="view_crm_phonecall2partner_create"/>
<field name="target">new</field>
</record>
-
-
</data>
</openerp>
=== modified file 'crm/wizard/crm_phonecall_to_phonecall_view.xml'
--- crm/wizard/crm_phonecall_to_phonecall_view.xml 2012-06-09 22:28:49 +0000
+++ crm/wizard/crm_phonecall_to_phonecall_view.xml 2012-06-18 12:49:30 +0000
@@ -11,9 +11,8 @@
<field name="arch" type="xml">
<form string="Schedule/Log a Call" version="7.0">
<header>
- <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
- <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
- <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+ <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_form_button_active_flow"/>
+ <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<separator string="Schedule/Log a Call" colspan="4"/>
=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner_view.xml'
--- crm_partner_assign/wizard/crm_forward_to_partner_view.xml 2012-03-06 13:48:46 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner_view.xml 2012-06-18 12:49:30 +0000
@@ -8,7 +8,10 @@
<field name="model">crm.lead.forward.to.partner</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Send Mail">
+ <form string="Send Mail" version="7.0">
+ <header>
+ <button name="action_forward" string="Send" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+ </header>
<separator string="Forward to Partner" colspan="4" />
<group col="4" colspan="6">
<field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@@ -41,11 +44,6 @@
<field name="attachment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
- <group col="4" colspan="4">
- <label string="" colspan="1"/>
- <button icon="gtk-close" special="cancel" string="Close"/>
- <button name="action_forward" string="Send" type="object" icon="gtk-go-forward"/>
- </group>
</form>
</field>
</record>
=== modified file 'crm_profiling/wizard/open_questionnaire_view.xml'
--- crm_profiling/wizard/open_questionnaire_view.xml 2012-06-09 14:39:04 +0000
+++ crm_profiling/wizard/open_questionnaire_view.xml 2012-06-18 12:49:30 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Questionnaires" version="7.0">
<header>
- <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
- <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+ <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="questionnaire_id"/>
@@ -34,14 +33,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
+ <header>
+ <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object" class="oe_form_button_active_flow"/>
+ </header>
<separator colspan="4" string="Questionnaire"/>
<field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
- <separator string="" colspan="4" />
- <label string="" colspan="2"/>
- <group col="2" colspan="2">
- <button icon='gtk-cancel' special="cancel" string="_Cancel" />
- <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object"/>
- </group>
</form>
</field>
</record>
=== modified file 'document_ftp/wizard/ftp_browse_view.xml'
--- document_ftp/wizard/ftp_browse_view.xml 2012-06-09 22:28:49 +0000
+++ document_ftp/wizard/ftp_browse_view.xml 2012-06-18 12:49:30 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Browse Document" version="7.0">
<header>
- <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+ <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<separator string="Browse Document"/>
<group>
=== modified file 'email_template/wizard/email_template_preview_view.xml'
--- email_template/wizard/email_template_preview_view.xml 2011-09-12 18:00:25 +0000
+++ email_template/wizard/email_template_preview_view.xml 2012-06-18 12:49:30 +0000
@@ -28,11 +28,6 @@
</notebook>
</group>
<field name="report_name" colspan="4" readonly="1"/>
- <separator colspan="4"/>
- <group col="4" colspan="4">
- <label string=""/>
- <button icon="gtk-ok" special="cancel" string="Close" colspan="1"/>
- </group>
</form>
</field>
</record>
=== modified file 'event/wizard/event_confirm_view.xml'
--- event/wizard/event_confirm_view.xml 2012-06-09 22:28:49 +0000
+++ event/wizard/event_confirm_view.xml 2012-06-18 12:49:30 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Event Confirmation" version="7.0">
<header>
- <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
- <button icon="gtk-close" special="cancel" string="Close"/>
+ <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_form_button_active_flow"/>
</header>
<label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
</form>
=== modified file 'event_moodle/wizard_moodle.xml'
--- event_moodle/wizard_moodle.xml 2012-04-24 06:05:32 +0000
+++ event_moodle/wizard_moodle.xml 2012-06-18 12:49:30 +0000
@@ -6,7 +6,11 @@
<field name="model">event.moodle.config.wiz</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Configure Moodle">
+ <form string="Configure Moodle" version="7.0">
+ <header>
+ <button type="object" name="configure_moodle"
+ string="Configure Moodle" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
<group>
<separator string="Server" colspan="4"/>
<field name="server_moodle"/>
@@ -20,11 +24,6 @@
<field name="moodle_username"/>
<field name="moodle_password"/>
</group>
- <newline/>
- <button type="special" special="cancel"
- string="Cancel" icon="gtk-cancel"/>
- <button type="object" name="configure_moodle"
- string="Configure Moodle" icon="gtk-ok"/>
</form>
</field>
</record>
=== modified file 'event_project/wizard/event_project_retro_view.xml'
--- event_project/wizard/event_project_retro_view.xml 2012-06-09 22:28:49 +0000
+++ event_project/wizard/event_project_retro_view.xml 2012-06-18 12:49:30 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Retro-Planning" version="7.0">
<header>
- <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
- <button icon="gtk-close" special="cancel" string="Close"/>
+ <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="project_id" colspan="4"/>
=== modified file 'google_base_account/wizard/google_login_view.xml'
--- google_base_account/wizard/google_login_view.xml 2012-06-09 14:39:04 +0000
+++ google_base_account/wizard/google_login_view.xml 2012-06-18 12:49:30 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Google login" version="7.0">
<header>
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
- <button name="login" string="_Login" type="object" icon="terp-check"/>
+ <button name="login" string="_Login" type="object" icon="terp-check" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="user" placeholder="[email protected]"/>
=== modified file 'plugin_outlook/plugin_outlook.xml'
--- plugin_outlook/plugin_outlook.xml 2012-06-08 13:10:48 +0000
+++ plugin_outlook/plugin_outlook.xml 2012-06-18 12:49:30 +0000
@@ -14,9 +14,6 @@
<separator string="title" position="before">
<label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
</separator>
- <xpath expr="//button[@string='Install Modules']" position="replace">
- <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
- </xpath>
<xpath expr="//button[@string='Cancel']" position="replace">
</xpath>
<xpath expr="//separator[@string='title']" position="after">
=== modified file 'plugin_thunderbird/plugin_thunderbird.xml'
--- plugin_thunderbird/plugin_thunderbird.xml 2012-06-08 18:35:18 +0000
+++ plugin_thunderbird/plugin_thunderbird.xml 2012-06-18 12:49:30 +0000
@@ -14,9 +14,6 @@
<separator string="title" position="before">
<label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
</separator>
- <xpath expr="//button[@string='Install Modules']" position="replace">
- <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
- </xpath>
<xpath expr="//button[@string='Cancel']" position="replace"></xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
