Fixed default value for audit_trail.fiscal_year column.

diff --git a/includes/db/audit_trail_db.inc b/includes/db/audit_trail_db.inc
index ff61e5313aad5826048b96ffe17c4573b0250383..c341a2f0d283c6ee171e4b177c414c9a647d07ff 100644 (file)
--- a/includes/db/audit_trail_db.inc
+++ b/includes/db/audit_trail_db.inc
@@ -12,6 +12,8 @@
 
 function add_audit_trail($trans_type, $trans_no, $trans_date, $descr='')
 {
+       begin_transaction();
+
        $date = date2sql($trans_date);
        $sql = "INSERT INTO ".TB_PREF."audit_trail"
                . " (type, trans_no, user, gl_date, description)
@@ -29,6 +31,7 @@ function add_audit_trail($trans_type, $trans_no, $trans_date, $descr='')
                . db_escape($trans_no);
 
        db_query($sql, "Cannot update audit gl_seq");
+       commit_transaction();
 }
 
 function get_audit_trail_all($trans_type, $trans_no)

diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index 1a135b77b5f2cd7be899e6b9e17e1013ad59cf8f..2d5725e6058a871b255df81bbd864122bf533fb9 100644 (file)
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -2,6 +2,8 @@ ALTER TABLE `0_suppliers` ADD COLUMN  `tax_algorithm` tinyint(1) NOT NULL defaul
 ALTER TABLE `0_supp_trans` ADD COLUMN `tax_algorithm` tinyint(1) NULL default '1' AFTER `tax_included`;
 INSERT INTO `0_sys_prefs` VALUES('tax_algorithm','glsetup.customer', 'tinyint', 1, '1');
 INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, '');
+ALTER TABLE `0_audit_trail` CHANGE   `fiscal_year` int(11) NOT NULL default 0,
+
 # Fix eventual invalid date/year in audit records
 UPDATE `0_audit_trail` audit 
                LEFT JOIN `0_gl_trans` gl ON  gl.`type`=audit.`type` AND gl.type_no=audit.trans_no

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 17ee80612f757dc36e0d120cf41d9174a31de400..e5250f5a983c419161b293d6fb8aa160e84a12a6 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS `0_audit_trail` (
   `user` smallint(6) unsigned NOT NULL default '0',
   `stamp` timestamp NOT NULL,
   `description` varchar(60) default NULL,
-  `fiscal_year` int(11) NOT NULL,
+  `fiscal_year` int(11) NOT NULL default 0,
   `gl_date` date NOT NULL default '0000-00-00',
   `gl_seq` int(11) unsigned default NULL,
   PRIMARY KEY  (`id`),

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 3b3d3f2e0e9095365a220748b715ba9619d614c0..341cb1e45277f24627239a952e9a8e037445b1cd 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS `0_audit_trail` (
   `user` smallint(6) unsigned NOT NULL default '0',
   `stamp` timestamp NOT NULL,
   `description` varchar(60) default NULL,
-  `fiscal_year` int(11) NOT NULL,
+  `fiscal_year` int(11) NOT NULL default 0,
   `gl_date` date NOT NULL default '0000-00-00',
   `gl_seq` int(11) unsigned default NULL,
   PRIMARY KEY  (`id`),