diff --git a/ext/custom-addons/dp_custom/models/product.py b/ext/custom-addons/dp_custom/models/product.py
index 0ca5c0f5..02993c21 100644
--- a/ext/custom-addons/dp_custom/models/product.py
+++ b/ext/custom-addons/dp_custom/models/product.py
@@ -42,6 +42,9 @@ else:
 class ReportIntrastatCode(models.Model):
     _inherit = "report.intrastat.code"
 
+    _sql_constraints = [
+        ('name_uniq', 'unique(name)', 'Der Intrastat-Code muss eindeutig sein'),
+    ]
     active = fields.Boolean(string='Active', default=True, help="If unchecked, it will allow you to hide the code without removing it.")
 
 
diff --git a/ext/custom-addons/dp_custom/views/product_views.xml b/ext/custom-addons/dp_custom/views/product_views.xml
index 4d9dc0e8..40050656 100644
--- a/ext/custom-addons/dp_custom/views/product_views.xml
+++ b/ext/custom-addons/dp_custom/views/product_views.xml
@@ -190,40 +190,44 @@
               action="product_xcategory_action"/>
 
 
-        <!-- Intrastat code -->
-        <record id="view_report_intrastat_code_tz_tree" model="ir.ui.view">
-            <field name="name">report.intrastat.code.tz_tree</field>
-            <field name="model">report.intrastat.code</field>
-            <field name="inherit_id" ref="report_intrastat.view_report_intrastat_code_tree"/>
-            <field name="arch" type="xml">
-                <field name="description" position="after">
-                    <field name="active" string="Active"/>
-                </field>
+    <!-- Intrastat code -->
+    <record id="view_report_intrastat_code_tz_tree" model="ir.ui.view">
+        <field name="name">report.intrastat.code.tz_tree</field>
+        <field name="model">report.intrastat.code</field>
+        <field name="inherit_id" ref="report_intrastat.view_report_intrastat_code_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="default_order">name asc</attribute>
+            </xpath>
+            <field name="description" position="after">
+                <field name="active" string="Active"/>
             </field>
-        </record>
-        <record id="view_report_intrastat_code_tz_form" model="ir.ui.view">
-            <field name="name">report.intrastat.code.tz_form</field>
-            <field name="model">report.intrastat.code</field>
-            <field name="inherit_id" ref="report_intrastat.view_report_intrastat_code_form"/>
-            <field name="arch" type="xml">
+        </field>
+    </record>
+
+    <record id="view_report_intrastat_code_tz_form" model="ir.ui.view">
+        <field name="name">report.intrastat.code.tz_form</field>
+        <field name="model">report.intrastat.code</field>
+        <field name="inherit_id" ref="report_intrastat.view_report_intrastat_code_form"/>
+        <field name="arch" type="xml">
 <!--                            class="oe_stat_button" icon="fa-archive" groups="sales_team.group_sale_manager"> -->
 <!--
-                <xpath expr="//form" position="attributes">
-                    <attribute name="delete">false</attribute>
-                </xpath>
+            <xpath expr="//form" position="attributes">
+                <attribute name="delete">false</attribute>
+            </xpath>
 -->
-                <xpath expr="//form" position="inside">
-                    <div class="oe_button_box" name="button_box">
-                        <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                            <field name="active" widget="boolean_button" options='{"terminology": "active"}'/>
-                        </button>
-                    </div>
-                </xpath>
-            </field>
-        </record>
+            <xpath expr="//form" position="inside">
+                <div class="oe_button_box" name="button_box">
+                    <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                        <field name="active" widget="boolean_button" options='{"terminology": "active"}'/>
+                    </button>
+                </div>
+            </xpath>
+        </field>
+    </record>
 
 
-        <record id="view_report_intrastat_search_view" model="ir.ui.view">
+    <record id="view_report_intrastat_search_view" model="ir.ui.view">
         <field name="name">report.intrastat.code.search</field>
         <field name="model">report.intrastat.code</field>
         <field name="context">{'filter_active': 1}</field>
@@ -235,7 +239,7 @@
                 <filter string="All" name="all" domain="['|',('active','=',False),('active','=',True)]"/>
             </search>
         </field>
-        </record>
+    </record>
 
 
 </odoo>