This commit is contained in:
@@ -1274,6 +1274,8 @@ namespace AyaNova.PlugIn.V8
|
||||
PickListAutoComplete pl = PickListAutoComplete.GetList("**", "contract");
|
||||
progress.Append("Exporting " + pl.Count.ToString() + " " + ObjectTypeName + "s");
|
||||
|
||||
RatePickList RateList = RatePickList.GetList(false);
|
||||
|
||||
foreach (PickListAutoComplete.PickListAutoCompleteInfo i in pl)
|
||||
{
|
||||
if (!progress.KeepGoing) return;
|
||||
@@ -1300,15 +1302,28 @@ namespace AyaNova.PlugIn.V8
|
||||
d.travelRatesOverrideType = 1;
|
||||
|
||||
dynamic dServiceRateItems = new JArray();
|
||||
dynamic dTravelRateItems = new JArray();
|
||||
|
||||
foreach (ContractRate cr in c.Rates)
|
||||
{
|
||||
dynamic dcr = new JObject();
|
||||
dcr.serviceRateId = Getv7v8IdMap(cr.RateID, "ServiceRate for Contract " + d.name);
|
||||
dServiceRateItems.Add(dcr);
|
||||
if (RateList.Contains(cr.RateID))
|
||||
{
|
||||
dynamic dcr = new JObject();
|
||||
if (RateList[cr.RateID].RateType == RateTypes.Service)
|
||||
{
|
||||
dcr.serviceRateId = Getv7v8IdMap(cr.RateID, "ServiceRate for Contract " + d.name);
|
||||
dServiceRateItems.Add(dcr);
|
||||
}
|
||||
else
|
||||
{
|
||||
dcr.travelRateId = Getv7v8IdMap(cr.RateID, "TravelRate for Contract " + d.name);
|
||||
dTravelRateItems.Add(dcr);
|
||||
}
|
||||
}
|
||||
}
|
||||
d.serviceRateItems = dServiceRateItems;
|
||||
|
||||
d.travelRateItems = dTravelRateItems;
|
||||
|
||||
TagFromv7Guid(c.RegionID, tags);
|
||||
SetTags(d, tags);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user