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

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

bzr revid: tpa@tinyerp.com-20120618055818-tlbunel4wz4z6soj
This commit is contained in:
Turkesh Patel (Open ERP) 2012-06-18 11:28:18 +05:30
parent 5ab63d8bb3
commit 90b807e407
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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" versio="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">