Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 -rc54863854ab063797737c6b3753e00115c0bbd11
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision a524ef99542bfa8d371835bc7c7d24c68ecf1865)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c54863854ab063797737c6b3753e00115c0bbd11)
@@ -226,11 +226,14 @@
     case Gui::GuiActionType::ID_AdjustServiceModeReq                    : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceModeRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustVersionsUIRsp                     : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsResponseData                     ); break;
     case Gui::GuiActionType::ID_AdjustVersionsUIReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData                      ); break;
-    case Gui::GuiActionType::ID_AdjustHDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData                    ); break;
-    case Gui::GuiActionType::ID_AdjustDGDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData                    ); break;
+    case Gui::GuiActionType::ID_AdjustTDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustTDDateTimeRequestData                    ); break;
+    case Gui::GuiActionType::ID_AdjustDDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustDDDateTimeRequestData                    ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData                  ); break;
     case Gui::GuiActionType::ID_HDUsageInfoReq                          : INTERPRET_TRSMT_MT_MESSAGE(HDUsageInfoRequestData                         ); break;
-    case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq            : INTERPRET_TRSMT_MT_MESSAGE(AdjustInstitutionalRequestData                 ); break;
+    case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustInstitutionalRequestData                 ); break;
+    case Gui::GuiActionType::ID_InstitutionalRecordReq                  : INTERPRET_TRSMT_MT_MESSAGE(InstitutionalRequestData                       ); break;
+    case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq    : INTERPRET_TRANSMIT_MESSAGE(AdjustAdvancedInstitutionalRequestData         ); break;
+    case Gui::GuiActionType::ID_AdvancedInstitutionalRecordReq          : INTERPRET_TRSMT_MT_MESSAGE(AdvancedInstitutionalRequestData               ); break;
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
@@ -258,7 +261,7 @@
     // End-Treatment
     case Gui::GuiActionType::ID_AdjustRinsebackReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData                     ); break;
     case Gui::GuiActionType::ID_AdjustRecirculateReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData                   ); break;
-    case Gui::GuiActionType::ID_AdjustTreatmentEndReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentEndReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentEndRequestData                  ); break;
     // Post-Treatment
     case Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq        : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData    ); break;
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq       : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData   ); break;
@@ -466,10 +469,15 @@
     case Gui::GuiActionType::ID_AdjustVersionsTDRsp                 : ok = notify<Model::MAdjustVersionsTDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp               ); break;
     case Gui::GuiActionType::ID_AdjustSerialTDRsp                   : ok = notify<Model::MAdjustSerialNumberTDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp             : ok = notify<Model::MAdjustServiceDatesHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp           ); break;
-    case Gui::GuiActionType::ID_AdjustHDDateTimeRsp                 : ok = notify<Model::MAdjustHDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustTDDateTimeRsp                 : ok = notify<Model::MAdjustTDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustTDDateTimeRsp               ); break;
     case Gui::GuiActionType::ID_HDUsageInfoRsp                      : ok = notify<Model::MHDUsageInfoResponse                       >(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp                    ); break;
     case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp        : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp      ); break;
-    // ----- States
+    case Gui::GuiActionType::ID_InstitutionalRecordRsp              : ok = notify<Model::MInstitutionalRecordResponse               >(vMessage, vData, Gui::GuiActionType::ID_InstitutionalRecordRsp            ); break;
+    case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp: ok = notify<Model::MAdjustAdvancedInstitutionalRecordResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp); break;
+    case Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp      : ok = notify<Model::MAdvancedInstitutionalRecordResponse       >(vMessage, vData, Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp    ); break;
+
+
+        // ----- States
     case Gui::GuiActionType::ID_TDOpModeData                        : ok = notify<Model::MTDOpMode                                  >(vMessage, vData, Gui::GuiActionType::ID_TDOpModeData                      ); break;
     case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;
     case Gui::GuiActionType::ID_TreatmentStates                     : ok = notify<Model::MTreatmentStates                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates                   ); break;
@@ -614,7 +622,7 @@
     case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustSerialDDRsp           : ok = notify<Model::MAdjustSerialNumberDDResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
-    case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
     case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp    : ok = notify<Model::MAdjustDGCleaningUsageResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp      ); break;
     // RO Water
     case Gui::GuiActionType::ID_DuetRoWaterStatDGq          : ok = notify<Model::MDuetRoWaterStatDGq            >(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq            ); break;