Merge 52b5346 into 1d2709c

OCA · May 25, 2016 · dda5a78 · dda5a78
2 parents 1d2709c + 52b5346
commit dda5a78
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 288 deletions.
diff --git a/l10n_br_crm_zip_correios/README.md b/l10n_br_crm_zip_correios/README.md
diff --git a/l10n_br_crm_zip_correios/README.rst b/l10n_br_crm_zip_correios/README.rst
diff --git a/l10n_br_crm_zip_correios/__init__.py b/l10n_br_crm_zip_correios/__init__.py
diff --git a/l10n_br_crm_zip_correios/__openerp__.py b/l10n_br_crm_zip_correios/__openerp__.py
diff --git a/l10n_br_crm_zip_correios/models/__init__.py b/l10n_br_crm_zip_correios/models/__init__.py
diff --git a/l10n_br_crm_zip_correios/models/crm_lead.py b/l10n_br_crm_zip_correios/models/crm_lead.py
diff --git a/l10n_br_crm_zip_correios/test/crm_zip.yml b/l10n_br_crm_zip_correios/test/crm_zip.yml
diff --git a/l10n_br_zip_correios/models/__init__.py b/l10n_br_zip_correios/models/__init__.py
@@ -20,6 +20,5 @@
 #
 ##############################################################################
 
-from . import res_company
-from . import res_partner
 from . import webservice_client
+from . import l10n_br_zip
diff --git a/l10n_br_zip_correios/models/l10n_br_zip.py b/l10n_br_zip_correios/models/l10n_br_zip.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright (C) 2016  Magno Costa - Akretion
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
+from openerp import models, api
+from openerp.addons.l10n_br_zip_correios.models.webservice_client\
+    import WebServiceClient
+
+
+class L10nBrZip(models.Model, WebServiceClient):
+
+    _inherit = 'l10n_br.zip'
+
+    @api.multi
+    def zip_search_multi(self, country_id=False,
+                         state_id=False, l10n_br_city_id=False,
+                         district=False, street=False, zip_code=False):
+
+        self.get_address(zip_code)
+        return super(L10nBrZip, self).zip_search_multi(
+            country_id, state_id, l10n_br_city_id, district, street, zip_code)
diff --git a/l10n_br_zip_correios/models/res_company.py b/l10n_br_zip_correios/models/res_company.py
diff --git a/l10n_br_zip_correios/models/res_partner.py b/l10n_br_zip_correios/models/res_partner.py
diff --git a/l10n_br_zip_correios/models/webservice_client.py b/l10n_br_zip_correios/models/webservice_client.py
@@ -31,12 +31,12 @@
 
 class WebServiceClient(object):
 
-    def get_address(self):
+    def get_address(self, zip_code):
 
-        if not self.zip:
+        if not zip_code:
             return
 
-        zip_str = self.zip.replace('-', '')
+        zip_str = zip_code.replace('-', '')
 
         if len(zip_str) == 8:
             if not self.env['l10n_br.zip'].search([('zip', '=', zip_str)]):