diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fccb4f..bc695c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) -project(kima2 VERSION 1.4.0) +project(kima2 VERSION 1.3.1) set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake") diff --git a/manual/Benutzerhandbuch.odt b/manual/Benutzerhandbuch.odt index ab245ce..0a57b47 100644 Binary files a/manual/Benutzerhandbuch.odt and b/manual/Benutzerhandbuch.odt differ diff --git a/manual/Benutzerhandbuch.pdf b/manual/Benutzerhandbuch.pdf index e4966fc..531ef19 100644 Binary files a/manual/Benutzerhandbuch.pdf and b/manual/Benutzerhandbuch.pdf differ diff --git a/src/core/excelreader.cpp b/src/core/excelreader.cpp index cd0a8d7..b1494e6 100644 --- a/src/core/excelreader.cpp +++ b/src/core/excelreader.cpp @@ -23,7 +23,7 @@ std::size_t ExcelReader::readSellersFromFile(const fs::path& filePath, Marketpla auto ws = wb.sheet_by_index(0); const int START_ROW = 5; - const int END_ROW = 504; + const int END_ROW = 503; int rowCount{}; for (const auto& row : ws.rows(false)) { diff --git a/src/core/marketplace.cpp b/src/core/marketplace.cpp index 8f666fe..302981a 100644 --- a/src/core/marketplace.cpp +++ b/src/core/marketplace.cpp @@ -173,7 +173,7 @@ void Marketplace::setSalesToDelete(int cashPointNo) void Marketplace::exportReportToCSV(const fs::path& filePath, int feeInPercent, int maxFeeInEuro) { - const char delimiter = ';'; + const char delimiter = ','; std::ofstream file(filePath); file << "Verk.Nr." << delimiter << "Nachname" << delimiter << "Vorname" << delimiter diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index bb3888a..c0fb637 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -446,7 +446,7 @@ void MainWindow::onImportSellerExcelActionTriggered() .exec(); auto filename = QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(), - "Alle unterstützte Dateien (*.xlsx *.csv);;Excel Dateien (*.xlsx);;CSV Dateien (*.csv)"); + "Excel Dateien (*.xlsx);CSV Dateien (*.csv)"); if (filename.isEmpty()) return; @@ -454,7 +454,7 @@ void MainWindow::onImportSellerExcelActionTriggered() fs::path filePath(filename.toStdWString()); std::size_t numImported{}; - if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) { + if (case_insensitive_match(filePath.extension().string(), std::string("xslx"))) { numImported = ExcelReader::readSellersFromFile(filePath, marketplace_.get()); } else { numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get()); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index baca01d..d686bf4 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -419,7 +419,7 @@ drucken 0 0 817 - 30 + 24 @@ -511,7 +511,7 @@ drucken - Aus Excel/CSV-Datei (initial) + Aus Excel-Datei (initial)