From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sun, 22 Mar 2015 06:54:03 +0000 (+0100)
Subject: Fixed bug in journal related part of sql upgrade script.
X-Git-Tag: v2.4.2~19^2~233
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=29a1353791d3b622af39431bb89a42392cc66666;hp=f610d691b5ecbb6e738eccfa1552b5d558e56ddf;p=fa-stable.git

Fixed bug in journal related part of sql upgrade script.
---

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)