USEPA · bl-young · Jul 28, 2025 · Jul 28, 2025 · Jul 28, 2025 · Jul 28, 2025
diff --git a/R/DataDocumentation.R b/R/DataDocumentation.R
@@ -817,8 +817,8 @@
 #' Detail Margins (Before Redef) table for 2017 (2017 schema)
 #' @format A dataframe with 58051 obs. and 9 variables:
 #' \describe{
-#'  \item{NIPACode}{text code}
-#'  \item{MarginsCategory}{text category name, like 'Therapeutic medical equipment'}
+#'  \item{IndustryCode}{text code}
+#'  \item{IndustryDescription}{text category name, like 'Therapeutic medical equipment'}
 #'  \item{CommodityCode}{BEA_2017_Detail_Code}
 #'  \item{CommodityDescription}{BEA_2017_Detail_Name}
 #'  \item{ProducersValue}{USD2017}
@@ -833,8 +833,8 @@
 #' Detail Margins (Before Redef) table for 2012 (2017 schema)
 #' @format A dataframe with 58032 obs. and 9 variables:
 #' \describe{
-#'  \item{NIPACode}{text code}
-#'  \item{MarginsCategory}{text category name, like 'Therapeutic medical equipment'}
+#'  \item{IndustryCode}{text code}
+#'  \item{IndustryDescription}{text category name, like 'Therapeutic medical equipment'}
 #'  \item{CommodityCode}{BEA_2017_Detail_Code}
 #'  \item{CommodityDescription}{BEA_2017_Detail_Name}
 #'  \item{ProducersValue}{USD2017}

diff --git a/R/LoadMargins.R b/R/LoadMargins.R
@@ -17,7 +17,9 @@ getMarginsTable <- function (model) {
   # Change in inventory has negative margins for positive change, which does not accurately portray actual margins either.
   purchaser_removal <- sapply(list("Export", "Import", "ChangeInventories"), getVectorOfCodes,
                               ioschema = model$specs$BaseIOSchema, iolevel = "Detail")
-  MarginsTable <- MarginsTable[!MarginsTable$NIPACode%in%purchaser_removal,]
+  # column names from Margins Tables from 2012 schema were not fixed
+  col <- ifelse("NIPACode" %in% names(MarginsTable), "NIPACode", "IndustryCode")
+  MarginsTable <- MarginsTable[!MarginsTable[[col]] %in% purchaser_removal,]
   # Remove Scrap, Used and secondhand goods, and Non-comparable imports, and Rest of world adjustment commodities
   commodity_removal <- sapply(list("Scrap", "UsedGoods", "NonComparableImport", "RoWAdjustment"), getVectorOfCodes,
                               ioschema = model$specs$BaseIOSchema, iolevel = model$specs$BaseIOLevel)

diff --git a/data-raw/BEAData.R b/data-raw/BEAData.R
@@ -1089,7 +1089,7 @@ getBEADetailMarginsBeforeRedef <- function(year, schema_year = NULL) {
   # Trim table, assign column names
   Margins <- Margins[!is.na(Margins[, 4]), ][-1, ]
   rownames(Margins) <- NULL
-  colnames(Margins) <- c("NIPACode", "MarginsCategory",
+  colnames(Margins) <- c("IndustryCode", "IndustryDescription",
                          "CommodityCode", "CommodityDescription",
                          "ProducersValue", "Transportation",
                          "Wholesale", "Retail", "PurchasersValue")

diff --git a/data/Detail_Margins_2012_BeforeRedef_17sch.rda b/data/Detail_Margins_2012_BeforeRedef_17sch.rda
diff --git a/data/Detail_Margins_2017_BeforeRedef_17sch.rda b/data/Detail_Margins_2017_BeforeRedef_17sch.rda
diff --git a/inst/extdata/metadata/Detail_Margins_2012_BeforeRedef_17sch_metadata.json b/inst/extdata/metadata/Detail_Margins_2012_BeforeRedef_17sch_metadata.json
@@ -1,14 +1,14 @@
 {
   "tool": ["useeior"],
   "name_data": ["Detail_Margins_2012_BeforeRedef_17sch"],
-  "tool_version": ["1.5.2"],
+  "tool_version": ["1.7.2"],
   "ext": ["json"],
-  "date_created": ["2024-05-26"],
+  "date_created": ["2025-07-28"],
   "data_meta": {
     "data_year": [2012],
     "author": ["US Bureau of Economic Analysis"],
     "source_url": ["https://apps.bea.gov/industry/xls/underlying-estimates/Margins_Before_Redefinitions_2017_DET.xlsx"],
     "date_last_modified": ["2024-05-23"],
-    "date_accessed": ["2024-05-26"]
+    "date_accessed": ["2025-07-28"]
   }
 }
diff --git a/inst/extdata/metadata/Detail_Margins_2017_BeforeRedef_17sch_metadata.json b/inst/extdata/metadata/Detail_Margins_2017_BeforeRedef_17sch_metadata.json
@@ -1,14 +1,14 @@
 {
   "tool": ["useeior"],
   "name_data": ["Detail_Margins_2017_BeforeRedef_17sch"],
-  "tool_version": ["1.5.2"],
+  "tool_version": ["1.7.2"],
   "ext": ["json"],
-  "date_created": ["2024-05-26"],
+  "date_created": ["2025-07-28"],
   "data_meta": {
     "data_year": [2017],
     "author": ["US Bureau of Economic Analysis"],
     "source_url": ["https://apps.bea.gov/industry/xls/underlying-estimates/Margins_Before_Redefinitions_2017_DET.xlsx"],
     "date_last_modified": ["2024-05-23"],
-    "date_accessed": ["2024-05-26"]
+    "date_accessed": ["2025-07-28"]
   }
 }
diff --git a/man/Detail_Margins_2012_BeforeRedef_17sch.Rd b/man/Detail_Margins_2012_BeforeRedef_17sch.Rd
diff --git a/man/Detail_Margins_2017_BeforeRedef_17sch.Rd b/man/Detail_Margins_2017_BeforeRedef_17sch.Rd