Compare commits

...

10 Commits

Author SHA1 Message Date
Allan Carr
a005f1bb45 IO-3609 Bill Cost Calculation Toggle
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-03-23 15:52:49 -07:00
Dave
f904fa4e18 Merge branch 'feature/IO-3587-Commision-Cut-clean' into release/2026-04-03 2026-03-23 13:04:12 -04:00
Dave Richer
27ffee0c7a Merged in hotfix/2026-03-20 (pull request #3147)
Fix RR
2026-03-20 18:56:08 +00:00
Patrick Fic
187938286d Merged in feature/IO-3515-bill-ocr-feedback (pull request #3145)
IO-3515 Add shopname to bill ai feedback.
2026-03-20 18:15:23 +00:00
Patrick Fic
6ad0272135 Merged in feature/IO-3515-bill-ocr-feedback (pull request #3142)
Feature/IO-3515 bill ocr feedback

Approved-by: Dave Richer
2026-03-19 22:44:36 +00:00
Dave Richer
86db96f47d Merged in feature/IO-3587-Commision-Cut-clean (pull request #3143)
Feature/IO-3587 Commision Cut clean
2026-03-19 22:44:22 +00:00
Allan Carr
ac8c84543a Merged in feature/IO-3616-Production-Phone#-Deeplink (pull request #3139)
IO-3616 Production Phone# Deeplinking

Approved-by: Dave Richer
2026-03-19 18:46:15 +00:00
Dave Richer
78a2ff0fa1 Merged in feature/IO-3587-Commision-Cut-clean (pull request #3140)
Feature/IO-3587 Commision Cut clean
2026-03-19 18:46:02 +00:00
Dave Richer
dac1ed42df Merged in feature/IO-3587-Commision-Cut-clean (pull request #3138)
Feature/IO-3587 Commision Cut clean
2026-03-17 15:20:59 +00:00
Allan Carr
bc5f9f88d1 IO-3616 Production Phone# Deeplinking
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-03-17 00:30:07 -07:00
6 changed files with 26 additions and 3 deletions

View File

@@ -96,6 +96,7 @@ export function BillEnterModalLinesComponent({
// Only fill actual_cost when the user forward-tabs out of Retail (actual_price)
const autofillActualCost = (index) => {
if (bodyshop.accountingconfig?.disableBillCostCalculation) return;
Promise.resolve().then(() => {
const retailRaw = form.getFieldValue(["billlines", index, "actual_price"]);
const actualRaw = form.getFieldValue(["billlines", index, "actual_cost"]);

View File

@@ -6,7 +6,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
import { store } from "../../redux/store";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { TimeFormatter } from "../../utils/DateFormatter";
import PhoneFormatter from "../../utils/PhoneFormatter";
import PhoneNumberFormatter from "../../utils/PhoneFormatter";
import { onlyUnique } from "../../utils/arrayHelper";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
@@ -28,6 +28,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
import ProductionListColumnStatus from "./production-list-columns.status.component";
import ProductionListColumnTouchTime from "./prodution-list-columns.touchtime.component";
import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
import ChatOpenButton from "../chat-open-button/chat-open-button.component.jsx";
const getEmployeeName = (employeeId, employees) => {
const employee = employees.find((e) => e.id === employeeId);
@@ -271,14 +272,24 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
dataIndex: "ownr_ph1",
key: "ownr_ph1",
ellipsis: true,
render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
render: (text, record) =>
technician ? (
<PhoneNumberFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneNumberFormatter>
) : (
<ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
)
},
{
title: i18n.t("jobs.fields.ownr_ph2"),
dataIndex: "ownr_ph2",
key: "ownr_ph2",
ellipsis: true,
render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
render: (text, record) =>
technician ? (
<PhoneNumberFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneNumberFormatter>
) : (
<ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
)
},
{
title: i18n.t("jobs.fields.specialcoveragepolicy"),

View File

@@ -342,6 +342,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
valuePropName="checked"
>
<Switch />
</Form.Item>,
<Form.Item
key="disableBillCostCalculation"
name={["accountingconfig", "disableBillCostCalculation"]}
label={t("bodyshop.fields.disableBillCostCalculation")}
valuePropName="checked"
>
<Switch />
</Form.Item>
]
: []),

View File

@@ -339,6 +339,7 @@
"require_actual_delivery_date": "Require Actual Delivery",
"templates": "Delivery Templates"
},
"disableBillCostCalculation": "Disable Automatic Bill Cost Calculation",
"dms": {
"apcontrol": "AP Control Number",
"appostingaccount": "AP Posting Account",

View File

@@ -339,6 +339,7 @@
"require_actual_delivery_date": "",
"templates": ""
},
"disableBillCostCalculation": "",
"dms": {
"apcontrol": "",
"appostingaccount": "",

View File

@@ -339,6 +339,7 @@
"require_actual_delivery_date": "",
"templates": ""
},
"disableBillCostCalculation": "",
"dms": {
"apcontrol": "",
"appostingaccount": "",