diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index c8941e88b..f58525479 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -278,10 +278,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         AssntoMech: null,
         AssntoPaint: null,
         AssntoDetail: null,
-        PromiseDate:
-          (job.scheduled_completion &&
-            moment(job.scheduled_completion).format(AhDateFormat)) ||
-          "",
+        // PromiseDate:
+        //   (job.scheduled_completion &&
+        //     moment(job.scheduled_completion).format(AhDateFormat)) ||
+        //   "",
         //InsuranceTargetOut: null,
         CarComplete:
           (job.actual_completion &&
@@ -312,6 +312,11 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         RefinishRate: job.rate_lar || 0,
         MechanicalRate: job.rate_lam || 0,
         StructuralRate: job.rate_las || 0,
+        ElectricalRate: job.rate_lae || 0,
+        FrameRate: job.rate_laf || 0,
+        GlassRate: job.rate_lag || 0,
+        DetailRate: job.rate_lad || 0,
+        LaborMiscRate: 0,
         PMRate: job.rate_mapa || 0,
         BMRate: job.rate_mash || 0,
         TaxRate:
@@ -399,6 +404,13 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         RefinishHours: job.job_totals.rates.lar.hours,
         MechanicalHours: job.job_totals.rates.lam.hours,
         StructuralHours: job.job_totals.rates.las.hours,
+
+        ElectricalHours: job.job_totals.rates.lae.hours,
+        FrameHours: job.job_totals.rates.laf.hours,
+        GlassHours: job.job_totals.rates.lag.hours,
+        DetailHours: job.job_totals.rates.lad.hours,
+        LaborMiscHours: 0,
+
         PartsTotal: Dinero(job.job_totals.parts.parts.total).toFormat(
           AHDineroFormat
         ),
@@ -459,6 +471,29 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         ),
         StructuralLaborTotalCost:
           repairCosts.StructuralLaborTotalCost.toFormat(AHDineroFormat),
+
+        ElectricalLaborTotal: Dinero(job.job_totals.rates.lae.total).toFormat(
+          AHDineroFormat
+        ),
+        ElectricalLaborTotalCost:
+          repairCosts.ElectricalLaborTotalCost.toFormat(AHDineroFormat),
+        FrameLaborTotal: Dinero(job.job_totals.rates.laf.total).toFormat(
+          AHDineroFormat
+        ),
+        FrameLaborTotalCost:
+          repairCosts.FrameLaborTotalCost.toFormat(AHDineroFormat),
+        GlassLaborTotal: Dinero(job.job_totals.rates.lag.total).toFormat(
+          AHDineroFormat
+        ),
+        GlassLaborTotalCost:
+          repairCosts.GlassLaborTotalCost.toFormat(AHDineroFormat),
+        DetailLaborTotal: Dinero(job.job_totals.rates.lag.total).toFormat(
+          AHDineroFormat
+        ),
+        DetailLaborTotalCost:
+          repairCosts.DetailLaborTotalCost.toFormat(AHDineroFormat),
+        LaborMiscTotal: 0,
+        LaborMiscTotalCost: 0,
         MiscellaneousChargeTotal: 0,
         MiscellaneousChargeTotalCost: 0,
         PMTotal: Dinero(job.job_totals.rates.mapa.total).toFormat(
@@ -647,6 +682,14 @@ const CreateCosts = (job) => {
       ticketTotalsByCostCenter[defaultCosts.LAM] || Dinero(),
     StructuralLaborTotalCost:
       ticketTotalsByCostCenter[defaultCosts.LAS] || Dinero(),
+      ElectricalLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAE] || Dinero(),
+      FrameLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAF] || Dinero(),
+      GlassLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAG] || Dinero(),
+      DetailLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAD] || Dinero(),
     PMTotalCost: billTotalsByCostCenters[defaultCosts.MAPA] || Dinero(),
     BMTotalCost: billTotalsByCostCenters[defaultCosts.MASH] || Dinero(),
     MiscTotalCost: billTotalsByCostCenters[defaultCosts.PAO] || Dinero(),