SF.net SVN: ledger-smb:[2935] addons/1.3/assets/trunk/sql/modules/Assets. sql

[..hidden..]

Revision: 2935
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2935&view=rev
Author:   einhverfr
Date:     2010-03-01 17:05:39 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Resolving conflicts

Modified Paths:
--------------
    addons/1.3/assets/trunk/sql/modules/Assets.sql

Modified: addons/1.3/assets/trunk/sql/modules/Assets.sql
===================================================================
--- addons/1.3/assets/trunk/sql/modules/Assets.sql	2010-03-01 05:40:20 UTC (rev 2934)
+++ addons/1.3/assets/trunk/sql/modules/Assets.sql	2010-03-01 17:05:39 UTC (rev 2935)
@@ -182,12 +182,10 @@
 	JOIN asset_item a ON (l.asset_id = a.id)
 	JOIN gl ON (gl.description = 'Asset Report ' || l.report_id)
 	WHERE r.id = in_report_id
-	GROUP BY gl.id, r.report_date;
+	GROUP BY gl.id, r.report_date, a.exp_account_id;
 
-	INSERT INTO acc_trans (trans_id, chart_id, transdate, approved, amount,
-                               source, memo)
+	INSERT INTO acc_trans (trans_id, chart_id, transdate, approved, amount)
 	SELECT gl.id, a.dep_account_id, r.report_date, true, sum(amount),
-               a.tag, a.description
 	FROM asset_report r
 	JOIN asset_report_line l ON (r.id = l.report_id)
 	JOIN asset_item a ON (l.asset_id = a.id)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.