diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/devdocs/specs/joyce-planning-docs-used/2017-11-22--1_DONEPOandPOReceipt.odt b/devdocs/specs/joyce-planning-docs-used/2017-11-22--1_DONEPOandPOReceipt.odt index d82ecf76..b11191c4 100644 Binary files a/devdocs/specs/joyce-planning-docs-used/2017-11-22--1_DONEPOandPOReceipt.odt and b/devdocs/specs/joyce-planning-docs-used/2017-11-22--1_DONEPOandPOReceipt.odt differ diff --git a/server/AyaNova/PickList/PartPickList.cs b/server/AyaNova/PickList/PartPickList.cs index 1f1f767e..1c9e4da9 100644 --- a/server/AyaNova/PickList/PartPickList.cs +++ b/server/AyaNova/PickList/PartPickList.cs @@ -12,7 +12,7 @@ namespace AyaNova.PickList SQLFrom = "from apart " + "left join avendor as amanufacturer on (apart.manufacturerid = amanufacturer.id) " + "left join avendor as awholesaler on (apart.wholesalerid = awholesaler.id) " - + "left join avendor as aalternativewholesaler on (apart.wholesalerid = aalternativewholesaler.id) "; + + "left join avendor as aalternativewholesaler on (apart.alternativewholesalerid = aalternativewholesaler.id) "; AllowedRoles = BizRoles.GetRoleSet(DefaultListObjectType).Select; dynamic dTemplate = new JArray(); dynamic cm = null;