diff --git a/account_partner_account_number/i18n/fr.po b/account_partner_account_number/i18n/fr.po
index 3b03c52..a70862c 100644
--- a/account_partner_account_number/i18n/fr.po
+++ b/account_partner_account_number/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-08 12:43+0000\n"
-"PO-Revision-Date: 2023-06-08 12:43+0000\n"
+"POT-Creation-Date: 2023-06-09 07:37+0000\n"
+"PO-Revision-Date: 2023-06-09 07:37+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,16 +16,21 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_partner_account_number
-#: model:ir.model.fields,field_description:account_partner_account_number.field_account_move_line__account_number
-msgid "Account Number"
-msgstr "Numéro de compte"
+#: model:ir.model.fields,field_description:account_partner_account_number.field_account_move_line__account_code
+msgid "Account code"
+msgstr "Code comptable"
 
 #. module: account_partner_account_number
-#: model:ir.model.fields,field_description:account_partner_account_number.field_res_partner__account_number
-#: model:ir.model.fields,field_description:account_partner_account_number.field_res_users__account_number
-#: model_terms:ir.ui.view,arch_db:account_partner_account_number.view_partner_property_form_account_number
-msgid "Account number"
-msgstr "Numéro de compte"
+#: model:ir.model.fields,field_description:account_partner_account_number.field_res_partner__account_code
+#: model:ir.model.fields,field_description:account_partner_account_number.field_res_users__account_code
+#: model_terms:ir.ui.view,arch_db:account_partner_account_number.view_partner_property_form_account_code
+msgid "Account code"
+msgstr "Code comptable"
+
+#. module: account_partner_account_number
+#: model:ir.model.constraint,message:account_partner_account_number.constraint_res_partner_account_coder_unique
+msgid "Choose another value of account code - it has to be unique!"
+msgstr "Choisissez une autre valeur de code comptable - il doit être unique !"
 
 #. module: account_partner_account_number
 #: model:ir.model,name:account_partner_account_number.model_res_partner
diff --git a/account_partner_account_number/models/account_move_line.py b/account_partner_account_number/models/account_move_line.py
index 47b1982..57cf179 100644
--- a/account_partner_account_number/models/account_move_line.py
+++ b/account_partner_account_number/models/account_move_line.py
@@ -4,17 +4,17 @@ from odoo import fields, models, _, api
 class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
 
-    account_number = fields.Char(compute='get_account_number', string="Account Number")
+    account_code = fields.Char(compute='get_account_code', string="Account code")
 
     @api.depends('partner_id','account_id')
-    def get_account_number(self):
+    def get_account_code(self):
         """
             assign account number of partner if move line is receivable (Customers) or payable (Suppliers)
         """
         for account_move_line in self:
-            if account_move_line.account_id.id == account_move_line.partner_id.property_account_receivable_id.id or \
-                    account_move_line.account_id.id == account_move_line.partner_id.property_account_payable_id.id:                
-                account_move_line.account_number = account_move_line.partner_id.account_number
+            if account_move_line.account_id.id == account_move_line.partner_id.commercial_partner_id.property_account_receivable_id.id or \
+                    account_move_line.account_id.id == account_move_line.partner_id.commercial_partner_id.property_account_payable_id.id:                
+                account_move_line.account_code = account_move_line.partner_id.commercial_partner_id.account_code
             else:
-                account_move_line.account_number = ''
+                account_move_line.account_code = ''
         
\ No newline at end of file
diff --git a/account_partner_account_number/models/res_partner.py b/account_partner_account_number/models/res_partner.py
index a9b5bdc..02e40ee 100644
--- a/account_partner_account_number/models/res_partner.py
+++ b/account_partner_account_number/models/res_partner.py
@@ -4,4 +4,10 @@ from odoo import fields, models, _
 class ResPartner(models.Model):
     _inherit = "res.partner"
 
-    account_number = fields.Char('Account number')
+    account_code = fields.Char('Account code')
+
+    _sql_constraints = [
+        ('account_coder_unique', 
+        'unique(account_code)',
+        'Choose another value of account code - it has to be unique!')
+    ]
diff --git a/account_partner_account_number/views/account_move_views.xml b/account_partner_account_number/views/account_move_views.xml
index 9e0644c..e4f0224 100644
--- a/account_partner_account_number/views/account_move_views.xml
+++ b/account_partner_account_number/views/account_move_views.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="view_move_line_tree_inherit_account_number" model="ir.ui.view">
+    <record id="view_move_line_tree_inherit_account_code" model="ir.ui.view">
         <field name="name">account.move.line.tree.inherit.account.number</field>
         <field name="model">account.move.line</field>
         <field eval="100" name="priority"/>
         <field name="inherit_id" ref="account.view_move_line_tree" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="account_number" />
+                <field name="account_code" />
             </xpath>
         </field>
     </record>
diff --git a/account_partner_account_number/views/partner_views.xml b/account_partner_account_number/views/partner_views.xml
index b0c5113..dbc0f5c 100644
--- a/account_partner_account_number/views/partner_views.xml
+++ b/account_partner_account_number/views/partner_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="view_partner_property_form_account_number" model="ir.ui.view">
+    <record id="view_partner_property_form_account_code" model="ir.ui.view">
         <field name="name">res.partner.property.form.inherit.account.number</field>
         <field name="model">res.partner</field>
         <field name="priority">2</field>
@@ -8,8 +8,8 @@
         <field name="groups_id" eval="[(5,)]"/>
         <field name="arch" type="xml">
             <xpath expr="//page[@name='accounting']/group" position="inside">
-                <group string="Account number" name="account_number" groups="account.group_account_readonly">
-                    <field name="account_number" />
+                <group string="Account code" name="account_code" groups="account.group_account_readonly">
+                    <field name="account_code" />
                 </group>
             </xpath>
         </field>