diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index e617cf3b5..d7adeb4fe 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -251,7 +251,10 @@ function BillEnterModalContainer({
       keyboard="false"
       onOk={() => form.submit()}
       onCancel={handleCancel}
-      afterClose={() => form.resetFields()}
+      afterClose={() => {
+        form.resetFields();
+        setLoading(false);
+      }}
       footer={
         <Space>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index 29bd6cbc7..3f78412cd 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -7,14 +7,14 @@ import {
   Select,
   Space,
   Switch,
-  Table,
+  Table
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CiecaSelect, { GetPartTypeName } from "../../utils/Ciecaselect";
+import CiecaSelect from "../../utils/Ciecaselect";
 import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 
@@ -74,7 +74,7 @@ export function BillEnterModalLinesComponent({
                         actual_price: opt.cost,
                         cost_center: opt.part_type
                           ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
-                            ? GetPartTypeName(opt.part_type)
+                            ? opt.part_type
                             : responsibilityCenters.defaults &&
                               (responsibilityCenters.defaults.costs[
                                 opt.part_type