diff --git a/api/oh.yaml b/api/oh.yaml
index a727cddcf..5d439b62a 100644
--- a/api/oh.yaml
+++ b/api/oh.yaml
@@ -2069,6 +2069,57 @@ paths:
                 $ref: '#/components/schemas/UserSettingDTO'
       security:
       - bearerAuth: []
+  /users/groups/{group_code}/permissions/{id}:
+    post:
+      tags:
+      - Users
+      operationId: assignPermission
+      parameters:
+      - name: group_code
+        in: path
+        required: true
+        schema:
+          type: string
+      - name: id
+        in: path
+        required: true
+        schema:
+          type: integer
+          format: int32
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: boolean
+      security:
+      - bearerAuth: []
+    delete:
+      tags:
+      - Users
+      operationId: revokePermission
+      parameters:
+      - name: group_code
+        in: path
+        required: true
+        schema:
+          type: string
+      - name: id
+        in: path
+        required: true
+        schema:
+          type: integer
+          format: int32
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: boolean
+      security:
+      - bearerAuth: []
   /therapies:
     post:
       tags:
@@ -3369,6 +3420,45 @@ paths:
                 $ref: '#/components/schemas/UserProfileDTO'
       security:
       - bearerAuth: []
+  /users/groups/{group_code}:
+    get:
+      tags:
+      - Users
+      operationId: getUserGroup_1
+      parameters:
+      - name: group_code
+        in: path
+        required: true
+        schema:
+          type: string
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserGroupDTO'
+      security:
+      - bearerAuth: []
+    delete:
+      tags:
+      - Users
+      operationId: deleteGroup
+      parameters:
+      - name: group_code
+        in: path
+        required: true
+        schema:
+          type: string
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: boolean
+      security:
+      - bearerAuth: []
   /therapies/{code_patient}:
     get:
       tags:
@@ -5872,26 +5962,6 @@ paths:
                 type: boolean
       security:
       - bearerAuth: []
-  /users/groups/{group_code}:
-    delete:
-      tags:
-      - Users
-      operationId: deleteGroup
-      parameters:
-      - name: group_code
-        in: path
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          description: OK
-          content:
-            application/json:
-              schema:
-                type: boolean
-      security:
-      - bearerAuth: []
   /operations/rows/{code}:
     delete:
       tags:
@@ -6108,10 +6178,10 @@ components:
           example: 0
         opd:
           type: boolean
-        female:
-          type: boolean
         male:
           type: boolean
+        female:
+          type: boolean
         pharmacy:
           type: boolean
     PatientDTO:
@@ -6358,6 +6428,23 @@ components:
           format: int32
           example: 0
       description: Class representing a vaccine
+    PermissionDTO:
+      required:
+      - description
+      - id
+      type: object
+      properties:
+        name:
+          type: string
+        id:
+          type: integer
+          description: The permission id
+          format: int32
+        description:
+          maxLength: 255
+          type: string
+          description: The permission description
+      description: List of group's permissions
     UserDTO:
       required:
       - passwd
@@ -6397,6 +6484,11 @@ components:
           type: string
           description: The description of the group
           example: Staff members working in the laboratory
+        permissions:
+          type: array
+          description: List of group's permissions
+          items:
+            $ref: '#/components/schemas/PermissionDTO'
       description: The user's group
     UserSettingDTO:
       required:
@@ -6426,7 +6518,6 @@ components:
           description: The value of the user
     SupplierDTO:
       required:
-      - supDeleted
       - supId
       - supName
       type: object
@@ -6468,10 +6559,6 @@ components:
           maxLength: 200
           type: string
           description: The supplier's notes
-        supDeleted:
-          type: string
-          description: "Flag record deleted, values are 'Y' OR 'N' "
-          example: "N"
     PricesOthersDTO:
       required:
       - code
@@ -6749,11 +6836,11 @@ components:
           type: string
           description: "Flag record deleted, values are 'Y' OR 'N' "
           example: "N"
+        fhu:
+          type: string
         yprog:
           type: integer
           format: int32
-        fhu:
-          type: string
       description: The admission
     AdmissionTypeDTO:
       required:
@@ -7764,10 +7851,10 @@ components:
           $ref: '#/components/schemas/PatientProfilePhoto'
         patientConsensus:
           $ref: '#/components/schemas/PatientConsensus'
-        searchString:
-          type: string
         informations:
           type: string
+        searchString:
+          type: string
     PatientConsensus:
       type: object
       properties:
@@ -7971,18 +8058,15 @@ components:
                           properties:
                             empty:
                               type: boolean
-                            width:
-                              type: number
-                              format: double
-                            height:
-                              type: number
-                              format: double
                             "y":
                               type: number
                               format: double
                             x:
                               type: number
                               format: double
+                            width:
+                              type: number
+                              format: double
                             maxX:
                               type: number
                               format: double
@@ -7995,6 +8079,9 @@ components:
                             centerY:
                               type: number
                               format: double
+                            height:
+                              type: number
+                              format: double
                             minX:
                               type: number
                               format: double
@@ -8006,18 +8093,15 @@ components:
                           properties:
                             empty:
                               type: boolean
-                            width:
-                              type: number
-                              format: double
-                            height:
-                              type: number
-                              format: double
                             "y":
                               type: number
                               format: double
                             x:
                               type: number
                               format: double
+                            width:
+                              type: number
+                              format: double
                             maxX:
                               type: number
                               format: double
@@ -8030,6 +8114,9 @@ components:
                             centerY:
                               type: number
                               format: double
+                            height:
+                              type: number
+                              format: double
                             minX:
                               type: number
                               format: double
@@ -8060,18 +8147,15 @@ components:
                       properties:
                         empty:
                           type: boolean
-                        width:
-                          type: number
-                          format: double
-                        height:
-                          type: number
-                          format: double
                         "y":
                           type: number
                           format: double
                         x:
                           type: number
                           format: double
+                        width:
+                          type: number
+                          format: double
                         maxX:
                           type: number
                           format: double
@@ -8084,6 +8168,9 @@ components:
                         centerY:
                           type: number
                           format: double
+                        height:
+                          type: number
+                          format: double
                         minX:
                           type: number
                           format: double
@@ -8175,9 +8262,6 @@ components:
                           format: float
                         transformed:
                           type: boolean
-                    height:
-                      type: integer
-                      format: int32
                     maxDescent:
                       type: integer
                       format: int32
@@ -8247,6 +8331,9 @@ components:
                     maxAdvance:
                       type: integer
                       format: int32
+                    height:
+                      type: integer
+                      format: int32
                     ascent:
                       type: integer
                       format: int32
@@ -8296,18 +8383,15 @@ components:
                       properties:
                         empty:
                           type: boolean
-                        width:
-                          type: number
-                          format: double
-                        height:
-                          type: number
-                          format: double
                         "y":
                           type: number
                           format: double
                         x:
                           type: number
                           format: double
+                        width:
+                          type: number
+                          format: double
                         maxX:
                           type: number
                           format: double
@@ -8320,6 +8404,9 @@ components:
                         centerY:
                           type: number
                           format: double
+                        height:
+                          type: number
+                          format: double
                         minX:
                           type: number
                           format: double
@@ -8331,18 +8418,15 @@ components:
                       properties:
                         empty:
                           type: boolean
-                        width:
-                          type: number
-                          format: double
-                        height:
-                          type: number
-                          format: double
                         "y":
                           type: number
                           format: double
                         x:
                           type: number
                           format: double
+                        width:
+                          type: number
+                          format: double
                         maxX:
                           type: number
                           format: double
@@ -8355,6 +8439,9 @@ components:
                         centerY:
                           type: number
                           format: double
+                        height:
+                          type: number
+                          format: double
                         minX:
                           type: number
                           format: double
@@ -8453,18 +8540,15 @@ components:
                       properties:
                         empty:
                           type: boolean
-                        width:
-                          type: number
-                          format: double
-                        height:
-                          type: number
-                          format: double
                         "y":
                           type: number
                           format: double
                         x:
                           type: number
                           format: double
+                        width:
+                          type: number
+                          format: double
                         maxX:
                           type: number
                           format: double
@@ -8477,6 +8561,9 @@ components:
                         centerY:
                           type: number
                           format: double
+                        height:
+                          type: number
+                          format: double
                         minX:
                           type: number
                           format: double
@@ -8488,18 +8575,15 @@ components:
                       properties:
                         empty:
                           type: boolean
-                        width:
-                          type: number
-                          format: double
-                        height:
-                          type: number
-                          format: double
                         "y":
                           type: number
                           format: double
                         x:
                           type: number
                           format: double
+                        width:
+                          type: number
+                          format: double
                         maxX:
                           type: number
                           format: double
@@ -8512,6 +8596,9 @@ components:
                         centerY:
                           type: number
                           format: double
+                        height:
+                          type: number
+                          format: double
                         minX:
                           type: number
                           format: double
@@ -8599,13 +8686,13 @@ components:
         smsInt:
           type: integer
           format: int32
+        medical:
+          type: integer
+          format: int32
         sms:
           type: boolean
         notify:
           type: boolean
-        medical:
-          type: integer
-          format: int32
     TherapyDTO:
       type: object
       properties:
@@ -8955,22 +9042,6 @@ components:
         currency:
           type: string
       description: The price list
-    PermissionDTO:
-      required:
-      - description
-      - id
-      type: object
-      properties:
-        name:
-          type: string
-        id:
-          type: integer
-          description: The permission id
-          format: int32
-        description:
-          maxLength: 255
-          type: string
-          description: The permission description
     PageInfoDTO:
       type: object
       properties:
diff --git a/src/generated/apis/UsersApi.ts b/src/generated/apis/UsersApi.ts
index 0bc6d395a..429f9b73b 100644
--- a/src/generated/apis/UsersApi.ts
+++ b/src/generated/apis/UsersApi.ts
@@ -21,6 +21,11 @@ import {
     UserSettingDTO,
 } from '../models';
 
+export interface AssignPermissionRequest {
+    groupCode: string;
+    id: number;
+}
+
 export interface DeleteGroupRequest {
     groupCode: string;
 }
@@ -41,6 +46,10 @@ export interface GetUserByNameRequest {
     username: string;
 }
 
+export interface GetUserGroup1Request {
+    groupCode: string;
+}
+
 export interface GetUserSettingByIdRequest {
     id: number;
 }
@@ -66,6 +75,11 @@ export interface RetrievePermissionsByUsernameRequest {
     username: string;
 }
 
+export interface RevokePermissionRequest {
+    groupCode: string;
+    id: number;
+}
+
 export interface UpdateUserRequest {
     userDTO: UserDTO;
     password?: boolean;
@@ -85,6 +99,25 @@ export interface UpdateUserSettingsRequest {
  */
 export class UsersApi extends BaseAPI {
 
+    /**
+     */
+    assignPermission({ groupCode, id }: AssignPermissionRequest): Observable<boolean>
+    assignPermission({ groupCode, id }: AssignPermissionRequest, opts?: OperationOpts): Observable<RawAjaxResponse<boolean>>
+    assignPermission({ groupCode, id }: AssignPermissionRequest, opts?: OperationOpts): Observable<boolean | RawAjaxResponse<boolean>> {
+        throwIfNullOrUndefined(groupCode, 'groupCode', 'assignPermission');
+        throwIfNullOrUndefined(id, 'id', 'assignPermission');
+
+        const headers: HttpHeaders = {
+            ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
+        };
+
+        return this.request<boolean>({
+            url: '/users/groups/{group_code}/permissions/{id}'.replace('{group_code}', encodeURI(groupCode)).replace('{id}', encodeURI(id)),
+            method: 'POST',
+            headers,
+        }, opts?.responseOpts);
+    };
+
     /**
      */
     deleteGroup({ groupCode }: DeleteGroupRequest): Observable<boolean>
@@ -195,6 +228,24 @@ export class UsersApi extends BaseAPI {
         }, opts?.responseOpts);
     };
 
+    /**
+     */
+    getUserGroup1({ groupCode }: GetUserGroup1Request): Observable<UserGroupDTO>
+    getUserGroup1({ groupCode }: GetUserGroup1Request, opts?: OperationOpts): Observable<RawAjaxResponse<UserGroupDTO>>
+    getUserGroup1({ groupCode }: GetUserGroup1Request, opts?: OperationOpts): Observable<UserGroupDTO | RawAjaxResponse<UserGroupDTO>> {
+        throwIfNullOrUndefined(groupCode, 'groupCode', 'getUserGroup1');
+
+        const headers: HttpHeaders = {
+            ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
+        };
+
+        return this.request<UserGroupDTO>({
+            url: '/users/groups/{group_code}'.replace('{group_code}', encodeURI(groupCode)),
+            method: 'GET',
+            headers,
+        }, opts?.responseOpts);
+    };
+
     /**
      */
     getUserSettingById({ id }: GetUserSettingByIdRequest): Observable<UserSettingDTO>
@@ -358,6 +409,25 @@ export class UsersApi extends BaseAPI {
         }, opts?.responseOpts);
     };
 
+    /**
+     */
+    revokePermission({ groupCode, id }: RevokePermissionRequest): Observable<boolean>
+    revokePermission({ groupCode, id }: RevokePermissionRequest, opts?: OperationOpts): Observable<RawAjaxResponse<boolean>>
+    revokePermission({ groupCode, id }: RevokePermissionRequest, opts?: OperationOpts): Observable<boolean | RawAjaxResponse<boolean>> {
+        throwIfNullOrUndefined(groupCode, 'groupCode', 'revokePermission');
+        throwIfNullOrUndefined(id, 'id', 'revokePermission');
+
+        const headers: HttpHeaders = {
+            ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
+        };
+
+        return this.request<boolean>({
+            url: '/users/groups/{group_code}/permissions/{id}'.replace('{group_code}', encodeURI(groupCode)).replace('{id}', encodeURI(id)),
+            method: 'DELETE',
+            headers,
+        }, opts?.responseOpts);
+    };
+
     /**
      */
     updateUser({ userDTO, password }: UpdateUserRequest): Observable<boolean>
diff --git a/src/generated/models/AdmissionDTO.ts b/src/generated/models/AdmissionDTO.ts
index 4b933c05e..df700ba52 100644
--- a/src/generated/models/AdmissionDTO.ts
+++ b/src/generated/models/AdmissionDTO.ts
@@ -200,13 +200,13 @@ export interface AdmissionDTO {
      */
     deleted: string;
     /**
-     * @type {number}
+     * @type {string}
      * @memberof AdmissionDTO
      */
-    yprog?: number;
+    fhu?: string;
     /**
-     * @type {string}
+     * @type {number}
      * @memberof AdmissionDTO
      */
-    fhu?: string;
+    yprog?: number;
 }
diff --git a/src/generated/models/Patient.ts b/src/generated/models/Patient.ts
index b48c7e07a..3e87778e4 100644
--- a/src/generated/models/Patient.ts
+++ b/src/generated/models/Patient.ts
@@ -195,10 +195,10 @@ export interface Patient {
      * @type {string}
      * @memberof Patient
      */
-    searchString?: string;
+    informations?: string;
     /**
      * @type {string}
      * @memberof Patient
      */
-    informations?: string;
+    searchString?: string;
 }
diff --git a/src/generated/models/PatientDTO.ts b/src/generated/models/PatientDTO.ts
index cef862532..24d2e9e08 100644
--- a/src/generated/models/PatientDTO.ts
+++ b/src/generated/models/PatientDTO.ts
@@ -148,7 +148,7 @@ export interface PatientDTO {
   lock?: number;
   /**
    * BlobPhoto
-   * @type {Array<string>}
+   * @type {string}
    * @memberof PatientDTO
    */
   blobPhoto?: string;
diff --git a/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D.ts b/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D.ts
index dc513a8ec..8887613f4 100644
--- a/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D.ts
+++ b/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D.ts
@@ -25,22 +25,17 @@ export interface PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D {
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
      */
-    width?: number;
-    /**
-     * @type {number}
-     * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
-     */
-    height?: number;
+    y?: number;
     /**
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
      */
-    y?: number;
+    x?: number;
     /**
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
      */
-    x?: number;
+    width?: number;
     /**
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
@@ -61,6 +56,11 @@ export interface PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D {
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
      */
     centerY?: number;
+    /**
+     * @type {number}
+     * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
+     */
+    height?: number;
     /**
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D
diff --git a/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsFontMetrics.ts b/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsFontMetrics.ts
index 5d7c0127d..d60c5d564 100644
--- a/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsFontMetrics.ts
+++ b/src/generated/models/PatientProfilePhotoPhotoAsImageGraphicsFontMetrics.ts
@@ -26,11 +26,6 @@ export interface PatientProfilePhotoPhotoAsImageGraphicsFontMetrics {
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsFontMetrics
      */
     font?: PatientProfilePhotoPhotoAsImageGraphicsFont;
-    /**
-     * @type {number}
-     * @memberof PatientProfilePhotoPhotoAsImageGraphicsFontMetrics
-     */
-    height?: number;
     /**
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsFontMetrics
@@ -61,6 +56,11 @@ export interface PatientProfilePhotoPhotoAsImageGraphicsFontMetrics {
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsFontMetrics
      */
     maxAdvance?: number;
+    /**
+     * @type {number}
+     * @memberof PatientProfilePhotoPhotoAsImageGraphicsFontMetrics
+     */
+    height?: number;
     /**
      * @type {number}
      * @memberof PatientProfilePhotoPhotoAsImageGraphicsFontMetrics
diff --git a/src/generated/models/PermissionDTO.ts b/src/generated/models/PermissionDTO.ts
index 741a8aca3..235214267 100644
--- a/src/generated/models/PermissionDTO.ts
+++ b/src/generated/models/PermissionDTO.ts
@@ -12,6 +12,7 @@
  */
 
 /**
+ * List of group\'s permissions
  * @export
  * @interface PermissionDTO
  */
diff --git a/src/generated/models/SupplierDTO.ts b/src/generated/models/SupplierDTO.ts
index 1f719082f..14bdb0d1f 100644
--- a/src/generated/models/SupplierDTO.ts
+++ b/src/generated/models/SupplierDTO.ts
@@ -63,10 +63,4 @@ export interface SupplierDTO {
      * @memberof SupplierDTO
      */
     supNote?: string;
-    /**
-     * Flag record deleted, values are \'Y\' OR \'N\' 
-     * @type {string}
-     * @memberof SupplierDTO
-     */
-    supDeleted: string;
 }
diff --git a/src/generated/models/TherapyRow.ts b/src/generated/models/TherapyRow.ts
index 7f96100ce..efbd13c70 100644
--- a/src/generated/models/TherapyRow.ts
+++ b/src/generated/models/TherapyRow.ts
@@ -106,18 +106,18 @@ export interface TherapyRow {
      */
     smsInt: number;
     /**
-     * @type {boolean}
+     * @type {number}
      * @memberof TherapyRow
      */
-    sms?: boolean;
+    medical?: number;
     /**
      * @type {boolean}
      * @memberof TherapyRow
      */
-    notify?: boolean;
+    sms?: boolean;
     /**
-     * @type {number}
+     * @type {boolean}
      * @memberof TherapyRow
      */
-    medical?: number;
+    notify?: boolean;
 }
diff --git a/src/generated/models/UserGroupDTO.ts b/src/generated/models/UserGroupDTO.ts
index 83426ccea..a7599a6d7 100644
--- a/src/generated/models/UserGroupDTO.ts
+++ b/src/generated/models/UserGroupDTO.ts
@@ -11,6 +11,10 @@
  * Do not edit the class manually.
  */
 
+import {
+    PermissionDTO,
+} from './';
+
 /**
  * The user\'s group
  * @export
@@ -29,4 +33,10 @@ export interface UserGroupDTO {
      * @memberof UserGroupDTO
      */
     desc?: string;
+    /**
+     * List of group\'s permissions
+     * @type {Array<PermissionDTO>}
+     * @memberof UserGroupDTO
+     */
+    permissions?: Array<PermissionDTO>;
 }
diff --git a/src/generated/models/WardDTO.ts b/src/generated/models/WardDTO.ts
index 5625690a3..9e7f85115 100644
--- a/src/generated/models/WardDTO.ts
+++ b/src/generated/models/WardDTO.ts
@@ -81,12 +81,12 @@ export interface WardDTO {
      * @type {boolean}
      * @memberof WardDTO
      */
-    female?: boolean;
+    male?: boolean;
     /**
      * @type {boolean}
      * @memberof WardDTO
      */
-    male?: boolean;
+    female?: boolean;
     /**
      * @type {boolean}
      * @memberof WardDTO