Version 23.2-Quitado log del buyFk y modificado mensaje
This commit is contained in:
parent
4e4dbaba15
commit
2737b93895
|
@ -83,11 +83,10 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2-Fallos precontrol-Directo Ubicador desde histórico-Inventario no se cierra-Botón solo Agregar">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2-Fallo item_card">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
@ -98,7 +97,7 @@
|
|||
<component name="CodeInsightWorkspaceSettings">
|
||||
<option name="optimizeImportsOnTheFly" value="true" />
|
||||
</component>
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
|
||||
<component name="ExportToHTMLSettings">
|
||||
<option name="OPEN_IN_BROWSER" value="true" />
|
||||
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
||||
|
@ -234,7 +233,7 @@
|
|||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"cidr.known.project.marker": "true",
|
||||
"com.google.services.firebase.aqiPopupShown": "true",
|
||||
"last_opened_file_path": "C:/Users/sergiodt/proyectos/vn-picture/platforms/android",
|
||||
"last_opened_file_path": "C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.17",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
|
@ -388,13 +387,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00057" summary="Version 8.3 Diseño grafico, llamadas a Salix y return "Finish"">
|
||||
<created>1652788345754</created>
|
||||
<option name="number" value="00057" />
|
||||
<option name="presentableId" value="LOCAL-00057" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1652788345755</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00058" summary="Version 8.4Beta, return "finish" y apptesters">
|
||||
<created>1653400494828</created>
|
||||
<option name="number" value="00058" />
|
||||
|
@ -731,7 +723,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1673601175078</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="106" />
|
||||
<task id="LOCAL-00106" summary="Version 23.2-Fallo item_card">
|
||||
<created>1674486271874</created>
|
||||
<option name="number" value="00106" />
|
||||
<option name="presentableId" value="LOCAL-00106" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674486271876</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="107" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
@ -832,7 +831,6 @@
|
|||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<MESSAGE value="Version 9 Arreglado vuelta atrás controlador" />
|
||||
<MESSAGE value="Version 9.2.1 Refactor Inicio" />
|
||||
<MESSAGE value="Version 9.2.1 Refactor Inicio, pintar a través del rgb, modificado diseño,se añade shelvingLog y muestra colección a través de ticket" />
|
||||
<MESSAGE value="Version 9.2.1 Modificado fragment" />
|
||||
|
@ -857,7 +855,8 @@
|
|||
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
|
||||
<MESSAGE value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
|
||||
<MESSAGE value="Version 23.2 Cambiado collection_assign a String." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Version 23.2 Cambiado collection_assign a String." />
|
||||
<MESSAGE value="Version 23.2-Fallo item_card" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Version 23.2-Fallo item_card" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
|
@ -589,12 +589,7 @@ class CollectionFragment(
|
|||
customDialogList.setValueTwo("")
|
||||
if (it.response.isBlank() || it.response.isEmpty()) {
|
||||
showErrorMessage(getString(R.string.codeNotExist))
|
||||
viewModel.debug_add(
|
||||
"buy_deletedFromApp",
|
||||
value + "-" + sales[storedPosition].itemFk + "-" + getDataInt(
|
||||
USERFK
|
||||
)
|
||||
)
|
||||
|
||||
} else {
|
||||
showErrorMessage(getString(R.string.lineNotExist))
|
||||
}
|
||||
|
|
|
@ -515,7 +515,7 @@
|
|||
<string name="nextEntrySummary">Siguiente paso: resumen entrada</string>
|
||||
<string name="activateModoChecking">Activado modo revisión</string>
|
||||
<string name="allowCheckingMode">Permite activar modo revisión. Escane primero una matrícula</string>
|
||||
<string name="codeNotExist">Código artículo no existe. Por favor remite foto del artículo al dpto informática para comprobar si el código buyFk ha sido borrado</string>
|
||||
<string name="codeNotExist">Código no existe. Avise para que reetiqueten producto</string>
|
||||
<string name="ticketWarning">Urge el ticket que está revisando, la hora de la zona web del ticket ya se ha cerrado</string>
|
||||
<string name="urgentWarning">Aviso urgente</string>
|
||||
<string name="aware">ENTERADO</string>
|
||||
|
|
Loading…
Reference in New Issue