Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Marco Elefante 2024-01-08 12:05:17 +01:00
commit 7c52a692e3
8 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 404
def appVersionName = '1.36.11'
def appVersionCode = 405
def appVersionName = '1.36.12'
signingConfigs {
release {

10
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
View File

@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form;
import androidx.lifecycle.MutableLiveData;
import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import org.json.JSONException;
@ -278,10 +277,15 @@ public class DocInterniEditFormViewModel {
if (doc == null || fornitori == null || tipoDocDTO == null)
return;
List<FornitoreDTO> filterFornitori = Stream.of(fornitori).filter(x->x.getCodAnag().equals(doc.getCodAnag())).toList();
List<FornitoreDTO> filterFornitori = Stream.of(fornitori)
.filter(x -> x.getCodAnag().equals(doc.getCodAnag()))
.toList();
List<CheckFornitoreDTO> checkFornitoreDTO;
TipoDocDTO tipoDoc = Stream.of(tipoDocDTO).filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv())).findFirst().get();
TipoDocDTO tipoDoc = Stream.of(tipoDocDTO)
.filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv()))
.findFirst()
.get();
if (tipoDoc.isFlagChkTracciabilita()) {
this.isCheckPartitaMag = tipoDoc.isFlagChkTracciabilita();

5
barcode_base_android_library/build.gradle
View File

@ -1,12 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 33
compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdk 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'

2
build.gradle
View File

@ -3,7 +3,7 @@
buildscript {
ext {
kotlin_version = '1.9.0'
agp_version = '8.2.0'
agp_version = '8.2.1'
}
repositories {

4
honeywellscannerlibrary/build.gradle
View File

@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 33
compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdk 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

4
keyobardemulatorscannerlibrary/build.gradle
View File

@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 33
compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdk 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'

4
pointmobilescannerlibrary/build.gradle
View File

@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 33
compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdk 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

4
zebrascannerlibrary/build.gradle
View File

@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 33
compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdk 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}