[IMP]improve view and add field in hr_timesheet_invoice
bzr revid: sgo@tinyerp.com-20120606070651-ol42dl8d6o5lqlsl
This commit is contained in:
parent
812cdd10c0
commit
48cf6955a7
|
@ -50,7 +50,7 @@
|
|||
<field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
|
||||
</group>
|
||||
</xpath>
|
||||
<xpath expr='//separator[@name="description"]' position='before'>
|
||||
<xpath expr='//group[@name="toinvoice"]' position='before'>
|
||||
<separator colspan="4" string="Invoicing" name="invoicing"/>
|
||||
<group col="1" colspan="4">
|
||||
<table border="0">
|
||||
|
@ -108,10 +108,6 @@
|
|||
</tr>
|
||||
</table>
|
||||
</group>
|
||||
<group colspan="4" class="oe_form_group_label_border">
|
||||
<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
|
||||
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
<group colspan="2" col="2" name="project" class="oe_form_group_label_border">
|
||||
<separator colspan="2" string="Project" name="project_sep" invisible="1"/>
|
||||
</group>
|
||||
<group name="toinvoice" invisible="1"></group>
|
||||
<separator string="Terms and Condition" colspan="4" name="description"/>
|
||||
<field colspan="4" name="description" nolabel="1"/>
|
||||
</page>
|
||||
|
|
|
@ -7,6 +7,12 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr='//group[@name="toinvoice"]' position='replace'>
|
||||
<group colspan="4" class="oe_form_group_label_border" name="to_invoice">
|
||||
<field name="pricelist_id" />
|
||||
<field name="to_invoice" widget="selection" />
|
||||
</group>
|
||||
</xpath>
|
||||
<xpath expr="/form/sheet" position='before'>
|
||||
<div class="oe_form_topbar">
|
||||
<button name="set_pending" string="Pending" type="object" states="open"/>
|
||||
|
|
Loading…
Reference in New Issue