Merge 6af60e8 into 8b906cc

OCA · Oct 18, 2019 · 3920547 · 3920547
2 parents 8b906cc + 6af60e8
commit 3920547
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/l10n_br_base/__manifest__.py b/l10n_br_base/__manifest__.py
@@ -24,7 +24,7 @@
         'views/webclient_templates.xml',
         'views/res_partner_address_view.xml',
         'views/res_config_settings_view.xml',
-        'data/base_data.xml',
+        'data/res_country.xml',
         'views/res_city_view.xml',
         'views/res_bank_view.xml',
         'views/res_partner_bank_view.xml',

diff --git a/l10n_br_base/data/base_data.xml → l10n_br_base/data/res_country.xml b/l10n_br_base/data/base_data.xml → l10n_br_base/data/res_country.xml
diff --git a/l10n_br_hr/models/hr_civil_certificate_type.py b/l10n_br_hr/models/hr_civil_certificate_type.py
@@ -6,8 +6,5 @@
 
 class HrCivilCertificateType(models.Model):
     _name = 'hr.civil.certificate.type'
+    _inherit = 'l10n_br_hr.data.abstract'
     _description = 'Civil Certificate Type'
-
-    name = fields.Char(
-        string='Civil certificate type',
-        required=True)