ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

Browse Source
This commit is contained in:
Pepa Rokos
2017-06-08 22:16:44 +02:00
parent 761fcad3b7 50ac5238da
commit e724a3b234
12 changed files with 5031 additions and 4433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/context.cpp
+1 -1
View File
@@ -61,8 +61,8 @@ void Context::loadPlugins()
if (p != NULL) {
IPlugin *plugin = qobject_cast<IPlugin*>(p);
if (plugin != NULL) {
plugin->init(pluginLoader.metaData());
m_plugins.append(plugin);
plugin->init(pluginLoader.metaData());
}
}
else
core/reporting/variablefiller.cpp
+3
View File
@@ -25,6 +25,9 @@ void VariableFiller::fill(ReportPtr report, int recordId)
vars[IC] = QString::number(m_settings->ic());
vars[DIC] = m_settings->dic();
vars[LOGO_PATH] = m_settings->logoPath();
vars[WEB] = m_settings->web();
vars[EMAIL] = m_settings->email();
vars[PHONE] = m_settings->phone();
if (recordId > 0)
{
core/reporting/variablefiller.h
+3
View File
@@ -14,6 +14,9 @@
#define DIC "DIC"
#define LOGO_PATH "LOGO_PATH"
#define RECORD_ID "RECORD_ID"
#define WEB "WEB"
#define EMAIL "EMAIL"
#define PHONE "PHONE"
class CORESHARED_EXPORT VariableFiller
{
core/settings/globalsettings.cpp
+30
View File
@@ -126,5 +126,35 @@ void GlobalSettings::setVatSecondLower(QDecDouble vatSecondLower)
m_vatSecondLower = FROM_DEC(vatSecondLower);
}
QString GlobalSettings::email() const
{
return m_email;
}
void GlobalSettings::setEmail(const QString &email)
{
m_email = email;
}
QString GlobalSettings::web() const
{
return m_web;
}
void GlobalSettings::setWeb(const QString &web)
{
m_web = web;
}
QString GlobalSettings::phone() const
{
return m_phone;
}
void GlobalSettings::setPhone(const QString &phone)
{
m_phone = phone;
}
core/settings/globalsettings.h
+16
View File
@@ -22,6 +22,10 @@ class CORESHARED_EXPORT GlobalSettings : public QObject
Q_PROPERTY(QDecDouble vatHigh READ vatHigh WRITE setVatHigh)
Q_PROPERTY(QDecDouble vatFirstLower READ vatFirstLower WRITE setVatFirstLower)
Q_PROPERTY(QDecDouble vatSecondLower READ vatSecondLower WRITE setVatSecondLower)
Q_PROPERTY(QString email READ email WRITE setEmail)
Q_PROPERTY(QString web READ web WRITE setWeb)
Q_PROPERTY(QString phone READ phone WRITE setPhone)
public:
explicit GlobalSettings(QObject *parent = 0);
@@ -61,6 +65,15 @@ public:
QDecDouble vatSecondLower() const;
void setVatSecondLower(QDecDouble vatSecondLower);
QString email() const;
void setEmail(const QString &email);
QString web() const;
void setWeb(const QString &web);
QString phone() const;
void setPhone(const QString &phone);
private:
QString m_firmName;
QString m_street;
@@ -74,6 +87,9 @@ private:
int m_vatHigh;
int m_vatFirstLower;
int m_vatSecondLower;
QString m_email;
QString m_web;
QString m_phone;
signals:
core/settings/globalsettingsform.cpp
+3
View File
@@ -28,6 +28,9 @@ GlobalSettingsForm::GlobalSettingsForm(QWidget *parent) :
registerBinding(ui->vatHigh);
registerBinding(ui->vatFirstLower);
registerBinding(ui->vatSecondLower);
registerBinding(ui->web);
registerBinding(ui->email);
registerBinding(ui->phone);
m_seriesModel = new AutoTableModel<NumberSeries>(this);
m_seriesModel->setEditableCols(QList<int>() << 0);
core/settings/globalsettingsform.ui
+31 -1
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>759</width>
<height>552</height>
<height>557</height>
</rect>
</property>
<property name="windowTitle">
@@ -89,6 +89,36 @@
<item row="4" column="1">
<widget class="QLineEdit" name="zipCode"/>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="web"/>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="email"/>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="phone"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Web</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>E-mail</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Phone</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
core/translations/core_cs_CZ.qm
BIN
View File
Binary file not shown.
core/translations/core_cs_CZ.ts
+38 -23
View File
@@ -129,63 +129,78 @@
<translation>Hlavní nastavení</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="136"/>
<location filename="../settings/globalsettingsform.ui" line="104"/>
<source>Web</source>
<translation>Web</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="111"/>
<source>E-mail</source>
<translation>E-mail</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="118"/>
<source>Phone</source>
<translation>Telefon</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="166"/>
<source>Company info</source>
<translation>Informace o společnosti</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="145"/>
<location filename="../settings/globalsettingsform.ui" line="175"/>
<source>IC</source>
<translation>IČO</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="155"/>
<location filename="../settings/globalsettingsform.ui" line="185"/>
<source>VAT number</source>
<translation>DIČ</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="165"/>
<location filename="../settings/globalsettingsform.ui" line="195"/>
<source>VAT payer</source>
<translation>Plátce DPH</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="178"/>
<location filename="../settings/globalsettingsform.ui" line="208"/>
<source>VAT rates</source>
<translation>Sazby DPH</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="184"/>
<location filename="../settings/globalsettingsform.ui" line="214"/>
<source>High</source>
<translation>Vysoká</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="198"/>
<location filename="../settings/globalsettingsform.ui" line="228"/>
<source>First lower</source>
<translation>První snížená</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="212"/>
<location filename="../settings/globalsettingsform.ui" line="242"/>
<source>Second lower</source>
<translation>Druhá snížená</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="233"/>
<location filename="../settings/globalsettingsform.ui" line="294"/>
<location filename="../settings/globalsettingsform.ui" line="263"/>
<location filename="../settings/globalsettingsform.ui" line="324"/>
<source>Number series</source>
<translation>Číselné řady</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="262"/>
<location filename="../settings/globalsettingsform.ui" line="292"/>
<source>Edit name</source>
<translation>Upravit název</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="273"/>
<location filename="../settings/globalsettingsform.ui" line="303"/>
<source>Season</source>
<translation>Sezóna</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="280"/>
<location filename="../settings/globalsettingsform.ui" line="310"/>
<source>Create new</source>
<translation>Vytvořit novou</translation>
</message>
@@ -220,42 +235,42 @@
<translation>PSČ</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="98"/>
<location filename="../settings/globalsettingsform.ui" line="128"/>
<source>Logo</source>
<translation>Logo</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.ui" line="126"/>
<location filename="../settings/globalsettingsform.ui" line="156"/>
<source>Select file</source>
<translation>Vyber soubor</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.cpp" line="78"/>
<location filename="../settings/globalsettingsform.cpp" line="81"/>
<source>Switch season</source>
<translation>Změna sezóny</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.cpp" line="78"/>
<location filename="../settings/globalsettingsform.cpp" line="81"/>
<source>Realy switch active season?</source>
<translation>Opravdu si přejete změnit aktivní sezónu?</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.cpp" line="144"/>
<location filename="../settings/globalsettingsform.cpp" line="147"/>
<source>New season</source>
<translation>Nová sezóna</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.cpp" line="144"/>
<location filename="../settings/globalsettingsform.cpp" line="147"/>
<source>Realy 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="167"/>
<location filename="../settings/globalsettingsform.cpp" line="170"/>
<source>Select logo</source>
<translation>Vybrat logo</translation>
</message>
<message>
<location filename="../settings/globalsettingsform.cpp" line="167"/>
<location filename="../settings/globalsettingsform.cpp" line="170"/>
<source>Images (*.png *.xpm *.jpg)</source>
<translation>Obrázky (*.png *.xpm *.jpg)</translation>
</message>
@@ -387,7 +402,7 @@
<message>
<location filename="../iplugin.h" line="58"/>
<source>You don&apos;t have permission to open this plugin.</source>
<translation>Nemáte oprávnění otevřít tento modul</translation>
<translation>Nemáte oprávnění otevřít tento modul.</translation>
</message>
</context>
<context>
@@ -556,7 +571,7 @@
<message>
<location filename="../settingsform.cpp" line="46"/>
<source>You don&apos;t have permission to save settings.</source>
<translation>Nemáte oprávnění uložit nastavení</translation>
<translation>Nemáte oprávnění uložit nastavení.</translation>
</message>
</context>
<context>