adapt to changes in woc

diff --git a/elam b/elam
index f0c1627..4750ca4 160000 (submodule)
--- a/elam
+++ b/elam
@@ -1 +1 @@
-Subproject commit f0c16272d5ec1cb313175ede04afb135c1472702
+Subproject commit 4750ca4eedb881a9f5625ef0133d6e2c91be78dd

diff --git a/pack b/pack
index f2a3ae9..124750d 160000 (submodule)
--- a/pack
+++ b/pack
@@ -1 +1 @@
-Subproject commit f2a3ae94fd26f7789ccfd33036512f513ba0c32a
+Subproject commit 124750d5e19a642f69f28a3299380bb95ba3d089

diff --git a/src/dialogs/customerdlg.cpp b/src/dialogs/customerdlg.cpp
index 328f83d..64939c0 100644 (file)
--- a/src/dialogs/customerdlg.cpp
+++ b/src/dialogs/customerdlg.cpp
@@ -12,6 +12,20 @@
 
 #include "customerdlg.h"
 #include "msinterface.h"
+#include "misc.h"
+
+#include "MTGetAllCustomerNames"
+#include "MTGetCustomer"
+#include "MTDeleteCustomer"
+#include "MTChangeCustomer"
+#include "MTChangeCustomerMail"
+#include "MTCreateCustomer"
+#include "MTResetCustomerPassword"
+#include "MTGetAllContactTypes"
+#include "MTCreateContactType"
+#include "MTCreateCountry"
+#include "MTGetAllCountries"
+#include "MTGetAddress"
 
 #include <QBoxLayout>
 #include <QCheckBox>

diff --git a/src/dialogs/eventedit.cpp b/src/dialogs/eventedit.cpp
index 0163995..b55151e 100644 (file)
--- a/src/dialogs/eventedit.cpp
+++ b/src/dialogs/eventedit.cpp
@@ -33,10 +33,18 @@
 
 #include "msinterface.h"
 #include "MTGetEvent"
+#include "MTCreateEvent"
+#include "MTChangeEvent"
+#include "MTGetAllRooms"
+#include "MTCreateRoom"
+#include "MTGetAllArtists"
+#include "MTCreateArtist"
+
 #include "centbox.h"
 #include "pricecatdlg.h"
 #include "formula.h"
 #include "flagedit.h"
+#include "misc.h"
 
 MEventEditor::MEventEditor(QWidget*pw,qint64 id)
        :QDialog(pw)

diff --git a/src/dialogs/eventsummary.cpp b/src/dialogs/eventsummary.cpp
index be77d22..e40d2b7 100644 (file)
--- a/src/dialogs/eventsummary.cpp
+++ b/src/dialogs/eventsummary.cpp
@@ -15,6 +15,8 @@
 #include "odtrender.h"
 #include "msinterface.h"
 
+#include "MTGetEventSummary"
+
 #include <QBoxLayout>
 #include <QDomDocument>
 #include <QDomElement>

diff --git a/src/dialogs/orderauditdlg.cpp b/src/dialogs/orderauditdlg.cpp
index 78a17b8..88c575f 100644 (file)
--- a/src/dialogs/orderauditdlg.cpp
+++ b/src/dialogs/orderauditdlg.cpp
@@ -17,6 +17,11 @@
 #include "main.h"
 
 #include "msinterface.h"
+#include "MTGetTicketAudit"
+#include "MTGetVoucherAudit"
+#include "MTGetOrderAudit"
+#include "MTGetUserAudit"
+#include "MTGetOrder"
 
 #include <DPtr>
 #include <QBoxLayout>

diff --git a/src/dialogs/orderwin.cpp b/src/dialogs/orderwin.cpp
index fe16a96..522cc44 100644 (file)
--- a/src/dialogs/orderwin.cpp
+++ b/src/dialogs/orderwin.cpp
@@ -23,6 +23,22 @@
 #include "ticketrender.h"
 
 #include "MOEvent"
+#include "MTGetEventList"
+#include "MTOrderAddComment"
+#include "MTOrderChangeComments"
+#include "MTOrderChangeShipping"
+#include "MTOrderMarkShipped"
+#include "MTOrderPay"
+#include "MTOrderRefund"
+#include "MTUseVoucher"
+#include "MTChangeTicketPrice"
+#include "MTChangeTicketPriceCategory"
+#include "MTReturnTicketVoucher"
+#include "MTCancelOrder"
+#include "MTReservationToOrder"
+#include "MTChangeOrderAddress"
+#include "MTGetAllShipping"
+#include "MTGetEvent"
 
 #include <QApplication>
 #include <QBoxLayout>

diff --git a/src/dialogs/payedit.cpp b/src/dialogs/payedit.cpp
index b561e5b..9d74d7b 100644 (file)
--- a/src/dialogs/payedit.cpp
+++ b/src/dialogs/payedit.cpp
@@ -16,6 +16,10 @@
 #include "flagedit.h"
 
 #include "msinterface.h"
+#include "MTSetPaymentType"
+#include "MTDeletePaymentType"
+#include "MTSetDefaultPaymentType"
+#include "MTGetPaymentTypes"
 
 #include <QApplication>
 #include <QDebug>

diff --git a/src/dialogs/pricecatdlg.cpp b/src/dialogs/pricecatdlg.cpp
index 42d7eda..688186e 100644 (file)
--- a/src/dialogs/pricecatdlg.cpp
+++ b/src/dialogs/pricecatdlg.cpp
@@ -14,6 +14,10 @@
 #include "msinterface.h"
 #include "flagedit.h"
 
+#include "MTGetAllPriceCategories"
+#include "MTCreatePriceCategory"
+#include "MTChangePriceCategory"
+
 #include <QBoxLayout>
 #include <QFormLayout>
 #include <QLabel>

diff --git a/src/dialogs/shipping.cpp b/src/dialogs/shipping.cpp
index 24585d9..da02cdf 100644 (file)
--- a/src/dialogs/shipping.cpp
+++ b/src/dialogs/shipping.cpp
@@ -16,6 +16,10 @@
 #include "flagedit.h"
 
 #include "MOShipping"
+#include "MTGetAllShipping"
+#include "MTChangeShipping"
+#include "MTCreateShipping"
+#include "MTDeleteShipping"
 
 #include "msinterface.h"
 

diff --git a/src/iface/msinterface.cpp b/src/iface/msinterface.cpp
index 54bbd80..0980564 100644 (file)
--- a/src/iface/msinterface.cpp
+++ b/src/iface/msinterface.cpp
@@ -14,6 +14,15 @@
 #include "main.h"
 #include "sslexception.h"
 #include "templates.h"
+#include "misc.h"
+
+#include "MTGetMyRights"
+#include "MTGetMyRoles"
+#include "MTServerInfo"
+#include "MTLogout"
+#include "MTGetLanguage"
+
+#include <WException>
 
 #include <QDateTime>
 #include <QDebug>

diff --git a/src/main.cpp b/src/main.cpp
index 69ca6c7..72b66af 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,6 +37,7 @@
 #include "login.h"
 #include "msinterface.h"
 #include "elam.h"
+#include "misc.h"
 
 QString choseLanguage(bool warn)
 {

diff --git a/src/mwin/acltabs.cpp b/src/mwin/acltabs.cpp
index d2124f5..410f4d7 100644 (file)
--- a/src/mwin/acltabs.cpp
+++ b/src/mwin/acltabs.cpp
@@ -17,6 +17,36 @@
 
 #include "acltabs.h"
 
+#include "MOHost"
+#include "MOUser"
+#include "MTChangePassword"
+#include "MTCreateRole"
+#include "MTCreateUser"
+#include "MTCreateUser"
+#include "MTDeleteFlag"
+#include "MTDeleteHost"
+#include "MTDeleteRole"
+#include "MTDeleteUser"
+#include "MTGetAllHostNames"
+#include "MTGetAllHosts"
+#include "MTGetAllRightNames"
+#include "MTGetAllRoles"
+#include "MTGetAllUsers"
+#include "MTGetRole"
+#include "MTGetUser"
+#include "MTGetUserHosts"
+#include "MTGetUserRoles"
+#include "MTGetValidFlags"
+#include "MTSetFlag"
+#include "MTSetHost"
+#include "MTSetRoleDescription"
+#include "MTSetRoleFlags"
+#include "MTSetRoleRights"
+#include "MTSetUserDescription"
+#include "MTSetUserFlags"
+#include "MTSetUserHosts"
+#include "MTSetUserRoles"
+
 #include <QBoxLayout>
 #include <QCryptographicHash>
 #include <QDebug>

diff --git a/src/mwin/carttab.cpp b/src/mwin/carttab.cpp
index ca81712..333a5b7 100644 (file)
--- a/src/mwin/carttab.cpp
+++ b/src/mwin/carttab.cpp
@@ -19,6 +19,12 @@
 
 #include "carttab.h"
 
+#include "MTGetAllShipping"
+#include "MTGetEvent"
+#include "MTGetValidVoucherPrices"
+#include "MTCreateOrder"
+#include "MTCreateReservation"
+
 #include <QApplication>
 #include <QBoxLayout>
 #include <QComboBox>

diff --git a/src/mwin/entrancetab.cpp b/src/mwin/entrancetab.cpp
index 4377fd4..3e4dd74 100644 (file)
--- a/src/mwin/entrancetab.cpp
+++ b/src/mwin/entrancetab.cpp
@@ -17,6 +17,10 @@
 
 #include "entrancetab.h"
 
+#include "MTUseTicket"
+#include "MTGetEntranceEvents"
+#include "MTGetOrderByBarcode"
+
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QLabel>

diff --git a/src/mwin/eventstab.cpp b/src/mwin/eventstab.cpp
index 8ba0e67..2ecf623 100644 (file)
--- a/src/mwin/eventstab.cpp
+++ b/src/mwin/eventstab.cpp
@@ -20,6 +20,10 @@
 
 #include "eventstab.h"
 
+#include "MTGetAllEvents"
+#include "MTGetEvent"
+#include "MTCancelEvent"
+
 #include <TimeStamp>
 
 #include <QApplication>

diff --git a/src/mwin/orderstab.cpp b/src/mwin/orderstab.cpp
index f5146a6..d10d092 100644 (file)
--- a/src/mwin/orderstab.cpp
+++ b/src/mwin/orderstab.cpp
@@ -22,6 +22,15 @@
 
 #include <TimeStamp>
 
+#include "MTGetOrder"
+#include "MTGetOrderList"
+#include "MTGetMyOrders"
+#include "MTGetOrderByBarcode"
+#include "MTGetOrdersByCustomer"
+#include "MTGetOrdersByEvents"
+#include "MTGetOrdersByUser"
+#include "MTGetAllUsers"
+
 #include <QBoxLayout>
 #include <QCheckBox>
 #include <QComboBox>

diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp
index 6494db0..92ab620 100644 (file)
--- a/src/mwin/overview.cpp
+++ b/src/mwin/overview.cpp
@@ -55,8 +55,16 @@
 #include <QTabWidget>
 #include <QFormLayout>
 #include <QDateTimeEdit>
+
 #include <labeldlg.h>
 
+#include "MTChangeMyPassword"
+#include "MTReturnTicketVoucher"
+#include "MTDeductVoucher"
+#include "MTEmptyVoucher"
+#include "MTBackup"
+#include "MTGetAllUsers"
+
 MOverview::MOverview(QString pk)
        :MTabWin(pk)
 {

diff --git a/src/templates/templates.cpp b/src/templates/templates.cpp
index 5f1f1bb..911d53e 100644 (file)
--- a/src/templates/templates.cpp
+++ b/src/templates/templates.cpp
@@ -30,6 +30,13 @@
 #include "templates.h"
 #include "msinterface.h"
 
+#include "MTGetTemplateList"
+#include "MTGetTemplate"
+#include "MTSetTemplate"
+#include "MTDeleteTemplate"
+#include "MTSetTemplateDescription"
+#include "MTSetTemplateFlags"
+
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>

diff --git a/src/wext/customer.cpp b/src/wext/customer.cpp
index 5b00e85..727ab10 100644 (file)
--- a/src/wext/customer.cpp
+++ b/src/wext/customer.cpp
@@ -15,6 +15,8 @@
 #include "msinterface.h"
 #include <QScriptEngine>
 
+#include "MTGetCustomer"
+
 static int mymeta=
        qRegisterMetaType<MOCustomer>()+
        qRegisterMetaType<QList<MOCustomer> >()+

diff --git a/src/wext/event.cpp b/src/wext/event.cpp
index ce9f356..5a13425 100644 (file)
--- a/src/wext/event.cpp
+++ b/src/wext/event.cpp
@@ -18,6 +18,9 @@
 #include <QScriptEngine>
 
 #include "msinterface.h"
+#include "MTGetEvent"
+
+#include "misc.h"
 
 static int mymeta=
        qRegisterMetaType<MOEvent>()+

diff --git a/src/wext/order.cpp b/src/wext/order.cpp
index 1a4c3aa..424bbbe 100644 (file)
--- a/src/wext/order.cpp
+++ b/src/wext/order.cpp
@@ -14,6 +14,8 @@
 #include "MOOrderInfo"
 #include "MORole"
 
+#include "MTGetOrder"
+
 #include "msinterface.h"
 #include <QScriptEngine>
 

diff --git a/src/wext/ticket.cpp b/src/wext/ticket.cpp
index f7616fd..0683f47 100644 (file)
--- a/src/wext/ticket.cpp
+++ b/src/wext/ticket.cpp
@@ -14,6 +14,7 @@
 #include "MOVoucher"
 #include "msinterface.h"
 #include <QScriptEngine>
+#include "MTGetEvent"
 
 static int mymeta=
        qRegisterMetaType<MOTicket>()+

diff --git a/wob/classes/cart.wolf b/wob/classes/cart.wolf
index 0c47b0a..a15dee2 100644 (file)
--- a/wob/classes/cart.wolf
+++ b/wob/classes/cart.wolf
@@ -10,6 +10,7 @@
        <Class name="CartTicket">
                <Doc>Encapsulates tickets for a specific event in a specific price category as they are stored in the cart. One instance of CartTicket can contain several tickets. This class is used by the client to tell the server about new orders and by the Web UI to actually store its cart.</Doc>
                <Enum name="TicketValidationState">
+                       <Doc>Used when checking orders: tells us whether a ticket can be sold or not.</Doc>
                        <Value name="Ok">The tickets can be sold</Value>
                        <Value name="EventOver">The event is already over</Value>
                        <Value name="TooLate">The event is not yet over, but normal sale is no longer possible, you need the CreateOrder:LateSale privilege</Value>