← Back to team overview

openerp-community team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-1135346-jitendra into lp:openobject-addons

 

Jitendra Prajapati(OpenERP Trainee) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-1135346-jitendra into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1135346 in OpenERP Addons: "[trunk/7.0] No UoM in Timesheet Activity list view."
  https://bugs.launchpad.net/openobject-addons/+bug/1135346

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1135346-jitendra/+merge/151733

Hello,

  Show uom in Timesheet Activity list view.

Thanks,
Jitendra.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1135346-jitendra/+merge/151733
Your team OpenERP Community is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-1135346-jitendra.
=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml	2012-12-14 11:14:32 +0000
+++ hr_timesheet/hr_timesheet_view.xml	2013-03-05 11:26:25 +0000
@@ -12,7 +12,7 @@
                     <field name="name"/>
                     <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="unit_amount" string="Duration" 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="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>


Follow ups