Merge pull request #88 from worldbank/develop

Merge develop to master for publication of 5.2
worldbank · Jul 28, 2017 · e65dfb9 · e65dfb9
2 parents 80f8961 + 9360bb9
commit e65dfb9
Show file tree

Hide file tree

Showing 18 changed files with 1,350 additions and 721 deletions.
diff --git a/src/ado_files/iebaltab.ado b/src/ado_files/iebaltab.ado
diff --git a/src/ado_files/ieboilsave.ado b/src/ado_files/ieboilsave.ado
@@ -1,4 +1,4 @@
-*! version 5.1 31MAY2017  Kristoffer Bjarkefur [email protected]
+*! version 5.2 28JUL2017  Kristoffer Bjarkefur [email protected]
 
 	capture program drop ieboilsave 
 	program ieboilsave , rclass

diff --git a/src/ado_files/ieboilstart.ado b/src/ado_files/ieboilstart.ado
@@ -1,4 +1,4 @@
-*! version 5.1 31MAY2017  Kristoffer Bjarkefur [email protected]
+*! version 5.2 28JUL2017  Kristoffer Bjarkefur [email protected]
 
 	capture program drop ieboilstart
 	program ieboilstart , rclass
@@ -16,11 +16,11 @@
 			
 		*********************************/			
 
-		local stata_versions "11.0 11.1 11.2 12.0 12.1 13.0 13.1 14.0 14.1"
+		local stata_versions "11 11.0 11.1 11.2 12 12.0 12.1 13 13.0 13.1 14 14.0 14.1 14.2 15 15.0"
 
 		if `:list versionnumber in stata_versions' == 0 {
 
-			di as error "{phang}Only recent major releases are allowed. One decimal must always be included. The releases currently allowed are:{break}`stata_versions'{p_end}"
+			di as error "{phang}Only recent major releases are allowed. The releases currently allowed are:{break}`stata_versions'{p_end}"
 			di ""
 			error 198
 			exit

diff --git a/src/ado_files/iecompdup.ado b/src/ado_files/iecompdup.ado
@@ -1,4 +1,4 @@
-*! version 5.1 31MAY2017  Kristoffer Bjarkefur [email protected]
+*! version 5.2 28JUL2017  Kristoffer Bjarkefur [email protected]
 
 	capture program drop iecompdup 
 	program iecompdup , rclass

diff --git a/src/ado_files/iedropone.ado b/src/ado_files/iedropone.ado
@@ -1,4 +1,4 @@
-*! version 5.1 31MAY2017  Kristoffer Bjarkefur [email protected]
+*! version 5.2 28JUL2017  Kristoffer Bjarkefur [email protected]
 
 	capture program drop 	iedropone
 			program define 	iedropone , 

diff --git a/src/ado_files/ieduplicates.ado b/src/ado_files/ieduplicates.ado
@@ -1,4 +1,4 @@
-*! version 5.1 31MAY2017  Kristoffer Bjarkefur [email protected]
+*! version 5.2 28JUL2017  Kristoffer Bjarkefur [email protected]
 
 	capture program drop ieduplicates
 	program ieduplicates , rclass
@@ -402,7 +402,7 @@
 				*Display error message if assertion is not true and some duplicates in the excle file are no longer in the data set
 				if _rc {
 
-					display as error "{phang}One or several observations in the Excel report are no longer found in the data set. Do not manually delete duplicates identified by this command. Use the Excel file generated by this command to delete duplicates. And do not use the same Excel report for a new data set. If you create a new data set you need a new location for your Excel file.{p_end}"
+					display as error "{phang}One or several observations in the Excel report are no longer found in the data set. Always run ieduplicates on the raw data set that include all the duplicates, both new duplicates and those you have already identified. After removing duplicates, save the data set using a different name. You might also recieve this error if you are using an old ieduplicates Excel report on a new data set.{p_end}"
 					error 9
 					exit