Merged in release/2024-03-08 (pull request #1329)

Release/2024 03 08

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -138,7 +138,6 @@ export function AccountingPayablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
-
       render: (text, record) => (
         <ExportLogsCountDisplay logs={record.exportlogs} />
       ),
@@ -147,8 +146,6 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
-
       render: (text, record) => (
         <PayableExportButton
           billId={record.id}

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -78,7 +78,10 @@ export function AccountingPayablesTableComponent({
       key: "owner",
       ellipsis: true,
       sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+        alphaSort(
+          OwnerNameDisplayFunction(a.job),
+          OwnerNameDisplayFunction(b.job)
+        ),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -146,8 +149,6 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
-
       render: (text, record) => (
         <PaymentExportButton
           paymentId={record.id}

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,10 +1,5 @@
-import {
-  BorderOutlined,
-  BranchesOutlined,
-  CheckSquareOutlined,
-  PauseCircleOutlined,
-} from "@ant-design/icons";
-import { Space, Tooltip } from "antd";
+import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
+import { Checkbox, Space, Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import { Link } from "react-router-dom";
@@ -312,12 +307,9 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       ],
       onFilter: (value, record) =>
         value.includes(record.special_coverage_policy),
-      render: (text, record) =>
-        record.special_coverage_policy === true ? (
-          <CheckSquareOutlined />
-        ) : (
-          <BorderOutlined />
-        ),
+      render: (text, record) => (
+        <Checkbox disabled checked={record.special_coverage_policy} />
+      ),
     },
 
     {