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

[IMP] small form view improvements 

bzr revid: rco@openerp.com-20120629093256-np0ver7xyzam2qzm
This commit is contained in:
Raphael Collet 2012-06-29 11:32:56 +02:00
parent 76f17eb480
commit 7416e2443f
19 changed files with 58 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/wizard/account_move_journal.py
View File

@ -107,7 +107,7 @@ class account_move_journal(osv.osv_memory):
view = """<?xml version="1.0" encoding="utf-8"?>
<form string="Standard entries" version="7.0">
<header>
<button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight_on_dirty"/>
<button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>

4
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -86,9 +86,9 @@
<button name="case_open" string="Open" type="object"
states="draft,pending" class="oe_highlight"/>
<button name="case_pending" string="Pending" type="object"
states="open" />
states="open"/>
<button name="case_reset" string="Reset to New" type="object"
states="done,cancel" />
states="done,cancel"/>
<button name="case_cancel" string="Refuse" type="object"
states="draft,open,pending" class="oe_highlight"/>
<button name="stage_previous" string="Previous" type="object"

5
addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
View File

@ -9,9 +9,8 @@
<field name="arch" type="xml">
<form string="Partner VAT intra" version="7.0">
<header>
<button name="create_xml" string="Create _XML" type="object" class="oe_highlight" />
or
<button name="preview" string="_Preview" type="object" class="oe_highlight" />
<button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
<button name="preview" string="_Preview" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>

4
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -19,7 +19,7 @@
<header>
<button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
<button name="state_done_set" string="Done" states="running" class="oe_highlight"/>
<button name="state_draft_set" string="Set to Draft" states="done,cancelled" />
<button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
<button name="state_cancel_set" string="Cancel" states="running"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>
@ -137,7 +137,7 @@
<header>
<button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
<button name="state_done_set" string="Close" states="running" class="oe_highlight"/>
<button name="state_draft_set" string="Set to Draft" states="done,cancelled" />
<button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
<button name="state_cancel_set" string="Cancel" states="running"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>

10
addons/mrp/wizard/mrp_price_view.xml
View File

@ -11,13 +11,11 @@
<field name="arch" type="xml">
<form string="Product Cost Structure" version="7.0">
<header>
<button name="print_report" string="Print"
colspan="1" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
<button name="print_report" type="object" string="Print" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator colspan="4" string="Print Cost Structure of Product." />
<group string="Print Cost Structure of Product.">
<field name="number"/>
</group>
</form>

10
addons/mrp/wizard/mrp_product_produce_view.xml
View File

@ -12,13 +12,11 @@
<field name="arch" type="xml">
<form string="Produce" version="7.0">
<header>
<button name="do_produce" string="Confirm"
colspan="1" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
<button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="Produce" colspan="4"/>
<group string="Produce">
<field name="mode"/>
<field name="product_qty" colspan="2"/>
</group>

16
addons/mrp/wizard/mrp_workcenter_load_view.xml
View File

@ -11,18 +11,16 @@
<field name="arch" type="xml">
<form string="Select time unit" version="7.0">
<header>
<button name="print_report" string="Print"
colspan="1" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
<button name="print_report" type="object" string="Print" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<sheet layout="auto">
<sheet>
<group>
<field name="time_unit"/>
<newline/>
<field name="measure_unit"/>
</sheet>
</group>
</group>
</sheet>
</form>
</field>
</record>

4
addons/mrp_operations/mrp_operations_view.xml
View File

@ -72,8 +72,8 @@
<button name="button_start_working" string="Start" states="draft" class="oe_highlight"/>
<button name="button_resume" string="Resume" states="pause" class="oe_highlight"/>
<button name="button_done" string="Finished" states="startworking" class="oe_highlight"/>
<button name="button_pause" string="Pending" states="startworking" />
<button name="button_draft" string="Set Draft" states="cancel" />
<button name="button_pause" string="Pending" states="startworking"/>
<button name="button_draft" string="Set Draft" states="cancel"/>
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
<field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
</header>

2
addons/mrp_repair/mrp_repair_view.xml
View File

@ -31,7 +31,7 @@
<header>
<button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_highlight"/>
<button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" />
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="action_repair_end" states="under_repair" string="End Repair" class="oe_highlight"/>
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>

21
addons/mrp_repair/wizard/cancel_repair.py
View File

@ -69,17 +69,16 @@ class repair_cancel(osv.osv_memory):
repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
if not repair_order.invoiced:
res['arch'] = """ <form string="Cancel Repair" colspan="4">
<header>
<button name="cancel_repair" string="_Yes" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="2" colspan="2">
<label string="Do you want to continue?" colspan="4"/>
</group>
</form>
"""
res['arch'] = """
<form string="Cancel Repair" version="7.0">
<header>
<button name="cancel_repair" string="_Yes" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Do you want to continue?"/>
</form>
"""
return res
repair_cancel()

5
addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
View File

@ -11,11 +11,10 @@
<field name="arch" type="xml">
<form string="Cancel Repair Order" version="7.0">
<header>
<button name="cancel_repair" string="Yes" type="object" class="oe_highlight" />
or
<button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<newline/>
<group>
<label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
</group>

6
addons/plugin_outlook/plugin_outlook.xml
View File

@ -14,11 +14,7 @@
<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 icon="gtk-close" special="cancel" string="_Close"/>
</xpath>
<xpath expr="//button[@string='Cancel']" position="replace">
</xpath>
<xpath expr="//header" position="replace"/>
<xpath expr="//separator[@string='title']" position="after" version="7.0">
<group>
<field name="plugin32" widget="url"/>

1
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -14,6 +14,7 @@
<separator string="title" position="before">
<label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
</separator>
<xpath expr="//header" position="replace"/>
<xpath expr="//separator[@string='title']" position="after">
<group>
<field name="thunderbird" invisible="1"/>

2
addons/point_of_sale/point_of_sale_view.xml
View File

@ -23,7 +23,7 @@
<button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}" class="oe_highlight"/>
<button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid" class="oe_highlight"/>
<button name="refund" string="Return Products" type="object"
attrs="{'invisible':[('state','=','draft')]}" />
attrs="{'invisible':[('state','=','draft')]}"/>
<field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
</header>
<sheet>

7
addons/point_of_sale/wizard/pos_details.xml
View File

@ -10,10 +10,9 @@
<field name="arch" type="xml">
<form string="POS Details" version="7.0">
<header>
<button name="print_report" string="Print Report"
colspan="1" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
<button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4" string="Dates">
<field name="date_start"/>

7
addons/point_of_sale/wizard/pos_open_statement.xml
View File

@ -10,10 +10,9 @@
<field name="arch" type="xml">
<form string="Open Statements" version="7.0">
<header>
<button name="open_statement" string="Open Registers"
type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
<button name="open_statement" type="object" string="Open Registers" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Do you want to open cash registers?"/>
<label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>

2
addons/point_of_sale/wizard/pos_payment_report_user_view.xml
View File

@ -9,6 +9,8 @@
<form string="Sale by User" version="7.0">
<header>
<button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
or
<button string="Cancel" special="cancel" class="oe_link"/>
</header>
<group>
<field name="user_id"/>

5
addons/point_of_sale/wizard/pos_sales_user.xml
View File

@ -10,8 +10,9 @@
<field name="arch" type="xml">
<form string="Sale By User" version="7.0">
<header>
<button name="print_report" string="Print Report"
type="object" icon="gtk-ok" class="oe_highlight" />
<button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
or
<button string="Cancel" special="cancel" class="oe_link"/>
</header>
<group col="4">
<field name="date_start"/>

14
addons/project/project_view.xml
View File

@ -29,10 +29,10 @@
<field name="arch" type="xml">
<form string="Project" version="7.0">
<header>
<button name="set_done" string="Done" type="object" states="open,pending" />
<button name="set_done" string="Done" type="object" states="open,pending"/>
<button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
<button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
<button name="set_pending" string="Pending" type="object" states="open" />
<button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
<button name="set_pending" string="Pending" type="object" states="open"/>
<button name="set_template" string="Set as Template" type="object" states="open"/>
<button string="New Project Based on Template" name="duplicate_template" type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
<button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
@ -321,20 +321,20 @@
<button name="do_open" string="Start Task" type="object"
states="draft,pending" class="oe_highlight"/>
<button name="do_draft" string="Draft" type="object"
states="cancel,done" />
states="cancel,done"/>
-->
<button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
<button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
states="cancelled" context="{'button_reactivate':True}"/>
<button name="action_close" string="Done" type="object"
states="open,draft,pending" />
states="draft,open,pending"/>
<button name="do_pending" string="Pending" type="object"
states="open" />
states="open"/>
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"
states="pending,open,draft" groups="project.group_delegate_task"/>
<button name="do_cancel" string="Cancel" type="object"
states="draft,open,pending" />
states="draft,open,pending"/>
<button name="stage_previous" string="Previous Stage" type="object"
states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
<button name="stage_next" string="Next Stage" type="object"