mirror of
https://github.com/NaN-tic/trytond-party_merge.git
synced 2023-12-14 03:13:02 +01:00
Fix merge_parties RPC params and improve wizard OK button
This commit is contained in:
parent
54f36d587f
commit
224b264348
|
@ -1,4 +1,4 @@
|
||||||
#
|
#
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr "Content-Type: text/plain; charset=utf-8\n"
|
msgstr "Content-Type: text/plain; charset=utf-8\n"
|
||||||
|
|
||||||
|
@ -36,4 +36,4 @@ msgstr "Cancel·lar"
|
||||||
|
|
||||||
msgctxt "wizard_button:party.party.merge,merge,result:"
|
msgctxt "wizard_button:party.party.merge,merge,result:"
|
||||||
msgid "OK"
|
msgid "OK"
|
||||||
msgstr "Crear"
|
msgstr "Aceptar"
|
||||||
|
|
13
party.py
13
party.py
|
@ -61,7 +61,6 @@ class MergeMixin:
|
||||||
where=(sql_field == self.id)
|
where=(sql_field == self.id)
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
# Validate all related records and target.
|
# Validate all related records and target.
|
||||||
# Do it at the very end because we may # temporarily leave
|
# Do it at the very end because we may # temporarily leave
|
||||||
# information inconsistent in the previous loop
|
# information inconsistent in the previous loop
|
||||||
|
@ -82,10 +81,6 @@ class MergeMixin:
|
||||||
|
|
||||||
self.validate([target])
|
self.validate([target])
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def merge_parties(cls, party, target):
|
|
||||||
party.merge_into(target)
|
|
||||||
|
|
||||||
|
|
||||||
class Party(MergeMixin):
|
class Party(MergeMixin):
|
||||||
__name__ = 'party.party'
|
__name__ = 'party.party'
|
||||||
|
@ -98,9 +93,13 @@ class Party(MergeMixin):
|
||||||
def __setup__(cls):
|
def __setup__(cls):
|
||||||
super(Party, cls).__setup__()
|
super(Party, cls).__setup__()
|
||||||
cls.__rpc__.update({
|
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):
|
class PartyMergeView(ModelView):
|
||||||
'Party Merge'
|
'Party Merge'
|
||||||
|
@ -120,7 +119,7 @@ class PartyMerge(Wizard):
|
||||||
'party.party.merge.view',
|
'party.party.merge.view',
|
||||||
'party_merge.party_merge_view', [
|
'party_merge.party_merge_view', [
|
||||||
Button('Cancel', 'end', 'tryton-cancel'),
|
Button('Cancel', 'end', 'tryton-cancel'),
|
||||||
Button('OK', 'result', 'tryton-ok'),
|
Button('OK', 'result', 'tryton-ok', default=True),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
result = StateTransition()
|
result = StateTransition()
|
||||||
|
|
Loading…
Reference in a new issue