diff options
| -rw-r--r-- | addons/hr_payroll/hr_payroll_demo.xml | 2 | ||||
| -rw-r--r-- | addons/mrp/mrp.py | 2 | ||||
| -rw-r--r-- | addons/mrp/mrp_demo.xml | 2 | ||||
| -rw-r--r-- | addons/product_extended/product_extended.py | 2 | ||||
| -rw-r--r-- | addons/resource/resource.py | 2 | ||||
| -rw-r--r-- | addons/resource/resource_demo.xml | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml index 2a180a0e5a4..868d31632d6 100644 --- a/addons/hr_payroll/hr_payroll_demo.xml +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -128,7 +128,7 @@ <record id="hr_employee_payroll" model="hr.employee"> <field eval="0" name="manager"/> - <field eval="1.0" name="time_efficiency"/> + <field eval="100" name="time_efficiency"/> <field name="company_id" ref="base.main_company"/> <field eval="1" name="active"/> <field name="name">Roger Scott</field> diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 6609c19d4ea..5173746c195 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -258,7 +258,7 @@ class mrp_bom(osv.osv): 'workcenter_id': wc.id, 'sequence': level + (wc_use.sequence or 0), 'cycle': cycle, - 'hour': float(wc_use.hour_nbr * mult + ((wc.time_start or 0.0) + (wc.time_stop or 0.0) + cycle * (wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)), + 'hour': float(wc_use.hour_nbr * mult + ((wc.time_start or 0.0) + (wc.time_stop or 0.0) + cycle * (wc.time_cycle or 0.0)) * (wc.time_efficiency or 100)), } def _prepare_consume_line(self, cr, uid, bom_line_id, quantity, context=None): diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml index f07417b2c1c..589adf81019 100644 --- a/addons/mrp/mrp_demo.xml +++ b/addons/mrp/mrp_demo.xml @@ -41,7 +41,7 @@ <field name="time_cycle">1</field> <field name="time_start">0.1</field> <field name="time_stop">0.1</field> - <field name="time_efficiency">0.87</field> + <field name="time_efficiency">87</field> <field name="product_id" ref="product.product_assembly"/> <field name="costs_hour">0.1</field> <field name="costs_hour_account_id" ref="account_assembly_hours"/> diff --git a/addons/product_extended/product_extended.py b/addons/product_extended/product_extended.py index f652d7bc7a8..369a9e6a8af 100644 --- a/addons/product_extended/product_extended.py +++ b/addons/product_extended/product_extended.py @@ -65,7 +65,7 @@ class product_template(osv.osv): for wline in bom.routing_id.workcenter_lines: wc = wline.workcenter_id cycle = wline.cycle_nbr - hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) * (wc.time_efficiency or 1.0) + hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) * (wc.time_efficiency or 100) price += wc.costs_cycle * cycle + wc.costs_hour * hour price = self.pool.get('product.uom')._compute_price(cr,uid,bom.product_uom.id, price, bom.product_id.uom_id.id) diff --git a/addons/resource/resource.py b/addons/resource/resource.py index a604764fcfb..880f148d2c0 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -675,7 +675,7 @@ class resource_resource(osv.osv): _defaults = { 'resource_type' : 'user', - 'time_efficiency' : 1, + 'time_efficiency' : 100, 'active' : True, 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', context=context) } diff --git a/addons/resource/resource_demo.xml b/addons/resource/resource_demo.xml index e1c03f87ef1..509e57ca262 100644 --- a/addons/resource/resource_demo.xml +++ b/addons/resource/resource_demo.xml @@ -80,7 +80,7 @@ </record> <record id="resource_analyst" model="resource.resource"> - <field eval="1.0" name="time_efficiency"/> + <field eval="100" name="time_efficiency"/> <field name="user_id" ref="base.user_root"/> <field name="name">Analyst</field> <field eval="1" name="active"/> @@ -89,7 +89,7 @@ </record> <record id="resource_designer" model="resource.resource"> - <field eval="1.0" name="time_efficiency"/> + <field eval="100" name="time_efficiency"/> <field name="user_id" ref="base.user_demo"/> <field name="name">Designer</field> <field eval="1" name="active"/> @@ -98,7 +98,7 @@ </record> <record id="resource_developer" model="resource.resource"> - <field eval="1.0" name="time_efficiency"/> + <field eval="100" name="time_efficiency"/> <field name="user_id" ref="base.user_demo"/> <field name="name">Developer</field> <field eval="1" name="active"/> |