From 29a1353791d3b622af39431bb89a42392cc66666 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 22 Mar 2015 07:54:03 +0100 Subject: [PATCH 1/1] Fixed bug in journal related part of sql upgrade script. --- sql/alter2.4.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql index cebe4e20..e2bf6278 100644 --- a/sql/alter2.4.sql +++ b/sql/alter2.4.sql @@ -148,7 +148,7 @@ ALTER TABLE `0_supp_invoice_items` ADD COLUMN `dimension2_id` int(11) NOT NULL D UPDATE `0_supp_invoice_items` si LEFT JOIN `0_gl_trans` gl ON si.supp_trans_type=gl.`type` AND si.supp_trans_no=gl.type_no AND si.gl_code=gl.account SET si.dimension_id=gl.dimension_id, si.dimension2_id=gl.dimension2_id -WHERE si.grn_item_id=-1 AND (gl.dimension_id OR gl.dimension2_id) +WHERE si.grn_item_id=-1 AND (gl.dimension_id OR gl.dimension2_id); ALTER TABLE `0_quick_entries` ADD COLUMN `usage` varchar(120) NULL AFTER `description`; ALTER TABLE `0_quick_entry_lines` ADD COLUMN `memo` tinytext NOT NULL AFTER `amount`; @@ -185,8 +185,8 @@ CREATE TABLE `0_journal` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ; INSERT INTO `0_journal` (`type`, `trans_no`, `tran_date`, `reference`, `event_date`,`doc_date`,`currency`,`amount`) - SELECT `gl`.`type`, `gl`.`type_no`, `gl`.`tran_date`, `ref`.`reference`, `gl`.`event_date`, - `gl`.`doc_date`, `sys_curr`.`value`, SUM(IF(`gl`.`amount`>0,`gl`.`amount`,0)) + SELECT `gl`.`type`, `gl`.`type_no`, `gl`.`tran_date`, `ref`.`reference`, `gl`.`tran_date`, + `gl`.`tran_date`, `sys_curr`.`value`, SUM(IF(`gl`.`amount`>0,`gl`.`amount`,0)) FROM `0_gl_trans` gl LEFT JOIN `0_refs` ref ON gl.type = ref.type AND gl.type_no=ref.id LEFT JOIN `0_sys_prefs` sys_curr ON `sys_curr`.`name`='curr_default' WHERE `gl`.`type` IN(0, 35) -- 2.30.2