Compare commits
No commits in common. "57459cc7dc2b53f343b955a0209afa2830d33a1f" and "5711791a1fefe4c9cb1382fbdb32f8235324c23b" have entirely different histories.
57459cc7dc
...
5711791a1f
|
|
@ -1197,8 +1197,8 @@ class HandoverSerializer(CustomModelSerializer):
|
||||||
attrs['type'] = Handover.H_NORMAL
|
attrs['type'] = Handover.H_NORMAL
|
||||||
|
|
||||||
mtype = attrs["mtype"]
|
mtype = attrs["mtype"]
|
||||||
new_state = None
|
|
||||||
if mtype == Handover.H_MERGE:
|
if mtype == Handover.H_MERGE:
|
||||||
|
new_state = None
|
||||||
new_wm:WMaterial = attrs.get("new_wm", None)
|
new_wm:WMaterial = attrs.get("new_wm", None)
|
||||||
if new_wm:
|
if new_wm:
|
||||||
attrs['new_batch'] = new_wm.batch
|
attrs['new_batch'] = new_wm.batch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue