Merge lp:~dorian-kemps/unifield-server/US-6833 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5587
Proposed branch: lp:~dorian-kemps/unifield-server/US-6833
Merge into: lp:unifield-server
Diff against target: 13 lines (+3/-0)
1 file modified
bin/addons/msf_tools/msf_tools.py (+3/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6833
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+378098@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py 2019-09-10 08:41:23 +0000
+++ bin/addons/msf_tools/msf_tools.py 2020-01-27 10:41:30 +0000
@@ -1094,6 +1094,9 @@
1094 if not nb_lines:1094 if not nb_lines:
1095 raise osv.except_osv(_('Warning'), _('No line to process'))1095 raise osv.except_osv(_('Warning'), _('No line to process'))
10961096
1097 if self.search(cr, 1, [('state', '=', 'in-progress')]):
1098 return True
1099
1097 object_id = src_ids[0]1100 object_id = src_ids[0]
1098 if main_object_id:1101 if main_object_id:
1099 object_id = main_object_id1102 object_id = main_object_id

Subscribers

People subscribed via source and target branches