[MERGE] forward port branch 10.0 up to d59fe9c58c

2018-03-06 14:18:10 +01:00
parent ac89023155 d59fe9c58c
commit 5ddb3fdb0e
1 changed files with 2 additions and 0 deletions
@@ -35,5 +35,7 @@ class ResCountry(models.Model):
                    states = res
                    break
                states |= carrier.state_ids
+            if not states:
+                states = states.search([('country_id', '=', self.id)])
            res = res & states
        return res