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

Merge branch 'hotfix/AIO/2024-04-24' into release/AIO/2024-04-26

Browse Source
This commit is contained in:
Patrick Fic
2024-04-25 08:19:00 -07:00
parent 1e27c4e1ae 6865fcbffc
commit 0d3bc0e95f
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/accounting/qb-receivables-lines.js
View File

@@ -1,9 +1,13 @@
const DineroQbFormat = require("./accounting-constants").DineroQbFormat; const DineroQbFormat = require("./accounting-constants").DineroQbFormat;
const Dinero = require("dinero.js"); const Dinero = require("dinero.js");
const { DiscountNotAlreadyCounted } = require("../job/job-totals");
const logger = require("../utils/logger");
const InstanceManager = require("../utils/instanceMgr").default; const InstanceManager = require("../utils/instanceMgr").default;
const { DiscountNotAlreadyCounted } = InstanceManager({
imex: require("../job/job-totals"),
rome: require("../job/job-totals-USA"),
promanager: "USE_ROME"
});
const logger = require("../utils/logger");
exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes, classes }) { exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes, classes }) {
const InvoiceLineAdd = []; const InvoiceLineAdd = [];

6
server/cdk/cdk-calculate-allocations.js
View File

@@ -9,8 +9,12 @@ const CdkBase = require("../web-sockets/web-socket");
const Dinero = require("dinero.js"); const Dinero = require("dinero.js");
const _ = require("lodash"); const _ = require("lodash");
const { DiscountNotAlreadyCounted } = require("../job/job-totals");
const InstanceManager = require("../utils/instanceMgr").default; const InstanceManager = require("../utils/instanceMgr").default;
const { DiscountNotAlreadyCounted } = InstanceManager({
imex: require("../job/job-totals"),
rome: require("../job/job-totals-USA"),
promanager: "USE_ROME"
});
exports.default = async function (socket, jobid) { exports.default = async function (socket, jobid) {
try { try {

7
server/job/job-costing.js
View File

@@ -2,7 +2,12 @@ const _ = require("lodash");
const Dinero = require("dinero.js"); const Dinero = require("dinero.js");
const queries = require("../graphql-client/queries"); const queries = require("../graphql-client/queries");
const logger = require("../utils/logger"); const logger = require("../utils/logger");
const { DiscountNotAlreadyCounted } = require("./job-totals"); const InstanceManager = require("../utils/instanceMgr").default;
const { DiscountNotAlreadyCounted } = InstanceManager({
imex: require("../job/job-totals"),
rome: require("../job/job-totals-USA"),
promanager: "USE_ROME"
});
// Dinero.defaultCurrency = "USD"; // Dinero.defaultCurrency = "USD";
// Dinero.globalLocale = "en-CA"; // Dinero.globalLocale = "en-CA";