From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Fri, 14 May 2010 17:43:14 +0000 (+0000)
Subject: "big merge" - do not put canceled tickets into bills
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=1ba3e063fc41c6f31db17da64d32926b1480c7b8;p=web%2Fkonrad%2Fsmoke.git

"big merge" - do not put canceled tickets into bills


git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@449 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/src/dialogs/orderwin.cpp b/src/dialogs/orderwin.cpp
index aa995bc..3721f97 100644
--- a/src/dialogs/orderwin.cpp
+++ b/src/dialogs/orderwin.cpp
@@ -629,10 +629,10 @@ void MOrderWindow::initPrintBuffer()
 {
 	//clear
 	donePrintBuffer();
-	//get tickets (only valid ones)
+	//get tickets (only valid ones, only those that are to be paid)
 	QList<MOTicket>tlst=m_order.tickets();
 	for(int i=0;i<tlst.size();i++)
-		if(!tlst[i].ticketid().isNull())
+		if(!tlst[i].ticketid().isNull() && (tlst[i].status()&MOTicket::MaskPay)!=0)
 			printBuffer.tickets.append(tlst[i]);
 	//accumulated view on tickets
 	for(int i=0;i<printBuffer.tickets.size();i++){