From f8aa4975352d03c59daf1e066fa25d49108581ea Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 2 Apr 2020 19:21:17 +0000
Subject: [PATCH]

---
 source/WinFormApp/config.txt                  |  8 ++--
 .../AyaLib/GZTW.AyaNova.BLL/DBManager.cs      | 43 +++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/source/WinFormApp/config.txt b/source/WinFormApp/config.txt
index 8f97dd6..65da8e5 100644
--- a/source/WinFormApp/config.txt
+++ b/source/WinFormApp/config.txt
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 			 
-	<!-- Development test MSSQL DB -->
+	<!-- Development test MSSQL DB 
 	<ConnectionType>DataBase</ConnectionType>
 	<DataBaseType>MSSQL</DataBaseType>	
     <DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>  	
-	 	
+	 	-->
 	 
 	<!-- Customer restored MSSQL DB   		
 	<ConnectionType>DataBase</ConnectionType>
@@ -13,11 +13,11 @@
     <DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova-XXXXX;User Id=sa; Password=abraxis;</DataBaseConnectionString>  	
 	 --> 	
 	
-	<!-- TEST embedded Firebird database 				 	
+	<!-- TEST embedded Firebird database 	-->			 	
 	<ConnectionType>DataBase</ConnectionType>
 	<DataBaseType>FireBird</DataBaseType>	
    	<DataBaseConnectionString>ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3;</DataBaseConnectionString>  	
-	--> 
+	 
 
 	<!-- DataPortal		
 	<ConnectionType>DataPortal</ConnectionType>	
diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/DBManager.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/DBManager.cs
index 16a81b4..398a500 100644
--- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/DBManager.cs
+++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/DBManager.cs
@@ -2620,6 +2620,49 @@ No message for error code 336397208 found.
                                     }
                                     #endregion
 
+                                    #region Firebird Version 136 Case 3740
+                                    if (nSchemaLevel < 136)
+                                    {
+                                        //-- Reset all ON ORDER to zero
+                                        DDL(@"update APARTBYWAREHOUSEINVENTORY set AQUANTITYONORDER=0;");
+                                        
+                                        //-- Update on order to actual values in PO Items
+                                        DDL(
+@"MERGE INTO APARTBYWAREHOUSEINVENTORY AS B 
+USING APURCHASEORDERITEM AS A
+ON A.APARTWAREHOUSEID=B.APARTWAREHOUSEID AND A.APARTID = B.APARTID
+WHEN MATCHED THEN
+UPDATE SET B.AQUANTITYONORDER=A.AQUANTITYORDERED-A.AQUANTITYRECEIVED
+                                        ");
+
+                                        //-- Reset all on order committed to zero
+                                        DDL("update APARTBYWAREHOUSEINVENTORY set AQTYONORDERCOMMITTED = 0;");
+
+                                        //-- Update on order committed to actual values in PO Items
+                                        DDL(
+@"MERGE INTO APARTBYWAREHOUSEINVENTORY AS B 
+USING APURCHASEORDERITEM AS A
+ON A.APARTWAREHOUSEID=B.APARTWAREHOUSEID AND A.APARTID = B.APARTID AND A.ACLOSED=0 AND A.AWORKORDERITEMPARTREQUESTID IS NOT NULL
+WHEN MATCHED THEN
+UPDATE SET B.AQTYONORDERCOMMITTED=A.AQUANTITYORDERED-A.AQUANTITYRECEIVED
+                                        ");
+
+                                        //-- Delete 'closed none received' orphan poitems
+                                        DDL(@"DELETE FROM APURCHASEORDERITEM POI WHERE EXISTS (SELECT AID FROM APURCHASEORDER PO WHERE PO.AID=POI.APURCHASEORDERID AND PO.ASTATUS=4);");
+
+                                        //-- Fix 'Closed - partially received' po items with mismatching quantities
+                                        DDL(
+@"MERGE INTO APURCHASEORDERITEM AS POI 
+USING APURCHASEORDER AS PO
+ON PO.AID=POI.APURCHASEORDERID AND PO.ASTATUS=4
+WHEN MATCHED THEN
+UPDATE SET POI.AQUANTITYORDERED=POI.AQUANTITYRECEIVED, POI.ACLOSED=1;
+                                        ");
+
+                                        nSchemaLevel = 136;
+                                    }
+                                    #endregion
+
                                     #endregion fb v 7.5