SF.net SVN: ledger-smb:[3854] trunk

[..hidden..]

Revision: 3854
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3854&view=rev
Author:   einhverfr
Date:     2011-10-12 22:12:26 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/sql/upgrade/1.2-1.3-manual.sql

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3850
   + /branches/1.3:3711-3853

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2011-10-12 22:06:49 UTC (rev 3853)
+++ trunk/Changelog	2011-10-12 22:12:26 UTC (rev 3854)
@@ -18,13 +18,14 @@
 * Fixed Employee record duplicted on save (Herman V)
 * Fixed upgrade script not bringing in entity.name for employees (Chris T)
 * Fixed upgrade script error importing duplicate customer/vendor numbers
-(Chris T2)
+(Chris T)
 
 Changelog for LedgerSMB 1.3.0
 
 Security:
 * Security is now robustly enforced on the db level (Chris T and Josh D)
 * New user interface to manage users (Chris T and Aurynn)
+* Framework in place, used to prevent XSRF attacks (Chris T)
 
 Separation of Duties:
 * Separate permissions for entry and posting to the books.


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3843-3850
/branches/1.3/scripts/employee.pl:3842-3843
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-3853
/branches/1.3/scripts/employee.pl:3842-3843

Modified: trunk/sql/upgrade/1.2-1.3-manual.sql
===================================================================
--- trunk/sql/upgrade/1.2-1.3-manual.sql	2011-10-12 22:06:49 UTC (rev 3853)
+++ trunk/sql/upgrade/1.2-1.3-manual.sql	2011-10-12 22:12:26 UTC (rev 3854)
@@ -26,6 +26,7 @@
 \i sql/modules/Payment.sql
 \i sql/modules/Person.sql
 \i sql/modules/Reconciliation.sql
+
 BEGIN;
 
 -- adding mapping info for import.
@@ -81,7 +82,8 @@
 
 UPDATE lsmb12.vendor SET credit_id = 
 	(SELECT id FROM entity_credit_account e 
-	WHERE e.meta_number = vendornumber);
+	WHERE e.meta_number = vendornumber and entity_class = 1
+        and e.entity_id = vendor.entity_id);
 
 
 INSERT INTO entity_credit_account
@@ -94,7 +96,7 @@
 
 UPDATE lsmb12.customer SET credit_id = 
 	(SELECT id FROM entity_credit_account e 
-	WHERE e.meta_number = customernumber AND customer.entity_id = e.entity_id);
+	WHERE e.meta_number = customernumber AND customer.entity_id = e.entity_id and entity_class = 2);
 
 --Company
 


Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-3853
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710

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