pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-red-button

Browse Source 
bzr revid: tpa@tinyerp.com-20120614084747-kn27cxtnxm0j2f59
This commit is contained in:
Turkesh Patel (Open ERP)
2012-06-14 14:17:47 +05:30
parent f0f18853c2 7110b8b2fd
commit 415e7edb6a
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/hr_view.xml
+2 -2
View File
@@ -356,8 +356,8 @@
<field name="arch" type="xml">
<form string="Job" version="7.0">
<header>
<button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
<button name="job_open" string="In Position" states="old,recruit" type="object"/>
<button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_form_button_active_flow"/>
<button name="job_open" string="In Position" states="old,recruit" type="object" class="oe_form_button_return_flow"/>
<button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
</header>
addons/hr_evaluation/hr_evaluation_view.xml
+8 -8
View File
@@ -148,9 +148,9 @@
<field name="arch" type="xml">
<form string="Appraisal" version="7.0">
<header>
<button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
<button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
<button name="button_done" string="Done" states="progress" type="object"/>
<button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" class="oe_form_button_active_flow"/>
<button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" class="oe_form_button_active_flow"/>
<button name="button_done" string="Done" states="progress" type="object" class="oe_form_button_active_flow"/>
<button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
<button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
@@ -275,13 +275,13 @@
<field name="arch" type="xml">
<form string="Interview Appraisal" version="7.0">
<header>
<button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
<button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_form_button_active_flow"/>
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" class="oe_form_button_active_flow"/>
<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)]}"/>
<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 string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
<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" 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>
addons/hr_expense/hr_expense_view.xml
+4 -4
View File
@@ -65,10 +65,10 @@
<field name="arch" type="xml">
<form string="Expenses Sheet" version="7.0">
<header>
<button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
<button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
<button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
<button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_form_button_active_flow"/>
<button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
<button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header>
addons/hr_holidays/hr_holidays_view.xml
+10 -10
View File
@@ -65,11 +65,11 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
<button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
<button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
<button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
<button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_form_button_active_flow"/>
<button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
</header>
<sheet string="Leave Request" layout="auto">
@@ -114,11 +114,11 @@
<field name="arch" type="xml">
<form string="Allocation Request" version="7.0">
<header>
<button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
<button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
<button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
<button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
<button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
<button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
</header>
<sheet>
addons/hr_payroll/hr_payroll_view.xml
+6 -6
View File
@@ -258,10 +258,10 @@
<field name="arch" type="xml">
<form string="Payslip" version="7.0">
<header>
<button string="Confirm" name="hr_verify_sheet" states="draft"/>
<button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
<button string="Confirm" name="hr_verify_sheet" states="draft" class="oe_form_button_active_flow"/>
<button string="Refund" name="refund_sheet" states="confirm,done" type='object' class="oe_form_button_return_flow"/>
<button string="Set to Draft" name="draft" states="cancel"/>
<button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
<button string="Compute Sheet" name="compute_sheet" type="object" states="draft" class="oe_form_button_active_flow"/>
<button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
@@ -721,9 +721,9 @@
<field name="arch" type="xml">
<form string="Payslips Batches" version="7.0">
<header>
<button name="close_payslip_run" type="object" string="Close" states="draft"/>
<button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
<button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
<button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_form_button_active_flow"/>
<button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_form_button_active_flow"/>
<button string="Set to Draft" name="draft_payslip_run" type="object" states="close" class="oe_form_button_return_flow"/>
<field name="state" widget="statusbar"/>
</header>
<sheet>
addons/hr_recruitment/hr_recruitment_view.xml
+4 -4
View File
@@ -73,15 +73,15 @@
<form string="Jobs - Recruitment Form" version="7.0">
<header>
<button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
states="open,pending"/>
states="open,pending" class="oe_form_button_active_flow"/>
<button name="case_open" string="Open" type="object"
states="draft,pending"/>
states="draft,pending" class="oe_form_button_active_flow"/>
<button name="case_pending" string="Pending" type="object"
states="open"/>
<button name="case_reset" string="Reset to New" type="object"
states="done,cancel"/>
states="done,cancel" class="oe_form_button_return_flow"/>
<button name="case_cancel" string="Refuse" type="object"
states="draft,open,pending"/>
states="draft,open,pending" class="oe_form_button_active_flow"/>
<button name="stage_previous" string="Previous" type="object"
states="open" icon="gtk-go-back"/>
<button name="stage_next" string="Next" type="object"
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+4 -4
View File
@@ -64,10 +64,10 @@
<field name="arch" type="xml">
<form string="Timesheet" version="7.0">
<header>
<button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
<button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
<button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
<button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_form_button_active_flow"/>
<button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
<button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
<field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
</header>
<sheet>
addons/point_of_sale/point_of_sale_view.xml
+4 -4
View File
@@ -18,12 +18,12 @@
<field name="arch" type="xml">
<form string="PoS Orders" version="7.0">
<header>
<button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
<button name="%(action_pos_payment)d" string="Payment" type="action" states="draft" class="oe_form_button_active_flow"/>
<button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
<button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
<button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
<button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}" class="oe_form_button_active_flow"/>
<button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid" class="oe_form_button_active_flow"/>
<button name="refund" string="Return Products" type="object"
attrs="{'invisible':[('state','=','draft')]}"/>
attrs="{'invisible':[('state','=','draft')]}" class="oe_form_button_return_flow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
</header>
<sheet>