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

[..hidden..]

Revision: 5259
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5259&view=rev
Author:   einhverfr
Date:     2012-11-25 02:10:58 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/sql/modules/admin.sql

Added Paths:
-----------
    trunk/templates/demo/ap_transaction.csv
    trunk/templates/demo/ar_transaction.csv
    trunk/templates/xedemo/ap_transaction.csv
    trunk/templates/xedemo/ar_transaction.csv

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5255
   + /branches/1.3:3711-5258

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-25 02:06:07 UTC (rev 5258)
+++ trunk/Changelog	2012-11-25 02:10:58 UTC (rev 5259)
@@ -86,6 +86,7 @@
 * Fixed letterhead not showing up on emailed invoices (Chris T, h/t Kevin B)
 * Fixed blank screen on posting AR/IS/OE (Chris T)
 * Fixed ECA's not distinct on parts screen and search (Chris T, 3550075)
+* Fixed error saving imported user with no existing db role (Chris T, 3559844)
 
 Chris T is Chris Travers
 Kevin B is Kevin Bailey

Modified: trunk/sql/modules/admin.sql
===================================================================
--- trunk/sql/modules/admin.sql	2012-11-25 02:06:07 UTC (rev 5258)
+++ trunk/sql/modules/admin.sql	2012-11-25 02:10:58 UTC (rev 5259)
@@ -368,7 +368,7 @@
         elsif in_import is false AND t_is_user is false 
               AND in_password IS NULL THEN
                 RAISE EXCEPTION 'No password';
-        elsif  t_is_role is false THEN
+        elsif  t_is_role is false and in_import IS FALSE THEN
             -- create an actual user
                 execute 'CREATE USER ' || quote_ident( in_username ) || 
                      ' WITH ENCRYPTED PASSWORD ' || quote_literal (in_password)

Copied: trunk/templates/demo/ap_transaction.csv (from rev 5258, branches/1.3/templates/demo/ap_transaction.csv)
===================================================================
--- trunk/templates/demo/ap_transaction.csv	                        (rev 0)
+++ trunk/templates/demo/ap_transaction.csv	2012-11-25 02:10:58 UTC (rev 5259)
@@ -0,0 +1,3 @@
+account,amount,description,project
+<?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?>

Copied: trunk/templates/demo/ar_transaction.csv (from rev 5258, branches/1.3/templates/demo/ar_transaction.csv)
===================================================================
--- trunk/templates/demo/ar_transaction.csv	                        (rev 0)
+++ trunk/templates/demo/ar_transaction.csv	2012-11-25 02:10:58 UTC (rev 5259)
@@ -0,0 +1,3 @@
+account,amount,description,project
+<?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?>

Copied: trunk/templates/xedemo/ap_transaction.csv (from rev 5258, branches/1.3/templates/xedemo/ap_transaction.csv)
===================================================================
--- trunk/templates/xedemo/ap_transaction.csv	                        (rev 0)
+++ trunk/templates/xedemo/ap_transaction.csv	2012-11-25 02:10:58 UTC (rev 5259)
@@ -0,0 +1,3 @@
+account,amount,description,project
+<?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?>

Copied: trunk/templates/xedemo/ar_transaction.csv (from rev 5258, branches/1.3/templates/xedemo/ar_transaction.csv)
===================================================================
--- trunk/templates/xedemo/ar_transaction.csv	                        (rev 0)
+++ trunk/templates/xedemo/ar_transaction.csv	2012-11-25 02:10:58 UTC (rev 5259)
@@ -0,0 +1,3 @@
+account,amount,description,project
+<?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?>

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