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

This commit is contained in:
Giuseppe Scorrano 2024-04-19 17:33:03 +02:00
commit 55db6d362d
2 changed files with 3 additions and 3 deletions

View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 430 def appVersionCode = 431
def appVersionName = '1.40.13' def appVersionName = '1.40.14'
signingConfigs { signingConfigs {
release { release {

View File

@ -151,7 +151,7 @@ public class StatoArtInventarioDTO {
} }
public Integer getPedMag() { public Integer getPedMag() {
if (pedMag < 0) if (pedMag == null || pedMag < 0)
return 0; return 0;
else else
return pedMag; return pedMag;