diff --git a/.gitignore b/.gitignore index 0fde7df..b2219d7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ bin/ obj/ *.user .vs/ -packages/ \ No newline at end of file +packages/ +/install/output +/AyaNovaQBI/Timestamp.cs diff --git a/AyaNovaQBI/AyaNovaQBI.csproj b/AyaNovaQBI/AyaNovaQBI.csproj index ffb123d..eba3cb3 100644 --- a/AyaNovaQBI/AyaNovaQBI.csproj +++ b/AyaNovaQBI/AyaNovaQBI.csproj @@ -50,10 +50,9 @@ false - - False + + ..\libs\QuickBooks\Interop.QBFC15.dll True - ..\..\..\..\Program Files (x86)\Common Files\Intuit\QuickBooks\interop.QBFC14.dll packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index d180729..4ef4067 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -1,4 +1,4 @@ -using Interop.QBFC14; +using Interop.QBFC15; using Newtonsoft.Json.Linq; using System; using System.Collections; diff --git a/install/qbi.iss b/install/qbi.iss index 2b65d4a..a9dafae 100644 --- a/install/qbi.iss +++ b/install/qbi.iss @@ -54,8 +54,8 @@ function CheckForQBFC(): Boolean; begin if not QBFCChecked then begin QBFCCheckResult := True; - if not FileExists(ExpandConstant('{commoncf32}\Intuit\QuickBooks\QBFC14.dll')) then begin - QBFCCheckResult := MsgBox('QBFC14 does not appear to have been installed as required prior to QBI.' #13#13 'File: ' + ExpandConstant('{commoncf32}\Intuit\QuickBooks\QBFC14.dll') + ' was not found.'#13#13'Do you want to install QBI anyway?', mbConfirmation, MB_YESNO) = idYes; + if not FileExists(ExpandConstant('{commoncf32}\Intuit\QuickBooks\QBFC15.dll')) then begin + QBFCCheckResult := MsgBox('QBFC15 does not appear to have been installed as required prior to QBI.' #13#13 'File: ' + ExpandConstant('{commoncf32}\Intuit\QuickBooks\QBFC15.dll') + ' was not found.'#13#13'Do you want to install QBI anyway?', mbConfirmation, MB_YESNO) = idYes; if not QBFCCheckResult then begin WizardForm.CancelButton.OnClick(WizardForm.CancelButton); end;