Merge remote-tracking branch 'odoo/11.0' into 11.0

OCA · Sep 27, 2019 · 22f88dd · 22f88dd
2 parents a97874b + 9d3a73f
commit 22f88dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/addons/mrp/models/mrp_routing.py b/addons/mrp/models/mrp_routing.py
@@ -87,7 +87,7 @@ def _compute_time_cycle(self):
                 limit=operation.time_mode_batch)
             count_data = dict((item['operation_id'][0], (item['duration'], item['qty_produced'])) for item in data)
             if count_data.get(operation.id) and count_data[operation.id][1]:
-                operation.time_cycle = count_data[operation.id][0] / count_data[operation.id][1]
+                operation.time_cycle = (count_data[operation.id][0] / count_data[operation.id][1]) * (operation.workcenter_id.capacity or 1.0)
             else:
                 operation.time_cycle = operation.time_cycle_manual
 

diff --git a/addons/payment_ogone/views/payment_views.xml b/addons/payment_ogone/views/payment_views.xml
@@ -15,7 +15,7 @@
                         <field name="ogone_shakey_in"/>
                         <field name="ogone_shakey_out"/>
                         <field name="ogone_alias_usage"/>
-                        <a colspan="2" href="http://payment-services.ingenico.com/int/en/ogone/support/guides/user%20guides/test-account-creation" target="_blank">How to configure your Ogone account?</a>
+                        <a colspan="2" href="https://payment-services.ingenico.com/int/en/ogone/support/guides/user%20guides/use-your-account" target="_blank">How to use your Ingenico ePayments account?</a>
                     </group>
                 </xpath>
             </field>