diff --git a/build/convert_pool.sql b/build/convert_pool.sql
index f3cd8f7..1d670bd 100644
--- a/build/convert_pool.sql
+++ b/build/convert_pool.sql
@@ -286,81 +286,84 @@ WHERE
 
 ---------------------------SET QUOTA REP---------------------------------------
 
-
 UPDATE
-    RLARP.OSMFS_DEV S
+    rlarp.osmfs_dev s
 SET
-    DSM = CR.QUOTA_REP
+    dsm = cr.quota_rep
 FROM
 (
     SELECT DISTINCT
         VERSION,
         COALESCE(GLEC,'') GLEC,
-        COALESCE(MING,'') MING,
+        MING,
         BILL_CUST,
         SHIP_CUST,
         ------------quota rep column--------------
-        RTRIM( 
-            --retail items go to currep, or if null go to 90005
-            CASE WHEN S.GLEC IN ('1RE','1CU') THEN
-                CASE WHEN BVCTRY = 'CAN' THEN
-                    --Rachel Bowman
-                    '50300'
-                ELSE
-                    --select customers go to select reps
-                    CASE ACCOUNT
-                        ------Alecia Latini-------------------------------
-                        WHEN 'DO IT BEST' THEN '90006'
-                        WHEN 'ACE HARDWARE' THEN '90006'
-                        WHEN 'ALDI' THEN '90006'
-                        WHEN 'AMAZON.COM' THEN '90006'
-                        WHEN 'GARDEN RIDGE CORP' THEN '90006' --AKA "At Home"
-                        WHEN 'TRUE VALUE' THEN '90006'
-                        WHEN 'WAYFAIR' THEN '90006'
-                        WHEN 'GRIFFIN' THEN '90006'
-                        WHEN 'WAL-MART' THEN '90006'
-                        ------Tony Landino--------------------------------
-                        WHEN 'THE HOME DEPOT' THEN '50802'
-                        WHEN 'FRED MEYER' THEN '50802'
-                        WHEN 'MENARDS' THEN '50802'
-                        WHEN 'KROGER' THEN '50802'
-                        WHEN 'OCEAN STATE JOBBERS' THEN '50802'
-                        WHEN 'AURORA WHOLESALE' THEN '50802'
-                        WHEN 'LEON KORRAL' THEN '50802'
-                        --all other retail goes to Doran Marable-----------
-                        ELSE '50200'
-                    END
-                END
-                --minor group b52 goes to dedicated rep
+        CASE WHEN COALESCE(ming,'') = 'B52' THEN 'PW' ELSE
+            --if the gl expense code is 1RE use the retail rep assigned to the bill-to customer if available
+            CASE WHEN COALESCE(glec,'') = '1RE' AND  COALESCE(cu.currep,'') <> '' THEN
+                cu.currep
+            --default logic
             ELSE
-                CASE WHEN MING = 'B52' THEN 
-                    'PW'
-                --gdir, ndir go to bill-to rep
-                ELSE 
-                    CASE WHEN BILL_CLASS IN ('GDIR','NDIR') THEN 
-                        BILL_REP
+                CASE SUBSTR(bill_class,2,3)
+                    WHEN 'DIS' THEN
+                        ship_rep
                     ELSE
-                        SHIP_REP
-                    END
+                        bill_rep
                 END
             END
-        ) QUOTA_REP
+        END QUOTA_REP
     FROM 
-        RLARP.OSMFS_DEV S
-        LEFT OUTER JOIN LGDAT.CUST ON
-          BVCUST = BILL_CUST
+        rlarp.osmfs_dev s
+        LEFT OUTER JOIN lgdat.cust ON
+            bvcust = bill_cust
+        LEFT OUTER JOIN lgpgm.usrcust cu ON
+            cu.cucust = s.bill_cust
     WHERE
-        COALESCE(GLEC,'') IS NOT NULL
+        version = 'ACTUALS'
     ) CR
 WHERE
     CR.VERSION = S.VERSION
     AND CR.GLEC = COALESCE(S.GLEC,'')
-    AND CR.MING = COALESCE(S.MING,'')
+    AND CR.MING = S.MING
     AND CR.BILL_CUST = S.BILL_CUST 
     AND CR.SHIP_CUST = S.SHIP_CUST
     AND COALESCE(S.DSM,'') <> CR.QUOTA_REP;
 
 
+-------------------set fiscal period--------------------------------------
+
+UPDATE
+    rlarp.osmfs_dev f
+SET
+    fspr = gld.fspr
+FROM
+    (
+        SELECT 
+            N1COMP COMP
+            ,N1CCYY FSYRq
+            ,KPMAXP PERDS
+            ,N1FSPP PERD
+            ,to_char(N1FSYP,'FM0000') FSPR
+            ,N1SD01 SDAT
+            ,N1ED01 EDAT
+            ,to_char(N1ED01,'yymm') CAPR
+            ,N1ED01 - N1SD01 +1 NDAYS 
+            ,CASE WHEN EXTRACT(MONTH FROM N1ED01) >= 6 THEN EXTRACT(YEAR FROM N1ED01) + 1 ELSE EXTRACT(YEAR FROM N1ED01) END SSYR
+            ,to_char(CASE WHEN EXTRACT(MONTH FROM N1ED01) >= 6 THEN EXTRACT(MONTH FROM N1ED01) -5  ELSE EXTRACT(MONTH FROM N1ED01) +7 END,'00') SSPR
+        FROM 
+            LGDAT.GLDATREF 
+            INNER JOIN LGDAT.GLDATE ON 
+                KPCOMP = N1COMP AND 
+                KPCCYY = N1CCYY
+        WHERE
+            N1COMP = 93
+            --AND DIGITS(N1FSYP) = '1901'
+    ) gld
+WHERE
+    f.sdate BETWEEN gld.sdat AND gld.edat
+    AND coalesce(f.fspr,'') <> gld.fspr;
+
 UPDATE
     rlarp.osmfS_dev
 SET
diff --git a/build/convert_pool_all.sql b/build/convert_pool_all.sql
index 08dd8ef..817cd7b 100644
--- a/build/convert_pool_all.sql
+++ b/build/convert_pool_all.sql
@@ -111,33 +111,6 @@ SELECT
 FROM
     rlarp.osm_pool;
 
-UPDATE
-    RLARP.OSMFS_DEV O
-SET
-    COLC = M.COLC
-    ,COLGRP = M.COLGRP
-    ,COLTIER = M.COLTIER
-    ,COLSTAT = M.COLSTAT
-    ,SIZC = M.SIZC
-    ,PCKG = M.PACKAGE
-    ,KIT = M.KIT
-    ,BRND = M.BRANDING
-    ,MAJG = M.MAJG
-    ,MING = M.MING
-    ,MAJS = M.MAJS
-    ,MINS = M.MINS
-    ,GLDC = M.GLCD
-    ,GLEC = M.GLEC
-    ,HARM = M.HARM
-    ,CLSS = M.CLSS
-    ,BRAND = M.BRAND
-    ,ASSC = M.ASSC
-    ,LBS = CASE M.NWUN WHEN 'KG' THEN 2.2046 ELSE 1 END*M.NWHT
-    ,UNTI = M.UNTI
-FROM
-    RLARP.ITEMM M
-WHERE
-    M.ITEM = O.PART;
 
 WITH
 plist AS (
@@ -420,6 +393,34 @@ SET
 WHERE
     c_currency = 'US';
 
+UPDATE
+    RLARP.OSMFS_DEV O
+SET
+    COLC = M.COLC
+    ,COLGRP = M.COLGRP
+    ,COLTIER = M.COLTIER
+    ,COLSTAT = M.COLSTAT
+    ,SIZC = M.SIZC
+    ,PCKG = M.PACKAGE
+    ,KIT = M.KIT
+    ,BRND = M.BRANDING
+    ,MAJG = M.MAJG
+    ,MING = M.MING
+    ,MAJS = M.MAJS
+    ,MINS = M.MINS
+    ,GLDC = M.GLCD
+    ,GLEC = M.GLEC
+    ,HARM = M.HARM
+    ,CLSS = M.CLSS
+    ,BRAND = M.BRAND
+    ,ASSC = M.ASSC
+    ,LBS = CASE M.NWUN WHEN 'KG' THEN 2.2046 ELSE 1 END*M.NWHT
+    ,UNTI = M.UNTI
+FROM
+    RLARP.ITEMM M
+WHERE
+    M.ITEM = O.PART;
+
 --DELETE FROM rlarp.osmf_dev WHERE iter IN ('adj price','adj volume');
 
 --INSERT INTO rlarp.osmf_dev SELECT * FROM rlarp.osmfs_dev;