diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-06-14 16:15:34 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-06-14 16:15:34 +0530 |
| commit | 787e2c7e01816c6a91e46855bc18bfad57ee987c (patch) | |
| tree | e8c0ff5bb7dd8c7498ea7812c426985e78bb2569 /addons/analytic_contract_project/analytic_contract_project_view.xml | |
| parent | 56ffb32517c4041ddc46b4762aac83687c3591c2 (diff) | |
| parent | f0a595b0628e9ade4b9dffc27c5c96beb390beea (diff) | |
[MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120614101024-ppna6h442m50f3no
bzr revid: sgo@tinyerp.com-20120614104534-25j88fdzquc5qdrg
Diffstat (limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')
| -rw-r--r-- | addons/analytic_contract_project/analytic_contract_project_view.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml index 06b5a66f107..fff5e002f0f 100644 --- a/addons/analytic_contract_project/analytic_contract_project_view.xml +++ b/addons/analytic_contract_project/analytic_contract_project_view.xml @@ -57,7 +57,7 @@ <group colspan="4" col="6" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"> <field class="oe_float_field" name="hours_qtt_est" nolabel="1" /> <field class="oe_float_field" name="hours_qtt_invoiced" nolabel="1"/> - <field class="oe_float_field" name="remaining_hours" nolabel="1" /> + <field class="oe_float_field" name="remaining_hours_to_invoice" nolabel="1" /> <field class="oe_float_field" name="hours_qtt_non_invoiced" nolabel="1" /> <div><button class="oe_btn_width_small" icon="terp-go-week" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" /></div> <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div> |