This commit is contained in:
@@ -139,7 +139,7 @@ namespace AyaNova.PlugIn.V8
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
Auth d = new Auth();
|
Auth d = new Auth();
|
||||||
var res = d.ShowDialog(); ;
|
var res = d.ShowDialog(); ;
|
||||||
if (res == DialogResult.Cancel)
|
if (res == DialogResult.Cancel)
|
||||||
@@ -388,8 +388,8 @@ namespace AyaNova.PlugIn.V8
|
|||||||
await ExportVendors(progress);
|
await ExportVendors(progress);
|
||||||
await ExportLoanItems(progress);
|
await ExportLoanItems(progress);
|
||||||
await InitInventory(progress);
|
await InitInventory(progress);
|
||||||
await ExportWarehouses(progress);
|
await ExportWarehouses(progress);
|
||||||
await ExportParts(progress);
|
await ExportParts(progress);
|
||||||
await ExportProjects(progress);
|
await ExportProjects(progress);
|
||||||
//PURCHASE ORDERS deferred to possibly never if people can live without it
|
//PURCHASE ORDERS deferred to possibly never if people can live without it
|
||||||
// await ExportPurchaseOrders(progress);
|
// await ExportPurchaseOrders(progress);
|
||||||
@@ -2319,8 +2319,8 @@ namespace AyaNova.PlugIn.V8
|
|||||||
progress.Op(ObjectTypeName + " " + d.name);
|
progress.Op(ObjectTypeName + " " + d.name);
|
||||||
d.active = i.Active;
|
d.active = i.Active;
|
||||||
|
|
||||||
d.taxAPct = i.TaxA*100;//v8 tax amounts are in percentage not decimal notation so .07 in v7 is 7 in v8
|
d.taxAPct = i.TaxA * 100;//v8 tax amounts are in percentage not decimal notation so .07 in v7 is 7 in v8
|
||||||
d.taxBPct = i.TaxB*100;
|
d.taxBPct = i.TaxB * 100;
|
||||||
d.taxOnTax = i.TaxOnTax;
|
d.taxOnTax = i.TaxOnTax;
|
||||||
|
|
||||||
SetTags(d, tags);
|
SetTags(d, tags);
|
||||||
@@ -2782,7 +2782,10 @@ namespace AyaNova.PlugIn.V8
|
|||||||
dwip.partId = tryPartId;
|
dwip.partId = tryPartId;
|
||||||
dwip.partWarehouseId = Getv7v8IdMap(wip.PartWarehouseID, "warehouse");
|
dwip.partWarehouseId = Getv7v8IdMap(wip.PartWarehouseID, "warehouse");
|
||||||
dwip.taxPartSaleId = Getv7v8IdMapNullOk(wip.TaxPartSaleID);
|
dwip.taxPartSaleId = Getv7v8IdMapNullOk(wip.TaxPartSaleID);
|
||||||
dwip.priceOverride = wip.Price;
|
if (wip.Discount != 0)
|
||||||
|
dwip.priceOverride = wip.Price - (wip.Price * wip.Discount);
|
||||||
|
else
|
||||||
|
dwip.priceOverride = wip.Price;
|
||||||
dwip.price = wip.Price;
|
dwip.price = wip.Price;
|
||||||
dwip.cost = wip.Cost;
|
dwip.cost = wip.Cost;
|
||||||
dwip.description = wip.Description;
|
dwip.description = wip.Description;
|
||||||
@@ -2804,13 +2807,13 @@ namespace AyaNova.PlugIn.V8
|
|||||||
var tryPartId = Getv7v8IdMapNullOk(wipr.PartID);
|
var tryPartId = Getv7v8IdMapNullOk(wipr.PartID);
|
||||||
if (tryPartId == null)
|
if (tryPartId == null)
|
||||||
{
|
{
|
||||||
dwipr.partId = UnknownV7PartId;
|
dwipr.partId = UnknownV7PartId;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
dwipr.partId = tryPartId;
|
dwipr.partId = tryPartId;
|
||||||
dwipr.partWarehouseId = Getv7v8IdMap(wipr.PartWarehouseID, "warehouse");
|
dwipr.partWarehouseId = Getv7v8IdMap(wipr.PartWarehouseID, "warehouse");
|
||||||
//TODO: if migrate purchase orders this is reqd
|
//TODO: if migrate purchase orders this is reqd
|
||||||
// dwipr.purchaseOrderItemId = Getv7v8IdMapNullOk(wipr.PurchaseOrderItemID);
|
// dwipr.purchaseOrderItemId = Getv7v8IdMapNullOk(wipr.PurchaseOrderItemID);
|
||||||
await util.PostAsync("workorder/items/part-requests", dwipr.ToString());
|
await util.PostAsync("workorder/items/part-requests", dwipr.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2821,7 +2824,7 @@ namespace AyaNova.PlugIn.V8
|
|||||||
dynamic dwil = new JObject();
|
dynamic dwil = new JObject();
|
||||||
dwil.workOrderId = RavenId;
|
dwil.workOrderId = RavenId;
|
||||||
dwil.workorderItemId = ravenwoitemid;
|
dwil.workorderItemId = ravenwoitemid;
|
||||||
|
|
||||||
dwil.loanUnitId = Getv7v8IdMap(wil.LoanItemID, "loan unit for workorder");
|
dwil.loanUnitId = Getv7v8IdMap(wil.LoanItemID, "loan unit for workorder");
|
||||||
dwil.outDate = util.DateToV8(wil.OutDate);
|
dwil.outDate = util.DateToV8(wil.OutDate);
|
||||||
dwil.dueDate = util.DateToV8(wil.DueDate);
|
dwil.dueDate = util.DateToV8(wil.DueDate);
|
||||||
@@ -2853,7 +2856,7 @@ namespace AyaNova.PlugIn.V8
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
dwil.priceOverride = wil.Charges;
|
dwil.priceOverride = wil.Charges;
|
||||||
dwil.notes = wil.Notes;
|
dwil.notes = wil.Notes;
|
||||||
await util.PostAsync("workorder/items/loans", dwil.ToString());
|
await util.PostAsync("workorder/items/loans", dwil.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2874,10 +2877,33 @@ namespace AyaNova.PlugIn.V8
|
|||||||
dwl.taxCodeSaleId = Getv7v8IdMapNullOk(wl.TaxRateSaleID);
|
dwl.taxCodeSaleId = Getv7v8IdMapNullOk(wl.TaxRateSaleID);
|
||||||
dwl.serviceRateId = Getv7v8IdMapNullOk(wl.ServiceRateID);
|
dwl.serviceRateId = Getv7v8IdMapNullOk(wl.ServiceRateID);
|
||||||
dwl.serviceDetails = wl.ServiceDetails;
|
dwl.serviceDetails = wl.ServiceDetails;
|
||||||
|
|
||||||
await util.PostAsync("workorder/items/labors", dwl.ToString());
|
await util.PostAsync("workorder/items/labors", dwl.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//##### WORKORDER ITEM TRAVEL
|
||||||
|
foreach (WorkorderItemTravel wt in wi.Travels)
|
||||||
|
{
|
||||||
|
progress.SubOp("WorkorderItemTravel " + wt.ID.ToString());
|
||||||
|
dynamic dwt = new JObject();
|
||||||
|
dwt.workOrderId = RavenId;
|
||||||
|
dwt.workorderItemId = ravenwoitemid;
|
||||||
|
|
||||||
|
//null is ok here for user
|
||||||
|
dwt.userId = Getv7v8IdMapNullOk(wt.UserID);
|
||||||
|
dwt.travelStartDate = util.DateToV8(wt.TravelStartDate);
|
||||||
|
dwt.travelStopDate = util.DateToV8(wt.TravelStopDate);
|
||||||
|
dwt.travelRateQuantity = wt.TravelRateQuantity;
|
||||||
|
dwt.noChargeQuantity = wt.NoChargeQuantity;
|
||||||
|
dwt.taxCodeSaleId = Getv7v8IdMapNullOk(wt.TaxRateSaleID);
|
||||||
|
dwt.travelRateId = Getv7v8IdMapNullOk(wt.TravelRateID);
|
||||||
|
dwt.travelDetails = wt.TravelDetails;
|
||||||
|
dwt.distance = wt.Distance;
|
||||||
|
|
||||||
|
|
||||||
|
await util.PostAsync("workorder/items/travels", dwt.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}//items loop
|
}//items loop
|
||||||
}//wo loop
|
}//wo loop
|
||||||
|
|||||||
Reference in New Issue
Block a user