SLX 8.1 Upgrade
MAS to SLX Account Contact DataFlow for SLX 8.1 NO UPDATES
SSIS MAS to SLX Products Pricing
Item Updater and minor StockCard Changes
Merge branch 'master' of https://github.com/ssommerfeldt/TAC_EAB

Conflicts:
	Extra/EAB_Custom/EAB_Custom/bin/Debug/ICSharpCode.NRefactory.dll
	Extra/EAB_Custom/EAB_Custom/bin/Debug/Sage.Integration.Client.dll
	Extra/EAB_Custom/EAB_Custom/bin/Debug/Sage.Integration.Diagnostics.dll
	Extra/EAB_Custom/EAB_Custom/bin/Debug/Sage.Platform.VirtualFileSystem.dll
	Extra/EAB_Custom/EAB_Custom/bin/Debug/Sage.SalesLogix.DelphiBridge.dll
	Model/Entity Model/EntityResources.resx
	Model/Entity Model/SalesLogix Application Entities/Account/Account.ACCOUNT.entity.xml
	Model/Entity Model/SalesLogix Application Entities/AccountFinancial/AccountFinancial.ACCOUNTFINANCIAL.entity.xml
	Model/Entity Model/SalesLogix Application Entities/AccountProductCategory/AccountProductCategory.ACCOUNTPRODUCTCATEGORY.entity.xml
	Model/Entity Model/SalesLogix Application Entities/AccountSummary/AccountSummary.Account.ACCOUNTSUMMARY.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Address/Address.ADDRESS.entity.xml
	Model/Entity Model/SalesLogix Application Entities/ERPSalesOrder/ERPSalesOrder.SalesOrder.ERPSALESORDER.entity.xml
	Model/Entity Model/SalesLogix Application Entities/PickingList/PickingList.PICKINGLIST.entity.xml
	Model/Entity Model/SalesLogix Application Entities/PickingListItem/PickingListItem.PICKINGLISTITEM.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Product/Product.PRODUCT.entity.xml
	Model/Entity Model/SalesLogix Application Entities/ProductProgram/ProductProgram.PRODUCTPROGRAM.entity.xml
	Model/Entity Model/SalesLogix Application Entities/ProductReference/ProductReference.PRODUCTREFERENCE.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Productstatus/Productstatus.PRODUCTSTATUS.entity.xml
	Model/Entity Model/SalesLogix Application Entities/ReceiptOfGoods/ReceiptOfGoods.RECEIPTOFGOODS.entity.xml
	Model/Entity Model/SalesLogix Application Entities/ReceiptOfGoodsItem/ReceiptOfGoodsItem.RECEIPTOFGOODSITEM.entity.xml
	Model/Entity Model/SalesLogix Application Entities/SLXSite/SLXSite.SITE.entity.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/OnBeforeUpdate.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/QuickForms/SalesOrderProducts.main.quickform.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/SalesOrder.SALESORDER.entity.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/CalcPriceFromProgramPrice.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/CalculateCalcPrice.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/CalculateDiscount.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/CalculateExtendedPrice.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/CalculatePriceChange.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/OnBeforeInsert.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/SalesOrderItem.SALESORDERITEMS.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Sitereference/Sitereference.SITEREFERENCE.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgInvtTranBatch_TAC/StgInvtTranBatch_TAC.STGINVTTRANBATCH_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgInvtTran_TAC/StgInvtTran_TAC.STGINVTTRAN_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgPOLine_TAC/StgPOLine_TAC.STGPOLINE_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgPORcptDist/StgPORcptDist.STGPORCPTDIST.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgPORcptLine/StgPORcptLine.STGPORCPTLINE.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgPORcptRcvr/StgPORcptRcvr.StgPORcptTransBatch.STGPORCPTRCVR.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgPORcptTransBatch/StgPORcptTransBatch.STGPORCPTTRANSBATCH.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgPurchaseOrder_TAC/StgPurchaseOrder_TAC.STGPURCHASEORDER_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgSOLine_TAC/StgSOLine_TAC.STGSOLINE_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgSOPicklistLine_TAC/StgSOPicklistLine_TAC.STGSOPICKLISTLINE_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgSOPicklist_TAC/StgSOPicklist_TAC.STGSOPICKLIST_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgSalesOrder_TAC/StgSalesOrder_TAC.STGSALESORDER_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgTrnsfrOrderLine_TAC/StgTrnsfrOrderLine_TAC.STGTRNSFRORDERLINE_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StgTrnsfrOrder_TAC/StgTrnsfrOrder_TAC.STGTRNSFRORDER_TAC.entity.xml
	Model/Entity Model/SalesLogix Application Entities/StockCardItems/StockCardItems.STOCKCARDITEMS.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Timprodpricegroup/Timprodpricegroup.TIMPRODPRICEGROUP.entity.xml
	Model/Entity Model/SalesLogix Application Entities/USERWHSE/USERWHSE.USERWHSE.entity.xml
	Model/Entity Model/SalesLogix Application Entities/UserDistributorWHSE/UserDistributorWHSE.USERDISTRIBUTORWHSE.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Vlueproductgroup/Vlueproductgroup.vlueProductGroup.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Vlueproductmsrp/Vlueproductmsrp.vluePRODUCTMSRP.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Vluestockcardproduct/Vluestockcardproduct.vlueStockCardProduct.entity.xml
	Model/Entity Model/SalesLogix Application Entities/Vproductpricesheet/Vproductpricesheet.vProductPriceSheet.entity.xml
	Model/Entity Model/SalesLogix Security Support/User/User.USERSECURITY.entity.xml
	Model/Localization/Global_Images.resx
	Model/Mashup Model/SummaryViewQueries.mashup.xml
	Model/Portal/SlxClient/SupportFiles/Bin/EAB_Custom.dll
	Model/project.info.xml
Added Bundle