diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py index 525fded870f..a87ba6047e2 100644 --- a/addons/account/wizard/wizard_pay_invoice.py +++ b/addons/account/wizard/wizard_pay_invoice.py @@ -90,7 +90,7 @@ def _wo_check(self, cr, uid, data, context): _transaction_add_form = '''
- + ''' diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index dc9553e96e6..6ae89fdc2ac 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -274,7 +274,7 @@ Auto Configure Directory - This wizard will be configure directory for ressource model. + This wizard will configure the URL of the server of the document management system. diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index e6bb1dc66c9..be31827a2d9 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -283,13 +283,14 @@ class mrp_bom(osv.osv): for wc_use in bom.routing_id.workcenter_lines: wc = wc_use.workcenter_id d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle) - cycle = (d + (m and 1.0 or 0.0)) * wc_use.cycle_nbr + mult = (d + (m and 1.0 or 0.0)) + cycle = mult * wc_use.cycle_nbr result2.append({ 'name': bom.routing_id.name, 'workcenter_id': wc.id, 'sequence': level+(wc_use.sequence or 0), 'cycle': cycle, - 'hour': float(wc_use.hour_nbr + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)), + 'hour': float(wc_use.hour_nbr*mult + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)), }) for bom2 in bom.bom_lines: res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)