Merge branch '1.0.39' into 1.1.0

# Conflicts:
#	BodyshopUploader/Properties/AssemblyInfo.cs
This commit is contained in:
Patrick Fic
2023-01-23 13:44:13 -08:00
2 changed files with 5 additions and 5 deletions

View File

@@ -214,9 +214,7 @@ v_paint_codes
);
foreach (dynamic job in data.jobs)
{
{
logger.Debug($"{job.ro_number}");
doc.Element("PPG").Element("DataInterface").Element("ROData").Element("RepairOrders").Add(new XElement("RO",
new XElement("RONumber", job.ro_number?.Value),
@@ -228,7 +226,7 @@ v_paint_codes
new XElement("ModelYear", job.v_model_yr?.Value),
new XElement("MakeDesc", job.v_make_desc?.Value),
new XElement("ModelName", job.v_model_desc?.Value),
new XElement("OEMColorCode", job.vehicle != null ? job.vehicle?.v_paint_codes == null ? "a" : job.vehicle?.v_paint_codes?.paint_cd1.Value : "b"),
new XElement("OEMColorCode", job.vehicle != null ? job.vehicle?.v_paint_codes == null ? "" : job.vehicle?.v_paint_codes?.paint_cd1?.Value : ""),
new XElement("RefinishLaborHours", job.larhrs?.aggregate?.sum.mod_lb_hrs?.Value),
new XElement("InsuranceCompanyName", job.ins_co_nm?.Value),
new XElement("EstimatorName", $"{job.est_ct_ln}, {job.est_ct_fn}"),