diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts
index 9fe16e9025..2310c8d538 100644
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@@ -63,6 +63,7 @@ import { CandidateCvModule } from './candidate-cv/candidate-cv.module';
 import { CandidateEducationModule } from './candidate-education/candidate-education.module';
 import { CandidateSourceModule } from './candidate_source/candidate_source.module';
 import { CandidateExperienceModule } from './candidate-experience/candidate-experience.module';
+import { ProductVariantSettingsModule } from './product-settings/product-settings.module';
 
 @Module({
 	imports: [
@@ -242,6 +243,10 @@ import { CandidateExperienceModule } from './candidate-experience/candidate-expe
 					{
 						path: '/product-variants',
 						module: ProductVariantModule
+					},
+					{
+						path: '/product-variant-settings',
+						module: ProductVariantSettingsModule
 					}
 				]
 			}
@@ -314,6 +319,7 @@ import { CandidateExperienceModule } from './candidate-experience/candidate-expe
 		IntegrationMapModule,
 		ProductVariantPriceModule,
 		ProductVariantModule,
+		ProductVariantSettingsModule,
 		IntegrationEntitySettingModule,
 		IntegrationEntitySettingTiedEntityModule
 	],
diff --git a/apps/api/src/app/product-option/product-option.entity.ts b/apps/api/src/app/product-option/product-option.entity.ts
index 30c11038fb..45c3b31183 100644
--- a/apps/api/src/app/product-option/product-option.entity.ts
+++ b/apps/api/src/app/product-option/product-option.entity.ts
@@ -19,7 +19,8 @@ export class ProductOption extends Base implements IProductOption {
 
 	@ManyToOne(
 		() => Product,
-		(product) => product.options
+		(product) => product.options,
+		{ onUpdate: 'CASCADE', onDelete: 'CASCADE' }
 	)
 	@JoinColumn()
 	product: Product;
diff --git a/apps/api/src/app/product-option/product-option.service.ts b/apps/api/src/app/product-option/product-option.service.ts
index f879677847..32a181834a 100644
--- a/apps/api/src/app/product-option/product-option.service.ts
+++ b/apps/api/src/app/product-option/product-option.service.ts
@@ -16,6 +16,6 @@ export class ProductOptionService extends CrudService<ProductOption> {
 	async createBulk(
 		productOptionsInput: ProductOption[]
 	): Promise<ProductOption[]> {
-		return this.productOptionRepository.create(productOptionsInput);
+		return this.productOptionRepository.save(productOptionsInput);
 	}
 }
diff --git a/apps/api/src/app/product-variant/product-variant.controller.ts b/apps/api/src/app/product-variant/product-variant.controller.ts
index 4c85364fff..b3cb16b6b2 100644
--- a/apps/api/src/app/product-variant/product-variant.controller.ts
+++ b/apps/api/src/app/product-variant/product-variant.controller.ts
@@ -1,6 +1,15 @@
-import { Controller, HttpStatus, Post, Body } from '@nestjs/common';
+import {
+	Controller,
+	HttpStatus,
+	Post,
+	Body,
+	Get,
+	HttpCode,
+	Put,
+	Param
+} from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
-import { CrudController } from '../core';
+import { CrudController, IPagination } from '../core';
 import { ProductVariant } from './product-variant.entity';
 import { ProductVariantService } from './product-variant.service';
 import { ProductVariantCreateCommand } from './commands';
@@ -36,4 +45,44 @@ export class ProductVariantController extends CrudController<ProductVariant> {
 	): Promise<ProductVariant[]> {
 		return this.commandBus.execute(new ProductVariantCreateCommand(entity));
 	}
+
+	@ApiOperation({
+		summary: 'Find all product variants'
+	})
+	@ApiResponse({
+		status: HttpStatus.OK,
+		description: 'Found product variants',
+		type: Product
+	})
+	@ApiResponse({
+		status: HttpStatus.NOT_FOUND,
+		description: 'Record not found'
+	})
+	@Get('all')
+	async findAllProductVariants(): Promise<IPagination<ProductVariant>> {
+		return this.productVariantService.findAllProductVariants();
+	}
+
+	@ApiOperation({ summary: 'Update an existing record' })
+	@ApiResponse({
+		status: HttpStatus.CREATED,
+		description: 'The record has been successfully edited.'
+	})
+	@ApiResponse({
+		status: HttpStatus.NOT_FOUND,
+		description: 'Record not found'
+	})
+	@ApiResponse({
+		status: HttpStatus.BAD_REQUEST,
+		description:
+			'Invalid input, The response body may contain clues as to what went wrong'
+	})
+	@HttpCode(HttpStatus.ACCEPTED)
+	@Put(':id')
+	async update(
+		@Param('id') id: string,
+		@Body() productVariant: ProductVariant
+	): Promise<ProductVariant> {
+		return this.productVariantService.updateVariant(productVariant);
+	}
 }
diff --git a/apps/api/src/app/product-variant/product-variant.entity.ts b/apps/api/src/app/product-variant/product-variant.entity.ts
index 82faa29020..a9ad25b15f 100644
--- a/apps/api/src/app/product-variant/product-variant.entity.ts
+++ b/apps/api/src/app/product-variant/product-variant.entity.ts
@@ -61,21 +61,30 @@ export class ProductVariant extends Base implements IProductVariant {
 
 	@OneToOne(
 		() => ProductVariantSettings,
-		(settings) => settings.productVariant
+		(settings) => settings.productVariant,
+		{
+			eager: true,
+			onDelete: 'CASCADE'
+		}
 	)
 	@JoinColumn()
 	settings: ProductVariantSettings;
 
 	@OneToOne(
 		() => ProductVariantPrice,
-		(variantPrice) => variantPrice.productVariant
+		(variantPrice) => variantPrice.productVariant,
+		{
+			eager: true,
+			onDelete: 'CASCADE'
+		}
 	)
 	@JoinColumn()
 	price: ProductVariantPrice;
 
 	@ManyToOne(
 		() => Product,
-		(product) => product.variants
+		(product) => product.variants,
+		{ onDelete: 'CASCADE' }
 	)
 	@JoinColumn()
 	product: Product;
diff --git a/apps/api/src/app/product-variant/product-variant.service.ts b/apps/api/src/app/product-variant/product-variant.service.ts
index 54b633688f..75c16bc5ef 100644
--- a/apps/api/src/app/product-variant/product-variant.service.ts
+++ b/apps/api/src/app/product-variant/product-variant.service.ts
@@ -1,5 +1,5 @@
 import { Repository } from 'typeorm';
-import { CrudService } from '../core';
+import { CrudService, IPagination } from '../core';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ProductVariant } from './product-variant.entity';
@@ -13,6 +13,15 @@ export class ProductVariantService extends CrudService<ProductVariant> {
 		super(productVariantRepository);
 	}
 
+	async findAllProductVariants(): Promise<IPagination<ProductVariant>> {
+		const total = await this.productVariantRepository.count();
+		const items = await this.productVariantRepository.find({
+			relations: ['settings', 'price']
+		});
+
+		return { items, total };
+	}
+
 	async createBulk(
 		productVariants: ProductVariant[]
 	): Promise<ProductVariant[]> {
@@ -24,4 +33,10 @@ export class ProductVariantService extends CrudService<ProductVariant> {
 	): Promise<ProductVariant> {
 		return this.productVariantRepository.save(productVariant);
 	}
+
+	async updateVariant(
+		productVariant: ProductVariant
+	): Promise<ProductVariant> {
+		return this.productVariantRepository.save(productVariant);
+	}
 }
diff --git a/apps/api/src/app/product/commands/handlers/product.create.handler.ts b/apps/api/src/app/product/commands/handlers/product.create.handler.ts
index 608a1a8642..b31e60b02d 100644
--- a/apps/api/src/app/product/commands/handlers/product.create.handler.ts
+++ b/apps/api/src/app/product/commands/handlers/product.create.handler.ts
@@ -18,14 +18,15 @@ export class ProductCreateHandler
 
 		const product = await this.productService.create(productInput);
 
-		const options = productInput.options.map((optionInput) => {
+		const optionsInput = productInput.options.map((optionInput) => {
 			const option = new ProductOption();
 			Object.assign(option, { ...optionInput, product });
 
 			return option;
 		});
 
-		product.options = await this.productOptionService.createBulk(options);
+		await this.productOptionService.createBulk(optionsInput);
+
 		return product;
 	}
 }
diff --git a/apps/api/src/app/product/commands/handlers/product.update.handler.ts b/apps/api/src/app/product/commands/handlers/product.update.handler.ts
new file mode 100644
index 0000000000..d83df82e4a
--- /dev/null
+++ b/apps/api/src/app/product/commands/handlers/product.update.handler.ts
@@ -0,0 +1,26 @@
+import { ICommandHandler, CommandHandler } from '@nestjs/cqrs';
+import { ProductService } from '../../../product/product.service';
+import { ProductOptionService } from '../../../product-option/product-option.service';
+import { Product } from '../../product.entity';
+import { ProductUpdateCommand } from '../product.update.command';
+
+@CommandHandler(ProductUpdateCommand)
+export class ProductUpdateHandler
+	implements ICommandHandler<ProductUpdateCommand> {
+	constructor(
+		private productOptionService: ProductOptionService,
+		private productService: ProductService
+	) {}
+
+	public async execute(command?: ProductUpdateCommand): Promise<Product> {
+		const { productUpdateRequest } = command;
+
+		const product = await this.productService.saveProduct(
+			productUpdateRequest
+		);
+
+		//todo manage options
+
+		return product;
+	}
+}
diff --git a/apps/api/src/app/product/commands/product.update.command.ts b/apps/api/src/app/product/commands/product.update.command.ts
new file mode 100644
index 0000000000..0d3c320601
--- /dev/null
+++ b/apps/api/src/app/product/commands/product.update.command.ts
@@ -0,0 +1,11 @@
+import { ICommand } from '@nestjs/cqrs';
+import { Product } from '../../product/product.entity';
+
+export class ProductUpdateCommand implements ICommand {
+	static readonly type = '[Product] Update';
+
+	constructor(
+		public readonly id: string,
+		public readonly productUpdateRequest: Product
+	) {}
+}
diff --git a/apps/api/src/app/product/product.controller.ts b/apps/api/src/app/product/product.controller.ts
index 9fd8b66bab..5f3f7a9f1c 100644
--- a/apps/api/src/app/product/product.controller.ts
+++ b/apps/api/src/app/product/product.controller.ts
@@ -3,7 +3,10 @@ import {
 	Get,
 	HttpStatus,
 	Post,
-	Body
+	Body,
+	Put,
+	Param,
+	HttpCode
 	// UseGuards
 } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
@@ -12,6 +15,7 @@ import { ProductService } from './product.service';
 import { Product } from './product.entity';
 import { CommandBus } from '@nestjs/cqrs';
 import { ProductCreateCommand } from './commands/product.create.command';
+import { ProductUpdateCommand } from './commands/product.update.command';
 // import { PermissionGuard } from '../shared/guards/auth/permission.guard';
 
 @ApiTags('Product')
@@ -56,4 +60,27 @@ export class ProductController extends CrudController<Product> {
 	async createProduct(@Body() entity: Product, ...options: any[]) {
 		return this.commandBus.execute(new ProductCreateCommand(entity));
 	}
+
+	@ApiOperation({ summary: 'Update an existing record' })
+	@ApiResponse({
+		status: HttpStatus.CREATED,
+		description: 'The record has been successfully edited.'
+	})
+	@ApiResponse({
+		status: HttpStatus.NOT_FOUND,
+		description: 'Record not found'
+	})
+	@ApiResponse({
+		status: HttpStatus.BAD_REQUEST,
+		description:
+			'Invalid input, The response body may contain clues as to what went wrong'
+	})
+	@HttpCode(HttpStatus.ACCEPTED)
+	@Put(':id')
+	async update(
+		@Param('id') id: string,
+		@Body() entity: Product
+	): Promise<any> {
+		return this.commandBus.execute(new ProductUpdateCommand(id, entity));
+	}
 }
diff --git a/apps/api/src/app/product/product.entity.ts b/apps/api/src/app/product/product.entity.ts
index 8325bc8225..98fb29b62f 100644
--- a/apps/api/src/app/product/product.entity.ts
+++ b/apps/api/src/app/product/product.entity.ts
@@ -38,7 +38,8 @@ export class Product extends Base implements IProduct {
 
 	@OneToMany(
 		() => ProductVariant,
-		(productVariant) => productVariant.product
+		(productVariant) => productVariant.product,
+		{ onDelete: 'CASCADE' }
 	)
 	variants: ProductVariant[];
 
@@ -62,5 +63,5 @@ export class Product extends Base implements IProduct {
 		(type) => ProductOption,
 		(productOption) => productOption.product
 	)
-	options?: ProductOption[];
+	options: ProductOption[];
 }
diff --git a/apps/api/src/app/product/product.module.ts b/apps/api/src/app/product/product.module.ts
index 35a3076152..b1519a8ffe 100644
--- a/apps/api/src/app/product/product.module.ts
+++ b/apps/api/src/app/product/product.module.ts
@@ -7,11 +7,17 @@ import { ProductOption } from '../product-option/product-option.entity';
 import { CqrsModule } from '@nestjs/cqrs';
 import { ProductOptionService } from '../product-option/product-option.service';
 import { ProductCreateHandler } from './commands/handlers/product.create.handler';
+import { ProductUpdateHandler } from './commands/handlers/product.update.handler';
 
 @Module({
 	imports: [TypeOrmModule.forFeature([Product, ProductOption]), CqrsModule],
 	controllers: [ProductController],
-	providers: [ProductService, ProductOptionService, ProductCreateHandler],
+	providers: [
+		ProductService,
+		ProductOptionService,
+		ProductCreateHandler,
+		ProductUpdateHandler
+	],
 	exports: [ProductService]
 })
 export class ProductModule {}
diff --git a/apps/api/src/app/product/product.service.ts b/apps/api/src/app/product/product.service.ts
index d1c5bd0594..126aeec449 100644
--- a/apps/api/src/app/product/product.service.ts
+++ b/apps/api/src/app/product/product.service.ts
@@ -21,4 +21,8 @@ export class ProductService extends CrudService<Product> {
 
 		return { items, total };
 	}
+
+	async saveProduct(productRequest: Product): Promise<Product> {
+		return await this.productRepository.save(productRequest);
+	}
 }
diff --git a/apps/gauzy/src/app/@core/services/product-variant-price.service.ts b/apps/gauzy/src/app/@core/services/product-variant-price.service.ts
new file mode 100644
index 0000000000..c70c17cd23
--- /dev/null
+++ b/apps/gauzy/src/app/@core/services/product-variant-price.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { ProductVariantPrice } from '@gauzy/models';
+import { first } from 'rxjs/operators';
+
+@Injectable()
+export class ProductVariantPriceService {
+	PRODUCT_VARIANT_PRICE_URL = '/api/product-variant-prices';
+
+	constructor(private http: HttpClient) {}
+
+	updateProductVariantPrice(
+		productVariantPrice: ProductVariantPrice
+	): Promise<ProductVariantPrice> {
+		return this.http
+			.put<ProductVariantPrice>(
+				`${this.PRODUCT_VARIANT_PRICE_URL}/${productVariantPrice.id}`,
+				productVariantPrice
+			)
+			.pipe(first())
+			.toPromise();
+	}
+}
diff --git a/apps/gauzy/src/app/@core/services/product-variant-settings.service.ts b/apps/gauzy/src/app/@core/services/product-variant-settings.service.ts
new file mode 100644
index 0000000000..b6213d6212
--- /dev/null
+++ b/apps/gauzy/src/app/@core/services/product-variant-settings.service.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { ProductVariantSettings } from '@gauzy/models';
+import { first } from 'rxjs/operators';
+
+@Injectable()
+export class ProductVariantSettingsService {
+	PRODUCT_VARIANT_SETTINGS_URL = '/api/product-variant-settings';
+
+	constructor(private http: HttpClient) {}
+
+	updateProductVariantSettings(
+		productVariantSettings: ProductVariantSettings
+	): Promise<ProductVariantSettings> {
+		return this.http
+			.put<ProductVariantSettings>(
+				`${this.PRODUCT_VARIANT_SETTINGS_URL}/${productVariantSettings.id}`,
+				productVariantSettings
+			)
+			.pipe(first())
+			.toPromise();
+	}
+
+	getProductVariantSettings(): Promise<ProductVariantSettings[]> {
+		return this.http
+			.get<ProductVariantSettings[]>(this.PRODUCT_VARIANT_SETTINGS_URL)
+			.pipe(first())
+			.toPromise();
+	}
+}
diff --git a/apps/gauzy/src/app/@core/services/product-variant.service.ts b/apps/gauzy/src/app/@core/services/product-variant.service.ts
index 345b021855..166f2f332f 100644
--- a/apps/gauzy/src/app/@core/services/product-variant.service.ts
+++ b/apps/gauzy/src/app/@core/services/product-variant.service.ts
@@ -9,6 +9,13 @@ export class ProductVariantService {
 
 	constructor(private http: HttpClient) {}
 
+	getProductVariant(id: string): Promise<ProductVariant> {
+		return this.http
+			.get<ProductVariant>(`${this.PRODUCT_VARIANTS_URL}/${id}`)
+			.pipe(first())
+			.toPromise();
+	}
+
 	createProductVariants(product: Product): Promise<ProductVariant[]> {
 		return this.http
 			.post<ProductVariant[]>(
@@ -18,4 +25,16 @@ export class ProductVariantService {
 			.pipe(first())
 			.toPromise();
 	}
+
+	updateProductVariant(
+		productVariant: ProductVariant
+	): Promise<ProductVariant> {
+		return this.http
+			.put<ProductVariant>(
+				`${this.PRODUCT_VARIANTS_URL}/${productVariant.id}`,
+				productVariant
+			)
+			.pipe(first())
+			.toPromise();
+	}
 }
diff --git a/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.html b/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.html
index 541cd4294a..462df3f406 100644
--- a/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.html
+++ b/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.html
@@ -175,7 +175,7 @@ <h5>
 	</nb-card-body>
 	<nb-card-footer class="text-right">
 		<button (click)="onCancel()" status="warning" class="mr-3" nbButton>
-			{{ 'BUTTONS.CANCEL' | translate }}
+			{{ 'BUTTONS.CLOSE' | translate }}
 		</button>
 		<button status="success" nbButton (click)="onSaveRequest()">
 			{{ 'BUTTONS.SAVE' | translate }}
diff --git a/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.ts b/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.ts
index 4a7910acbf..282564cd9a 100644
--- a/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.ts
+++ b/apps/gauzy/src/app/@shared/product-mutation/product-form/product-form.component.ts
@@ -5,7 +5,8 @@ import {
 	Product,
 	ProductType,
 	ProductCategory,
-	ProductOption
+	ProductOption,
+	ProductVariant
 } from '@gauzy/models';
 import { TranslateService } from '@ngx-translate/core';
 import { ProductTypeService } from '../../../@core/services/product-type.service';
@@ -28,6 +29,7 @@ export class ProductFormComponent extends TranslationBaseComponent
 	productTypes: ProductType[];
 	productCategories: ProductCategory[];
 	options: Array<ProductOption> = [];
+	variants: Array<ProductVariant> = [];
 
 	@Output() save = new EventEmitter<Product>();
 	@Output() cancel = new EventEmitter<string>();
@@ -47,6 +49,9 @@ export class ProductFormComponent extends TranslationBaseComponent
 		this.loadProductTypes();
 		this.loadProductCategories();
 		this._initializeForm();
+
+		this.options = this.product ? this.product.options : [];
+		this.variants = this.product ? this.product.variants : [];
 	}
 
 	private _initializeForm() {
@@ -81,14 +86,14 @@ export class ProductFormComponent extends TranslationBaseComponent
 	}
 
 	onSaveRequest() {
-		const newProduct = {
+		const productRequest = {
 			name: this.form.get('name').value,
 			code: this.form.get('code').value,
 			productTypeId: this.form.get('productTypeId').value,
 			productCategoryId: this.form.get('productCategoryId').value,
 			enabled: this.form.get('enabled').value,
 			description: this.form.get('description').value,
-			variants: [],
+			variants: this.variants,
 			options: this.options,
 			category: this.productCategories.find((c) => {
 				return c.id === this.form.get('productCategoryId').value;
@@ -98,7 +103,11 @@ export class ProductFormComponent extends TranslationBaseComponent
 			})
 		};
 
-		this.save.emit(newProduct);
+		if (this.product) {
+			productRequest['id'] = this.product.id;
+		}
+
+		this.save.emit(productRequest);
 	}
 
 	onAddOption() {
diff --git a/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.html b/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.html
index 65727b8fe6..2d8655901d 100644
--- a/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.html
+++ b/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.html
@@ -8,6 +8,7 @@
 	></ngx-product-form>
 	<ngx-product-variant-form
 		*ngIf="edit === 'product-variant' && editProductVariant"
+		(save)="onSaveProductVarinat($event)"
 		(cancel)="closeDialog($event)"
 		[productVariant]="editProductVariant"
 	>
diff --git a/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.ts b/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.ts
index 36cb38cf91..e738e83c47 100644
--- a/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.ts
+++ b/apps/gauzy/src/app/@shared/product-mutation/product-mutation.component.ts
@@ -1,11 +1,13 @@
 import { Component } from '@angular/core';
 import { TranslationBaseComponent } from '../language-base/translation-base.component';
 import { TranslateService } from '@ngx-translate/core';
-import { NbDialogRef } from '@nebular/theme';
+import { NbDialogRef, NbToastrService } from '@nebular/theme';
 import { Product, ProductVariant } from '@gauzy/models';
 import { FormGroup } from '@angular/forms';
 import { ProductService } from '../../@core/services/product.service';
 import { ProductVariantService } from '../../@core/services/product-variant.service';
+import { ProductVariantSettingsService } from '../../@core/services/product-variant-settings.service';
+import { ProductVariantPriceService } from '../../@core/services/product-variant-price.service';
 
 @Component({
 	selector: 'ngx-product-mutation',
@@ -20,9 +22,12 @@ export class ProductMutationComponent extends TranslationBaseComponent {
 
 	constructor(
 		readonly translationService: TranslateService,
+		private toastrService: NbToastrService,
 		public dialogRef: NbDialogRef<ProductMutationComponent>,
 		private productService: ProductService,
-		private productVariantService: ProductVariantService
+		private productVariantService: ProductVariantService,
+		private productVariantPriceService: ProductVariantPriceService,
+		private productVariantSettingsService: ProductVariantSettingsService
 	) {
 		super(translationService);
 	}
@@ -34,8 +39,46 @@ export class ProductMutationComponent extends TranslationBaseComponent {
 				this.product
 			);
 		} else {
-			// product = await this.productService.update(productRequest);
+			this.product = await this.productService.update(productRequest);
 		}
+
+		this.toastrService.primary(
+			this.getTranslation('INVENTORY_PAGE.INVENTORY_ITEM_SAVED'),
+			this.getTranslation('TOASTR.TITLE.SUCCESS')
+		);
+	}
+
+	async onSaveProductVarinat(productVariantRequest: any) {
+		await this.productVariantSettingsService.updateProductVariantSettings(
+			productVariantRequest.productVariantSettings
+		);
+
+		await this.productVariantPriceService.updateProductVariantPrice(
+			productVariantRequest.productVariantPrice
+		);
+
+		await this.productVariantService.updateProductVariant(
+			productVariantRequest.productVariant
+		);
+
+		const oldVariant = this.product.variants.find(
+			(v) => v.id === productVariantRequest.productVariant.id
+		);
+
+		const newProductVariant = await this.productVariantService.getProductVariant(
+			oldVariant.id
+		);
+
+		this.product.variants[
+			this.product.variants.indexOf(oldVariant)
+		] = newProductVariant;
+
+		this.closeDialog('PRODUCT_VARIANT_EDIT');
+
+		this.toastrService.primary(
+			this.getTranslation('INVENTORY_PAGE.PRODUCT_VARIANT_SAVED'),
+			this.getTranslation('TOASTR.TITLE.SUCCESS')
+		);
 	}
 
 	async onEditProductVariant(productVariantId: string) {
diff --git a/apps/gauzy/src/app/@shared/product-mutation/product-mutation.module.ts b/apps/gauzy/src/app/@shared/product-mutation/product-mutation.module.ts
index 3b6462de96..10df9e7c21 100644
--- a/apps/gauzy/src/app/@shared/product-mutation/product-mutation.module.ts
+++ b/apps/gauzy/src/app/@shared/product-mutation/product-mutation.module.ts
@@ -8,7 +8,8 @@ import {
 	NbInputModule,
 	NbCheckboxModule,
 	NbButtonModule,
-	NbSelectModule
+	NbSelectModule,
+	NbToastrModule
 } from '@nebular/theme';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { HttpLoaderFactory } from '../../@theme/components/header/selectors/employee/employee.module';
@@ -21,6 +22,9 @@ import { ProductService } from '../../@core/services/product.service';
 import { ProductTypeService } from '../../@core/services/product-type.service';
 import { ProductVariantFormComponent } from './product-variant-form/product-variant-form.component';
 import { ProductVariantService } from '../../@core/services/product-variant.service';
+import { ProductVariantSettingsService } from '../../@core/services/product-variant-settings.service';
+import { ProductVariantPriceService } from '../../@core/services/product-variant-price.service';
+import { UserFormsModule } from '../user/forms/user-forms.module';
 
 @NgModule({
 	declarations: [
@@ -40,6 +44,8 @@ import { ProductVariantService } from '../../@core/services/product-variant.serv
 		ReactiveFormsModule,
 		NbSelectModule,
 		NbCheckboxModule,
+		NbToastrModule,
+		UserFormsModule,
 		TranslateModule.forChild({
 			loader: {
 				provide: TranslateLoader,
@@ -52,7 +58,9 @@ import { ProductVariantService } from '../../@core/services/product-variant.serv
 		ProductTypeService,
 		ProductCategoryService,
 		ProductService,
-		ProductVariantService
+		ProductVariantService,
+		ProductVariantSettingsService,
+		ProductVariantPriceService
 	]
 })
 export class ProductMutationModule {}
diff --git a/apps/gauzy/src/app/@shared/product-mutation/product-variant-form/product-variant-form.component.ts b/apps/gauzy/src/app/@shared/product-mutation/product-variant-form/product-variant-form.component.ts
index 61b7c0e3a8..abb519ea23 100644
--- a/apps/gauzy/src/app/@shared/product-mutation/product-variant-form/product-variant-form.component.ts
+++ b/apps/gauzy/src/app/@shared/product-mutation/product-variant-form/product-variant-form.component.ts
@@ -15,7 +15,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 })
 export class ProductVariantFormComponent extends TranslationBaseComponent
 	implements OnInit {
-	@Output() save = new EventEmitter<ProductVariant>();
+	@Output() save = new EventEmitter<any>();
 	@Output() cancel = new EventEmitter<string>();
 
 	currencies = Object.values(CurrenciesEnum);
@@ -86,5 +86,39 @@ export class ProductVariantFormComponent extends TranslationBaseComponent
 		this.cancel.emit('PRODUCT_VARIANT_EDIT');
 	}
 
-	onSaveRequest() {}
+	onSaveRequest() {
+		const formValue = this.form.value;
+
+		const productVariantRequest = {
+			productVariant: {
+				id: this.productVariant.id,
+				internalReference: formValue['internationalReference'],
+				billingInvoicingPolicy: formValue['invoicingPolicy'],
+				quantity: formValue['quantity'],
+				taxes: formValue['taxes'],
+				enabled: formValue['enabled'],
+				notes: formValue['notes']
+			},
+			productVariantPrice: {
+				id: this.productVariant.price.id,
+				retailPrice: formValue['retailPrice'],
+				retailPriceCurrency: formValue['retailPriceCurrency'],
+				unitCost: formValue['unitCost'],
+				unitCostCurrency: formValue['unitCostCurrency']
+			},
+			productVariantSettings: {
+				id: this.productVariant.settings.id,
+				isSubscription: formValue['isSubscription'],
+				isPurchaseAutomatically: formValue['isPurchaseAutomatically'],
+				canBeSold: formValue['canBeSold'],
+				canBePurchased: formValue['canBePurchased'],
+				canBeCharged: formValue['canBeCharged'],
+				canBeRented: formValue['canBeRented'],
+				trackInventory: formValue['trackInventory'],
+				isEquipment: formValue['isEquipment']
+			}
+		};
+
+		this.save.emit(productVariantRequest);
+	}
 }
diff --git a/apps/gauzy/src/app/pages/inventory/inventory-table/inventory.component.ts b/apps/gauzy/src/app/pages/inventory/inventory-table/inventory.component.ts
index ffc0d8071d..8b08337db1 100644
--- a/apps/gauzy/src/app/pages/inventory/inventory-table/inventory.component.ts
+++ b/apps/gauzy/src/app/pages/inventory/inventory-table/inventory.component.ts
@@ -8,6 +8,7 @@ import { ProductMutationComponent } from '../../../@shared/product-mutation/prod
 import { first } from 'rxjs/operators';
 import { ProductService } from '../../../@core/services/product.service';
 import { Product, ProductType, ProductCategory } from '@gauzy/models';
+import { DeleteConfirmationComponent } from '../../../@shared/user/forms/delete-confirmation/delete-confirmation.component';
 
 export interface SelectedProduct {
 	data: Product;
@@ -87,23 +88,31 @@ export class InventoryComponent extends TranslationBaseComponent
 			context: { product: this.selectedItem }
 		});
 
-		const product = await dialog.onClose.pipe(first()).toPromise();
+		await dialog.onClose.pipe(first()).toPromise();
 
-		if (product) {
+		this.loadSettings();
+	}
+
+	async delete() {
+		const result = await this.dialogService
+			.open(DeleteConfirmationComponent)
+			.onClose.pipe(first())
+			.toPromise();
+
+		if (result) {
+			await this.productService.delete(this.selectedItem.id);
+			this.loadSettings();
 			this.toastrService.primary(
-				this.getTranslation('INVENTORY_PAGE.INVENTORY_ITEM_SAVED'),
+				this.getTranslation('INVENTORY_PAGE.INVENTORY_ITEM_DELETED'),
 				this.getTranslation('TOASTR.TITLE.SUCCESS')
 			);
 		}
-		this.loadSettings();
+		this.disableButton = true;
 	}
 
-	async delete() {}
-
 	async loadSettings() {
 		this.selectedItem = null;
 		const { items } = await this.productService.getAll();
-		console.log(items);
 		this.loading = false;
 		this.smartTableSource.load(items);
 	}
diff --git a/apps/gauzy/src/app/pages/inventory/inventory.module.ts b/apps/gauzy/src/app/pages/inventory/inventory.module.ts
index a4dc90337a..18e9fbcca2 100644
--- a/apps/gauzy/src/app/pages/inventory/inventory.module.ts
+++ b/apps/gauzy/src/app/pages/inventory/inventory.module.ts
@@ -19,6 +19,7 @@ import { ProductMutationComponent } from '../../@shared/product-mutation/product
 import { ProductMutationModule } from '../../@shared/product-mutation/product-mutation.module';
 import { ThemeModule } from '../../@theme/theme.module';
 import { ProductVariantFormComponent } from '../../@shared/product-mutation/product-variant-form/product-variant-form.component';
+import { UserFormsModule } from '../../@shared/user/forms/user-forms.module';
 
 export function HttpLoaderFactory(http: HttpClient) {
 	return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -27,6 +28,7 @@ export function HttpLoaderFactory(http: HttpClient) {
 @NgModule({
 	declarations: [InventoryComponent],
 	imports: [
+		UserFormsModule,
 		InventoryRoutingModule,
 		ThemeModule,
 		CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index bc877d0e40..0070c19a84 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -782,6 +782,7 @@
 		"INVENTORY_ITEM_DELETED": "Inventory item deleted!",
 		"INVENTORY_ITEM_SAVED": "Inventory item saved!",
 		"EDIT_PRODUCT_VARIANT": "Edit product variant",
+		"PRODUCT_VARIANT_SAVED": "Product variant saved",
 		"NAME": "Name",
 		"ENABLED": "Enabled",
 		"PRODUCT_TYPE": "Product type",