SF.net SVN: ledger-smb:[6549] branches/1.3/sql/upgrade/sl2.8-1.3.sql

[..hidden..]

Revision: 6549
          http://sourceforge.net/p/ledger-smb/code/6549
Author:   ehuelsmann
Date:     2014-01-19 12:57:04 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Fixes for the sl2.8 import script.

Modified Paths:
--------------
    branches/1.3/sql/upgrade/sl2.8-1.3.sql

Modified: branches/1.3/sql/upgrade/sl2.8-1.3.sql
===================================================================
--- branches/1.3/sql/upgrade/sl2.8-1.3.sql	2014-01-19 11:46:31 UTC (rev 6548)
+++ branches/1.3/sql/upgrade/sl2.8-1.3.sql	2014-01-19 12:57:04 UTC (rev 6549)
@@ -447,7 +447,7 @@
                     from account
                    where accno = (select accno
                                     from sl28.chart
-                                   where chart.id = acc_trans.chart_id)),
+                                   where chart.id = ac.chart_id)),
         amount, transdate, source,
 	CASE WHEN cleared IS NOT NULL THEN TRUE ELSE FALSE END, fx_transaction,
 	project_id, memo, approved, cleared, null, vr_id
@@ -474,14 +474,15 @@
        JOIN sl28.chart c ON (t.chart_id = c.id)
        JOIN account a ON (a.accno = c.accno);
 
-INSERT INTO eca_tax (credit_id, chart_id)
+INSERT INTO customertax (customer_id, chart_id)
   SELECT c.credit_id, (select id from account
                       where accno = (select accno from sl28.chart sc
                                       where sc.id = ct.chart_id))
    FROM sl28.customertax ct
    JOIN sl28.customer c
-     ON ct.customer_id = c.id
-  UNION
+     ON ct.customer_id = c.id;
+
+INSERT INTO vendortax (vendor_id, chart_id)
   SELECT v.credit_id, (select id from account
                       where accno = (select accno from sl28.chart sc
                                       where sc.id = vt.chart_id))
@@ -576,9 +577,9 @@
      SELECT id from users;
 
 INSERT INTO recurring(id, reference, startdate, nextdate, enddate,
-            recurring_interval, howmany, payment)
+            repeat, unit, howmany, payment)
      SELECT id, reference, startdate, nextdate, enddate, 
-            (repeat || ' ' || unit)::interval,
+            repeat, unit,
             howmany, payment 
        FROM sl28.recurring;
 

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits