AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1224 from itflow-org/develop 

25.6.1 Release
This commit is contained in:
Johnny 2025-06-22 01:52:33 -04:00 committed by GitHub
parent ed8a576ac3 49511276fd
commit 6df04390bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@
This file documents all notable changes made to ITFlow. This file documents all notable changes made to ITFlow.
## [25.06.1]
### Fixed
- Fixed a regression in setup causing it to crash and never complete, due to missing default for currency.
## [25.06] ## [25.06]
### Breaking CHANGES ### Breaking CHANGES

13
database_updates.php
View File

@ -3670,13 +3670,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.9'"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.9'");
} }
// if (CURRENT_DATABASE_VERSION == '2.1.9') { if (CURRENT_DATABASE_VERSION == '2.1.9') {
// // Insert queries here required to update to DB version 2.2.0 mysqli_query($mysqli, "ALTER TABLE `companies` MODIFY `company_currency` VARCHAR(200) DEFAULT 'USD'");
mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.0'");
}
// if (CURRENT_DATABASE_VERSION == '2.2.0') {
// // Insert queries here required to update to DB version 2.2.1
// // Then, update the database to the next sequential version // // Then, update the database to the next sequential version
// mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.0'"); // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.1'");
// } // }
} else { } else {
// Up-to-date // Up-to-date
} }

4
db.sql
View File

@ -554,7 +554,7 @@ CREATE TABLE `companies` (
`company_website` varchar(200) DEFAULT NULL, `company_website` varchar(200) DEFAULT NULL,
`company_logo` varchar(250) DEFAULT NULL, `company_logo` varchar(250) DEFAULT NULL,
`company_locale` varchar(200) DEFAULT NULL, `company_locale` varchar(200) DEFAULT NULL,
`company_currency` varchar(200) NOT NULL, `company_currency` varchar(200) DEFAULT 'USD',
`company_tax_id` varchar(200) DEFAULT NULL, `company_tax_id` varchar(200) DEFAULT NULL,
`company_created_at` datetime NOT NULL DEFAULT current_timestamp(), `company_created_at` datetime NOT NULL DEFAULT current_timestamp(),
`company_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `company_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
@ -2590,4 +2590,4 @@ CREATE TABLE `vendors` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-06-17 22:44:10 -- Dump completed on 2025-06-21 18:33:02

2
includes/app_version.php
View File

@ -5,4 +5,4 @@
* Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month. * Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month.
*/ */
DEFINE("APP_VERSION", "25.06"); DEFINE("APP_VERSION", "25.06.1");

2
includes/database_version.php
View File

@ -5,4 +5,4 @@
* It is used in conjunction with database_updates.php * It is used in conjunction with database_updates.php
*/ */
DEFINE("LATEST_DATABASE_VERSION", "2.1.9"); DEFINE("LATEST_DATABASE_VERSION", "2.2.0");