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
master
Pepa Rokos 9 years ago
parent 761fcad3b7 50ac5238da
commit e724a3b234
12 changed files with 5391 additions and 4793 deletions
Show Stats Download Patch File Download Diff File

32
camp/translations/camp_cs_CZ.ts
Unescape Escape View File

@ -321,7 +321,7 @@
<translation>Sleva</translation> <translation>Sleva</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="377"/> <location filename="../campwizard.cpp" line="380"/>
<source>Apply sale</source> <source>Apply sale</source>
<translation>Uplatnit slevu</translation> <translation>Uplatnit slevu</translation>
</message> </message>
@ -346,7 +346,7 @@
</message> </message>
<message> <message>
<location filename="../campwizard.ui" line="540"/> <location filename="../campwizard.ui" line="540"/>
<location filename="../campwizard.cpp" line="382"/> <location filename="../campwizard.cpp" line="385"/>
<source>Change</source> <source>Change</source>
<translation>Změnit</translation> <translation>Změnit</translation>
</message> </message>
@ -391,56 +391,56 @@
<translation>Tisk</translation> <translation>Tisk</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="224"/> <location filename="../campwizard.cpp" line="227"/>
<source>Fixed amound</source> <source>Fixed amound</source>
<translation>Pevná částka</translation> <translation>Pevná částka</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="224"/> <location filename="../campwizard.cpp" line="227"/>
<source>%</source> <source>%</source>
<translation>%</translation> <translation>%</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="392"/> <location filename="../campwizard.cpp" line="395"/>
<location filename="../campwizard.cpp" line="398"/> <location filename="../campwizard.cpp" line="401"/>
<location filename="../campwizard.cpp" line="404"/> <location filename="../campwizard.cpp" line="407"/>
<source>Error</source> <source>Error</source>
<translation>Chyba</translation> <translation>Chyba</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="392"/> <location filename="../campwizard.cpp" line="395"/>
<source>Add people.</source> <source>Add people.</source>
<translation>Přidání lidí.</translation> <translation>Přidání lidí.</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="398"/> <location filename="../campwizard.cpp" line="401"/>
<source>Start date is after or equals end date.</source> <source>Start date is after or equals end date.</source>
<translation>Datum začátku je stejné nebo menší než datum konce.</translation> <translation>Datum začátku je stejné nebo menší než datum konce.</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="404"/> <location filename="../campwizard.cpp" line="407"/>
<source>Add service.</source> <source>Add service.</source>
<translation>Přidat službu.</translation> <translation>Přidat službu.</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="417"/> <location filename="../campwizard.cpp" line="420"/>
<location filename="../campwizard.cpp" line="452"/> <location filename="../campwizard.cpp" line="455"/>
<source>Database error</source> <source>Database error</source>
<translation>Chyba databáze</translation> <translation>Chyba databáze</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="422"/> <location filename="../campwizard.cpp" line="425"/>
<location filename="../campwizard.cpp" line="457"/> <location filename="../campwizard.cpp" line="460"/>
<source>Permission denied</source> <source>Permission denied</source>
<translation>Nedostatečná oprávnění</translation> <translation>Nedostatečná oprávnění</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="443"/> <location filename="../campwizard.cpp" line="446"/>
<source>Save record?</source> <source>Save record?</source>
<translation>Uložit záznam?</translation> <translation>Uložit záznam?</translation>
</message> </message>
<message> <message>
<location filename="../campwizard.cpp" line="443"/> <location filename="../campwizard.cpp" line="446"/>
<source>Record must be saved before print. Do you want to save record?</source> <source>Record must be saved before print. Do you want to save record?</source>
<translation>Záznam musí být před tiskem uložen. Chcete jej uložit?</translation> <translation>Záznam musí být před tiskem uložen. Chcete jej uložit?</translation>
</message> </message>

2
core/context.cpp
Unescape Escape View File

@ -61,8 +61,8 @@ void Context::loadPlugins()
if (p != NULL) { if (p != NULL) {
IPlugin *plugin = qobject_cast<IPlugin*>(p); IPlugin *plugin = qobject_cast<IPlugin*>(p);
if (plugin != NULL) { if (plugin != NULL) {
plugin->init(pluginLoader.metaData());
m_plugins.append(plugin); m_plugins.append(plugin);
plugin->init(pluginLoader.metaData());
} }
} }
else else

3
core/reporting/variablefiller.cpp
Unescape Escape View File

@ -25,6 +25,9 @@ void VariableFiller::fill(ReportPtr report, int recordId)
vars[IC] = QString::number(m_settings->ic()); vars[IC] = QString::number(m_settings->ic());
vars[DIC] = m_settings->dic(); vars[DIC] = m_settings->dic();
vars[LOGO_PATH] = m_settings->logoPath(); vars[LOGO_PATH] = m_settings->logoPath();
vars[WEB] = m_settings->web();
vars[EMAIL] = m_settings->email();
vars[PHONE] = m_settings->phone();
if (recordId > 0) if (recordId > 0)
{ {

3
core/reporting/variablefiller.h
Unescape Escape View File

@ -14,6 +14,9 @@
#define DIC "DIC" #define DIC "DIC"
#define LOGO_PATH "LOGO_PATH" #define LOGO_PATH "LOGO_PATH"
#define RECORD_ID "RECORD_ID" #define RECORD_ID "RECORD_ID"
#define WEB "WEB"
#define EMAIL "EMAIL"
#define PHONE "PHONE"
class CORESHARED_EXPORT VariableFiller class CORESHARED_EXPORT VariableFiller
{ {

30
core/settings/globalsettings.cpp
Unescape Escape View File

@ -126,5 +126,35 @@ void GlobalSettings::setVatSecondLower(QDecDouble vatSecondLower)
m_vatSecondLower = FROM_DEC(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;
}

16
core/settings/globalsettings.h
Unescape Escape View File

@ -22,6 +22,10 @@ class CORESHARED_EXPORT GlobalSettings : public QObject
Q_PROPERTY(QDecDouble vatHigh READ vatHigh WRITE setVatHigh) Q_PROPERTY(QDecDouble vatHigh READ vatHigh WRITE setVatHigh)
Q_PROPERTY(QDecDouble vatFirstLower READ vatFirstLower WRITE setVatFirstLower) Q_PROPERTY(QDecDouble vatFirstLower READ vatFirstLower WRITE setVatFirstLower)
Q_PROPERTY(QDecDouble vatSecondLower READ vatSecondLower WRITE setVatSecondLower) 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: public:
explicit GlobalSettings(QObject *parent = 0); explicit GlobalSettings(QObject *parent = 0);
@ -61,6 +65,15 @@ public:
QDecDouble vatSecondLower() const; QDecDouble vatSecondLower() const;
void setVatSecondLower(QDecDouble vatSecondLower); 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: private:
QString m_firmName; QString m_firmName;
QString m_street; QString m_street;
@ -74,6 +87,9 @@ private:
int m_vatHigh; int m_vatHigh;
int m_vatFirstLower; int m_vatFirstLower;
int m_vatSecondLower; int m_vatSecondLower;
QString m_email;
QString m_web;
QString m_phone;
signals: signals:

3
core/settings/globalsettingsform.cpp
Unescape Escape View File

@ -28,6 +28,9 @@ GlobalSettingsForm::GlobalSettingsForm(QWidget *parent) :
registerBinding(ui->vatHigh); registerBinding(ui->vatHigh);
registerBinding(ui->vatFirstLower); registerBinding(ui->vatFirstLower);
registerBinding(ui->vatSecondLower); registerBinding(ui->vatSecondLower);
registerBinding(ui->web);
registerBinding(ui->email);
registerBinding(ui->phone);
m_seriesModel = new AutoTableModel<NumberSeries>(this); m_seriesModel = new AutoTableModel<NumberSeries>(this);
m_seriesModel->setEditableCols(QList<int>() << 0); m_seriesModel->setEditableCols(QList<int>() << 0);

32
core/settings/globalsettingsform.ui
Unescape Escape View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>759</width> <width>759</width>
<height>552</height> <height>557</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -89,6 +89,36 @@
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="zipCode"/> <widget class="QLineEdit" name="zipCode"/>
</item> </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> </layout>
</widget> </widget>
</item> </item>

BIN
core/translations/core_cs_CZ.qm
View File

Binary file not shown.

61
core/translations/core_cs_CZ.ts
Unescape Escape View File

@ -129,63 +129,78 @@
<translation>Hlavní nastavení</translation> <translation>Hlavní nastavení</translation>
</message> </message>
<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> <source>Company info</source>
<translation>Informace o společnosti</translation> <translation>Informace o společnosti</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="145"/> <location filename="../settings/globalsettingsform.ui" line="175"/>
<source>IC</source> <source>IC</source>
<translation>IČO</translation> <translation>IČO</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="155"/> <location filename="../settings/globalsettingsform.ui" line="185"/>
<source>VAT number</source> <source>VAT number</source>
<translation>DIČ</translation> <translation>DIČ</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="165"/> <location filename="../settings/globalsettingsform.ui" line="195"/>
<source>VAT payer</source> <source>VAT payer</source>
<translation>Plátce DPH</translation> <translation>Plátce DPH</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="178"/> <location filename="../settings/globalsettingsform.ui" line="208"/>
<source>VAT rates</source> <source>VAT rates</source>
<translation>Sazby DPH</translation> <translation>Sazby DPH</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="184"/> <location filename="../settings/globalsettingsform.ui" line="214"/>
<source>High</source> <source>High</source>
<translation>Vysoká</translation> <translation>Vysoká</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="198"/> <location filename="../settings/globalsettingsform.ui" line="228"/>
<source>First lower</source> <source>First lower</source>
<translation>První snížená</translation> <translation>První snížená</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="212"/> <location filename="../settings/globalsettingsform.ui" line="242"/>
<source>Second lower</source> <source>Second lower</source>
<translation>Druhá snížená</translation> <translation>Druhá snížená</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="233"/> <location filename="../settings/globalsettingsform.ui" line="263"/>
<location filename="../settings/globalsettingsform.ui" line="294"/> <location filename="../settings/globalsettingsform.ui" line="324"/>
<source>Number series</source> <source>Number series</source>
<translation>Číselné řady</translation> <translation>Číselné řady</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="262"/> <location filename="../settings/globalsettingsform.ui" line="292"/>
<source>Edit name</source> <source>Edit name</source>
<translation>Upravit název</translation> <translation>Upravit název</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="273"/> <location filename="../settings/globalsettingsform.ui" line="303"/>
<source>Season</source> <source>Season</source>
<translation>Sezóna</translation> <translation>Sezóna</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="280"/> <location filename="../settings/globalsettingsform.ui" line="310"/>
<source>Create new</source> <source>Create new</source>
<translation>Vytvořit novou</translation> <translation>Vytvořit novou</translation>
</message> </message>
@ -220,42 +235,42 @@
<translation>PSČ</translation> <translation>PSČ</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="98"/> <location filename="../settings/globalsettingsform.ui" line="128"/>
<source>Logo</source> <source>Logo</source>
<translation>Logo</translation> <translation>Logo</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.ui" line="126"/> <location filename="../settings/globalsettingsform.ui" line="156"/>
<source>Select file</source> <source>Select file</source>
<translation>Vyber soubor</translation> <translation>Vyber soubor</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.cpp" line="78"/> <location filename="../settings/globalsettingsform.cpp" line="81"/>
<source>Switch season</source> <source>Switch season</source>
<translation>Změna sezóny</translation> <translation>Změna sezóny</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.cpp" line="78"/> <location filename="../settings/globalsettingsform.cpp" line="81"/>
<source>Realy switch active season?</source> <source>Realy switch active season?</source>
<translation>Opravdu si přejete změnit aktivní sezónu?</translation> <translation>Opravdu si přejete změnit aktivní sezónu?</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.cpp" line="144"/> <location filename="../settings/globalsettingsform.cpp" line="147"/>
<source>New season</source> <source>New season</source>
<translation>Nová sezóna</translation> <translation>Nová sezóna</translation>
</message> </message>
<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> <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> <translation>Opravdu si přejete vytvořit novou sezónu a přepnout na ni?</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.cpp" line="167"/> <location filename="../settings/globalsettingsform.cpp" line="170"/>
<source>Select logo</source> <source>Select logo</source>
<translation>Vybrat logo</translation> <translation>Vybrat logo</translation>
</message> </message>
<message> <message>
<location filename="../settings/globalsettingsform.cpp" line="167"/> <location filename="../settings/globalsettingsform.cpp" line="170"/>
<source>Images (*.png *.xpm *.jpg)</source> <source>Images (*.png *.xpm *.jpg)</source>
<translation>Obrázky (*.png *.xpm *.jpg)</translation> <translation>Obrázky (*.png *.xpm *.jpg)</translation>
</message> </message>
@ -387,7 +402,7 @@
<message> <message>
<location filename="../iplugin.h" line="58"/> <location filename="../iplugin.h" line="58"/>
<source>You don&apos;t have permission to open this plugin.</source> <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> </message>
</context> </context>
<context> <context>
@ -556,7 +571,7 @@
<message> <message>
<location filename="../settingsform.cpp" line="46"/> <location filename="../settingsform.cpp" line="46"/>
<source>You don&apos;t have permission to save settings.</source> <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> </message>
</context> </context>
<context> <context>

5019
reports/camp_accommodation_document.lrxml
View File

File diff suppressed because it is too large Load Diff

5019
reports/camp_accommodation_document_en.lrxml
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save