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

[IMP] hr_timesheet : Improvement in working hours view 

bzr revid: vir@tinyerp.com-20100917133824-x8cwpc4dbu2atidj
This commit is contained in:
Vir (Open ERP) 2010-09-17 19:08:24 +05:30
parent aaea54012a
commit d6ece1013d
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -31,17 +31,31 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet Lines">
<field colspan="4" name="name"/>
<group colspan="4" col="6">
<field name="name"/>
<field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
<field name="date" select="1" on_change="on_change_date(date)"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<newline/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
<field name="amount"/>
<field name="general_account_id"/>
<field name="journal_id"/>
</group>
<notebook colspan="4">
<page string="Information">
<group colspan="2" col="2">
<separator string="Product" colspan="2"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
</group>
<group colspan="2" col="2">
<separator string="Accounting" colspan="2"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
<field name="amount"/>
<field name="general_account_id"/>
<field name="journal_id"/>
</group>
<group colspan="2" col="2">
<separator string="Invoicing" colspan="2"/>
</group>
</page>
</notebook>
</form>
</field>
</record>

6
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -21,18 +21,16 @@
</field>
</record>
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<field name="journal_id" position="after">
<xpath expr='//separator[@string="Invoicing"]' position='after'>
<field name="to_invoice"/>
<field name="invoice_id"/>
</field>
</xpath>
</field>
</record>