Add german tax changes to the database.

dragotin · Jul 25, 2020 · a299ac1 · a299ac1
1 parent 1244bd3
commit a299ac1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/database/mysql/migration/22_dbmigrate.sql b/database/mysql/migration/22_dbmigrate.sql
@@ -0,0 +1,5 @@
+
+
+INSERT INTO taxes (fullTax, reducedTax, startDate) VALUES (16.0, 5.0, '2020-07-01');
+INSERT INTO taxes (fullTax, reducedTax, startDate) VALUES (19.0, 7.0, '2021-01-01');
+
diff --git a/database/sqlite3/migration/22_dbmigrate.sql b/database/sqlite3/migration/22_dbmigrate.sql
@@ -0,0 +1,5 @@
+
+
+INSERT INTO taxes (fullTax, reducedTax, startDate) VALUES (16.0, 5.0, '2020-07-01');
+INSERT INTO taxes (fullTax, reducedTax, startDate) VALUES (19.0, 7.0, '2021-01-01');
+
diff --git a/src/setupassistant.cpp b/src/setupassistant.cpp
@@ -103,9 +103,10 @@ SqLiteDetailsPage::SqLiteDetailsPage(QWidget *parent)
     registerField("SqliteStorageFile", ui._fileName);
 
     // Preset the sqlite storage
-    if( ! DatabaseSettings::self()->dbFile().isEmpty()) {
+    const QString fileName = DatabaseSettings::self()->dbFile();
+    if( ! fileName.isEmpty()) {
         ui.mRbCustom->setChecked(true);
-        setField("SqliteStorageFile", DatabaseSettings::self()->dbFile());
+        setField("SqliteStorageFile", fileName);
     }
 }
 

diff --git a/src/version.h b/src/version.h
@@ -2,5 +2,5 @@
 
 #define KRAFT_CODENAME "Gunny"
 
-#define KRAFT_REQUIRED_SCHEMA_VERSION 21
+#define KRAFT_REQUIRED_SCHEMA_VERSION 22
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@


		INSERT INTO taxes (fullTax, reducedTax, startDate) VALUES (16.0, 5.0, '2020-07-01');
		INSERT INTO taxes (fullTax, reducedTax, startDate) VALUES (19.0, 7.0, '2021-01-01');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,5 @@

		#define KRAFT_CODENAME "Gunny"

		#define KRAFT_REQUIRED_SCHEMA_VERSION 21
		#define KRAFT_REQUIRED_SCHEMA_VERSION 22