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

[IMP]:improved view for charge expenses 

bzr revid: apa@tinyerp.com-20120618122930-9j53nfnc2n7vmmrw
This commit is contained in:
Amit Patel (OpenERP) 2012-06-18 17:59:30 +05:30
parent e7eefa1884
commit a1467226e9
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -80,7 +80,7 @@
<button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
<button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
</td>
</tr><tr>
</tr><tr name='total'>
<th>
<label string="Total"/>
</th><td>

31
addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
View File

@ -5,19 +5,28 @@
<field name="name">account.analytic.account.form.expense.inherit</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
<field eval="20" name="priority"/>
<field name="arch" type="xml">
<xpath expr='//div[@name="total"]' position='before'>
<field class="oe_field_label" name="charge_expenses"/>
<group colspan="4" col="6" attrs="{'invisible': [('charge_expenses','=',False)]}">
<field class="oe_float_field" name="est_expenses" nolabel="1" />
<field class="oe_float_field" name="expense_invoiced" nolabel="1"/>
<field class="oe_float_field" name="remaining_expense" nolabel="1" />
<field class="oe_float_field" name="expense_to_invoice" nolabel="1" />
<div><button class="oe_btn_width_small" icon="gtk-select-all" name="open_hr_expense" string="Expenses" type="object" /></div>
<div><button class="oe_btn_width" icon="terp-dolar" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object"/></div>
</group>
<xpath expr='//tr[@name="total"]' position='before'>
<tr>
<td>
<label for="charge_expenses"/>
</td><td>
<field name="charge_expenses"/>
</td><td>
<field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
</td><td>
<field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
</td><td>
<field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
</td><td>
<field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
</td><td>
<button name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
<button name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
</td>
</tr>
</xpath>
</field>
</record>