Merge branch 'features/1.4.100_develop' into 'features/1.4.100'

Features/1.4.100 develop

See merge request !217

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

@@ -130,7 +130,7 @@ public class OperationDao extends AbstractDao {
             dto.permitCodeRequiredFlg = cursor.getInt(column);
             dto.permitCodeRequiredFlg = cursor.getInt(column);
         }
         }
 
 
-        column = cursor.getColumnIndex("display_permission_flg ");
+        column = cursor.getColumnIndex("display_permission_flg");
         if (column != -1) {
         if (column != -1) {
             dto.displayPermissionFlg = cursor.getInt(column);
             dto.displayPermissionFlg = cursor.getInt(column);
         }
         }

check @ edcdda20

-Subproject commit 89f7f804a54cf4890189864d9384f6b3de21ccb4
+Subproject commit edcdda20ab9ec49e8c58117222b7a676f7c8c311

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/constant/ErrorCode.java

@@ -54,6 +54,7 @@ public enum ErrorCode {
 	L121(R.string.L121),
 	L121(R.string.L121),
 	L122(R.string.L122),
 	L122(R.string.L122),
 	L124(R.string.L124),
 	L124(R.string.L124),
+	L125(R.string.L125),
 	
 	
     C_E_SYSTEM_0001(R.string.C_E_SYSTEM_0001),
     C_E_SYSTEM_0001(R.string.C_E_SYSTEM_0001),
     C_E_SYSTEM_0002(R.string.C_E_SYSTEM_0002),
     C_E_SYSTEM_0002(R.string.C_E_SYSTEM_0002),

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -4890,7 +4890,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 						//	空き容量が足りない
 						//	空き容量が足りない
 						handleErrorMessageToast(ErrorCode.STORAGE_ERROR);
 						handleErrorMessageToast(ErrorCode.STORAGE_ERROR);
 					} else {
 					} else {
-						handleErrorMessageToast(ErrorCode.L120);
+						handleErrorMessageToast(ErrorCode.L125);
 					}
 					}
 				}
 				}
 			});
 			});