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

[MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-hr-tpa 

bzr revid: jam@tinyerp.com-20120619085748-75frnq0xa40oa1pl
This commit is contained in:
Jigar Amin - OpenERP 2012-06-19 14:27:48 +05:30
parent 6ec1de1314 f60af5667a
commit 52af3a08aa
20 changed files with 95 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr/res_config_view.xml
View File

@ -16,8 +16,7 @@
<field name="arch" type="xml">
<form string="Configure Human Resources" 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 col="4">

3
addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
View File

@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Print Attendance Report Monthly" version="7.0">
<header>
<button name="print_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="month"/>

9
addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
View File

@ -6,13 +6,12 @@
<field name="model">hr.attendance.week</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Print Attendance Report Weekly">
<form string="Print Attendance Report Weekly" version="7.0">
<header>
<button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<field name="init_date"/>
<field name="end_date"/>
<newline/>
<separator colspan="4"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" type="object" icon="gtk-print"/>
</form>
</field>
</record>

3
addons/hr_attendance/wizard/hr_attendance_error_view.xml
View File

@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Print Attendance Report Error" version="7.0">
<header>
<button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
<button special="cancel" string="Cancel" icon='gtk-cancel' colspan="2"/>
<button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<group string="Analysis Information" col="4">
<field name="init_date"/>

37
addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
View File

@ -6,7 +6,11 @@
<field name="model">hr.sign.in.out</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign in / Sign out">
<form string="Sign in / Sign out" version="7.0">
<header>
<button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_form_button_active_flow"/>
<button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_form_button_active_flow"/>
</header>
<separator colspan="4" string="Sign in / Sign out"/>
<label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
<newline/>
@ -14,12 +18,6 @@
<field name="name" />
<field name="state" />
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object"/>
<button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object"/>
</group>
</form>
</field>
</record>
@ -29,11 +27,8 @@
<field name="model">hr.sign.in.out</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign in / Sign out">
<form string="Sign in / Sign out" version="7.0">
<separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Ok"/>
</group>
</form>
</field>
</record>
@ -56,17 +51,15 @@
<field name="model">hr.sign.in.out.ask</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="hr.sign.out.ask">
<form string="hr.sign.out.ask" version="7.0">
<header>
<button icon="gtk-go-back" string="Sign in" name="sign_in" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4" >
<separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
<field name="name" />
<field name="last_time" string="Your last sign out" />
</group>
<separator colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
</group>
</form>
</field>
</record>
@ -76,17 +69,15 @@
<field name="model">hr.sign.in.out.ask</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="hr.sign.in.out.ask">
<form string="hr.sign.in.out.ask" version="7.0">
<header>
<button icon="gtk-go-back" string="Sign out" name="sign_out" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4" >
<separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
<field name="name" />
<field name="last_time" string="Your last sign in" />
</group>
<separator colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
</group>
</form>
</field>
</record>

3
addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
View File

@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Evaluation Reminders" version="7.0">
<header>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group string="Send Evaluation Reminder">
<field name="evaluation_id"/>

3
addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
View File

@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Leaves by Department" version="7.0">
<header>
<button icon="gtk-print" name="print_report" string="Print" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-print" name="print_report" string="Print" type="object" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="date_from" />

10
addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
View File

@ -7,7 +7,10 @@
<field name="model">hr.holidays.summary.employee</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leaves Summary">
<form string="Leaves Summary" version="7.0">
<header>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<group col="4" colspan="6">
<field name="date_from"/>
<newline/>
@ -15,11 +18,6 @@
<newline/>
<field name="emp" invisible="True"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
</group>
</form>
</field>
</record>

10
addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
View File

@ -7,17 +7,15 @@
<field name="model">payslip.lines.contribution.register</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Contribution Register's Payslip Lines">
<form string="Contribution Register's Payslip Lines" version="7.0">
<header>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<group col="4" colspan="6">
<field name="date_from"/>
<newline/>
<field name="date_to"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
</group>
</form>
</field>
</record>

11
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
View File

@ -7,19 +7,16 @@
<field name="model">hr.payslip.employees</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Payslips by Employees">
<form string="Payslips by Employees" version="7.0">
<header>
<button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_form_button_active_flow"/>
</header>
<label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
<group colspan="4" >
<separator string="Employees" colspan="4"/>
<newline/>
<field name="employee_ids" nolabel="1"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Generate" name="compute_sheet" type="object"/>
</group>
</form>
</field>
</record>

12
addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
View File

@ -7,14 +7,12 @@
<field name="model">hr.recruitment.partner.create</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Partner">
<form string="Convert To Partner" version="7.0">
<header>
<button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager" class="oe_form_button_active_flow"/>
</header>
<group col="4" colspan="6">
<label string="Are you sure you want to create a contact based on this job request ?"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
<label string="Are you sure you want to create a contact based on this job request ?"/>
</group>
</form>
</field>

13
addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
View File

@ -7,13 +7,12 @@
<field name="model">hired.employee</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create New Employee">
<label string="Would you like to create an employee ?" colspan="4" />
<separator string="" colspan="4"/>
<newline />
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="case_close" string="No" icon='gtk-no' type="object"/>
<button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test"/>
<form string="Create New Employee" version="7.0">
<header>
<button name="case_close" string="No" icon='gtk-no' type="object" class="oe_form_button_active_flow"/>
<button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
</header>
<label string="Would you like to create an employee ?" colspan="4" />
</form>
</field>
</record>

10
addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
View File

@ -7,7 +7,10 @@
<field name="model">hr.recruitment.job2phonecall</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Schedule Phone Call">
<form string="Schedule Phone Call" version="7.0">
<header>
<button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
</header>
<group col="4" colspan="6">
<separator string="Phone Call Description" colspan="4" />
<newline />
@ -18,11 +21,6 @@
<newline />
<field name='category_id' domain="[('object_id.model', '=', 'crm.phonecall')]"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute"/>
</group>
</form>
</field>
</record>

20
addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
View File

@ -8,17 +8,15 @@
<field name="model">hr.analytical.timesheet.employee</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Monthly Employee Timesheet">
<form string="Monthly Employee Timesheet" version="7.0">
<header>
<button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4">
<field name="month"/>
<field name="year"/>
<field name="employee_id" colspan="3"/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-print" string="Print" name="print_report" type="object"/>
</group>
</form>
</field>
</record>
@ -44,17 +42,15 @@
<field name="model">hr.analytical.timesheet.employee</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Print My Timesheet">
<form string="Print My Timesheet" version="7.0">
<header>
<button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4">
<separator string="This wizard will print monthly timesheet" colspan="4"/>
<field name="month"/>
<field name="year"/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-print" string="Print" name="print_report" type="object"/>
</group>
</form>
</field>
</record>

10
addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
View File

@ -8,7 +8,10 @@
<field name="model">hr.analytical.timesheet.users</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Monthly Employees Timesheet">
<form string="Monthly Employees Timesheet" version="7.0">
<header>
<button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
</header>
<group height="260" width="460">
<group colspan="4">
<field name="month"/>
@ -16,11 +19,6 @@
<separator string="Employees" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
<separator colspan="4"/>
<group colspan="4">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-print" string="Print" name="print_report" type="object"/>
</group>
</group>
</form>
</field>

32
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
View File

@ -6,14 +6,12 @@
<field name="model">hr.sign.in.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out by Project">
<form string="Sign In/Out by Project" version="7.0">
<header>
<button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_form_button_active_flow"/>
</header>
<separator colspan="4" string="Sign In/Out by Project"/>
<label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
<newline/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object"/>
</group>
</form>
</field>
</record>
@ -23,7 +21,10 @@
<field name="model">hr.sign.in.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out by Project">
<form string="Sign In/Out by Project" version="7.0">
<header>
<button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4" >
<separator string="Sign in" colspan="4"/>
<field name="name" readonly="True" />
@ -33,10 +34,6 @@
<field name="date"/>
<label string="(Keep empty for current time)" colspan="2"/>
</group>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object"/>
</group>
</form>
</field>
</record>
@ -56,7 +53,11 @@
<field name="model">hr.sign.out.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out by Project">
<form string="Sign In/Out by Project" version="7.0">
<header>
<button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object" class="oe_form_button_active_flow"/>
<button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_form_button_active_flow"/>
</header>
<group colspan="4" >
<separator string="General Information" colspan="4" />
<field name="name" readonly="True" />
@ -70,12 +71,7 @@
<label string="(Keep empty for current_time)" colspan="2"/>
<field name="analytic_amount"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
<button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object"/>
</group>
</form>
</field>
</record>

28
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
View File

@ -7,23 +7,21 @@
<field name="model">hr.timesheet.analytic.profit</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet Profit">
<group height="420" width="370">
<group col="4" colspan="4">
<field name="date_from"/>
<field name="date_to"/>
<form string="Timesheet Profit" version="7.0">
<header>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
<group height="420" width="370">
<group col="4" colspan="4">
<field name="date_from"/>
<field name="date_to"/>
<separator string="Journals" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<separator string="Users" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
</group>
</group>
</form>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
</group>
</form>
</field>
</record>

10
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
View File

@ -26,7 +26,10 @@
<field name="model">hr.timesheet.invoice.create.final</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invoice contract">
<form string="Invoice contract" version="7.0">
<header>
<button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
</header>
<group col="4" colspan="6">
<separator string="Do you want to display work details on the invoice?" colspan="4"/>
<field name="date"/>
@ -36,11 +39,6 @@
<separator string="Force to use a special product" colspan="4"/>
<field name="product"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
</group>
</form>
</field>
</record>

3
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
View File

@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Create Invoice" version="7.0">
<header>
<button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
</header>
<notebook>
<page string="Billing Data">

3
addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
View File

@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="My Current Timesheet" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
<button icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_form_button_active_flow"/>
</header>
<separator string="It will open your current timesheet"/>
</form>