Merge ed2013d into 5094878

OCA · May 28, 2016 · ae66bc2 · ae66bc2
2 parents 5094878 + ed2013d
commit ae66bc2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/l10n_br_account_product/models/l10n_br_account_product.py b/l10n_br_account_product/models/l10n_br_account_product.py
@@ -168,7 +168,7 @@ def _check_ie(self):
         """
         check_ie = True
 
-        if self.inscr_est or self.inscr_est != 'ISENTO':
+        if self.inscr_est and self.inscr_est != 'ISENTO':
             uf = self.state_id and self.state_id.code.lower() or ''
             try:
                 mod = __import__('openerp.addons.l10n_br_base.tools.fiscal',

diff --git a/l10n_br_base/models/res_partner.py b/l10n_br_base/models/res_partner.py
@@ -136,7 +136,12 @@ def _check_ie(self):
         :Parameters:
         """
         result = True
-        if self.inscr_est == 'ISENTO' or self.is_company:
+        if ((self.inscr_est and self.inscr_est != 'ISENTO')
+             and (self.inscr_est.upper() == 'ISENTA' or
+             self.inscr_est.upper() == 'ISENTO')):
+            self.inscr_est = 'ISENTO'
+
+        if self.inscr_est != 'ISENTO' and self.is_company:
             state_code = self.state_id.code or ''
             uf = state_code.lower()
             result = self._validate_ie_param(uf, self.inscr_est)

diff --git a/l10n_br_crm/models/crm_lead.py b/l10n_br_crm/models/crm_lead.py
@@ -75,7 +75,13 @@ def _check_ie(self):
         :Return: True or False.
         """
         result = True
-        if self.inscr_est != 'ISENTO' or self.partner_name:
+
+        if ((self.inscr_est and self.inscr_est != 'ISENTO')
+             and (self.inscr_est.upper() == 'ISENTA' or
+             self.inscr_est.upper() == 'ISENTO')):
+            self.inscr_est = 'ISENTO'
+
+        if self.inscr_est and self.inscr_est != 'ISENTO':
             state_code = self.state_id.code or ''
             uf = state_code.lower()
             try: