From: Nik Okuntseff Date: Mon, 19 Mar 2018 12:48:43 +0000 (+0000) Subject: Intoduced audit fields for expenses. X-Git-Tag: timetracker_1.19-1~1002 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=495d025c9955576144df1be2ad4fbaaeb2abd51f;p=timetracker.git Intoduced audit fields for expenses. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 4ccd531a..41ceedba 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.17.58.4109 | Copyright © Anuko | +  Anuko Time Tracker 1.17.59.4110 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index d1159eaa..57dc6fd4 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -805,7 +805,7 @@ if ($_POST) { print "Updated $users_updated users...
\n"; } - if ($_POST["convert11744to11756"]) { + if ($_POST["convert11744to11759"]) { setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')"); setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'"); setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324"); @@ -832,6 +832,13 @@ if ($_POST) { setChange("ALTER TABLE `tt_log` ADD `modified_ip` varchar(45) default NULL AFTER `modified`"); setChange("ALTER TABLE `tt_log` ADD `modified_by` int(11) default NULL AFTER `modified_ip`"); setChange("UPDATE `tt_site_config` SET param_value = '1.17.56', modified = now() where param_name = 'version_db' and param_value = '1.17.53'"); + setChange("ALTER TABLE `tt_expense_items` ADD `created` datetime default NULL AFTER `paid`"); + setChange("ALTER TABLE `tt_expense_items` ADD `created_ip` varchar(45) default NULL AFTER `created`"); + setChange("ALTER TABLE `tt_expense_items` ADD `created_by` int(11) default NULL AFTER `created_ip`"); + setChange("ALTER TABLE `tt_expense_items` ADD `modified` datetime default NULL AFTER `created_by`"); + setChange("ALTER TABLE `tt_expense_items` ADD `modified_ip` varchar(45) default NULL AFTER `modified`"); + setChange("ALTER TABLE `tt_expense_items` ADD `modified_by` int(11) default NULL AFTER `modified_ip`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.59', modified = now() where param_name = 'version_db' and param_value = '1.17.56'"); } if ($_POST["cleanup"]) { @@ -877,7 +884,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.56) + Create database structure (v1.17.59)
(applies only to new installations, do not execute when updating)
@@ -917,8 +924,8 @@ if ($_POST) {
Update database structure (v1.17.44 to v1.17.56)Update database structure (v1.17.44 to v1.17.59)
diff --git a/mysql.sql b/mysql.sql index ad4516b1..502884d9 100644 --- a/mysql.sql +++ b/mysql.sql @@ -377,16 +377,22 @@ CREATE TABLE `tt_custom_field_log` ( # This table lists expense items. # CREATE TABLE `tt_expense_items` ( - `id` bigint NOT NULL auto_increment, # expense item id - `date` date NOT NULL, # date the record is for - `user_id` int(11) NOT NULL, # user id the expense item is reported by - `client_id` int(11) default NULL, # client id - `project_id` int(11) default NULL, # project id - `name` text NOT NULL, # expense item name (what is an expense for) - `cost` decimal(10,2) default '0.00', # item cost (including taxes, etc.) - `invoice_id` int(11) default NULL, # invoice id - `paid` tinyint(4) default 0, # whether the item is paid - `status` tinyint(4) default 1, # item status + `id` bigint NOT NULL auto_increment, # expense item id + `date` date NOT NULL, # date the record is for + `user_id` int(11) NOT NULL, # user id the expense item is reported by + `client_id` int(11) default NULL, # client id + `project_id` int(11) default NULL, # project id + `name` text NOT NULL, # expense item name (what is an expense for) + `cost` decimal(10,2) default '0.00', # item cost (including taxes, etc.) + `invoice_id` int(11) default NULL, # invoice id + `paid` tinyint(4) default 0, # whether the item is paid + `created` datetime default NULL, # creation timestamp + `created_ip` varchar(45) default NULL, # creator ip + `created_by` int(11) default NULL, # creator user_id + `modified` datetime default NULL, # modification timestamp + `modified_ip` varchar(45) default NULL, # modifier ip + `modified_by` int(11) default NULL, # modifier user_id + `status` tinyint(4) default 1, # item status PRIMARY KEY (`id`) ); @@ -440,4 +446,4 @@ CREATE TABLE `tt_site_config` ( PRIMARY KEY (`param_name`) ); -INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.56', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.59', now()); # TODO: change when structure changes.