[FIX] incorrect method name + duplicate domain attribute in wiki

bzr revid: hda@tinyerp.com-20090925125056-qnv83x3vv9upfupr

addons/purchase/wizard/wizard_group.py

@@ -40,7 +40,7 @@ merge_form = """<?xml version="1.0"?>
       - lines will only be merged if:
         * they are exactly the same except for the quantity and unit</label>
 </form>
-""" 
+"""
 
 merge_fields = {
 }
@@ -53,10 +53,10 @@ ack_form = """<?xml version="1.0"?>
 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'])
 

addons/wiki/wiki_view.xml

@@ -222,9 +222,8 @@
             src_model="wiki.wiki"/>
 
         <act_window domain="[('group_id', '=', active_id)]"
-            domain="[('group_id', 'child_of', active_ids)]"
             id="act_wiki_group_open"
-            name="Search a Pages"
+            name="Search Page"
             res_model="wiki.wiki"
             src_model="wiki.groups"/>