[MERGE] lp:~openerp-commiter/openobject-addons/trunk-red-button-fix-aja

bzr revid: jam@tinyerp.com-20120620045947-2ex69uxt9c1v463f
This commit is contained in:
Jigar Amin - OpenERP 2012-06-20 10:29:47 +05:30
commit 375f0fb3e9
4 changed files with 11 additions and 5 deletions

View File

@ -277,7 +277,7 @@
<button name="action_invoice_sent" type="object" string="Send by Email" states="open" class="oe_form_button_active_flow" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_form_button_active_flow"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices" class="oe_form_button_active_flow"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid' class="oe_form_button_return_flow"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" class="oe_form_button_return_flow"/>

View File

@ -280,7 +280,7 @@
<button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
<button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
<button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
<button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
<button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
<button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_form_button_active_flow"/>
<field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
</header>

View File

@ -333,9 +333,13 @@
states="cancel,done" class="oe_form_button_return_flow"/>
-->
<button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
states="done" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
<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="draft,open,pending" class="oe_form_button_active_flow"/>
states="open" class="oe_form_button_active_flow"/>
<button name="action_close" string="Done" type="object"
states="draft,pending" />
<button name="do_pending" string="Pending" type="object"
states="open" class="oe_form_button_return_flow"/>
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"

View File

@ -57,7 +57,9 @@
<button name="case_open" string="Open" type="object"
states="draft,pending" class="oe_form_button_active_flow"/>
<button name="case_close" string="Done" type="object"
states="draft,open,pending" class="oe_form_button_active_flow"/>
states="open" class="oe_form_button_active_flow"/>
<button name="case_close" string="Done" type="object"
states="draft,pending"/>
<button name="case_pending" string="Pending" type="object"
states="draft,open" class="oe_form_button_return_flow"/>
<button name="case_escalate" string="Escalate" type="object"