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

This commit is contained in:
Giuseppe Scorrano 2023-04-28 12:55:49 +02:00
commit 2d4d9cef4e

View File

@ -216,6 +216,7 @@ public class PVOrdineAcquistoEditViewModel {
saveAction.run(); saveAction.run();
} }
} else { } else {
articolo.setQtaOrd(articolo.getQtaOrd() > 0f ? articolo.getQtaOrd() : articolo.getQtaCnf());
this.sendOnItemDispatched(articolo, onSuccess); this.sendOnItemDispatched(articolo, onSuccess);
} }
@ -249,7 +250,6 @@ public class PVOrdineAcquistoEditViewModel {
articolo.setNewNoPromo(art.isNewNoPromo()); articolo.setNewNoPromo(art.isNewNoPromo());
articolo.setSystemNote(art.generateSystemNote()); articolo.setSystemNote(art.generateSystemNote());
articolo.setQtaCnf(art.getQtaCnf() > 0f ? art.getQtaCnf() : 1); articolo.setQtaCnf(art.getQtaCnf() > 0f ? art.getQtaCnf() : 1);
articolo.setQtaOrd(art.getQtaOrd() > 0f ? art.getQtaOrd() : art.getQtaCnf());
articolo.setCodAlis(art.getCodAlis()); articolo.setCodAlis(art.getCodAlis());
articolo.setCtMaxOrd(BigDecimal.valueOf(art.getCtMaxOrd())); articolo.setCtMaxOrd(BigDecimal.valueOf(art.getCtMaxOrd()));