[FIX] conflicts incorrectly resolved when merging upstream/7.0

This commit is contained in:
Laurent Mignon (aka lmi)
2014-08-06 16:20:11 +02:00
parent 410c8c47b3
commit aed71450ef

View File

@@ -118,4 +118,3 @@ class base_completion(common.TransactionCase):
self.partner_id, statement_line.partner_id['id'],
"Partner id should be empty after completion(partner_name: "
"%s, line_name: %s)" % (case.partner_name, case.line_label))