diff --git a/__manifest__.py b/__manifest__.py
index 8108628..449f770 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -15,8 +15,9 @@
         'base'
     ],
     'data': [
-        'views/ciiu.xml',
         'views/l10n_co_res_partner.xml',
+        'views/ciiu.xml',
+        'views/website.xml',
         'data/ciiu.csv',
         'data/l10n_states_co_data.xml',
         'data/l10n_cities_co_data.xml',
diff --git a/controllers/controller.py b/controllers/controller.py
index 3da5207..728b5dd 100755
--- a/controllers/controller.py
+++ b/controllers/controller.py
@@ -22,17 +22,27 @@
 
 class controller(http.Controller):
 
-    @http.route('/l10n_co_res_partner/get_partner_state_city',  methods=['POST'], type='json', auth="public", website=True)
+    @http.route('/l10n_co_res_partner/get_partner_state_city/',  methods=['POST'], type='json', auth="public", website=True)
     def get_partner_state_city(self, **kw):
         _response = {}
         partner_id = kw.get('partner_id')
-        query = "select xcity from res_partner where id = " + str(partner_id)
+        query = "select xcity, state_id from res_partner where id = " + str(partner_id)
         request.cr.execute(query)
         partner_city = request.cr.dictfetchone()
         _response['xcity_id_'] = partner_city
         return _response
+    
+    @http.route('/l10n_co_res_partner/get_partner_state/',  methods=['POST'], type='json', auth="public", website=True)
+    def get_partner_state(self, **kw):
+        _response = {}
+        partner_id = kw.get('partner_id')
+        query = "select state_id from res_partner where id = " + str(partner_id)
+        request.cr.execute(query)
+        state_id = request.cr.dictfetchone()
+        _response['state_id'] = state_id
+        return _response
 
-    @http.route('/l10n_co_res_partner/get_state_city',  methods=['POST'], type='json', auth="public", website=True)
+    @http.route('/l10n_co_res_partner/get_state_city/',  methods=['POST'], type='json', auth="public", website=True)
     def get_state_city(self, **kw):
         _response = {'state_cities':None}
         state_id_ = kw.get('state_id')
diff --git a/i18n/es_CO.po b/i18n/es_CO.po
index c31f3a8..39cfc8e 100755
--- a/i18n/es_CO.po
+++ b/i18n/es_CO.po
@@ -1,14 +1,14 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* l10n_co_res_partner
+#	* l10n_co_res_partner
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0-20201112\n"
+"Project-Id-Version: Odoo Server 9.0c\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-17 00:06+0000\n"
-"PO-Revision-Date: 2020-12-17 00:06+0000\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2016-06-10 02:00+0000\n"
+"PO-Revision-Date: 2016-06-10 02:00+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,507 +16,471 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__11
+#: selection:res.partner,doctype:0
 msgid "11 - Birth Certificate"
 msgstr "11 - Registro civil de nacimiento"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__12
+#: selection:res.partner,doctype:0
 msgid "12 - Identity Card"
 msgstr "12 - Tarjeta de identidad"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__13
+#: selection:res.partner,doctype:0
 msgid "13 - Citizenship Card"
 msgstr "13 - Cédula de ciudadanía"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__21
+#: selection:res.partner,doctype:0
 msgid "21 - Alien Registration Card"
 msgstr "21 - Tarjeta de extranjería"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__22
+#: selection:res.partner,doctype:0
 msgid "22 - Foreigner ID"
 msgstr "22 - Cédula de extranjería"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__31
+#: selection:res.partner,doctype:0
 msgid "31 - TAX Number (NIT)"
 msgstr "31 - NIT (Número de identificación tributaria)"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__41
+#: selection:res.partner,doctype:0
 msgid "41 - Passport"
 msgstr "41 - Pasaporte"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__42
+#: selection:res.partner,doctype:0
 msgid "42 - Foreign Identification Document"
 msgstr "42 - Documento de identificación extranjero"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__43
+#: selection:res.partner,doctype:0
 msgid "43 - No Foreign Identification"
 msgstr "43 - Sin identificación del exterior o para uso definido por la DIAN"
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.res_partner_kanban_view_extened
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.res_partner_kanban_view_extened
 msgid "<b>Information is incomplete!</b><br/> Please update soon!"
 msgstr "<b>¡Datos incompletos!</b><br/> Por favor, actualice pronto."
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__xbirthday
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__xbirthday
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_xbirthday
 msgid "Birthday"
 msgstr "Fecha de Nacimiento"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__companyBrandName
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__companyBrandName
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_companyBrandName
 msgid "Brand"
 msgstr "Marca"
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Brand Name of the Company?"
 msgstr "Nombre de la Marca"
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.actions.act_window,help:l10n_co_res_partner.action_ciiu_transaction
+#: model:ir.actions.act_window,help:l10n_co_res_partner.action_ciiu_transaction
 #: model:ir.actions.act_window,name:l10n_co_res_partner.action_ciiu_transaction
 #: model:ir.ui.menu,name:l10n_co_res_partner.menu_action_ciiu_transaction
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.view_ciiu_transaction_form
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.view_ciiu_transaction_tree
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_ciiu_transaction_form
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_ciiu_transaction_tree
 msgid "CIIU"
 msgstr "Actividad CIIU"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__change_country
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__change_country
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_change_country
 msgid "Change Country / Department?"
 msgstr "Cambiar País/Dpt./Ciudad?"
 
-
-#. module: l10n_co_res_partner
-#: model:ir.model.fields,help:l10n_co_res_partner.field_res_partner__is_company
-#: model:ir.model.fields,help:l10n_co_res_partner.field_res_users__is_company
-msgid "Check if the contact is a company, otherwise it is a person"
-msgstr ""
-"Marque esta casilla si el contacto es una compañía. En caso contrario, es "
-"una persona."
-
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "City"
 msgstr "Ciudad"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__code
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_code
 msgid "City Code"
 msgstr "Codigo Ciudad"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__name
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__city
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__city
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_name
 msgid "City Name"
 msgstr "Ciudad"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__code
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_code
 msgid "Code"
-msgstr "Código"
+msgstr "Codigo"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,help:l10n_co_res_partner.field_res_country_state_city__code
-msgid "Code DANE - 5 digits-"
-msgstr "Código DANE - 5 dígitos"
-
-#. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__name
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_name
 msgid "Code and Description"
-msgstr "Código y Descripción"
+msgstr "Codigo y Descripción"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__7
+#: selection:res.partner,x_pn_retri:0
 msgid "Common"
 msgstr "Común"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__25
+#: selection:res.partner,x_pn_retri:0
 msgid "Common Autorretenedor"
 msgstr "Común Auto-retenedor"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__company_type__company
-msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__companyType
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__company_type
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__companyType
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__company_type
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_companyType
 msgid "Company Type"
-msgstr "Tipo de compañía"
-
-#. module: l10n_co_res_partner
-#: model:ir.model,name:l10n_co_res_partner.model_res_partner
-msgid "Contact"
-msgstr "Contacto"
+msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__country_id
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__country_id
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__country_id
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_country_id
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Country"
 msgstr "País"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__create_uid
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__create_uid
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_create_uid
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_create_uid
 msgid "Created by"
-msgstr "Creado por"
+msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__create_date
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__create_date
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_create_date
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_create_date
 msgid "Created on"
-msgstr "Creado en"
+msgstr ""
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,help:l10n_co_res_partner.field_res_country_state_city_code
+msgid "Code DANE - 5 digits-"
+msgstr "Código DANE -5 dígitos-"
+
+#. module: l10n_co_res_partner
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_verificationDigit
+msgid "VD"
+msgstr "DV"
+
+#. module: l10n_co_res_partner
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Department"
 msgstr "Departamento"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__description
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_description
 msgid "Description"
 msgstr "Descripción"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__display_name
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__display_name
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_display_name
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_display_name
 msgid "Display Name"
-msgstr "Nombre a mostrar"
+msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__division
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_division
 msgid "Division"
-msgstr "División"
+msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__xidentification
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__xidentification
-msgid "Document Number"
-msgstr "Número de documento"
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.res_partner_kanban_view_extened
+msgid "Document #"
+msgstr "N° Documento:"
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.res_partner_kanban_view_extened
-msgid "Document:"
-msgstr "Documento:"
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_xidentification
+msgid "Document Number"
+msgstr "Numero de Documento"
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Don't touch! Field will be filled up automatically!"
 msgstr "¡Campo se llenará automáticamente!"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__dv
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__dv
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_dv
 msgid "Dv"
 msgstr "DV"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,help:l10n_co_res_partner.field_res_partner__xidentification
-#: model:ir.model.fields,help:l10n_co_res_partner.field_res_users__xidentification
+#: model:ir.model.fields,help:l10n_co_res_partner.field_res_partner_xidentification
 msgid "Enter the Identification Number"
 msgstr "Ingresa el numero de identifcacion"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:419
 #, python-format
 msgid "Error! Identification number can only have numbers"
 msgstr "¡Error! El número de identificación sólo permite números"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:434
 #, python-format
 msgid "Error! Identification number is mandatory"
 msgstr "¡Error! Número de identificación es obligatorio!"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:398
 #, python-format
-msgid ""
-"Error! Number of digits in Identification number must bebetween 2 and 12"
+msgid "Error! Number of digits in Identification number must bebetween 2 and 12"
 msgstr "¡Error! Número de identificación debe tener entre 2 y 12 dígitos"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:431
 #, python-format
 msgid "Error! Please choose an identification type"
 msgstr "¡Error! Porfavor escoga un tipo de identificación"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:450
 #, python-format
 msgid "Error! Please enter the companys name"
 msgstr "¡Error! Porfavor ingrese el nombre de la empresa"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:458
 #, python-format
 msgid "Error! Please enter the name of the person"
 msgstr "¡Error! Porfavor ingrese el nombre de la persona"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:446
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:454
 #, python-format
 msgid "Error! Please enter the persons name"
 msgstr "¡Error! Porfavor ingrese el nombre de la persona"
 
 #. module: l10n_co_res_partner
-#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:0
+#: code:addons/l10n_co_res_partner/models/l10n_co_res_partner.py:468
 #, python-format
 msgid "Error! Please select a person type"
 msgstr "¡Error! Por favor selecciona un tipo de persona"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__x_name1
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__x_name1
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,help:l10n_co_res_partner.field_res_partner_xidentification
+msgid "Enter the Identification Number"
+msgstr "Ingrese el numero de identificación"
+
+#. module: l10n_co_res_partner
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_name1
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "First Name"
 msgstr "Primer Nombre"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__24
+#: selection:res.partner,x_pn_retri:0
 msgid "Great Contributor"
 msgstr "Gran Contribuyente"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__11
+#: selection:res.partner,x_pn_retri:0
 msgid "Great Taxpayer Autorretenedor"
 msgstr "Gran Contribuyente  Auto-retenedor"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__has_division
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__ciiu__hierarchy__2
+#: selection:ciiu,hierarchy:0
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_has_division
 msgid "Has Division?"
-msgstr "Tiene División?"
+msgstr "Tiene Division?"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__has_parent
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__ciiu__hierarchy__1
+#: selection:ciiu,hierarchy:0
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_has_parent
 msgid "Has Parent?"
 msgstr "Tiene Padre?"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__has_section
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__ciiu__hierarchy__3
+#: selection:ciiu,hierarchy:0
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_has_section
 msgid "Has Section?"
-msgstr "Tiene Sección?"
+msgstr "Tiene Seccion?"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__hierarchy
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_hierarchy
 msgid "Hierarchy"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__id
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__id
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_id
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_id
 msgid "ID"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__ciiu
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__ciiu
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_ciiu
 msgid "ISIC Activity"
 msgstr "Actividad CIIU"
 
 #. module: l10n_co_res_partner
-#: model:ir.model,name:l10n_co_res_partner.model_ciiu
-msgid "ISIC List"
-msgstr "Lista CIIU"
-
-#. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.view_tree_res_partner_inherited
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_tree_res_partner_inherited
 msgid "Identification"
 msgstr "Identificación"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.constraint,message:l10n_co_res_partner.constraint_res_partner_ident_unique
+#: sql_constraint:res.partner:0
 msgid "Identification number must be unique!"
 msgstr "¡Error! El número de identificación debe ser único!"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__company_type__person
-msgid "Individual"
-msgstr ""
-
-#. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__22
+#: selection:res.partner,x_pn_retri:0
 msgid "International"
 msgstr "Internacional"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__is_company
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__is_company
-msgid "Is Company"
-msgstr "¿Es una empresa?"
-
-#. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Is it a Company?"
 msgstr "¿Es una empresa?"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__personType__2
+#: selection:res.partner,personType:0
 msgid "Juridical"
 msgstr "juridica"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu____last_update
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city____last_update
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu___last_update
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__x_lastname1
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__x_lastname1
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_lastname1
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Last Name"
 msgstr "Primer Apellido"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__write_uid
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__write_uid
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_write_uid
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__write_date
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__write_date
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_write_date
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_write_date
 msgid "Last Updated on"
 msgstr ""
 
+#. module: l10n_co_res_partner
+#: model:ir.model,name:l10n_co_res_partner.model_ciiu
+msgid "Lista CIIU"
+msgstr "ISIC List"
+
 #. module: l10n_co_res_partner
 #: model:ir.model,name:l10n_co_res_partner.model_res_country_state_city
 msgid "Model to manipulate Cities"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__xcity
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__xcity
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_xcity
 msgid "Municipality"
 msgstr "Municipio"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__formatedNit
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__formatedNit
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_formatedNit
 msgid "NIT Formatted"
 msgstr "NIT Formateado"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__companyName
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__companyName
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_companyName
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Name of the Company"
 msgstr "Nombre de la Compañia"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__personType__1
+#: selection:res.partner,personType:0
 msgid "Natural"
 msgstr "natural"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__23
+#: selection:res.partner,x_pn_retri:0
 msgid "Natural Person"
 msgstr "P/Natural Común"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__doctype__1
+#: selection:res.partner,doctype:0
 msgid "No identification"
 msgstr "Sin identificación"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__parent
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
+msgid "Point of Sales Name or Direction"
+msgstr "Nombre del Punto de Venta o dirección"
+
+#. module: l10n_co_res_partner
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_parent
 msgid "Parent"
 msgstr "Padre"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__pos_name
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__pos_name
-msgid "Point of Sales Name"
+#: model:ir.model,name:l10n_co_res_partner.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_pos_name
+msgid "Point of Sales Name"
+msgstr "Nombre del Punto de Venta"
+
+#. module: l10n_co_res_partner
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Point of Sales Name or Direction"
-msgstr ""
+msgstr "Nombre del Punto de Venta o dirección"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__x_lastname2
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__x_lastname2
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_lastname2
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Second Last Name"
 msgstr "Segundo Apellido"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__x_name2
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__x_name2
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_name2
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Second Name"
 msgstr "Segundo Nombre"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__section
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_section
 msgid "Section"
-msgstr "Sección"
+msgstr "Seccion"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields.selection,name:l10n_co_res_partner.selection__res_partner__x_pn_retri__6
+#: selection:res.partner,x_pn_retri:0
 msgid "Simplified"
 msgstr "Simplificado"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city__state_id
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_country_state_city_state_id
 msgid "State"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__x_pn_retri
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__x_pn_retri
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_pn_retri
 msgid "Tax Regime"
 msgstr "Regímen Tributario"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu__type
+#: model:ir.model.fields,help:l10n_co_res_partner.field_res_partner_companyType
+msgid "Technical field, used only to display a boolean using a radio button. As for Odoo v9 RadioButton cannot be used on boolean fields, this one serves as interface. Due to the old API limitations with interface function field, we implement it by hand instead of a true function field. When migrating to the new API the code should be simplified. Changing thecompany_type of a company contact into a company will not displaythis contact as a company contact but as a standalone company."
+msgstr ""
+
+#. module: l10n_co_res_partner
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_ciiu_type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__doctype
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__doctype
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_doctype
 msgid "Type of Identification"
 msgstr "Tipo de identificación"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__personType
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__personType
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_personType
 msgid "Type of Person"
 msgstr "Tipo de persona"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner__verificationDigit
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_users__verificationDigit
-msgid "VD"
-msgstr "DV"
-
-#. module: l10n_co_res_partner
-#: model_terms:ir.ui.view,arch_db:l10n_co_res_partner.l10n_co_view_partner_form
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "e.g. 900301230"
 msgstr "No. ej. 900301230"
+
diff --git a/i18n/l10n_co_res_partner.pot b/i18n/l10n_co_res_partner.pot
index 70c2b22..c9abe6d 100755
--- a/i18n/l10n_co_res_partner.pot
+++ b/i18n/l10n_co_res_partner.pot
@@ -18,7 +18,7 @@ msgstr ""
 #. module: l10n_co_res_partner
 #: selection:res.partner,doctype:0
 msgid "11 - Birth Certificate"
-msgstr "11 - Registro civil de nacimiento"
+msgstr ""
 
 #. module: l10n_co_res_partner
 #: selection:res.partner,doctype:0
diff --git a/models/__init__.py b/models/__init__.py
index 3c631d7..74ccbdd 100755
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -16,6 +16,6 @@
 # You should have received a copy of the GNU Affero General Public License    #
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 ###############################################################################
-from . import ciiu
-from . import l10n_co_res_partner
 
+from . import l10n_co_res_partner
+from . import ciiu
diff --git a/models/ciiu.py b/models/ciiu.py
index 6a08ef0..7b4f84c 100755
--- a/models/ciiu.py
+++ b/models/ciiu.py
@@ -47,14 +47,15 @@ class IndustrialClassification(models.Model):
 
     hierarchy = fields.Selection(
         [
-            ("1", 'Has Parent?'),
-            ("2", 'Has Division?'),
-            ("3", 'Has Section?')
+            (1, 'Has Parent?'),
+            (2, 'Has Division?'),
+            (3, 'Has Section?')
         ],
         'Hierarchy'
     )
 
 
+    @api.multi
     @api.depends('code', 'description')
     def _compute_concat_name(self):
         """
@@ -70,6 +71,7 @@ def _compute_concat_name(self):
                     ' - ' + str(rec.description.encode('utf-8').strip())
 
 
+    @api.multi
     @api.depends('has_parent')
     def _compute_set_type(self):
         """
diff --git a/models/l10n_co_res_partner.py b/models/l10n_co_res_partner.py
index 00e610b..08b50c7 100755
--- a/models/l10n_co_res_partner.py
+++ b/models/l10n_co_res_partner.py
@@ -60,21 +60,21 @@ class PartnerInfoExtended(models.Model):
     # Document information
     doctype = fields.Selection(
         [
-            ("1", "No identification"),
-            ("11", "11 - Birth Certificate"),
-            ("12", "12 - Identity Card"),
-            ("13", "13 - Citizenship Card"),
-            ("21", "21 - Alien Registration Card"),
-            ("22", "22 - Foreigner ID"),
-            ("31", "31 - TAX Number (NIT)"),
-            ("41", "41 - Passport"),
-            ("42", "42 - Foreign Identification Document"),
-            ("43", "43 - No Foreign Identification")
+            (1, "No identification"),
+            (11, "11 - Birth Certificate"),
+            (12, "12 - Identity Card"),
+            (13, "13 - Citizenship Card"),
+            (21, "21 - Alien Registration Card"),
+            (22, "22 - Foreigner ID"),
+            (31, "31 - TAX Number (NIT)"),
+            (41, "41 - Passport"),
+            (42, "42 - Foreign Identification Document"),
+            (43, "43 - No Foreign Identification")
+
         ], "Type of Identification"
     )
     xidentification = fields.Char("Document Number", store=True,
                                   help="Enter the Identification Number")
-
     verificationDigit = fields.Integer('VD', size=2)
     formatedNit = fields.Char(
         string='NIT Formatted',
@@ -85,27 +85,27 @@ class PartnerInfoExtended(models.Model):
     # Tributate regime
     x_pn_retri = fields.Selection(
                                     [
-                                        ("6", "Simplified"),
-                                        ("23", "Natural Person"),
-                                        ("7", "Common"),
-                                        ("11", "Great Taxpayer Autorretenedor"),
-                                        ("22", "International"),
-                                        ("25", "Common Autorretenedor"),
-                                        ("24", "Great Contributor")
+                                        (6, "Simplified"),
+                                        (23, "Natural Person"),
+                                        (7, "Common"),
+                                        (11, "Great Taxpayer Autorretenedor"),
+                                        (22, "International"),
+                                        (25, "Common Autorretenedor"),
+                                        (24, "Great Contributor")
                                     ], 
                                     string="Tax Regime",
-                                    default="6"                                    
+                                    default=6                                    
                                   )
 
     # CIIU - Clasificación Internacional Industrial Uniforme
     ciiu = fields.Many2one('ciiu', "ISIC Activity")
     personType = fields.Selection(
         [
-            ("1", "Natural"),
-            ("2", "Juridical")
+            (1, "Natural"),
+            (2, "Juridical")
         ],
         "Type of Person",
-        default="1"
+        default=1
     )
 
     # Replacing the field company_type
@@ -166,7 +166,7 @@ def _compute_concat_nit(self):
         """
         # Executing only for Document Type 31 (NIT)
         for partner in self:
-            if partner.doctype is "31":
+            if partner.doctype is 31:
                 # First check if entered value is valid
                 self._check_ident()
                 self._check_ident_num()
@@ -238,7 +238,7 @@ def _concat_name(self):
                 self.x_name2 = False
                 self.x_lastname1 = False
                 self.x_lastname2 = False
-                self.doctype = "1"
+                self.doctype = 1
             else:
                 for item in nameList:
                     if item is not b'':
@@ -280,13 +280,13 @@ def on_change_person_type(self):
         contact cleaner and ready for analysis
         @return: void
         """
-        if self.personType is "2":
+        if self.personType is 2:
             self.x_name1 = ''
             self.x_name2 = ''
             self.x_lastname1 = ''
             self.x_lastname2 = ''
-            self.x_pn_retri = "7"
-        elif self.personType is "1":
+            self.x_pn_retri = 7
+        elif self.personType is 1:
             self.companyName = False
             self.companyBrandName = False
             self.x_pn_retri = False
@@ -311,13 +311,13 @@ def on_change_company_type(self):
         @return: void
         """
         if self.company_type == 'company':
-            self.personType = "2"
+            self.personType = 2
             self.is_company = True
-            self.doctype = "31"
+            self.doctype = 31
         else:
-            self.personType = "1"
+            self.personType = 1
             self.is_company = False
-            self.doctype = "1"
+            self.doctype = 1
 
     @api.onchange('is_company')
     def on_change_is_company(self):
@@ -327,7 +327,7 @@ def on_change_is_company(self):
         @return: void
         """
         if self.is_company is True:
-            self.personType = "2"
+            self.personType = 2
             self.company_type = 'company'
             self.xbirthday = False
         else:
@@ -354,7 +354,7 @@ def _check_dv(self, nit):
         @return: String
         """
         for item in self:
-            if item.doctype != "31":
+            if item.doctype != 31:
                 return str(nit)
 
             nitString = '0'*(15-len(nit)) + nit
@@ -395,8 +395,8 @@ def onchange_location(self, cr, uid, ids, country_id=False,
         else:
             return {}
 
-        obj = self.env[mymodel]
-        ids = obj.search([(filter_column, '=', check_value)])
+        obj = self.pool.get(mymodel)
+        ids = obj.search(cr, uid, [(filter_column, '=', check_value)])
         return {
             'domain': {domain: [('id', 'in', ids)]},
             'value': {domain: ''}
@@ -410,7 +410,7 @@ def _check_ident(self):
         @return: void
         """
         for item in self:
-            if item.doctype is not "1":
+            if item.doctype is not 1:
                 msg = _('Error! Number of digits in Identification number must be'
                         'between 2 and 12')
                 if len(str(item.xidentification)) < 2:
@@ -428,10 +428,10 @@ def _check_ident_num(self):
         @return: void
         """
         for item in self:
-            if item.doctype is not "1":
+            if item.doctype is not 1:
                 if item.xidentification is not False and \
-                        item.doctype != "21" and \
-                        item.doctype != "41":
+                        item.doctype != 21 and \
+                        item.doctype != 41:
                     if re.match("^[0-9]+$", item.xidentification) is None:
                         msg = _('Error! Identification number can only '
                                 'have numbers')
@@ -443,11 +443,11 @@ def _checkDocType(self):
         This function throws and error if there is no document type selected.
         @return: void
         """
-        if self.doctype is not "1":
+        if self.doctype is not 1:
             if self.doctype is False:
                 msg = _('Error! Please choose an identification type')
                 raise exceptions.ValidationError(msg)
-            elif self.xidentification is False and self.doctype is not "43":
+            elif self.xidentification is False and self.doctype is not 43:
                 msg = _('Error! Identification number is mandatory')
                 raise exceptions.ValidationError(msg)
 
@@ -458,11 +458,11 @@ def _check_names(self):
         we check it again to get sure
         """
         if self.is_company is True:
-            if self.personType is "1":
+            if self.personType is 1:
                 if self.x_name1 is False or self.x_name1 == '':
                     msg = _('Error! Please enter the persons name')
                     raise exceptions.ValidationError(msg)
-            elif self.personType is "2":
+            elif self.personType is 2:
                 if self.companyName is False:
                     msg = _('Error! Please enter the companys name')
                     raise exceptions.ValidationError(msg)
@@ -485,15 +485,34 @@ def _check_person_type(self):
             msg = _('Error! Please select a person type')
             raise exceptions.ValidationError(msg)
 
-
-    @api.onchange('state_id')
-    def on_change_domain_xcity(self):
-        """
-        If Document Type changes we delete the document number as for different
-        document types there are different rules that apply e.g. foreign
-        documents (e.g. 21) allows letters in the value. Here we reduce the
-        risk of having corrupt information about the contact.
-        @return: void
-        """
-        if self.state_id:
-            return {'domain': {'xcity': [('state_id.code', '=', self.state_id.code)]}}
+    @api.multi
+    def _display_address(self, without_company=False):
+
+        '''
+        The purpose of this function is to build and return an address formatted accordingly to the
+        standards of the country where it belongs.
+
+        :param address: browse record of the res.partner to format
+        :returns: the address formatted in a display that fit its country habits (or the default ones
+            if not country is specified)
+        :rtype: string
+        '''
+        # get the information that will be injected into the display format
+        # get the address format
+        address_format = self._get_address_format()
+        args = {
+            'state_code': self.state_id.code or '',
+            'state_name': self.state_id.name or '',
+            'country_code': self.country_id.code or '',
+            'country_name': self._get_country_name(),
+            'company_name': self.commercial_company_name or '',
+        }
+        for field in self._formatting_address_fields():
+            args[field] = getattr(self, field) or ''
+        if without_company:
+            args['company_name'] = ''
+        elif self.commercial_company_name:
+            address_format = '%(company_name)s\n' + address_format
+
+        args['city'] = args['city'].capitalize() + ','
+        return address_format % args
diff --git a/static/src/css/frontend.css b/static/src/css/frontend.css
index ad1b1f8..d0cf8d0 100755
--- a/static/src/css/frontend.css
+++ b/static/src/css/frontend.css
@@ -28,3 +28,9 @@ form.checkout_autoformat input[name="name"], form.checkout_autoformat label[for=
 {
     margin-top: 5px;
 }
+.div_zip, .div_city
+{
+    display: none!important;
+}
+.div_state
+{display: block!important;}
diff --git a/static/src/js/frontend.js b/static/src/js/frontend.js
index 989d11a..e4058e2 100755
--- a/static/src/js/frontend.js
+++ b/static/src/js/frontend.js
@@ -6,10 +6,15 @@ odoo.define('module.DianInvoice', function(require) {
     {
         var flagLoaded = false;
         var mainIntervalTime = 2500;
-        setInterval(function() 
+        var itv = setInterval(function() 
         {
             if($("form.checkout_autoformat").length>0)
-            {
+            {   
+                $(".div_zip").remove()
+                var country_id = $('#country_id option:contains(Colombia)').val();
+                $("#country_id").val(country_id);
+                
+                $('input[name="city"]').val("not_needed")
                 init_xcity_selection()             
 
                 $(document).on("blur", "input[name='xidentification']", function() 
@@ -47,14 +52,30 @@ odoo.define('module.DianInvoice', function(require) {
                     $("input[name='zip']").val(xcity_zip);
                 }); 
 
+                clearInterval(itv)
+
             }
         
         function init_xcity_selection() 
         {
+            
+            populate_states(country_id);
             if($("select[name='xcity']").find('option').length == 0)
             {                
                 populate_xcity_field(true);
+                
+                
+            }
+            var companyBrandName = $("input[name='companyBrandName']").val()
+            if(String(companyBrandName).length>0)
+            {
+                $("select[name='doctype']").val(31); 
+            }
+            else
+            {
+                $("select[name='doctype']").val(13); 
             }
+            $("input[name='company_name']").val(companyBrandName);
         }
 
         function update_nit_cod_verification()
@@ -74,10 +95,13 @@ odoo.define('module.DianInvoice', function(require) {
             if(String(company_name)=="")
             {
                 $("select[name='doctype']").val(13);
+                $("input[name='verificationDigit']").val('');
+                $("input[name='is_company']").prop( "checked", false );
             }
             if(String(company_name).length > 0 )
             {
                 $("select[name='doctype']").val(31);
+                $("input[name='is_company']").prop( "checked", true );                
             }
         }
         function update_customer_full_name()
@@ -98,7 +122,7 @@ odoo.define('module.DianInvoice', function(require) {
             
                 $.ajax({
                     type: "POST",
-                    url: '/l10n_co_res_partner/get_state_city',
+                    url: '/l10n_co_res_partner/get_state_city/',
                     data: JSON.stringify(data),
                     dataType: 'json',
                     contentType: "application/json",
@@ -121,7 +145,8 @@ odoo.define('module.DianInvoice', function(require) {
                                     
                                     $("select[name='xcity']").html('');
                                     $("select[name='xcity']").append(xcities_options);
-
+                                    var code = $("select[name='xcity'] option:selected").attr("code")
+                                    $("input[name='zip']").val(code) 
                                     if(set_partner_city)
                                     {
                                         
@@ -141,7 +166,9 @@ odoo.define('module.DianInvoice', function(require) {
                                             {
                                                 if (response.result.xcity_id_!=null) 
                                                 {
-                                                    $("select[name='xcity']").val(response.result.xcity_id_.xcity) 
+                                                    $("select[name='xcity']").val(response.result.xcity_id_.xcity)
+                                                    var code = $("select[name='xcity'] option:selected").attr("code")
+                                                    $("input[name='zip']").val(code)  
                                                 }
                                             }
                                         });
@@ -157,6 +184,47 @@ odoo.define('module.DianInvoice', function(require) {
 
         }
 
+        function populate_states(country_id)
+        {
+            var data = { "params": { "mode": "shipping" } }
+            var country_id = $('#country_id option:contains(Colombia)').val();
+                $.ajax({
+                    type: "POST",
+                    url: '/shop/country_infos/' + String(country_id),
+                    data: JSON.stringify(data),
+                    dataType: 'json',
+                    contentType: "application/json",
+                    async: false,
+                    success: function(response) 
+                    {
+                        var xidentification = $('input[name="xidentification"]').val();
+                        if(String(xidentification).length==0)
+                        {
+
+                        
+                        if(response.result.states)
+                        {
+                            var states = response.result.states;
+                            var options = ""
+                            states.forEach(function(state,index)
+                            {
+                                // [679, "Vichada", "VID"]
+                               if(parseInt(state[0])>0)
+                                   options = options + String("<option value='"+state[0]+"' data-code='"+state[2]+"'>") + String(state[1]) +String("<option>")
+                            });
+                            $("select[name='state_id']").html("");
+                            $("select[name='state_id']").append(options);
+                            $("select[name='state_id'] option").not( "[value]" ).remove();
+                            var xcity_code = $("select[name='xcity'] option:selected").attr("code");
+                            $("input[name='zip']").val(xcity_code);
+
+                        }
+                    }
+                    }
+                });
+
+        }
+
         function dian_nit_codigo_verificacion(myNit) 
         {
             var vpri,
diff --git a/views/ciiu.xml b/views/ciiu.xml
index 0bd2cae..ff6a8d9 100755
--- a/views/ciiu.xml
+++ b/views/ciiu.xml
@@ -1,51 +1,55 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <record id="view_ciiu_transaction_tree" model="ir.ui.view">
-            <field name="name">ciiu.tree</field>
-            <field name="model">ciiu</field>
-            <field name="arch" type="xml">
-                <tree string="CIIU" create="0" delete="0" edit="0">
-                    <field name="code"/>
-                    <field name="description"/>
-                    <field name="type" invisible="1" />
-                </tree>
-            </field>
-        </record>
 
-        <!-- CIIU Form View-->
-        <record id="view_ciiu_transaction_form" model="ir.ui.view">
-            <field name="name">ciiu.view</field>
-            <field name="model">ciiu</field>
-            <field name="arch" type="xml">
-                <form string="CIIU" create="0" delete="0" edit="0">
-                    <group>
-                        <field name="code"/>
-                        <field name="description"/>
-                        <field name="has_parent" attrs="{'invisible':['|',('has_division', '=', True),('has_section', '=', True)]}" />
-                        <field name="parent" attrs="{'invisible':[('has_parent', '=', False)]}"/>
-                        <field name="has_division" attrs="{'invisible':['|',('has_parent', '=', True),('has_section', '=', True)]}" />
-                        <field name="division" attrs="{'invisible':[('has_division', '=', False)]}"/>
-                        <field name="has_section" attrs="{'invisible':['|',('has_division', '=', True),('has_parent', '=', True)]}" />
-                        <field name="section" attrs="{'invisible':[('has_section', '=', False)]}"/>
-                        <field name="type"/>
-                        <field name="name" />
-                    </group>
-                </form>
-            </field>
-        </record>
+    <!-- CIIU Related info-->
 
-        <record id="action_ciiu_transaction" model="ir.actions.act_window">
-            <field name="name">CIIU</field>
-            <field name="res_model">ciiu</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id"  eval="False"/>
-            <field name="context">{}</field>
-            <field name="help">CIIU</field>
-        </record>
+    <!--CIIU List View-->
+    <record id="view_ciiu_transaction_tree" model="ir.ui.view">
+        <field name="name">ciiu.tree</field>
+        <field name="model">ciiu</field>
+        <field name="arch" type="xml">
+            <tree string="CIIU" create="0" delete="0" edit="0">
+                <field name="code"/>
+                <field name="description"/>
+                <field name="type" invisible="1" />
+            </tree>
+        </field>
+    </record>
+
+    <!-- CIIU Form View-->
+    <record id="view_ciiu_transaction_form" model="ir.ui.view">
+        <field name="name">ciiu.view</field>
+        <field name="model">ciiu</field>
+        <field name="arch" type="xml">
+            <form string="CIIU" create="0" delete="0" edit="0">
+                <group>
+                    <field name="code"/>

+                    <field name="description"/>

+                    <field name="has_parent" attrs="{'invisible':['|',('has_division', '=', True),('has_section', '=', True)]}" />
+                    <field name="parent" attrs="{'invisible':[('has_parent', '=', False)]}"/>

+                    <field name="has_division" attrs="{'invisible':['|',('has_parent', '=', True),('has_section', '=', True)]}" />
+                    <field name="division" attrs="{'invisible':[('has_division', '=', False)]}"/>

+                    <field name="has_section" attrs="{'invisible':['|',('has_division', '=', True),('has_parent', '=', True)]}" />
+                    <field name="section" attrs="{'invisible':[('has_section', '=', False)]}"/>

+                    <field name="type"/>
+                    <field name="name" />
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_ciiu_transaction" model="ir.actions.act_window">
+        <field name="name">CIIU</field>
+        <field name="res_model">ciiu</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id"  eval="False"/>
+        <field name="context">{}</field>
+        <field name="help">CIIU</field>
+    </record>
+
+    <menuitem action="action_ciiu_transaction"
+        id="menu_action_ciiu_transaction"
+        parent="account.account_account_menu" sequence="11"/>
 
-        <menuitem action="action_ciiu_transaction"
-            id="menu_action_ciiu_transaction"
-            parent="account.account_account_menu" sequence="11"/>
-    </data>
 </odoo>
diff --git a/views/l10n_co_res_partner.xml b/views/l10n_co_res_partner.xml
index 9ccffae..17e7f42 100755
--- a/views/l10n_co_res_partner.xml
+++ b/views/l10n_co_res_partner.xml
@@ -1,223 +1,231 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <record id="l10n_co_view_partner_form" model="ir.ui.view">
-            <field name="name">l10n.co.view.partner.form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <field name="name" position="attributes">
-                    <attribute name="invisible">True</attribute>
-                </field>
+    <!-- Extending Partner Form View -->
+    <record id="view_partner_form" model="ir.ui.view">
+       <field name="inherit_id" ref="base.view_partner_form" />
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+
+            <!-- Hiding some fields that will be replaced partially or just set to invisible -->
+            <field name="name" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </field>
 
-                <field name="company_type" position="attributes">
-                    <attribute name="invisible">True</attribute>
-                </field>
+            <field name="company_type" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </field>
 
-                <field name="state_id" position="replace">
-                    <field name="state_id" invisible="1"/>
-                </field>
+            <field name="state_id" position="replace">
+                <field name="state_id" invisible="1"/>
+            </field>
 
-                <field name="city" position="replace">
-                    <field name="city" invisible="1"/>
-                </field>
+            <field name="city" position="replace">
+                <field name="city" invisible="1"/>
+            </field>
 
-                <field name="country_id" position="replace">
-                    <field name="country_id" invisible="1"/>
-                </field>
+            <field name="country_id" position="replace">
+                <field name="country_id" invisible="1"/>
+            </field>
 
 
-                <!-- Dynamic Form which opens when creating a related contact to a company -->
-                <xpath expr="(//field[@name='city'])[4]" position="replace"></xpath>
-                <xpath expr="(//field[@name='state_id'])[4]" position="replace"></xpath>
-                <xpath expr="(//field[@name='country_id'])[4]" position="replace"></xpath>
-
-                <xpath expr="(//field[@name='zip'])[4]" position="after">
-                    <field name="change_country" class="oe_edit_only"
-                        attrs="{'invisible':[('change_country', '=', True)]}"/>
-
-                    <field name="country_id"
-                        attrs="{'readonly':[('change_country', '=', False)]}"
-                        options='{"no_open": True, "no_create": True}'
-                        placeholder="Country" on_change="onchange_location(country_id, False)"
-                        class="o_address_country" /> <!-- Country -->
-                    <field name="state_id"
-                        options="{'no_open': True}"
-                        placeholder="Department"
-                        attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('country_id', '=', False)], 'required': [('xcity', '!=', False)]}" on_change="onchange_location(False, state_id)" /> <!-- Department -->
-                    <field name="xcity"
-                        options="{'no_open': True}"
-                        placeholder="City"
-                        attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('state_id', '=', False)]}" />  <!-- City / Municipality -->
-
-                </xpath>
-
-                <xpath expr="(//field[@name='name'])[4]" position="before">
-                    <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
-                    <field name="x_name1"
-                        placeholder="First Name" attrs="{'invisible':['|',('type', '=', 'delivery')], 'required': [('type', '!=', 'delivery')]}" />
-                    <field name="x_name2"
-                        placeholder="Second Name" attrs="{'invisible':['|',('type', '=', 'delivery')]}" />
-                    <field name="x_lastname1"
-                        placeholder="Last Name" attrs="{'invisible':['|',('type', '=', 'delivery')], 'required': [('type', '!=', 'delivery')]}" />
-                    <field name="x_lastname2"
-                        placeholder="Second Last Name" attrs="{'invisible':['|',('type', '=', 'delivery')]}" />
-                    <field name="xbirthday" attrs="{'invisible':[('type', '=', 'delivery')]}" />
-
-                    <field name="doctype" attrs="{'invisible':[('type', '=', 'delivery')]}" />
-                    <field name="xidentification"
-                        placeholder="e.g. 900301230"
-                        attrs="{'invisible':['|','|','|',('doctype', '=', '43'), ('doctype', '=', '1'), ('doctype', '=', False), ('type', '=', 'delivery')]}" />
-                    <field name="formatedNit"
-                        attrs="{'invisible':[('doctype', '!=', '31')]}"
-                        readonly="1" />
-                    <field name="dv" invisible="1" />
-                    <field name="x_pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
-                    <field name="ciiu" attrs="{'invisible':[('type', '=', 'delivery')]}" domain="[('type', '=', 'other')]" />
-                </xpath>
-
-                <!-- Adding some more relevant fields to the form view -->
-                <field name="company_type" position="after">
-                    <field invisible="1"
-                        name="company_type"
-                        widget="radio"
-                        class="oe_edit_only"
-                        options="{'horizontal': true}"/>
-
-                    <field name="is_company" class="oe_inline" modifiers="{}"/>
-                    <label for="is_company" string="Is it a Company?"/>
-                </field>
+            <!-- Dynamic Form which opens when creating a related contact to a company -->
+            <xpath expr="(//field[@name='city'])[4]" position="replace"></xpath>
+            <xpath expr="(//field[@name='state_id'])[4]" position="replace"></xpath>
+            <xpath expr="(//field[@name='country_id'])[4]" position="replace"></xpath>
+
+            <xpath expr="(//field[@name='zip'])[4]" position="after">
+                <field name="change_country" class="oe_edit_only"
+                       attrs="{'invisible':[('change_country', '=', True)]}"/>
+
+                <field name="country_id"
+                       attrs="{'readonly':[('change_country', '=', False)]}"
+                       options='{"no_open": True, "no_create": True}'
+                       placeholder="Country" on_change="onchange_location(country_id, False)"
+                       class="o_address_country" /> <!-- Country -->
+                <field name="state_id"
+                       options="{'no_open': True}"
+                       placeholder="Department"
+                       attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('country_id', '=', False)], 'required': [('xcity', '!=', False)]}" on_change="onchange_location(False, state_id)" /> <!-- Department -->
+                <field name="xcity"
+                       options="{'no_open': True}"
+                       placeholder="City"
+                       attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('state_id', '=', False)]}" />  <!-- City / Municipality -->
+
+            </xpath>
+
+            <xpath expr="(//field[@name='name'])[4]" position="before">
+                <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
+                <field name="x_name1"
+                       placeholder="First Name" attrs="{'invisible':['|',('type', '=', 'delivery')], 'required': [('type', '!=', 'delivery')]}" />
+                <field name="x_name2"
+                       placeholder="Second Name" attrs="{'invisible':['|',('type', '=', 'delivery')]}" />
+                <field name="x_lastname1"
+                       placeholder="Last Name" attrs="{'invisible':['|',('type', '=', 'delivery')], 'required': [('type', '!=', 'delivery')]}" />
+                <field name="x_lastname2"
+                       placeholder="Second Last Name" attrs="{'invisible':['|',('type', '=', 'delivery')]}" />
+                <field name="xbirthday" attrs="{'invisible':[('type', '=', 'delivery')]}" />
+
+                <field name="doctype" attrs="{'invisible':[('type', '=', 'delivery')]}" />
+                <field name="xidentification"
+                       placeholder="e.g. 900301230"
+                       attrs="{'invisible':['|','|','|',('doctype', '=', 43), ('doctype', '=', 1), ('doctype', '=', False), ('type', '=', 'delivery')]}" />
+                <field name="formatedNit"
+                       attrs="{'invisible':[('doctype', '!=', 31)]}"
+                       readonly="1" />
+                <field name="dv" invisible="1" />
+                <field name="x_pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
+                <field name="ciiu" attrs="{'invisible':[('type', '=', 'delivery')]}" domain="[('type', '=', 'other')]" />
+
+            </xpath>
+
+            <!-- Adding some more relevant fields to the form view -->
+            <field name="company_type" position="after">
+                <field invisible="1"
+                       name="company_type"
+                       widget="radio"
+                       class="oe_edit_only"
+                       options="{'horizontal': true}"/>
+
+                <field name="is_company" class="oe_inline" modifiers="{}"/>
+                <label for="is_company" string="Is it a Company?"/>
+            </field>
 
-                <field name="parent_id" position="before">
-                    <h3>
-                        <field
-                                name="name"
-                                attrs="{'invisible':[('x_name1', '=', ''),('companyName', '=', False)]}"
-                                placeholder="Don't touch! Field will be filled up automatically!" />
-                    </h3>
-                </field>
+            <field name="parent_id" position="before">
+                <h3>
+                    <field
+                            name="name"
+                            attrs="{'invisible':[('x_name1', '=', ''),('companyName', '=', False)]}"
+                            placeholder="Don't touch! Field will be filled up automatically!" />
+                </h3>
+            </field>
 
-                <field name="type" position="before">
-                    <field name="personType"
-                        attrs="{'readonly':[('company_type', '=', 'person')]}"/>
-                    <field name="doctype" attrs="{'invisible':[('type', '=', 'delivery')], 'required': [('doctype', '=', False)]}" />
-                    <field name="xidentification"
-                        placeholder="e.g. 900301230"
-                        attrs="{'invisible':['|','|',('doctype', '=', '43'), ('doctype', '=', '1'), ('doctype', '=', False)]}" />
-                    <field name="formatedNit"
-                        attrs="{'invisible':[('doctype', '!=', '31')]}"
-                        readonly="1" />
-                    <field name="dv" invisible="1" />
-                    <field name="companyName"
-                        placeholder="Name of the Company"
-                        attrs="{'invisible':['|',('personType', '=', '1'),('company_type', '=', 'person')], 'required': [('personType', '=', '2')]}" />
-                    <field name="companyBrandName"
-                        placeholder="Brand Name of the Company?"
-                        attrs="{'invisible':['|',('personType', '=', '1'),('company_type', '=', 'person')]}" />
-                    <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
-                    <field name="x_name1"
-                        placeholder="First Name"
-                        default_focus="1"
-                        attrs="{'invisible':['|',('personType', '=', '2'), ('type', '=', 'delivery')], 'required': [('personType', '=', '1'), ('type', '!=', 'delivery')]}" />
-                    <field name="x_name2"
-                        placeholder="Second Name"
-                        attrs="{'invisible':['|',('personType', '=', '2'), ('type', '=', 'delivery')]}" />
-                    <field name="x_lastname1"
-                        placeholder="Last Name"
-                        attrs="{'invisible':['|',('personType', '=', '2'), ('type', '=', 'delivery')], 'required': [('personType', '=', '1'), ('type', '!=', 'delivery')]}" />
-                    <field name="x_lastname2"
-                        placeholder="Second Last Name"
-                        attrs="{'invisible':['|',('personType', '=', '2'), ('type', '=', 'delivery')]}"  />
-                    <field name="xbirthday" attrs="{'invisible':[('is_company', '=', True)]}" />
-                    <field name="x_pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
-                    <field name="ciiu" attrs="{'invisible':[('type', '=', 'delivery')]}"  domain="[('type', '=', 'other')]" />
+            <field name="type" position="before">
+                <field name="personType"
+                       attrs="{'readonly':[('company_type', '=', 'person')]}"/>
+                <field name="doctype" attrs="{'invisible':[('type', '=', 'delivery')], 'required': [('doctype', '=', False)]}" />
+                <field name="xidentification"
+                       placeholder="e.g. 900301230"
+                       attrs="{'invisible':['|','|',('doctype', '=', 43), ('doctype', '=', 1), ('doctype', '=', False)]}" />
+                <field name="formatedNit"
+                       attrs="{'invisible':[('doctype', '!=', 31)]}"
+                       readonly="1" />
+                <field name="dv" invisible="1" />
+                <field name="companyName"
+                       placeholder="Name of the Company"
+                       attrs="{'invisible':['|',('personType', '=', 1),('company_type', '=', 'person')], 'required': [('personType', '=', 2)]}" />
+                <field name="companyBrandName"
+                       placeholder="Brand Name of the Company?"
+                       attrs="{'invisible':['|',('personType', '=', 1),('company_type', '=', 'person')]}" />
+                <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
+                <field name="x_name1"
+                       placeholder="First Name"
+                       default_focus="1"
+                       attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')], 'required': [('personType', '=', 1), ('type', '!=', 'delivery')]}" />
+                <field name="x_name2"
+                       placeholder="Second Name"
+                       attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')]}" />
+                <field name="x_lastname1"
+                       placeholder="Last Name"
+                       attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')], 'required': [('personType', '=', 1), ('type', '!=', 'delivery')]}" />
+                <field name="x_lastname2"
+                       placeholder="Second Last Name"
+                       attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')]}"  />
+                <field name="xbirthday" attrs="{'invisible':[('is_company', '=', True)]}" />
+                <field name="x_pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
+                <field name="ciiu" attrs="{'invisible':[('type', '=', 'delivery')]}"  domain="[('type', '=', 'other')]" />
 
-                </field>
-                <field name="website" position="before">
-
-                    <field name="change_country" class="oe_edit_only"
-                        attrs="{'invisible':[('change_country', '=', True)]}"/>
-
-                    <field name="country_id"
-                        attrs="{'readonly':[('change_country', '=', False)]}"
-                        options='{"no_open": True, "no_create": True}'
-                        placeholder="Country" on_change="onchange_location(country_id, False)"
-                        class="o_address_country" /> <!-- Country -->
-                    <field name="state_id"
-                        options="{'no_open': True}"
-                        placeholder="Department"
-                        attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('country_id', '=', False)], 'required': [('xcity', '!=', False)]}" on_change="onchange_location(False, state_id)" /> <!-- Department -->
-                    <field name="xcity"
-                        options="{'no_open': True}"
-                        placeholder="City"
-                        attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('state_id', '=', False)]}" />  <!-- City / Municipality -->
-                </field>
             </field>
-        </record>
-
+            <field name="website" position="before">
+
+                <field name="change_country" class="oe_edit_only"
+                       attrs="{'invisible':[('change_country', '=', True)]}"/>
+
+                <field name="country_id"
+                       attrs="{'readonly':[('change_country', '=', False)]}"
+                       options='{"no_open": True, "no_create": True}'
+                       placeholder="Country" on_change="onchange_location(country_id, False)"
+                       class="o_address_country" /> <!-- Country -->
+                <field name="state_id"
+                       options="{'no_open': True}"
+                       placeholder="Department"
+                       attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('country_id', '=', False)], 'required': [('xcity', '!=', False)]}" on_change="onchange_location(False, state_id)" /> <!-- Department -->
+                <field name="xcity"
+                       options="{'no_open': True}"
+                       placeholder="City"
+                       attrs="{'readonly':[('change_country', '=', False)], 'invisible':[('state_id', '=', False)]}" />  <!-- City / Municipality -->
+            </field>
+        </field>
+    </record>
 
-        <record id="view_tree_res_partner_inherited" model="ir.ui.view">
-            <field name="name">Partner – User extension</field>
+    <!-- Extending the Partner Tree view -->
+    <record id="view_tree_res_partner_inherited" model="ir.ui.view">
+        <field name="name">Partner – User extension</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
-
-                <field name="phone" position="before">
-                    <field name="xidentification" string="Identification" />
-                    <field name="doctype"/>
-                </field>
-
-
-				<xpath expr="//tree" position="attributes">
-					<attribute name="decoration-bf">doctype=='43'</attribute>
-					<attribute name="decoration-bf">doctype=='1'</attribute>
-					<attribute name="decoration-danger">xidentification==False</attribute>
-					<attribute name="decoration-danger">xidentification==''</attribute>
-				</xpath>
-
-                
+                <tree position="attributes">
+                    <attribute name="colors">black:doctype==43;black:doctype==1;red:xidentification==False;red:xidentification=='';</attribute>
+                </tree>
+            <field name="phone" position="before">
+                <field name="xidentification" string="Identification" />
+                <field name="doctype" invisible="1" />
+                <field name="doctype" invisible="1" />
             </field>
-        </record>
+        </field>
+    </record>
+
+    <!-- Extending the Partner Kanban view -->
+    <!--
+    <record model="ir.ui.view" id="res_partner_kanban_view_extened">
+        <field name="name">res.partner.kanban.view.extened</field>
+        <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+            <xpath expr='//kanban/templates/t/div/div[3]/ul' position="before">
+                <field name="doctype" invisible="1"/>
+
+                <div attrs="{'invisible':[('xidentification', '=', False)]}">
+                    Document # <field name="xidentification" />
+                </div>
+                <div t-if="record.doctype.raw_value !=1">
+                    <div t-if="record.doctype.raw_value !=43">
+                        <div t-if="!record.xidentification.raw_value"
+                             style="margin: 0px; padding:3px 3px 10px 3px; color:#F77171; background-color: #FFF3F3;">
+                            <b>Information is incomplete!</b><br/> Please update soon!
+                        </div>
+                    </div>
+                </div>
 
 
+            </xpath>
+        </field>
+    </record>
+    -->
 
-        <record id="view_search_res_partner_inherited" model="ir.ui.view">
-            <field name="name">Search - extension</field>
+    <!-- Extending the Search: Making document number searchable -->
+    <record id="view_search_res_partner_inherited" model="ir.ui.view">
+        <field name="name">Search - extension</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
                 <field name="name" position="replace">
                     <field name="name" filter_domain="['|',('display_name','ilike',self), ('xidentification','ilike',self)]" />
                 </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="res_partner_kanban_view_extened">
-            <field name="name">res.partner.kanban.view.extened</field>
-            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
-            <field name="model">res.partner</field>
-            <field name="arch" type="xml">
-
-                <xpath expr="//kanban/templates/t[@t-name='kanban-box']/div[@class='oe_kanban_global_click o_kanban_record_has_image_fill o_res_partner_kanban']/div[@class='oe_kanban_details']/ul" position="before">
-                    <field name="doctype" invisible="1"/>
-
-                    <div attrs="{'invisible':[('xidentification', '=', False)]}">
-                        Document: <field name="xidentification" />
-                    </div>
-
-
-                    <div t-if="record.doctype.raw_value != 'no_identification'">
-                        <div t-if="record.doctype.raw_value != '43'">
-                            <div t-if="!record.xidentification.raw_value" style="margin: 0px; padding:3px 3px 10px 3px; color:#F77171; background-color: #FFF3F3;">
-                                <b>Information is incomplete!</b><br/> Please update soon!
-                            </div>
-                        </div>
-                    </div>
-
-                </xpath>
-            </field>
-        </record>
+        </field>
+    </record>
+
+
+<function model="ir.model.fields" name="formbuilder_whitelist">
+            <value>res.partner</value>
+            <value eval="[
+                'name', 'phone', 'email',
+                'city', 'zip', 'street', 'street2', 'state_id', 'country_id',
+                'vat', 'company_name', 'district_id','mobile','partner_id',
+                'x_name1','x_name2','x_lastname1','x_lastname2', 
+                'xidentification','xcity', 'doctype', 'personType', 
+                'verificationDigit', 'pos_name', 'companyBrandName', 'is_company'
+            ]"/>
+        </function>
 
-    </data>
 
 </odoo>
diff --git a/views/website.xml b/views/website.xml
index a4a271b..6fbf3ca 100755
--- a/views/website.xml
+++ b/views/website.xml
@@ -44,6 +44,7 @@
                 </xpath>  
                 <xpath expr="//form[@class='checkout_autoformat']//div//div" position="inside">
                      <div>
+                            <input type="checkbox" t-att-value="'is_company' in checkout and checkout['is_company']" name="is_company" class="form-control website-is_company hidden-element"></input>  
                             <input type="text"  name="name"  class="form-control website-name hidden-element" readonly="1" t-att-value="'name' in checkout and checkout['name']" ></input> 
                             <input type="text"  name="pos_name"  class="form-control website-name hidden-element" readonly="1" t-att-value="'name' in checkout and checkout['name']" ></input> 
                             <input type="text"  name="companyBrandName"  class="form-control website-name hidden-element" readonly="1" t-att-value="'company_name' in checkout and checkout['company_name']" ></input> 
@@ -51,11 +52,11 @@
                                 <tr>
                                     <td>
                                         <label>Primer Nombre</label>
-                                        <input t-att-value="'x_name1' in checkout and checkout['x_name1']" type="text" name="x_name1" placeholder="Richi" class="form-control website-x_name1"/>
+                                        <input t-att-value="'x_name1' in checkout and checkout['x_name1']" type="text" name="x_name1" placeholder="Jon" class="form-control website-x_name1"/>
                                     </td>
                                     <td>
                                         <label>Segundo Nombre</label>
-                                        <input t-att-value="'x_name2' in checkout and checkout['x_name2']" type="text" name="x_name2" placeholder="Hamilton" class="form-control website-x_name2"/>
+                                        <input t-att-value="'x_name2' in checkout and checkout['x_name2']" type="text" name="x_name2" placeholder="Smith" class="form-control website-x_name2"/>
                                     </td>
                                 </tr>
                                 <tr>
@@ -71,16 +72,20 @@
                             </table>                        
                     </div>
                 </xpath>
-                <xpath expr="//form[@class='checkout_autoformat']/div[@class='form-row']/div[12]" position="after">
+                 <xpath expr="//form[@class='checkout_autoformat']/div[@class='form-row']/div[12]" position="after">
                     <t> 
                         <div class="div_district form-group  col-lg-6">
                             <label class="col-form-label" for="xcity">Municipio</label>                 
                                 <select name="xcity" class="form-control ">
 
                                 </select>     
-                        </div>           
+                        </div>  
+                         <div class="div_zip_custom form-group  col-lg-6" style="max-width:200px">
+                                <label class="col-form-label label-optional" for="zip">Zip Code</label>
+                                <input type="text" name="zip" t-attf-class="form-control #{error.get('zip') and 'is-invalid' or ''}" t-att-value="'zip' in checkout and checkout['zip']" style="max-width:200px"/>
+                        </div> 
                     </t>
-                </xpath>              
+                </xpath>            
         </template>                        
     </data>
-</odoo>
+</odoo>
\ No newline at end of file