Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/models/vendor_money_model.php

@@ -658,6 +658,9 @@ FROM
                 -- AND ( tourProvide=gci_vei_name  )
                 -- AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%'
                 and CHARINDEX(gci_no, tourBZ) > 0
+                and exists (
+                    select 1 from BIZ_ConfirmLineInfo where COLI_ID=ordernumber and COLI_State<>50
+                )
         ) AS report_cost ,
         (SELECT top 1 RPT_Total
         FROM report_tour