admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2024-09-20 (pull request #1749)

Browse Source 
Release/2024 09 20 IO-2934 IO-2920 IO-2936 IO-2933 IO-2921 IO-2939 IO-2933 IO-2949 IO-2928 IO-2782 IO-2948 IO-2932
This commit is contained in:
Patrick Fic
2024-09-20 17:05:40 +00:00
parent 8bb6898520 7c8ac50426
commit ff2e4b9d3a
21 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/firebase/firebase.utils.js
View File

@@ -87,7 +87,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
operationName: eventName,
variables: additionalParams,
dbevent: false,
env: "master"
env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
});
// console.log(
// "%c[Analytics]",

3
client/src/redux/messaging/messaging.sagas.js
View File

@@ -36,7 +36,8 @@ export function* openChatByPhone({ payload }) {
data: { conversations }
} = yield client.query({
query: CONVERSATION_ID_BY_PHONE,
variables: { phone: p.number }
variables: { phone: p.number },
fetchPolicy: 'no-cache'
});
if (conversations.length === 0) {

2
hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "courtesycars_idx_fleet" on
"public"."courtesycars" using btree ("fleetnumber");

1
hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."courtesycars_idx_fleet";

2
hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_ownrfn" on
"public"."jobs" using gin ("ownr_fn");

1
hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_ownrfn";

2
hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_ownrln" on
"public"."jobs" using gin ("ownr_ln");

1
hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_ownrln";

2
hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "jobs_idx_iouparent" on
"public"."jobs" using btree ("iouparent");

1
hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."jobs_idx_iouparent";

2
hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_ronumber" on
"public"."jobs" using gin ("ro_number");

1
hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_ronumber";

2
hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_clmno" on
"public"."jobs" using gin ("clm_no");

1
hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_clmno";

2
hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_vmodeldesc" on
"public"."jobs" using gin ("v_model_desc");

1
hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_vmodeldesc";

2
hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_vmakedesc" on
"public"."jobs" using gin ("v_make_desc");

1
hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_vmakedesc";

2
hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql Normal file
View File

@@ -0,0 +1,2 @@
CREATE INDEX "idx_jobs_plateno" on
"public"."jobs" using gin ("plate_no");

1
hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IF EXISTS "public"."idx_jobs_plateno";

26
server/accounting/qbo/qbo-payables.js
View File

@@ -194,7 +194,9 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
bodyshop.md_responsibility_centers.sales_tax_codes,
classes,
taxCodes,
bodyshop.md_responsibility_centers.costs
bodyshop.md_responsibility_centers.costs,
bodyshop.accountingconfig,
bodyshop.region_config
)
);
@@ -298,17 +300,29 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
// },
// ],
const generateBillLine = (billLine, accounts, jobClass, ioSalesTaxCodes, classes, taxCodes, costCenters) => {
const generateBillLine = (
billLine,
accounts,
jobClass,
ioSalesTaxCodes,
classes,
taxCodes,
costCenters,
accountingconfig,
region_config
) => {
const account = costCenters.find((c) => c.name === billLine.cost_center);
return {
DetailType: "AccountBasedExpenseLineDetail",
AccountBasedExpenseLineDetail: {
...(jobClass ? { ClassRef: { value: classes[jobClass] } } : {}),
TaxCodeRef: {
value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
},
TaxCodeRef:
accountingconfig.qbo && accountingconfig.qbo_usa && region_config.includes("CA_")
? {}
: {
value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
},
AccountRef: {
value: accounts[account.accountname]
}