Merge remote-tracking branch 'origin/master'

code/fi/nckd-xtpoc-fi/src/main/java/nckd/xtpoc/fi/app/plugin/operate/TripReimburseBillCusOpPlugin.java

@@ -44,7 +44,7 @@ public class TripReimburseBillCusOpPlugin extends AbstractOperationServicePlugIn
                     boolean isroomboard = data.getBoolean("nckd_isroomboard");
                     boolean isinnertrip = data.getBoolean("nckd_isinnertrip");
 
-                    if(!isroomboard || !isinnertrip){
+                    if(!isroomboard && !isinnertrip){
                         continue;
                     }