diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py index 09ccc5ddd92..597f1bdc5f4 100644 --- a/addons/purchase/wizard/wizard_group.py +++ b/addons/purchase/wizard/wizard_group.py @@ -40,7 +40,7 @@ merge_form = """ - lines will only be merged if: * they are exactly the same except for the quantity and unit -""" +""" merge_fields = { } @@ -53,10 +53,10 @@ ack_form = """ ack_fields = {} -def _mergeOrders(self, cr, uid, data, context): +def _merge_orders(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) order_obj = pool.get('purchase.order') - mod_obj = pool.get('ir.model.data') + mod_obj = pool.get('ir.model.data') result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter') id = mod_obj.read(cr, uid, result, ['res_id']) diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 452d948668f..1aa12e0f2c9 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -222,9 +222,8 @@ src_model="wiki.wiki"/>