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

[..hidden..]

Revision: 6963
          http://sourceforge.net/p/ledger-smb/code/6963
Author:   einhverfr
Date:     2014-04-01 02:46:30 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Merging changes into 1.4

Modified Paths:
--------------
    branches/1.4/Changelog
    branches/1.4/LedgerSMB/Upgrade_Tests.pm
    branches/1.4/sql/coa/nl/chart/General.sql
    branches/1.4/sql/upgrade/sl2.8-1.4.sql

Modified: branches/1.4/Changelog
===================================================================
--- branches/1.4/Changelog	2014-04-01 02:44:31 UTC (rev 6962)
+++ branches/1.4/Changelog	2014-04-01 02:46:30 UTC (rev 6963)
@@ -107,6 +107,10 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.40
+* Updated nginx configuration (Pongracz I)
+* GL account search now will search within descriptions for matches (Chris T)
+
 Changelog for 1.3.39
 * Fixed Internal Server Error clicking through ar/ap report (Chris T, 1022)
 * Fixed internal server error deleting part (Chris T, 1027)
@@ -119,6 +123,9 @@
 * Fixed encoding for templates when edited through web (Chris T, 1077)
 * Fixed customer/vendor dropdown resetting on update (Chris T, 1072)
 
+Chris T is Chris Travers
+Robert C is Robert Clay
+
 Changelog for 1.3.38
 * Fixed AR/AP transactions resetting currency/exchange rate (Chris T)
 * Fixed adding vouchers not checking for locked/approved batches (Chris T 1025)

Modified: branches/1.4/LedgerSMB/Upgrade_Tests.pm
===================================================================
--- branches/1.4/LedgerSMB/Upgrade_Tests.pm	2014-04-01 02:44:31 UTC (rev 6962)
+++ branches/1.4/LedgerSMB/Upgrade_Tests.pm	2014-04-01 02:46:30 UTC (rev 6963)
@@ -437,8 +437,7 @@
 push @tests, __PACKAGE__->new(
     test_query => "select *
                      from partscustomer
-                    where pricegroup_id is not null and
-                          not exists (select 1
+                    where 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/coa/nl/chart/General.sql
===================================================================
--- branches/1.4/sql/coa/nl/chart/General.sql	2014-04-01 02:44:31 UTC (rev 6962)
+++ branches/1.4/sql/coa/nl/chart/General.sql	2014-04-01 02:46:30 UTC (rev 6963)
@@ -191,9 +191,10 @@
 SELECT account__save(NULL,'8100','Directe Verkoopkosten','E','8100', NULL, false, false, string_to_array('AP_amount:IC_expense', ':'), false, false);
 SELECT account__save(NULL,'8150','Toeslag Indirecte Verkoopkosten','E','8150', NULL, false, false, string_to_array('', ':'), false, false);
 SELECT account__save(NULL,'8300','Kortingen bij Verkoop','E','8300', NULL, false, false, string_to_array('', ':'), false, false);
-SELECT account__save(NULL,'8520','Opbrengst Verkopen A','I','8520', NULL, false, false, string_to_array('AR_amount:IC_sale', ':'), false, false);
-SELECT account__save(NULL,'8530','Opbrengst Verkopen B','I','8530', NULL, false, false, string_to_array('AR_amount:IC_sale', ':'), false, false);
-SELECT account__save(NULL,'8540','Opbrengst Verkopen C','I','8540', NULL, false, false, string_to_array('AR_amount:IC_sale', ':'), false, false);
+SELECT account_heading_save(NULL,'8500','Opbrengsten', NULL);
+SELECT account__save(NULL,'8520','Opbrengst Verkopen A','I','8520', NULL, false, false, string_to_array('AR_amount:IC_sale:IC_income', ':'), false, false);
+SELECT account__save(NULL,'8530','Opbrengst Verkopen B','I','8530', NULL, false, false, string_to_array('AR_amount:IC_sale:IC_income', ':'), false, false);
+SELECT account__save(NULL,'8540','Opbrengst Verkopen C','I','8540', NULL, false, false, string_to_array('AR_amount:IC_sale:IC_income', ':'), false, false);
 SELECT account__save(NULL,'8999','Overboekingsrekening Rubriek 8','E','8999', NULL, false, false, string_to_array('', ':'), false, false);
 SELECT account_heading_save(NULL,'9000','Rekeningen tbv Resultatenrekening', NULL);
 SELECT account__save(NULL,'9010','Resultaat Indirecte Kosten','E','9010', NULL, false, false, string_to_array('', ':'), false, false);

Modified: branches/1.4/sql/upgrade/sl2.8-1.4.sql
===================================================================
--- branches/1.4/sql/upgrade/sl2.8-1.4.sql	2014-04-01 02:44:31 UTC (rev 6962)
+++ branches/1.4/sql/upgrade/sl2.8-1.4.sql	2014-04-01 02:46:30 UTC (rev 6963)
@@ -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, total)
+            person_id, notes, business_unit_id)
      SELECT j.id,  parts_id, description, qty, allocated,
             sellprice, fxsellprice, serialnumber, checkedin, checkedout,
-            p.id, j.notes, j.project_id+1000, qty * sellprice
+            p.id, j.notes, j.project_id+1000
        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