SF.net SVN: ledger-smb:[5735] branches/1.3

[..hidden..]

Revision: 5735
          http://sourceforge.net/p/ledger-smb/code/5735
Author:   einhverfr
Date:     2013-05-02 10:20:11 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Merging Nick Prater's patch for 812 to branches/1.3

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Template/LaTeX.pm
    branches/1.3/sql/modules/Reconciliation.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-02 10:12:09 UTC (rev 5734)
+++ branches/1.3/Changelog	2013-05-02 10:20:11 UTC (rev 5735)
@@ -5,7 +5,10 @@
 Changelog for 1.3.32
 * Fixed em-dash handling for pdfs (Chris T)
 * Fixed multiple blank line handling for pdfs (Chris T)
+* Fixed multiple repeat entries in chart of accounts drop down (Nick P, 812)
 
+Nick P is Nick Prater
+
 Changelog for 1.3.31
 * Removed spurious commit saving orders (Chris T)
 * Removed check for reversing too many sales, since this poses problems 

Modified: branches/1.3/LedgerSMB/Template/LaTeX.pm
===================================================================
--- branches/1.3/LedgerSMB/Template/LaTeX.pm	2013-05-02 10:12:09 UTC (rev 5734)
+++ branches/1.3/LedgerSMB/Template/LaTeX.pm	2013-05-02 10:20:11 UTC (rev 5735)
@@ -112,7 +112,7 @@
    '%' => '\\%',
    '{' => '\\{',
    '}' => '\\}',
-   'â' => '---',
+   'â' => '--',
   );
 
 # Breaking this off to be used separately.
@@ -120,7 +120,7 @@
     my ($vars) = shift @_;
 
     if (defined $vars){
-            $vars =~ s/([&\$\\_<>~^#\%\{\}])/$escapes{$1}/g;
+            $vars =~ s/([&\$\\_<>~^#\%\{\}â])/$escapes{$1}/g;
             $vars =~ s/â/--/g;
             $vars =~ s/[ââ]/---/g;
             $vars =~ s/"(.*)"/``$1''/gs;

Modified: branches/1.3/sql/modules/Reconciliation.sql
===================================================================
--- branches/1.3/sql/modules/Reconciliation.sql	2013-05-02 10:12:09 UTC (rev 5734)
+++ branches/1.3/sql/modules/Reconciliation.sql	2013-05-02 10:20:11 UTC (rev 5735)
@@ -548,7 +548,7 @@
 );
 
 create or replace function reconciliation__account_list () returns setof recon_accounts as $$
-    SELECT
+    SELECT DISTINCT
         coa.accno || ' ' || coa.description as name,
         coa.accno, coa.id as id
     FROM account coa

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