diff --git a/AyaNovaQBI/AyaNovaQBI.csproj b/AyaNovaQBI/AyaNovaQBI.csproj index eba3cb3..56027ce 100644 --- a/AyaNovaQBI/AyaNovaQBI.csproj +++ b/AyaNovaQBI/AyaNovaQBI.csproj @@ -50,6 +50,11 @@ false + + False + True + ..\libs\QuickBooks\qbfc14\interop.QBFC14.dll + ..\libs\QuickBooks\Interop.QBFC15.dll True diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index 4ef4067..d180729 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -1,4 +1,4 @@ -using Interop.QBFC15; +using Interop.QBFC14; using Newtonsoft.Json.Linq; using System; using System.Collections; diff --git a/docs/docs/install-qbi.md b/docs/docs/install-qbi.md index 57fce7a..0ab2f7e 100644 --- a/docs/docs/install-qbi.md +++ b/docs/docs/install-qbi.md @@ -1,11 +1,5 @@ # Installing QBI -Did you hear about Bertram? - -He didn't read all the instructions before starting installation and the whole thing took twice as long and resulted in so many problems down the road it was a right kerfuffle! - -Don't be a Bertram; read these instructions before you install QBI. - ## Requirements before installation #### 64 Bit Windows operating system diff --git a/install/qbi.iss b/install/qbi.iss index a9dafae..2b65d4a 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\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 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 QBFCCheckResult then begin WizardForm.CancelButton.OnClick(WizardForm.CancelButton); end; diff --git a/libs/QuickBooks/qbfc-readme.txt b/libs/QuickBooks/qbfc-readme.txt new file mode 100644 index 0000000..433bacf --- /dev/null +++ b/libs/QuickBooks/qbfc-readme.txt @@ -0,0 +1 @@ +Installer and app are coded to use qbfc14, the installer is on the ayanova.com download site and the docs for qbi link to it so using qbfc14 but keeping the qbfc15 stuff just in case can't get it anywhere else and becomes necessary. \ No newline at end of file diff --git a/libs/QuickBooks/qbfc14/QBFC14.dll b/libs/QuickBooks/qbfc14/QBFC14.dll new file mode 100644 index 0000000..b891508 Binary files /dev/null and b/libs/QuickBooks/qbfc14/QBFC14.dll differ diff --git a/libs/QuickBooks/qbfc14/interop.QBFC14.dll b/libs/QuickBooks/qbfc14/interop.QBFC14.dll new file mode 100644 index 0000000..b1ea2ff Binary files /dev/null and b/libs/QuickBooks/qbfc14/interop.QBFC14.dll differ diff --git a/libs/QuickBooks/msvcp71.dll b/libs/QuickBooks/qbfc14/msvcp71.dll similarity index 100% rename from libs/QuickBooks/msvcp71.dll rename to libs/QuickBooks/qbfc14/msvcp71.dll diff --git a/libs/QuickBooks/msvcr71.dll b/libs/QuickBooks/qbfc14/msvcr71.dll similarity index 100% rename from libs/QuickBooks/msvcr71.dll rename to libs/QuickBooks/qbfc14/msvcr71.dll diff --git a/libs/QuickBooks/qbfc14/xerces-c_2_5_0_qb.dll b/libs/QuickBooks/qbfc14/xerces-c_2_5_0_qb.dll new file mode 100644 index 0000000..3ed2fcd Binary files /dev/null and b/libs/QuickBooks/qbfc14/xerces-c_2_5_0_qb.dll differ diff --git a/libs/QuickBooks/Interop.QBFC15.dll b/libs/QuickBooks/qbfc15/Interop.QBFC15.dll similarity index 100% rename from libs/QuickBooks/Interop.QBFC15.dll rename to libs/QuickBooks/qbfc15/Interop.QBFC15.dll diff --git a/libs/QuickBooks/Interop.QBXMLRP2.dll b/libs/QuickBooks/qbfc15/Interop.QBXMLRP2.dll similarity index 100% rename from libs/QuickBooks/Interop.QBXMLRP2.dll rename to libs/QuickBooks/qbfc15/Interop.QBXMLRP2.dll diff --git a/libs/QuickBooks/QBFC15_0Installer.exe b/libs/QuickBooks/qbfc15/QBFC15_0Installer.exe similarity index 100% rename from libs/QuickBooks/QBFC15_0Installer.exe rename to libs/QuickBooks/qbfc15/QBFC15_0Installer.exe diff --git a/libs/QuickBooks/QbFC15.dll b/libs/QuickBooks/qbfc15/QbFC15.dll similarity index 100% rename from libs/QuickBooks/QbFC15.dll rename to libs/QuickBooks/qbfc15/QbFC15.dll diff --git a/libs/QuickBooks/boost_regex-vc80-mt-p-1_33.dll b/libs/QuickBooks/qbfc15/boost_regex-vc80-mt-p-1_33.dll similarity index 100% rename from libs/QuickBooks/boost_regex-vc80-mt-p-1_33.dll rename to libs/QuickBooks/qbfc15/boost_regex-vc80-mt-p-1_33.dll diff --git a/libs/QuickBooks/qbfc15/msvcp71.dll b/libs/QuickBooks/qbfc15/msvcp71.dll new file mode 100644 index 0000000..9ed0d17 Binary files /dev/null and b/libs/QuickBooks/qbfc15/msvcp71.dll differ diff --git a/libs/QuickBooks/qbfc15/msvcr71.dll b/libs/QuickBooks/qbfc15/msvcr71.dll new file mode 100644 index 0000000..9d9e028 Binary files /dev/null and b/libs/QuickBooks/qbfc15/msvcr71.dll differ diff --git a/libs/QuickBooks/stlport_r50.dll b/libs/QuickBooks/qbfc15/stlport_r50.dll similarity index 100% rename from libs/QuickBooks/stlport_r50.dll rename to libs/QuickBooks/qbfc15/stlport_r50.dll diff --git a/libs/QuickBooks/stlport_vc746.dll b/libs/QuickBooks/qbfc15/stlport_vc746.dll similarity index 100% rename from libs/QuickBooks/stlport_vc746.dll rename to libs/QuickBooks/qbfc15/stlport_vc746.dll diff --git a/libs/QuickBooks/xerces-c_2_5_0_qb_vc12_x64.dll b/libs/QuickBooks/qbfc15/xerces-c_2_5_0_qb_vc12_x64.dll similarity index 100% rename from libs/QuickBooks/xerces-c_2_5_0_qb_vc12_x64.dll rename to libs/QuickBooks/qbfc15/xerces-c_2_5_0_qb_vc12_x64.dll