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

[IMP] hr_payroll: remove cancel button from wizard and improved view. 

bzr revid: tpa@tinyerp.com-20120618052955-rizzewqljm3sxbon
This commit is contained in:
Turkesh Patel (Open ERP) 2012-06-18 10:59:55 +05:30
parent 86d52c4e73
commit f971e2c3c1
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>