Fixed permission evaluation.

Fixed loading of saved vouchers.
Translation update.
2023-06-17 19:13:27 +02:00 · 2023-06-05 22:31:59 +02:00 · 2023-06-05 16:58:59 +02:00
12 changed files with 260 additions and 153 deletions
@@ -95,6 +95,10 @@ void Role::clearPermissions()
    m_listPermissions.clear();
 }

+QStringList Role::eagerLoad() {
+    return {"object_id_fk", "value_fk"};
+}
+



@@ -46,6 +46,8 @@ public:
    void addPermission(QSharedPointer<Permission> perm);
    void clearPermissions();

+    Q_INVOKABLE QStringList eagerLoad();
+
 private:
    long m_id;
    QString m_name;
@@ -112,6 +112,10 @@ void User::setIsAdmin(bool isAdmin)
    m_isAdmin = isAdmin;
 }

+QStringList User::eagerLoad() {
+    return {"object_id_fk"};
+}
+



@@ -57,6 +57,7 @@ public:

    void clearRoles();

+    Q_INVOKABLE QStringList eagerLoad();

 private:
    long m_id;
@@ -95,7 +95,7 @@ protected:
            m_translator = new QTranslator();

            if (!m_translator->load(fileName + QLocale::system().name())) {
-                qDebug() << "Cannot load translation";
+                qDebug() << "Cannot load translation " << QLocale::system().name();
            }
        }

@@ -1,4 +1,5 @@
 #include "permissionservice.h"
+#include "service.h"
 #include <QCryptographicHash>

 QList<QSharedPointer<Permission> > PermissionService::forPlugin(const QString &pluginId)
@@ -54,6 +55,10 @@ QSharedPointer<User> PermissionService::loadUser(const QString &login)
    auto admin = srvUser.all("login = '" + login + "'");

    if (admin.count() == 1) {
+        Service<Role> srvRole;
+        for (auto& role : admin[0]->listRoles()) {
+            srvRole.load(role);
+        }
        return admin[0];
    }

@@ -156,7 +156,7 @@ public:
            pSession = ptrSession.data();
        }

-        *pSession += qx::dao::delete_by_id(entity);
+        *pSession += qx::dao::delete_by_id(entity, pSession->database());

        if (!pSession->isValid()) {
            qDebug() << pSession->firstError().text();
@@ -129,83 +129,83 @@
        <translation>Hlavní nastavení</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="104"/>
+        <location filename="../settings/globalsettingsform.ui" line="107"/>
        <source>Web</source>
        <translation>Web</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="111"/>
+        <location filename="../settings/globalsettingsform.ui" line="114"/>
        <source>E-mail</source>
        <translation>E-mail</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="118"/>
+        <location filename="../settings/globalsettingsform.ui" line="121"/>
        <source>Phone</source>
        <translation>Telefon</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="166"/>
+        <location filename="../settings/globalsettingsform.ui" line="169"/>
        <source>Company info</source>
        <translation>Informace o společnosti</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="175"/>
+        <location filename="../settings/globalsettingsform.ui" line="178"/>
        <source>IC</source>
        <translation>IČO</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="185"/>
+        <location filename="../settings/globalsettingsform.ui" line="188"/>
        <source>VAT number</source>
        <translation>DIČ</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="195"/>
+        <location filename="../settings/globalsettingsform.ui" line="198"/>
        <source>VAT payer</source>
        <translation>Plátce DPH</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="208"/>
+        <location filename="../settings/globalsettingsform.ui" line="211"/>
        <source>VAT rates</source>
        <translation>Sazby DPH</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="214"/>
+        <location filename="../settings/globalsettingsform.ui" line="217"/>
        <source>High</source>
        <translation>Vysoká</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="228"/>
+        <location filename="../settings/globalsettingsform.ui" line="231"/>
        <source>First lower</source>
        <translation>První snížená</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="242"/>
+        <location filename="../settings/globalsettingsform.ui" line="245"/>
        <source>Second lower</source>
        <translation>Druhá snížená</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="259"/>
+        <location filename="../settings/globalsettingsform.ui" line="262"/>
        <source>Prices with VAT</source>
        <translation>Ceny s DPH</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="270"/>
-        <location filename="../settings/globalsettingsform.ui" line="331"/>
+        <location filename="../settings/globalsettingsform.ui" line="273"/>
+        <location filename="../settings/globalsettingsform.ui" line="334"/>
        <source>Number series</source>
        <translation>Číselné řady</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="299"/>
+        <location filename="../settings/globalsettingsform.ui" line="302"/>
        <source>Edit name</source>
        <translation>Upravit název</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="310"/>
+        <location filename="../settings/globalsettingsform.ui" line="313"/>
        <source>Season</source>
        <translation>Sezóna</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="317"/>
+        <location filename="../settings/globalsettingsform.ui" line="320"/>
        <source>Create new</source>
        <translation>Vytvořit novou</translation>
    </message>
@@ -215,67 +215,75 @@
        <translation>Kontaktní údaje</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="45"/>
+        <location filename="../settings/globalsettingsform.ui" line="48"/>
        <source>Firm Name</source>
        <translation>Název společnosti</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="55"/>
+        <location filename="../settings/globalsettingsform.ui" line="58"/>
        <source>Street</source>
        <translation>Ulice</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="65"/>
+        <location filename="../settings/globalsettingsform.ui" line="68"/>
        <source>House Number</source>
        <translation>Číslo popisné</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="75"/>
+        <location filename="../settings/globalsettingsform.ui" line="78"/>
        <source>City</source>
        <translation>Město</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="85"/>
+        <location filename="../settings/globalsettingsform.ui" line="88"/>
        <source>ZIP code</source>
        <translation>PSČ</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="128"/>
+        <location filename="../settings/globalsettingsform.ui" line="131"/>
        <source>Logo</source>
        <translation>Logo</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.ui" line="156"/>
+        <location filename="../settings/globalsettingsform.ui" line="159"/>
        <source>Select file</source>
        <translation>Vyber soubor</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.cpp" line="82"/>
+        <location filename="../settings/globalsettingsform.cpp" line="95"/>
        <source>Switch season</source>
        <translation>Změna sezóny</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.cpp" line="82"/>
        <source>Realy switch active season?</source>
-        <translation>Opravdu si přejete změnit aktivní sezónu?</translation>
+        <translation type="vanished">Opravdu si přejete změnit aktivní sezónu?</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.cpp" line="150"/>
+        <location filename="../settings/globalsettingsform.cpp" line="155"/>
        <source>New season</source>
        <translation>Nová sezóna</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.cpp" line="150"/>
        <source>Realy create new season and switch to it?</source>
+        <translation type="vanished">Opravdu si přejete vytvořit novou sezónu a přepnout na ni?</translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.cpp" line="95"/>
+        <source>Really switch active season?</source>
+        <translation>Opravdu si přejete změnit aktivní sezónu?</translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.cpp" line="155"/>
+        <source>Really create new season and switch to it?</source>
        <translation>Opravdu si přejete vytvořit novou sezónu a přepnout na ni?</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.cpp" line="173"/>
+        <location filename="../settings/globalsettingsform.cpp" line="178"/>
        <source>Select logo</source>
        <translation>Vybrat logo</translation>
    </message>
    <message>
-        <location filename="../settings/globalsettingsform.cpp" line="173"/>
+        <location filename="../settings/globalsettingsform.cpp" line="178"/>
        <source>Images (*.png *.xpm *.jpg)</source>
        <translation>Obrázky (*.png *.xpm *.jpg)</translation>
    </message>
@@ -359,17 +367,17 @@
        <translation>Import dat</translation>
    </message>
    <message>
-        <location filename="../importdialog.ui" line="20"/>
+        <location filename="../importdialog.ui" line="23"/>
        <source>File</source>
        <translation>Soubor</translation>
    </message>
    <message>
-        <location filename="../importdialog.ui" line="27"/>
+        <location filename="../importdialog.ui" line="30"/>
        <source>Separator</source>
        <translation>Oddělovač</translation>
    </message>
    <message>
-        <location filename="../importdialog.ui" line="65"/>
+        <location filename="../importdialog.ui" line="68"/>
        <source>...</source>
        <translation>...</translation>
    </message>
@@ -400,12 +408,12 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../iplugin.h" line="58"/>
+        <location filename="../iplugin.h" line="52"/>
        <source>Permission denied</source>
        <translation>Nedostatečná oprávnění</translation>
    </message>
    <message>
-        <location filename="../iplugin.h" line="58"/>
+        <location filename="../iplugin.h" line="52"/>
        <source>You don&apos;t have permission to open this plugin.</source>
        <translation>Nemáte oprávnění otevřít tento modul.</translation>
    </message>
@@ -590,39 +598,39 @@
    </message>
    <message>
        <location filename="../autoform.h" line="46"/>
-        <location filename="../gridform.h" line="250"/>
-        <location filename="../gridform.h" line="262"/>
-        <location filename="../gridform.h" line="274"/>
+        <location filename="../gridform.h" line="252"/>
+        <location filename="../gridform.h" line="264"/>
+        <location filename="../gridform.h" line="276"/>
        <source>Permission denied</source>
        <translation>Nedostatečná oprávnění</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="250"/>
+        <location filename="../gridform.h" line="252"/>
        <source>You don&apos;t have permission to add new record.</source>
        <translation>Nemáte oprávnění přidat nový záznam.</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="262"/>
+        <location filename="../gridform.h" line="264"/>
        <source>You don&apos;t have permission to edit record.</source>
        <translation>Nemáte oprávnění upravit záznam.</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="274"/>
+        <location filename="../gridform.h" line="276"/>
        <source>You don&apos;t have permission to delete record.</source>
        <translation>Nemáte oprávnění smazat záznam.</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="231"/>
+        <location filename="../gridform.h" line="233"/>
        <source>Delete record</source>
        <translation>Smazat záznam</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="231"/>
+        <location filename="../gridform.h" line="233"/>
        <source>Realy delete this record?</source>
        <translation>Opravdu si přejete smazat tento záznam?</translation>
    </message>
    <message>
-        <location filename="../gridform.h" line="327"/>
+        <location filename="../gridform.h" line="329"/>
        <source>Import</source>
        <translation>Import</translation>
    </message>
@@ -635,37 +643,37 @@
        <translation></translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="20"/>
+        <location filename="../users/userform.ui" line="23"/>
        <source>Login</source>
        <translation>Uživatelské jméno</translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="30"/>
+        <location filename="../users/userform.ui" line="33"/>
        <source>Password</source>
        <translation>Heslo</translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="44"/>
+        <location filename="../users/userform.ui" line="47"/>
        <source>Name</source>
        <translation>Jméno</translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="57"/>
+        <location filename="../users/userform.ui" line="60"/>
        <source>Is Admin</source>
        <translation>Admin</translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="67"/>
+        <location filename="../users/userform.ui" line="70"/>
        <source>Active</source>
        <translation>Aktivní</translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="77"/>
+        <location filename="../users/userform.ui" line="80"/>
        <source>Roles</source>
        <translation>Role</translation>
    </message>
    <message>
-        <location filename="../users/userform.ui" line="91"/>
+        <location filename="../users/userform.ui" line="94"/>
        <source>Retype Password</source>
        <translation>Zopakujte heslo</translation>
    </message>
@@ -60,10 +60,6 @@ void ShopService::calculate(VoucherPtr voucher)

    loadSettings();

-    if (voucher->items().isEmpty()) {
-        load(voucher);
-    }
-
    foreach (QSharedPointer<VoucherItem> item, voucher->items()) {

        if (item->refId() == ROUNDING_ITEM)
@@ -384,6 +380,9 @@ void ShopService::moveItems(QList<VoucherItemPtr> items, VoucherPtr source, Vouc
        it->setVoucher(target);
    }

+    calculate(target);
+    update(target, &session);
+
    if (source->items().isEmpty())
    {
        erase(source, &session);
@@ -29,22 +29,22 @@
        <translation>Sazba DPH</translation>
    </message>
    <message>
-        <location filename="../directsaleform.cpp" line="17"/>
+        <location filename="../directsaleform.cpp" line="18"/>
        <source>None</source>
        <translation>Žádná</translation>
    </message>
    <message>
-        <location filename="../directsaleform.cpp" line="18"/>
+        <location filename="../directsaleform.cpp" line="19"/>
        <source>High</source>
        <translation>Vysoká</translation>
    </message>
    <message>
-        <location filename="../directsaleform.cpp" line="19"/>
+        <location filename="../directsaleform.cpp" line="20"/>
        <source>First Lower</source>
        <translation>První snížená</translation>
    </message>
    <message>
-        <location filename="../directsaleform.cpp" line="20"/>
+        <location filename="../directsaleform.cpp" line="21"/>
        <source>Second Lower</source>
        <translation>Druhá snížená</translation>
    </message>
@@ -60,36 +60,41 @@
 <context>
    <name>PayDialog</name>
    <message>
-        <location filename="../paydialog.ui" line="14"/>
+        <location filename="../paydialog.ui" line="20"/>
        <source>Recieve money</source>
        <translation>Platba</translation>
    </message>
    <message>
-        <location filename="../paydialog.ui" line="30"/>
+        <location filename="../paydialog.ui" line="36"/>
        <source>Total:</source>
        <translation>Celkem:</translation>
    </message>
    <message>
-        <location filename="../paydialog.ui" line="44"/>
-        <location filename="../paydialog.ui" line="101"/>
+        <location filename="../paydialog.ui" line="50"/>
+        <location filename="../paydialog.ui" line="107"/>
        <source>0</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../paydialog.ui" line="59"/>
+        <location filename="../paydialog.ui" line="65"/>
        <source>Recieved</source>
        <translation>Obdrženo</translation>
    </message>
    <message>
-        <location filename="../paydialog.ui" line="89"/>
+        <location filename="../paydialog.ui" line="95"/>
        <source>Return</source>
        <translation>Vrátit</translation>
    </message>
    <message>
-        <location filename="../paydialog.ui" line="124"/>
+        <location filename="../paydialog.ui" line="117"/>
        <source>Send to EET portal</source>
        <translation>Odeslat na EET</translation>
    </message>
+    <message>
+        <location filename="../paydialog.ui" line="142"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
 </context>
 <context>
    <name>PaydVouchersDialog</name>
@@ -104,65 +109,66 @@
        <translation>Vytisknout účtenku</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.ui" line="55"/>
-        <location filename="../paydvouchersdialog.cpp" line="99"/>
+        <location filename="../paydvouchersdialog.ui" line="75"/>
+        <location filename="../paydvouchersdialog.cpp" line="110"/>
        <source>Save receipt</source>
        <translation>Uložit účtenku</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.ui" line="58"/>
+        <location filename="../paydvouchersdialog.ui" line="52"/>
        <location filename="../paydvouchersdialog.ui" line="78"/>
-        <location filename="../paydvouchersdialog.ui" line="101"/>
+        <location filename="../paydvouchersdialog.ui" line="98"/>
+        <location filename="../paydvouchersdialog.ui" line="121"/>
        <source>...</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.ui" line="153"/>
+        <location filename="../paydvouchersdialog.ui" line="173"/>
        <source>Items</source>
        <translation>Položky</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.ui" line="168"/>
+        <location filename="../paydvouchersdialog.ui" line="188"/>
        <source>EET:</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.ui" line="219"/>
+        <location filename="../paydvouchersdialog.ui" line="239"/>
        <source>Total:</source>
        <translation>Celkem:</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.ui" line="239"/>
+        <location filename="../paydvouchersdialog.ui" line="259"/>
        <source>0</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.cpp" line="63"/>
+        <location filename="../paydvouchersdialog.cpp" line="74"/>
        <source>not entering</source>
        <translation>Nevstupuje</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.cpp" line="66"/>
+        <location filename="../paydvouchersdialog.cpp" line="77"/>
        <source>for send</source>
        <translation>K odeslání</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.cpp" line="69"/>
+        <location filename="../paydvouchersdialog.cpp" line="80"/>
        <source>error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.cpp" line="72"/>
+        <location filename="../paydvouchersdialog.cpp" line="83"/>
        <source>sent</source>
        <translation>Odesláno</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.cpp" line="99"/>
+        <location filename="../paydvouchersdialog.cpp" line="110"/>
        <source>Text files (*.txt)</source>
        <translation>Textové soubory (*.txt)</translation>
    </message>
    <message>
-        <location filename="../paydvouchersdialog.cpp" line="139"/>
+        <location filename="../paydvouchersdialog.cpp" line="150"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
@@ -170,33 +176,33 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../shopform.cpp" line="36"/>
+        <location filename="../shopform.cpp" line="35"/>
        <source>EET communication error.
 </source>
        <translation>Chyba komunikace s EET</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="40"/>
+        <location filename="../shopform.cpp" line="39"/>
        <source>Message from portal: </source>
        <translation>Zpráva z EET portálu:</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="43"/>
+        <location filename="../shopform.cpp" line="42"/>
        <source>Switch to offline?</source>
        <translation>Přepnout do offline?</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="45"/>
+        <location filename="../shopform.cpp" line="44"/>
        <source>EET error</source>
        <translation>Chyba EET</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="51"/>
+        <location filename="../shopform.cpp" line="50"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;Online&lt;/a&gt;</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="51"/>
+        <location filename="../shopform.cpp" line="50"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;Offline&lt;/a&gt;</source>
        <translation></translation>
    </message>
@@ -223,6 +229,11 @@
        <source>Items</source>
        <translation>Položky</translation>
    </message>
+    <message>
+        <location filename="../receiptloadform.ui" line="55"/>
+        <source>Select &amp;all</source>
+        <translation>Vybrat &amp;vše</translation>
+    </message>
 </context>
 <context>
    <name>ReceiptSaveForm</name>
@@ -284,142 +295,167 @@
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="44"/>
+        <location filename="../shopform.ui" line="111"/>
        <source>Commodity</source>
        <translation>Zboží</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="73"/>
+        <location filename="../shopform.ui" line="140"/>
        <source>Count</source>
        <translation>Počet</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="99"/>
+        <location filename="../shopform.ui" line="166"/>
        <source>Add Item</source>
        <translation>Přidat položku</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="127"/>
        <source>Direct Sale</source>
-        <translation>Přímý prodej</translation>
+        <translation type="vanished">Přímý prodej</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="140"/>
+        <location filename="../shopform.ui" line="62"/>
        <source>Ctrl+D</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="162"/>
+        <location filename="../shopform.ui" line="84"/>
+        <source>Favorities</source>
+        <translation>Oblíbené</translation>
+    </message>
+    <message>
+        <location filename="../shopform.ui" line="186"/>
        <source>Receipt</source>
        <translation>Účtenka</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="201"/>
+        <location filename="../shopform.ui" line="231"/>
        <source>10%</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="260"/>
+        <location filename="../shopform.ui" line="289"/>
        <source>0%</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="273"/>
+        <location filename="../shopform.ui" line="302"/>
        <source>21%</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="312"/>
+        <location filename="../shopform.ui" line="340"/>
        <source>15%</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="361"/>
+        <location filename="../shopform.ui" line="387"/>
        <source>Witouth VAT</source>
        <translation>Bez DPH</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="371"/>
+        <location filename="../shopform.ui" line="397"/>
        <source>VAT</source>
        <translation>DPH</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="381"/>
+        <location filename="../shopform.ui" line="407"/>
        <source>Total</source>
        <translation>Celkem</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="409"/>
+        <location filename="../shopform.ui" line="435"/>
        <source>EET status:</source>
        <translation>EET status:</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="425"/>
+        <location filename="../shopform.ui" line="450"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;dfghdfg&lt;/a&gt;</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="455"/>
+        <location filename="../shopform.ui" line="479"/>
        <source>Total:</source>
        <translation>Celkem:</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="185"/>
-        <location filename="../shopform.ui" line="208"/>
-        <location filename="../shopform.ui" line="218"/>
-        <location filename="../shopform.ui" line="228"/>
-        <location filename="../shopform.ui" line="244"/>
-        <location filename="../shopform.ui" line="280"/>
-        <location filename="../shopform.ui" line="296"/>
-        <location filename="../shopform.ui" line="325"/>
-        <location filename="../shopform.ui" line="335"/>
-        <location filename="../shopform.ui" line="351"/>
-        <location filename="../shopform.ui" line="472"/>
+        <location filename="../shopform.ui" line="627"/>
+        <location filename="../shopform.cpp" line="655"/>
+        <source>Delete items</source>
+        <translation>Smazat položky</translation>
+    </message>
+    <message>
+        <location filename="../shopform.ui" line="630"/>
+        <source>Ctrl+Del</source>
+        <translation>Ctrl+Del</translation>
+    </message>
+    <message>
+        <location filename="../shopform.ui" line="215"/>
+        <location filename="../shopform.ui" line="238"/>
+        <location filename="../shopform.ui" line="248"/>
+        <location filename="../shopform.ui" line="258"/>
+        <location filename="../shopform.ui" line="273"/>
+        <location filename="../shopform.ui" line="309"/>
+        <location filename="../shopform.ui" line="324"/>
+        <location filename="../shopform.ui" line="352"/>
+        <location filename="../shopform.ui" line="362"/>
+        <location filename="../shopform.ui" line="377"/>
+        <location filename="../shopform.ui" line="495"/>
        <source>0</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="493"/>
+        <location filename="../shopform.ui" line="49"/>
+        <source>Direct Sell</source>
+        <translation>Přímý prodej</translation>
+    </message>
+    <message>
+        <location filename="../shopform.ui" line="516"/>
        <source>Temporary Save</source>
        <translation>Dočasné uložení</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="515"/>
+        <location filename="../shopform.ui" line="538"/>
        <source>Save</source>
        <translation>Uložení</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="537"/>
+        <location filename="../shopform.ui" line="560"/>
        <source>Load</source>
        <translation>Načíst</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="559"/>
+        <location filename="../shopform.ui" line="582"/>
        <source>Show paid</source>
        <translation>Zobrazit zaplacené</translation>
    </message>
    <message>
-        <location filename="../shopform.ui" line="581"/>
+        <location filename="../shopform.ui" line="604"/>
        <source>Pay</source>
        <translation>Zaplatit</translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="149"/>
-        <location filename="../shopform.cpp" line="595"/>
+        <location filename="../shopform.cpp" line="157"/>
+        <location filename="../shopform.cpp" line="640"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;Online&lt;/a&gt;</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="149"/>
-        <location filename="../shopform.cpp" line="595"/>
+        <location filename="../shopform.cpp" line="157"/>
+        <location filename="../shopform.cpp" line="640"/>
        <source>&lt;a href=&quot;#eet&quot;&gt;Offline&lt;/a&gt;</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../shopform.cpp" line="223"/>
+        <location filename="../shopform.cpp" line="236"/>
        <source>&lt;&lt; empty &gt;&gt;</source>
        <translation>&lt;&lt; nevybráno &gt;&gt;</translation>
    </message>
+    <message>
+        <location filename="../shopform.cpp" line="655"/>
+        <source>Really delete selected voucher items?</source>
+        <translation>Opravdu chcete smazat vybrané položky?</translation>
+    </message>
    <message>
        <source>EET communication error.
 </source>
@@ -453,7 +489,9 @@
    <message>
        <location filename="../shopoverview.ui" line="52"/>
        <location filename="../shopoverview.ui" line="75"/>
-        <location filename="../shopoverview.ui" line="110"/>
+        <location filename="../shopoverview.ui" line="108"/>
+        <location filename="../shopoverview.ui" line="131"/>
+        <location filename="../shopoverview.ui" line="154"/>
        <source>TextLabel</source>
        <translation></translation>
    </message>
@@ -463,10 +501,20 @@
        <translation>Nezaplaceno v Kč:</translation>
    </message>
    <message>
-        <location filename="../shopoverview.ui" line="91"/>
+        <location filename="../shopoverview.ui" line="90"/>
        <source>Unsend to EET:</source>
        <translation>Neodesláno na EET:</translation>
    </message>
+    <message>
+        <location filename="../shopoverview.ui" line="118"/>
+        <source>Today sales:</source>
+        <translation>Dnešní tržba:</translation>
+    </message>
+    <message>
+        <location filename="../shopoverview.ui" line="141"/>
+        <source>Number of sales today:</source>
+        <translation>Dnešní počet prodejů:</translation>
+    </message>
 </context>
 <context>
    <name>ShopSettingsForm</name>
@@ -481,127 +529,148 @@
        <translation>Nastavení rychlé volby</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="236"/>
+        <location filename="../settings/shopsettingsform.ui" line="245"/>
        <source>...</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="126"/>
+        <location filename="../settings/shopsettingsform.ui" line="129"/>
        <source>Printer</source>
        <translation>Tiskárna</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="89"/>
+        <location filename="../settings/shopsettingsform.ui" line="92"/>
        <source>Columns</source>
        <translation>Sloupců</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="99"/>
+        <location filename="../settings/shopsettingsform.ui" line="102"/>
        <source>Rows</source>
        <translation>Řádků</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="109"/>
+        <location filename="../settings/shopsettingsform.ui" line="112"/>
        <source>Size</source>
        <translation>Velikost</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="132"/>
+        <location filename="../settings/shopsettingsform.ui" line="138"/>
        <source>Output device</source>
        <translation>Jméno tiskárny</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="142"/>
+        <location filename="../settings/shopsettingsform.ui" line="148"/>
        <source>Letters per line</source>
        <translation>Znaků na řádek</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="152"/>
+        <location filename="../settings/shopsettingsform.ui" line="158"/>
        <source>Footer text</source>
        <translation>Patička</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="163"/>
+        <location filename="../settings/shopsettingsform.ui" line="169"/>
        <source>EET</source>
        <translation>EET</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="169"/>
+        <location filename="../settings/shopsettingsform.ui" line="175"/>
        <source>Activate EET</source>
        <translation>Zapnout podporu EET</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="181"/>
+        <location filename="../settings/shopsettingsform.ui" line="190"/>
        <source>Shop ID</source>
        <translation>ID provozovny</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="191"/>
+        <location filename="../settings/shopsettingsform.ui" line="200"/>
        <source>Cash register ID</source>
        <translation>ID zařízení</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="201"/>
+        <location filename="../settings/shopsettingsform.ui" line="210"/>
        <source>EET mode</source>
        <translation>EET režim</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="211"/>
+        <location filename="../settings/shopsettingsform.ui" line="220"/>
        <source>Certificate file</source>
        <translation>Certifikát</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="246"/>
+        <location filename="../settings/shopsettingsform.ui" line="255"/>
        <source>Private key password</source>
        <translation>Heslo k certifikátu</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="260"/>
+        <location filename="../settings/shopsettingsform.ui" line="269"/>
        <source>Test mode</source>
        <translation>Testovací režim</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="267"/>
+        <location filename="../settings/shopsettingsform.ui" line="276"/>
        <source>Communication with playground </source>
        <translation>Testovací EET server </translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="278"/>
+        <location filename="../settings/shopsettingsform.ui" line="287"/>
        <source>Other</source>
        <translation>Jiné</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="284"/>
+        <location filename="../settings/shopsettingsform.ui" line="293"/>
        <source>Rounding</source>
        <translation>Zaokrouhlování</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="290"/>
+        <location filename="../settings/shopsettingsform.ui" line="302"/>
        <source>Direction</source>
        <translation>Typ</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="300"/>
+        <location filename="../settings/shopsettingsform.ui" line="312"/>
        <source>Decimal places</source>
        <translation>Desetiných míst</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.ui" line="313"/>
+        <location filename="../settings/shopsettingsform.ui" line="325"/>
        <source>Rounding item text</source>
        <translation>Název položky</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.cpp" line="27"/>
+        <location filename="../settings/shopsettingsform.ui" line="335"/>
+        <source>Default VAT type</source>
+        <translation>Výchozí sazba daně</translation>
+    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.ui" line="348"/>
+        <source>Doub&amp;le print bill</source>
+        <translation>Z&amp;dvojená účtenka</translation>
+    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.ui" line="363"/>
+        <source>Item name</source>
+        <translation>Jméno položky</translation>
+    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.ui" line="376"/>
+        <source>Show field for item count</source>
+        <translation>Zobrazit pole pro počet položek</translation>
+    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.cpp" line="24"/>
        <source>Simplifyed</source>
        <translation>Zjednodušený</translation>
    </message>
    <message>
-        <location filename="../settings/shopsettingsform.cpp" line="27"/>
+        <location filename="../settings/shopsettingsform.cpp" line="24"/>
        <source>Standard</source>
        <translation>Standartní</translation>
    </message>
    <message>
        <location filename="../settings/shopsettingsform.cpp" line="40"/>
+        <location filename="../settings/shopsettingsform.cpp" line="55"/>
        <source>None</source>
        <translation>Žádný</translation>
    </message>
@@ -620,6 +689,21 @@
        <source>Mathematic</source>
        <translation>Matematické</translation>
    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.cpp" line="56"/>
+        <source>High</source>
+        <translation>Vysoká</translation>
+    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.cpp" line="57"/>
+        <source>First lower</source>
+        <translation>První snížená</translation>
+    </message>
+    <message>
+        <location filename="../settings/shopsettingsform.cpp" line="58"/>
+        <source>Second lower</source>
+        <translation>Druhá snížená</translation>
+    </message>
 </context>
 <context>
    <name>TemporaryReceiptSaveForm</name>
Author	SHA1	Message	Date
pepa	e3a5e44c33	Fixed permission evaluation.	2023-06-17 19:13:27 +02:00
pepa	12dd6ddba0	Fixed loading of saved vouchers.	2023-06-05 22:31:59 +02:00
pepa	de2bab90de	Translation update.	2023-06-05 16:58:59 +02:00