Merge branch 'feature/1.0.1' into feature/1.0.1_32825

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java

@@ -288,7 +288,7 @@ public class OperationDao extends AbstractDao {
             sql.append("    AND top.report_type in ("+ reportTypeStr +")");
             sql.append("    AND top.report_type in ("+ reportTypeStr +")");
         }
         }
 
 
-        sql.append("        ORDER BY top.operation_start_date DESC, top.operation_name ASC");
+        sql.append("        ORDER BY top.operation_start_date DESC, top.operation_id DESC");
 
 
         Logger.v(TAG, "sql=%s", sql);
         Logger.v(TAG, "sql=%s", sql);
 
 

ABVJE_UI_Android/res/values-ja/arrays.xml

@@ -72,10 +72,4 @@
         <item>縦</item>
         <item>縦</item>
         <item>縦（反転）</item>
         <item>縦（反転）</item>
     </string-array>
     </string-array>
-
-    <string-array name="operation_report_types">
-        <item>Report</item>
-        <item>Routine</item>
-        <item>ReportReply</item>
-    </string-array>
 </resources>
 </resources>
\ No newline at end of file

ABVJE_UI_Android/res/values/arrays.xml

@@ -108,4 +108,9 @@
         <item>0</item>
         <item>0</item>
         <item>1</item>
         <item>1</item>
     </string-array>
     </string-array>
+    <string-array name="operation_report_types">
+        <item>Report</item>
+        <item>Routine</item>
+        <item>ReportReply</item>
+    </string-array>
 </resources>
 </resources>
\ No newline at end of file