diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index 096e4fb..e981190 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     "name": "Improved Field Service Management",
-    "version": "17.0.0.4.0",
+    "version": "17.0.0.4.1",
     "summary": (
         "Adds functionality necessary for managing field service operations at Durpro."
     ),
diff --git a/bemade_fsm/i18n/fr.po b/bemade_fsm/i18n/fr.po
index 0625dc0..d8f79be 100644
--- a/bemade_fsm/i18n/fr.po
+++ b/bemade_fsm/i18n/fr.po
@@ -687,9 +687,9 @@ msgid "Owned Equipments"
 msgstr "Équipements possédés"
 
 #. module: bemade_fsm
-#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_equipment__pid_tag
-msgid "P&ID Tag"
-msgstr "Tag P&ID"
+#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_equipment__code
+msgid "Code"
+msgstr "Code"
 
 #. module: bemade_fsm
 #: model_terms:ir.ui.view,arch_db:bemade_fsm.project_task_view_search_fsm_inherit
@@ -703,7 +703,7 @@ msgid "Parent Task Template"
 msgstr "Gabarit de tâche parent"
 
 #. module: bemade_fsm
-#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_equipment__partner_location_id
+#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_equipment__partner_id
 msgid "Physical Address"
 msgstr "Adresse physique"
 
diff --git a/bemade_fsm/reports/worksheet_custom_report_templates.xml b/bemade_fsm/reports/worksheet_custom_report_templates.xml
index cddad25..80c6215 100644
--- a/bemade_fsm/reports/worksheet_custom_report_templates.xml
+++ b/bemade_fsm/reports/worksheet_custom_report_templates.xml
@@ -435,7 +435,7 @@
                     <tbody>
                         <t t-foreach="doc.equipment_ids" t-as="equipment">
                             <tr>
-                                <td><span t-esc="equipment.pid_tag" /></td>
+                                <td><span t-esc="equipment.code" /></td>
                                 <td><span t-esc="equipment.name" /></td>
                                 <td>
                                     <t t-foreach="equipment.tag_ids" t-as="application">
@@ -445,7 +445,7 @@
                                     </t>
                                 </td>
                                 <td
-                  t-esc="equipment.partner_location_id"
+                  t-esc="equipment.partner_id"
                   t-options='{
                                                 "widget": "contact",
                                                 "fields": ["name", "address"]}'
diff --git a/bemade_fsm/views/sale_order_views.xml b/bemade_fsm/views/sale_order_views.xml
index 4fb8882..cf9fc6d 100644
--- a/bemade_fsm/views/sale_order_views.xml
+++ b/bemade_fsm/views/sale_order_views.xml
@@ -17,7 +17,7 @@
                         <field name="valid_equipment_ids" invisible="1" />
                         <field
               name="summary_equipment_ids"
-              context="{'default_partner_location_id': partner_shipping_id,}"
+              context="{'default_partner_id': partner_shipping_id,}"
               widget="many2many_tags"
               groups="account.group_delivery_invoice_address"
             />
@@ -32,7 +32,7 @@
 
                         <field
               name="default_equipment_ids"
-              context="{'default_partner_location_id': partner_shipping_id,}"
+              context="{'default_partner_id': partner_shipping_id,}"
               widget="many2many_tags"
               domain="[('id', 'in', valid_equipment_ids)]"
               groups="account.group_delivery_invoice_address"