Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
2025-10-28 16:03:24 +01:00

View File

@@ -160,7 +160,7 @@ public class MmposServices {
"FROM venduto\n" +
" INNER JOIN relaz_pdv_mag\n" +
" ON venduto._codazienda = relaz_pdv_mag._codazienda AND venduto._codpv = relaz_pdv_mag._codpv\n" +
"WHERE venduto.fltrans NOT IN ('FS', 'PC', 'SS', 'IP', 'VO', 'BB', 'CP')\n" +
"WHERE venduto.fltrans NOT IN ('FS', 'PC', 'SS', 'IP', 'VO', 'BB', 'CP', 'RS')\n" +
"ORDER BY idx\n";
sql = UtilityDB.addwhereCond(sql, whereCond, false);
@@ -523,8 +523,7 @@ public class MmposServices {
String opTrans = row.getOpTrans();
if (!UtilityString.isNullOrEmpty(opTrans) &&
!opTrans.toUpperCase().startsWith("ORD") &&
!row.getFlTrans().toUpperCase().startsWith("RS")) {
!opTrans.toUpperCase().startsWith("ORD") ) {
ntbDocr.setCausaleReso(opTrans);
}