Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
55db6d362d
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
||||
|
||||
android {
|
||||
|
||||
def appVersionCode = 430
|
||||
def appVersionName = '1.40.13'
|
||||
def appVersionCode = 431
|
||||
def appVersionName = '1.40.14'
|
||||
|
||||
signingConfigs {
|
||||
release {
|
||||
|
||||
@ -151,7 +151,7 @@ public class StatoArtInventarioDTO {
|
||||
}
|
||||
|
||||
public Integer getPedMag() {
|
||||
if (pedMag < 0)
|
||||
if (pedMag == null || pedMag < 0)
|
||||
return 0;
|
||||
else
|
||||
return pedMag;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user