This commit is contained in:
2020-12-15 21:54:02 +00:00
parent a118282fbb
commit 88d3ea747a
2 changed files with 5 additions and 2 deletions

View File

@@ -2232,6 +2232,9 @@ namespace AyaNova.PlugIn.V8
LocalizedTextTable lt = LocalizedTextTable.Load(i.Locale); LocalizedTextTable lt = LocalizedTextTable.Load(i.Locale);
progress.Op("Checking if locale " + i.Locale + " is customized"); progress.Op("Checking if locale " + i.Locale + " is customized");
#if(DEBUG)
continue;
#endif
if (!util.LocaleIsCustomized(i.Locale, lt, progress)) continue; if (!util.LocaleIsCustomized(i.Locale, lt, progress)) continue;
////calculate hash ////calculate hash
//List<string> allStrings = new List<string>(); //List<string> allStrings = new List<string>();

View File

@@ -384,8 +384,8 @@ namespace GZTW.AyaNova.BLL
dr = DBUtil.GetReaderFromSQLString( dr = DBUtil.GetReaderFromSQLString(
"SELECT aMemo.aID, aMemo.aCreated, " + "SELECT aMemo.aID, aMemo.aCreated, " +
"aMemo.aViewed, aMemo.aReplied, aMemo.aSubject, aMemo.aMessage, " + "aMemo.aViewed, aMemo.aReplied, aMemo.aSubject, aMemo.aMessage, " +
"aMemo.aFromID, aMemo.aToId " + "aMemo.aFromID, aMemo.aToId, " +
" 'first' as afirstname, 'last' as alastname, 'ii' as ainitials, 'en' as aemployeenumber, 'r' as aregionname " + "'first' as afirstname, 'last' as alastname, 'ii' as ainitials, 'en' as aemployeenumber, 'r' as aregionname " +
"FROM aMemo order by amemo.acreated"); "FROM aMemo order by amemo.acreated");
} }
else else