Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
93abea0823
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 432
|
def appVersionCode = 433
|
||||||
def appVersionName = '1.40.15'
|
def appVersionName = '1.40.16'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import com.annimon.stream.Stream;
|
|||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@ -355,6 +356,7 @@ public class DocInterniEditFormViewModel {
|
|||||||
row.setQtaCnf(resultDTO.getQtaCnf().floatValue());
|
row.setQtaCnf(resultDTO.getQtaCnf().floatValue());
|
||||||
row.setNumCnf(resultDTO.getNumCnf().floatValue());
|
row.setNumCnf(resultDTO.getNumCnf().floatValue());
|
||||||
row.setQtaCol(resultDTO.getQtaTot().floatValue());
|
row.setQtaCol(resultDTO.getQtaTot().floatValue());
|
||||||
|
row.setDatetimeRow(new Date());
|
||||||
row.setNote(resultDTO.getNote());
|
row.setNote(resultDTO.getNote());
|
||||||
row.setDataScad(resultDTO.getDataScad());
|
row.setDataScad(resultDTO.getDataScad());
|
||||||
row.setPartitaMag(resultDTO.getPartitaMag());
|
row.setPartitaMag(resultDTO.getPartitaMag());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user