pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] resource, misc: time_efficiency on 100 scale

Browse Source
This commit is contained in:
Josse Colpaert
2016-07-04 16:22:35 +02:00
committed by Thibault Delavallée
parent abf967b9ad
commit ba7274dc01
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll_demo.xml
+1 -1
View File
@@ -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>
addons/mrp/mrp.py
+1 -1
View File
@@ -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):
addons/mrp/mrp_demo.xml
+1 -1
View File
@@ -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"/>
addons/product_extended/product_extended.py
+1 -1
View File
@@ -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)
addons/resource/resource.py
+1 -1
View File
@@ -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)
}
addons/resource/resource_demo.xml
+3 -3
View File
@@ -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"/>