Finish v1_2_2(55)
This commit is contained in:
commit
64f526b5c5
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 54
|
def appVersionCode = 55
|
||||||
def appVersionName = '1.2.1'
|
def appVersionName = '1.2.2'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -1115,13 +1115,14 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
|
|||||||
boolean useQtaDaEvadere;
|
boolean useQtaDaEvadere;
|
||||||
|
|
||||||
if(tmpPickData.getQtaTot() != null) {
|
if(tmpPickData.getQtaTot() != null) {
|
||||||
useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue();
|
useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa();
|
||||||
if(useQtaDaEvadere){
|
if(useQtaDaEvadere){
|
||||||
dto.setQtaTot(qtaDaEvadere);
|
dto.setQtaTot(qtaDaEvadere);
|
||||||
dto.setMaxQta(qtaDaEvadere);
|
dto.setMaxQta(qtaDaEvadere);
|
||||||
} else {
|
} else {
|
||||||
dto.setQtaTot(tmpPickData.getQtaTot());
|
dto.setQtaTot(tmpPickData.getQtaTot());
|
||||||
dto.setMaxQta(tmpPickData.getQtaTot());
|
dto.setMaxQta(tmpPickData.getQtaTot());
|
||||||
|
dto.setQtaCnf(tmpPickData.getQtaTot());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user