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

Merged in release/2022-08-19 (pull request #560)

Browse Source 
Release/2022 08 19
This commit is contained in:
Patrick Fic
2022-08-17 16:30:52 +00:00
parent c2058bcec6 fe6e85e993
commit 18c182e573
7 changed files with 222 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
View File

@@ -205,7 +205,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseLines);
const HasBeenConvertedTolabor = ({ value }) => { const HasBeenConvertedTolabor = ({ value }) => {
const { t } = useTranslation(); const { t } = useTranslation();
console.log(value);
if (!value) return null; if (!value) return null;
return ( return (
<Tooltip title={t("joblines.labels.convertedtolabor")}> <Tooltip title={t("joblines.labels.convertedtolabor")}>

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

@@ -1,6 +1,7 @@
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 logger = require("../utils/logger");
exports.default = function ({ exports.default = function ({
@@ -37,23 +38,22 @@ exports.default = function ({
amount: Math.round((jobline.act_price || 0) * 100), amount: Math.round((jobline.act_price || 0) * 100),
}).multiply(jobline.part_qty || 1); }).multiply(jobline.part_qty || 1);
if (
(jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) ||
((jobline.db_ref === "900511" ||
jobline.db_ref === "900510" ||
jobline.db_ref === "900500") &&
jobline.prt_dsmk_m &&
jobline.prt_dsmk_m !== 0)
) {
// console.log("Have a part discount", jobline); // console.log("Have a part discount", jobline);
DineroAmount = DineroAmount.add( DineroAmount = DineroAmount.add(
jobline.prt_dsmk_m && jobline.prt_dsmk_m !== 0 ((jobline.prt_dsmk_m && jobline.prt_dsmk_m !== 0) ||
(jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0)) &&
DiscountNotAlreadyCounted(jobline, jobs_by_pk.joblines)
? jobline.prt_dsmk_m
? Dinero({ amount: Math.round(jobline.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(jobline.prt_dsmk_m * 100) })
: DineroAmount.percentage( : Dinero({
Math.abs(jobline.prt_dsmk_p || 0) amount: Math.round(jobline.act_price * 100),
).multiply(jobline.prt_dsmk_p > 0 ? 1 : -1) })
.multiply(jobline.part_qty || 0)
.percentage(Math.abs(jobline.prt_dsmk_p || 0))
.multiply(jobline.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
); );
}
const account = responsibilityCenters.profits.find( const account = responsibilityCenters.profits.find(
(i) => jobline.profitcenter_part.toLowerCase() === i.name.toLowerCase() (i) => jobline.profitcenter_part.toLowerCase() === i.name.toLowerCase()
); );
@@ -82,7 +82,11 @@ exports.default = function ({
state: state:
jobs_by_pk.state_tax_rate === 0 jobs_by_pk.state_tax_rate === 0
? false ? false
: jobline.db_ref === "900511" || jobline.db_ref === "900510" : jobline.db_ref === "900511" ||
jobline.db_ref === "900510" ||
(jobline.mod_lb_hrs === 0 && //Extending IO-1375 as a part of IO-2023
jobline.act_price > 0 &&
jobline.lbr_op === "OP14")
? true ? true
: jobline.tax_part, : jobline.tax_part,
}, },

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

@@ -12,6 +12,7 @@ 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");
exports.default = async function (socket, jobid) { exports.default = async function (socket, jobid) {
try { try {
@@ -70,23 +71,20 @@ exports.default = async function (socket, jobid) {
amount: Math.round(val.act_price * 100), amount: Math.round(val.act_price * 100),
}).multiply(val.part_qty || 1); }).multiply(val.part_qty || 1);
if (
(val.prt_dsmk_p && val.prt_dsmk_p !== 0) ||
((val.db_ref === "900511" ||
val.db_ref === "900510" ||
val.db_ref === "900500") &&
val.prt_dsmk_m &&
val.prt_dsmk_m !== 0)
) {
// console.log("Have a part discount", val);
DineroAmount = DineroAmount.add( DineroAmount = DineroAmount.add(
val.prt_dsmk_m && val.prt_dsmk_m !== 0 ((val.prt_dsmk_m && val.prt_dsmk_m !== 0) ||
(val.prt_dsmk_p && val.prt_dsmk_p !== 0)) &&
DiscountNotAlreadyCounted(val, job.joblines)
? val.prt_dsmk_m
? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
: DineroAmount.percentage(Math.abs(val.prt_dsmk_p || 0)).multiply( : Dinero({
val.prt_dsmk_p > 0 ? 1 : -1 amount: Math.round(val.act_price * 100),
) })
.multiply(val.part_qty || 0)
.percentage(Math.abs(val.prt_dsmk_p || 0))
.multiply(val.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
); );
}
acc[val.profitcenter_part] = acc[val.profitcenter_part] =
acc[val.profitcenter_part].add(DineroAmount); acc[val.profitcenter_part].add(DineroAmount);

2
server/cdk/cdk-job-export.js
View File

@@ -431,7 +431,7 @@ async function QueryDmsCustomerById(socket, JobData, CustomerId) {
async function QueryDmsCustomerByName(socket, JobData) { async function QueryDmsCustomerByName(socket, JobData) {
const ownerName = ( const ownerName = (
JobData.ownr_co_nm JobData.ownr_co_nm && JobData.ownr_co_nm !== ""
? JobData.ownr_co_nm ? JobData.ownr_co_nm
: `${JobData.ownr_ln},${JobData.ownr_fn}` : `${JobData.ownr_ln},${JobData.ownr_fn}`
).replace(replaceSpecialRegex, ""); ).replace(replaceSpecialRegex, "");

10
server/graphql-client/queries.js
View File

@@ -209,6 +209,9 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
prt_dsmk_p prt_dsmk_p
prt_dsmk_m prt_dsmk_m
tax_part tax_part
line_ref
unq_seq
lbr_op
} }
} }
bodyshops(where: {associations: {active: {_eq: true}}}) { bodyshops(where: {associations: {active: {_eq: true}}}) {
@@ -402,6 +405,8 @@ query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
profitcenter_part profitcenter_part
db_ref db_ref
prt_dsmk_p prt_dsmk_p
unq_seq
line_ref
} }
} }
@@ -1112,6 +1117,7 @@ exports.QUERY_JOB_COSTING_DETAILS = ` query QUERY_JOB_COSTING_DETAILS($id: uuid!
joblines(where: { removed: { _eq: false } }) { joblines(where: { removed: { _eq: false } }) {
id id
db_ref db_ref
line_ref
unq_seq unq_seq
line_ind line_ind
tax_part tax_part
@@ -1220,6 +1226,7 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
id id
db_ref db_ref
unq_seq unq_seq
line_ref
line_ind line_ind
tax_part tax_part
line_desc line_desc
@@ -1443,7 +1450,8 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
op_code_desc op_code_desc
profitcenter_labor profitcenter_labor
profitcenter_part profitcenter_part
prt_dsmk_p line_ref
unq_seq
} }
} }
} }

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

@@ -4,6 +4,7 @@ const queries = require("../graphql-client/queries");
const _ = require("lodash"); const _ = require("lodash");
const GraphQLClient = require("graphql-request").GraphQLClient; const GraphQLClient = require("graphql-request").GraphQLClient;
const logger = require("../utils/logger"); const logger = require("../utils/logger");
const { DiscountNotAlreadyCounted } = require("./job-totals");
// Dinero.defaultCurrency = "USD"; // Dinero.defaultCurrency = "USD";
// Dinero.globalLocale = "en-CA"; // Dinero.globalLocale = "en-CA";
Dinero.globalRoundingMode = "HALF_EVEN"; Dinero.globalRoundingMode = "HALF_EVEN";
@@ -308,7 +309,8 @@ function GenerateCostingData(job) {
job.bodyshop.md_responsibility_centers.defaults.profits; job.bodyshop.md_responsibility_centers.defaults.profits;
const allCenters = _.union( const allCenters = _.union(
job.bodyshop.md_responsibility_centers.profits.map((p) => p.name), job.bodyshop.md_responsibility_centers.profits.map((p) => p.name),
job.bodyshop.md_responsibility_centers.costs.map((p) => p.name) job.bodyshop.md_responsibility_centers.costs.map((p) => p.name),
["Unknown"]
); );
const materialsHours = { mapaHrs: 0, mashHrs: 0 }; const materialsHours = { mapaHrs: 0, mashHrs: 0 };
@@ -330,12 +332,15 @@ function GenerateCostingData(job) {
} }
if (val.mod_lbr_ty) { if (val.mod_lbr_ty) {
const laborProfitCenter = const laborProfitCenter =
val.profitcenter_labor || defaultProfits[val.mod_lbr_ty] || "?"; val.profitcenter_labor ||
defaultProfits[val.mod_lbr_ty] ||
"Unknown";
if (laborProfitCenter === "?") if (laborProfitCenter === "Unknown")
console.log("Unknown type", val.line_desc, val.mod_lbr_ty); console.log("Unknown type", val.line_desc, val.mod_lbr_ty);
const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`; const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`;
const laborAmount = Dinero({ const laborAmount = Dinero({
amount: Math.round((job[rateName] || 0) * 100), amount: Math.round((job[rateName] || 0) * 100),
}).multiply(val.mod_lb_hrs || 0); }).multiply(val.mod_lb_hrs || 0);
@@ -344,6 +349,19 @@ function GenerateCostingData(job) {
acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter] =
acc.labor[laborProfitCenter].add(laborAmount); acc.labor[laborProfitCenter].add(laborAmount);
if (
val.mod_lb_hrs === 0 &&
val.act_price > 0 &&
val.lbr_op === "OP14"
) {
//Scenario where SGI may pay out hours using a part price.
acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(
Dinero({
amount: Math.round((val.act_price || 0) * 100),
}).multiply(val.part_qty)
);
}
if (val.mod_lbr_ty === "LAR") { if (val.mod_lbr_ty === "LAR") {
materialsHours.mapaHrs += val.mod_lb_hrs || 0; materialsHours.mapaHrs += val.mod_lb_hrs || 0;
} }
@@ -359,9 +377,9 @@ function GenerateCostingData(job) {
val.part_type !== "PASL" val.part_type !== "PASL"
) { ) {
const partsProfitCenter = const partsProfitCenter =
val.profitcenter_part || defaultProfits[val.part_type] || "?"; val.profitcenter_part || defaultProfits[val.part_type] || "Unknown";
if (partsProfitCenter === "?") if (partsProfitCenter === "Unknown")
console.log("Unknown type", val.line_desc, val.part_type); console.log("Unknown type", val.line_desc, val.part_type);
if (!partsProfitCenter) if (!partsProfitCenter)
@@ -375,7 +393,10 @@ function GenerateCostingData(job) {
}) })
.multiply(val.part_qty || 1) .multiply(val.part_qty || 1)
.add( .add(
val.prt_dsmk_m && val.prt_dsmk_m !== 0 ((val.prt_dsmk_m && val.prt_dsmk_m !== 0) ||
(val.prt_dsmk_p && val.prt_dsmk_p !== 0)) &&
DiscountNotAlreadyCounted(val, job.joblines)
? val.prt_dsmk_m
? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(val.act_price * 100), amount: Math.round(val.act_price * 100),
@@ -383,6 +404,7 @@ function GenerateCostingData(job) {
.multiply(val.part_qty || 0) .multiply(val.part_qty || 0)
.percentage(Math.abs(val.prt_dsmk_p || 0)) .percentage(Math.abs(val.prt_dsmk_p || 0))
.multiply(val.prt_dsmk_p > 0 ? 1 : -1) .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
); );
if (!acc.parts[partsProfitCenter]) if (!acc.parts[partsProfitCenter])
acc.parts[partsProfitCenter] = Dinero(); acc.parts[partsProfitCenter] = Dinero();
@@ -395,9 +417,9 @@ function GenerateCostingData(job) {
(val.part_type === "PAS" || val.part_type === "PASL") (val.part_type === "PAS" || val.part_type === "PASL")
) { ) {
const partsProfitCenter = const partsProfitCenter =
val.profitcenter_part || defaultProfits[val.part_type] || "?"; val.profitcenter_part || defaultProfits[val.part_type] || "Unknown";
if (partsProfitCenter === "?") if (partsProfitCenter === "Unknown")
console.log("Unknown type", val.line_desc, val.part_type); console.log("Unknown type", val.line_desc, val.part_type);
if (!partsProfitCenter) if (!partsProfitCenter)
@@ -411,7 +433,10 @@ function GenerateCostingData(job) {
}) })
.multiply(val.part_qty || 1) .multiply(val.part_qty || 1)
.add( .add(
val.prt_dsmk_m && val.prt_dsmk_m !== 0 ((val.prt_dsmk_m && val.prt_dsmk_m !== 0) ||
(val.prt_dsmk_p && val.prt_dsmk_p !== 0)) &&
DiscountNotAlreadyCounted(val, job.joblines)
? val.prt_dsmk_m
? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(val.act_price * 100), amount: Math.round(val.act_price * 100),
@@ -419,6 +444,7 @@ function GenerateCostingData(job) {
.multiply(val.part_qty || 0) .multiply(val.part_qty || 0)
.percentage(Math.abs(val.prt_dsmk_p || 0)) .percentage(Math.abs(val.prt_dsmk_p || 0))
.multiply(val.prt_dsmk_p > 0 ? 1 : -1) .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
); );
if (!acc.sublet[partsProfitCenter]) if (!acc.sublet[partsProfitCenter])
acc.sublet[partsProfitCenter] = Dinero(); acc.sublet[partsProfitCenter] = Dinero();
@@ -433,17 +459,20 @@ function GenerateCostingData(job) {
const partsProfitCenter = const partsProfitCenter =
val.profitcenter_part || val.profitcenter_part ||
getAdditionalCostCenter(val, defaultProfits) || getAdditionalCostCenter(val, defaultProfits) ||
"?"; "Unknown";
if (partsProfitCenter === "?") { if (partsProfitCenter === "Unknown") {
console.log("Unknown type", val.line_desc, val.part_type); console.log("Unknown type", val.line_desc, val.part_type);
} else { }
const partsAmount = Dinero({ const partsAmount = Dinero({
amount: Math.round((val.act_price || 0) * 100), amount: Math.round((val.act_price || 0) * 100),
}) })
.multiply(val.part_qty || 1) .multiply(val.part_qty || 1)
.add( .add(
val.prt_dsmk_m && val.prt_dsmk_m !== 0 ((val.prt_dsmk_m && val.prt_dsmk_m !== 0) ||
(val.prt_dsmk_p && val.prt_dsmk_p !== 0)) &&
DiscountNotAlreadyCounted(val, job.joblines)
? val.prt_dsmk_m
? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(val.act_price * 100), amount: Math.round(val.act_price * 100),
@@ -451,6 +480,7 @@ function GenerateCostingData(job) {
.multiply(val.part_qty || 0) .multiply(val.part_qty || 0)
.percentage(Math.abs(val.prt_dsmk_p || 0)) .percentage(Math.abs(val.prt_dsmk_p || 0))
.multiply(val.prt_dsmk_p > 0 ? 1 : -1) .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
); );
if (!acc.additional[partsProfitCenter]) if (!acc.additional[partsProfitCenter])
@@ -458,7 +488,6 @@ function GenerateCostingData(job) {
acc.additional[partsProfitCenter] = acc.additional[partsProfitCenter] =
acc.additional[partsProfitCenter].add(partsAmount); acc.additional[partsProfitCenter].add(partsAmount);
} }
}
return acc; return acc;
}, },

51
server/job/job-totals.js
View File

@@ -362,9 +362,9 @@ function CalculateRatesTotals(ratesList) {
} }
function CalculatePartsTotals(jobLines) { function CalculatePartsTotals(jobLines) {
const ret = jobLines const jl = jobLines.filter((jl) => !jl.removed);
.filter((jl) => !jl.removed)
.reduce( const ret = jl.reduce(
(acc, value) => { (acc, value) => {
switch (value.part_type) { switch (value.part_type) {
case "PAS": case "PAS":
@@ -379,11 +379,10 @@ function CalculatePartsTotals(jobLines) {
}) })
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.add( .add(
(value.db_ref === "900511" || ((value.prt_dsmk_m && value.prt_dsmk_m !== 0) ||
value.db_ref === "900510" || (value.prt_dsmk_p && value.prt_dsmk_p !== 0)) &&
value.db_ref === "900500") && DiscountNotAlreadyCounted(value, jl)
value.prt_dsmk_m && ? value.prt_dsmk_m
value.prt_dsmk_m !== 0
? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),
@@ -391,6 +390,7 @@ function CalculatePartsTotals(jobLines) {
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.percentage(Math.abs(value.prt_dsmk_p || 0)) .percentage(Math.abs(value.prt_dsmk_p || 0))
.multiply(value.prt_dsmk_p > 0 ? 1 : -1) .multiply(value.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
) )
), ),
}, },
@@ -408,11 +408,10 @@ function CalculatePartsTotals(jobLines) {
parts: { parts: {
...acc.parts, ...acc.parts,
prt_dsmk_total: acc.parts.prt_dsmk_total.add( prt_dsmk_total: acc.parts.prt_dsmk_total.add(
(value.db_ref === "900511" || ((value.prt_dsmk_m && value.prt_dsmk_m !== 0) ||
value.db_ref === "900510" || (value.prt_dsmk_p && value.prt_dsmk_p !== 0)) &&
value.db_ref === "900500") && DiscountNotAlreadyCounted(value, jl)
value.prt_dsmk_m && ? value.prt_dsmk_m
value.prt_dsmk_m !== 0
? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),
@@ -420,6 +419,7 @@ function CalculatePartsTotals(jobLines) {
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.percentage(Math.abs(value.prt_dsmk_p || 0)) .percentage(Math.abs(value.prt_dsmk_p || 0))
.multiply(value.prt_dsmk_p > 0 ? 1 : -1) .multiply(value.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
), ),
...(value.part_type ...(value.part_type
? { ? {
@@ -429,9 +429,7 @@ function CalculatePartsTotals(jobLines) {
acc.parts.list[value.part_type] && acc.parts.list[value.part_type] &&
acc.parts.list[value.part_type].total acc.parts.list[value.part_type].total
? { ? {
total: acc.parts.list[ total: acc.parts.list[value.part_type].total.add(
value.part_type
].total.add(
Dinero({ Dinero({
amount: Math.round( amount: Math.round(
(value.act_price || 0) * 100 (value.act_price || 0) * 100
@@ -456,11 +454,10 @@ function CalculatePartsTotals(jobLines) {
}).multiply(value.part_qty || 0) }).multiply(value.part_qty || 0)
) )
.add( .add(
(value.db_ref === "900511" || ((value.prt_dsmk_m && value.prt_dsmk_m !== 0) ||
value.db_ref === "900510" || (value.prt_dsmk_p && value.prt_dsmk_p !== 0)) &&
value.db_ref === "900500") && DiscountNotAlreadyCounted(value, jl)
value.prt_dsmk_m && ? value.prt_dsmk_m
value.prt_dsmk_m !== 0
? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),
@@ -468,6 +465,7 @@ function CalculatePartsTotals(jobLines) {
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.percentage(Math.abs(value.prt_dsmk_p || 0)) .percentage(Math.abs(value.prt_dsmk_p || 0))
.multiply(value.prt_dsmk_p > 0 ? 1 : -1) .multiply(value.prt_dsmk_p > 0 ? 1 : -1)
: Dinero()
), ),
}, },
}; };
@@ -706,7 +704,16 @@ function CalculateTaxesTotals(job, otherTotals) {
exports.default = Totals; exports.default = Totals;
function DiscountNotAlreadyCounted(jobline, joblines) { function DiscountNotAlreadyCounted(jobline, joblines) {
if (jobline.db_ref !== "900510") return true; if (
//If it's not a discount line, then it definitely hasn't been counted yet.
jobline.db_ref !== "900510" &&
jobline.db_ref !== "900511"
)
return true;
const ParentLine = joblines.find((j) => j.unq_seq === jobline.line_ref); const ParentLine = joblines.find((j) => j.unq_seq === jobline.line_ref);
return ParentLine && !(ParentLine.prt_dsmk_m && ParentLine.prt_dsmk_m !== 0); return ParentLine && !(ParentLine.prt_dsmk_m && ParentLine.prt_dsmk_m !== 0);
} }
exports.DiscountNotAlreadyCounted = DiscountNotAlreadyCounted;