[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[6956] branches/1.4



Revision: 6956
          http://sourceforge.net/p/ledger-smb/code/6956
Author:   einhverfr
Date:     2014-03-28 10:06:22 +0000 (Fri, 28 Mar 2014)
Log Message:
-----------
Merged from trunk through rev 6955

Revision Links:
--------------
    http://sourceforge.net/p/ledger-smb/code/6955

Modified Paths:
--------------
    branches/1.4/LedgerSMB/Upgrade_Tests.pm
    branches/1.4/sql/upgrade/sl2.8-1.4.sql

Modified: branches/1.4/LedgerSMB/Upgrade_Tests.pm
===================================================================
--- branches/1.4/LedgerSMB/Upgrade_Tests.pm	2014-03-28 09:52:58 UTC (rev 6955)
+++ branches/1.4/LedgerSMB/Upgrade_Tests.pm	2014-03-28 10:06:22 UTC (rev 6956)
@@ -437,7 +437,8 @@
 push @tests, __PACKAGE__->new(
     test_query => "select *
                      from partscustomer
-                    where not exists (select 1
+                    where pricegroup_id is not null and
+                          not exists (select 1
                                         from pricegroup
                                        where id = pricegroup_id)",
     display_name => $LedgerSMB::App_State::Locale->text('Non-existing customer pricegroups in partscustomer'),

Modified: branches/1.4/sql/upgrade/sl2.8-1.4.sql
===================================================================
--- branches/1.4/sql/upgrade/sl2.8-1.4.sql	2014-03-28 09:52:58 UTC (rev 6955)
+++ branches/1.4/sql/upgrade/sl2.8-1.4.sql	2014-03-28 10:06:22 UTC (rev 6956)
@@ -442,7 +442,7 @@
 -- ### Move those to business_units
 -- ### TODO: Reconciled disappeared from the source table...
 
-ALTER TABLE sl28.acc_trans ADD COLUMN entry_id integer;
+--ALTER TABLE sl28.acc_trans ADD COLUMN entry_id integer;
 
 update sl28.acc_trans
   set entry_id = nextval('acc_trans_entry_id_seq');
@@ -625,10 +625,10 @@
 
 INSERT INTO jcitems(id, parts_id, description, qty, allocated,
             sellprice, fxsellprice, serialnumber, checkedin, checkedout,
-            person_id, notes, business_unit_id)
+            person_id, notes, business_unit_id, total)
      SELECT j.id,  parts_id, description, qty, allocated,
             sellprice, fxsellprice, serialnumber, checkedin, checkedout,
-            p.id, j.notes, j.project_id+1000
+            p.id, j.notes, j.project_id+1000, qty * sellprice
        FROM sl28.jcitems j
        JOIN sl28.employee e ON j.employee_id = e.id
        JOIN person p ON e.entity_id = p.entity_id;

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


------------------------------------------------------------------------------
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits