openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #03220
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-720623-ara into lp:openobject-addons
Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-720623-ara into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#720623 [PS] HR - Format of the quantity field is not the same for timesheet lines of My current Timesheet and for working hours
https://bugs.launchpad.net/bugs/720623
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-720623-ara/+merge/50327
Hello,
fixed the bug: HR - Format of the quantity field is not the same for timesheet lines of My current Timesheet and for working hours
https://bugs.launchpad.net/openobject-addons/+bug/720623
Thanks,
ara
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-720623-ara/+merge/50327
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-720623-ara.
=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml 2011-01-14 00:11:01 +0000
+++ hr_timesheet/hr_timesheet_view.xml 2011-02-18 13:07:53 +0000
@@ -14,7 +14,7 @@
<field name="name"/>
<field domain="[('type','=','normal')]" name="account_id"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
- <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time"/>
+ <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
<field name="amount" sum="Total cost" invisible="1"/>
<field name="general_account_id" invisible="1"/>
@@ -38,7 +38,7 @@
<separator string="Product" colspan="2"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
- <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
+ <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
</group>
<group colspan="2" col="2">
<separator string="Accounting" colspan="2"/>
Follow ups