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

[FIX] all: change confusing labels on Cancel buttons in form views 

lp bug: https://launchpad.net/bugs/1103426 fixed

bzr revid: odo@openerp.com-20130225133804-k7012p8p81e6g8vg
This commit is contained in:
Olivier Dony 2013-02-25 14:38:04 +01:00
parent 9bb28d2dfe
commit cd0714b78d
22 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_budget/account_budget_view.xml
View File

@ -99,7 +99,7 @@
<button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
<button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/>
<button name="draft" states="cancel" string="Reset to Draft" type="workflow" />
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
<button string="Cancel Budget" name="cancel" states="confirm,validate" type="workflow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet string="Budget">

4
addons/account_cancel/account_cancel_view.xml
View File

@ -18,7 +18,7 @@
<field name="inherit_id" ref="account.invoice_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='invoice_cancel']" position="replace">
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
</xpath>
</field>
</record>
@ -29,7 +29,7 @@
<field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='invoice_cancel']" position="replace">
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
</xpath>
</field>
</record>

2
addons/account_payment/account_payment_view.xml
View File

@ -88,7 +88,7 @@
<button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
<button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
<button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
<button name="cancel" states="draft,open" string="Cancel"/>
<button name="cancel" states="draft,open" string="Cancel Payments"/>
<field name="state" widget="statusbar" statusbar_visible="draft,open"/>
</header>
<sheet string="Payment order">

4
addons/account_voucher/account_voucher_view.xml
View File

@ -43,8 +43,8 @@
<form string="Accounting Voucher" version="7.0">
<header>
<button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel Voucher" type="object" states="posted" confirm="Are you sure you want to unreconcile this record?"/>
<button name="cancel_voucher" string="Cancel Voucher" states="draft,proforma" />
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>

4
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -126,7 +126,7 @@
<form string="Voucher Payment" version="7.0">
<header>
<button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Cancel Voucher" states="draft,proforma" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
@ -394,7 +394,7 @@
<form string="Receipt" version="7.0">
<header invisible="context.get('line_type', False)">
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma"/>
<button name="cancel_voucher" string="Cancel Receipt" states="draft,proforma"/>
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" confirm="Are you sure to unreconcile and cancel this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>

8
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -63,8 +63,8 @@
<header>
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
<button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Validate Payment" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
<button name="cancel_voucher" string="Cancel Voucher" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel Voucher" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
@ -208,8 +208,8 @@
<header>
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
<button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
<button name="cancel_voucher" string="Cancel Voucher" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel Voucher" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>

2
addons/base_calendar/base_calendar_view.xml
View File

@ -70,7 +70,7 @@
<header>
<button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
<button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
<button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object"/>
<button name="do_cancel" string="Cancel Event" states="tentative,confirmed" type="object"/>
<field name="state" widget="statusbar"
statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
</header>

2
addons/crm/crm_lead_view.xml
View File

@ -97,7 +97,7 @@
states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
<button name="case_reset" string="Reset" type="object"
states="cancel"/>
<button name="case_cancel" string="Cancel" type="object"
<button name="case_cancel" string="Cancel Case" type="object"
states="draft,open,pending"/>
<field name="stage_id" widget="statusbar" clickable="True"
on_change="onchange_stage_id(stage_id)"/>

2
addons/crm/crm_phonecall_view.xml
View File

@ -73,7 +73,7 @@
states="open,pending"/>
<button name="case_reset" string="Reset to Todo" type="object"
states="cancel"/>
<button name="case_cancel" string="Cancel" type="object"
<button name="case_cancel" string="Cancel Call" type="object"
states="draft,open,pending"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
</header>

6
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -31,8 +31,8 @@
<header>
<button name="case_open" string="Open" type="object" class="oe_highlight"
states="draft,pending"/>
<button name="case_close" string="Close" type="object" states="draft,pending"/>
<button name="case_close" string="Close" type="object" states="open" class="oe_highlight"/>
<button name="case_close" string="Close Case" type="object" states="draft,pending"/>
<button name="case_close" string="Close Case" type="object" states="open" class="oe_highlight"/>
<button name="case_pending" string="Pending" type="object"
states="draft"/>
<button name="case_pending" string="Pending" type="object"
@ -41,7 +41,7 @@
states="cancel,done"/>
<button name="case_escalate" string="Escalate" type="object"
states="open,draft,pending"/>
<button name="case_cancel" string="Cancel" type="object"
<button name="case_cancel" string="Cancel Case" type="object"
states="draft,open,pending"/>
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>

4
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -160,7 +160,7 @@
<button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" class="oe_highlight"/>
<button name="button_done" string="Done" states="progress" type="object" class="oe_highlight"/>
<button name="button_draft" string="Reset to Draft" states="cancel" type="object" />
<button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
<button name="button_cancel" string="Cancel Appraisal" states="draft,wait,progress" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
</header>
<sheet>
@ -282,7 +282,7 @@
<field name="arch" type="xml">
<form string="Interview Appraisal" version="7.0">
<header>
<button string="Cancel" name="survey_req_cancel" type="object"
<button string="Cancel Survey" name="survey_req_cancel" type="object"
states="draft,waiting_answer" class="oe_left"/>
<button string="Print Survey" name="action_print_survey" type="object"
states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"

2
addons/hr_payroll/hr_payroll_view.xml
View File

@ -217,7 +217,7 @@
<button string="Refund" name="refund_sheet" states="confirm,done" type='object' />
<button string="Set to Draft" name="draft" states="cancel"/>
<button string="Compute Sheet" name="compute_sheet" type="object" states="draft" class="oe_highlight"/>
<button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
<button string="Cancel Payslip" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>

2
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
View File

@ -80,7 +80,7 @@
<header>
<button name="confirm_sheet" string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
<button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
<button name="cancel_sheet" string="Cancel" states="draft" type="object"/>
<button name="cancel_sheet" string="Cancel Advice" states="draft" type="object"/>
<button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
<div class="oe_right">
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>

2
addons/mail/mail_mail_view.xml
View File

@ -75,7 +75,7 @@
<field name="type" invisible="1"/>
<button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
<button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
<button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
<button name="cancel" string="Cancel Email" type="object" icon="terp-gtk-stop" states='outgoing'/>
</tree>
</field>
</record>

6
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -59,7 +59,7 @@
<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_cancel_set" string="Cancel" states="running"/>
<button name="state_cancel_set" string="Cancel Campaign" states="running"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>
<sheet string="Campaign">
@ -190,7 +190,7 @@
<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_cancel_set" string="Cancel" states="running"/>
<button name="state_cancel_set" string="Cancel Segment" states="running"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>
<sheet string="Segments" >
@ -387,7 +387,7 @@
<header>
<button string="Process" states="todo" name="process" type="object"/>
<button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
<button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
<button string="Cancel Workitem" states="todo,exception" name="button_cancel" type="object"/>
<field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
<button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
</header>

4
addons/mrp/mrp_view.xml
View File

@ -625,8 +625,8 @@
<button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
<button name="button_produce" states="ready" string="Mark as Started"/>
<button name="button_recreate" states="picking_except" string="Recreate Picking"/>
<button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
<button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
<button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel Production"/>
<button name="action_cancel" type="object" states="confirmed" string="Cancel Production"/>
<field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
</header>
<sheet>

2
addons/mrp_operations/mrp_operations_view.xml
View File

@ -10,7 +10,7 @@
<xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
<header colspan="8">
<button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
<button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
<button name="button_cancel" string="Cancel Order" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
<button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>

2
addons/procurement/procurement_view.xml
View File

@ -47,7 +47,7 @@
<button name="button_confirm" states="draft" string="Confirm" class="oe_highlight"/>
<button name="button_check" states="confirmed" string="Run Procurement" class="oe_highlight"/>
<button name="button_restart" states="exception" string="Retry" class="oe_highlight"/>
<button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
<button name="button_cancel" states="draft,exception,waiting" string="Cancel Procurement"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
</header>
<sheet>

2
addons/project_long_term/project_long_term_view.xml
View File

@ -146,7 +146,7 @@
<button string="Done" name="set_done" states="pending,open"/>
<button string="Pending" name="set_pending" states="open"/>
<button string="Draft" name="set_draft" states="open"/>
<button string="Cancel" name="set_cancel" states="draft,open,pending"/>
<button string="Cancel Phase" name="set_cancel" states="draft,open,pending"/>
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet>

2
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -33,7 +33,7 @@
<button name="tender_in_progress" states="draft" string="Send to Suppliers" type="object" class="oe_highlight"/>
<button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
<button name="tender_done" states="in_progress" string="Purchase Done" type="object" class="oe_highlight"/>
<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
<button name="tender_cancel" states="draft,in_progress" string="Cancel Requisition" type="object" />
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
</header>
<sheet>

2
addons/sale_stock/sale_stock_view.xml
View File

@ -43,7 +43,7 @@
attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}" groups="base.group_user"/>
</xpath>
<xpath expr="//button[@name='action_cancel']" position="after">
<button name="ship_cancel" states="shipping_except" string="Cancel"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
</xpath>
<field name="state" position="replace">
<field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>

4
addons/survey/survey_view.xml
View File

@ -23,7 +23,7 @@
<header>
<button name="survey_open" string="Open" states="cancel,close" type="object"/>
<button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
<button name="survey_cancel" string="Cancel" states="open" type="object"/>
<button name="survey_cancel" string="Cancel Survey" states="open" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="open,close"/>
</header>
<sheet>
@ -1117,7 +1117,7 @@
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
<button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_highlight"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" class="oe_highlight"/>
<button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
<button name="survey_req_cancel" string="Cancel Request" states="waiting_answer" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
</header>
<sheet string="Survey Request">