Finish v1.25.1(278)

This commit is contained in:
Giuseppe Scorrano 2022-04-11 19:17:26 +02:00
commit 37a16f6292
5 changed files with 6 additions and 6 deletions

View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 277 def appVersionCode = 278
def appVersionName = '1.25.0' def appVersionName = '1.25.1'
signingConfigs { signingConfigs {
release { release {

View File

@ -336,7 +336,7 @@ public class DBSettingsModel {
} }
public boolean getFlagOrdinaArticoliOnScan() { public boolean isFlagOrdinaArticoliOnScan() {
return flagOrdinaArticoliOnScan; return flagOrdinaArticoliOnScan;
} }

View File

@ -260,7 +260,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
DialogInputLUProdView DialogInputLUProdView
.newInstance(mConnectedBluetoothDevice.toSimpleDeviceInterface(), dialogInputLUProdDTO, resultDTO -> { .newInstance(mConnectedBluetoothDevice != null ? mConnectedBluetoothDevice.toSimpleDeviceInterface() : null, dialogInputLUProdDTO, resultDTO -> {
ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO() ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO()
.setNumCnf(resultDTO.getNumCnf()) .setNumCnf(resultDTO.getNumCnf())
.setPesoCollo(resultDTO.getPesoCollo()) .setPesoCollo(resultDTO.getPesoCollo())

View File

@ -192,7 +192,7 @@ public class PVOrdineAcquistoEditViewModel {
} }
private boolean isAutoOrderOnScan() { private boolean isAutoOrderOnScan() {
return SettingsManager.iDB().getFlagOrdinaNuoviArticoliInGriglia(); return SettingsManager.iDB().isFlagOrdinaArticoliOnScan();
} }
private void getNewArticoli(int idGrigla, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) { private void getNewArticoli(int idGrigla, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) {

View File

@ -177,7 +177,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
}); });
UtilityObservable.addPropertyChanged(this.currentMtbTCol, (value) -> { UtilityObservable.addPropertyChanged(this.currentMtbTCol, (value) -> {
this.currentTaraPed.set(value.getOriginalModel().getTaraKg()); this.currentTaraPed.set(value.getOriginalModel().getPesoKg());
}); });
UtilityObservable.addPropertyChanged(this.selectedLineaProd, (value) -> { UtilityObservable.addPropertyChanged(this.selectedLineaProd, (value) -> {