From 224b264348cd69a36a179b02276f44e8d45ebe13 Mon Sep 17 00:00:00 2001
From: Guillem Barba <guillem@nan-tic.com>
Date: Thu, 5 May 2016 13:01:20 +0200
Subject: [PATCH] Fix merge_parties RPC params and improve wizard OK button

---
 locale/es_ES.po |  4 ++--
 party.py        | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/locale/es_ES.po b/locale/es_ES.po
index 6219131..e6094ef 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -36,4 +36,4 @@ msgstr "Cancel·lar"
 
 msgctxt "wizard_button:party.party.merge,merge,result:"
 msgid "OK"
-msgstr "Crear"
+msgstr "Aceptar"
diff --git a/party.py b/party.py
index 39aa757..e10bfa9 100644
--- a/party.py
+++ b/party.py
@@ -61,7 +61,6 @@ class MergeMixin:
                     where=(sql_field == self.id)
                     ))
 
-
         # Validate all related records and target.
         # Do it at the very end because we may # temporarily leave
         # information inconsistent in the previous loop
@@ -82,10 +81,6 @@ class MergeMixin:
 
         self.validate([target])
 
-    @classmethod
-    def merge_parties(cls, party, target):
-        party.merge_into(target)
-
 
 class Party(MergeMixin):
     __name__ = 'party.party'
@@ -98,9 +93,13 @@ class Party(MergeMixin):
     def __setup__(cls):
         super(Party, cls).__setup__()
         cls.__rpc__.update({
-                'merge_parties': RPC(instantiate=0),
+                'merge_parties': RPC(readonly=False, instantiate=slice(0, 2)),
                 })
 
+    @classmethod
+    def merge_parties(cls, party, target):
+        party.merge_into(target)
+
 
 class PartyMergeView(ModelView):
     'Party Merge'
@@ -120,7 +119,7 @@ class PartyMerge(Wizard):
         'party.party.merge.view',
         'party_merge.party_merge_view', [
             Button('Cancel', 'end', 'tryton-cancel'),
-            Button('OK', 'result', 'tryton-ok'),
+            Button('OK', 'result', 'tryton-ok', default=True),
             ]
         )
     result = StateTransition()