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

[..hidden..]

Revision: 3680
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3680&view=rev
Author:   einhverfr
Date:     2011-08-23 23:37:37 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
More progress on migration tools
fixing bug 3394736

Modified Paths:
--------------
    trunk/LedgerSMB/RP.pm
    trunk/LedgerSMB/Template.pm
    trunk/bin/rp.pl
    trunk/scripts/setup.pl
    trunk/templates/demo/statement.tex

Modified: trunk/LedgerSMB/RP.pm
===================================================================
--- trunk/LedgerSMB/RP.pm	2011-08-23 17:06:28 UTC (rev 3679)
+++ trunk/LedgerSMB/RP.pm	2011-08-23 23:37:37 UTC (rev 3680)
@@ -1841,7 +1841,7 @@
                        a.curr, a.ponumber, a.notes, c.language_code
 		HAVING sum(p.due) <> 0|;
 
-    $query .= qq| ORDER BY ctid, curr, $transdate, invnumber|;
+    $query .= qq| ORDER BY e.legal_name, ctid, curr, $transdate, invnumber|;
     $sth = $dbh->prepare($query) || $form->dberror($query);
 
     $sth->execute($form->{todate}, $form->{todate}, $form->{todate}, 

Modified: trunk/LedgerSMB/Template.pm
===================================================================
--- trunk/LedgerSMB/Template.pm	2011-08-23 17:06:28 UTC (rev 3679)
+++ trunk/LedgerSMB/Template.pm	2011-08-23 23:37:37 UTC (rev 3680)
@@ -264,7 +264,7 @@
 		$cleanvars->{text} = sub { return $self->escape($self->{locale}->text(@_))};
 	} 
 	else {
-            $cleanvars->{text} = sub { return shift @_ };
+            $cleanvars->{text} = sub { return $self->escape(shift @_) };
 	
         }
         $cleanvars->{tt_url} = sub {

Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl	2011-08-23 17:06:28 UTC (rev 3679)
+++ trunk/bin/rp.pl	2011-08-23 23:37:37 UTC (rev 3680)
@@ -1379,7 +1379,7 @@
     my %hiddens;
     # get name and email addresses
     for $i ( 1 .. $form->{rowcount} ) {
-        if ( $form->{"statement_$i"} ) {
+        if ( $form->{"statement_$i"} eq '1' ) {
             $form->{"$form->{ct}_id"}  = $form->{"$form->{ct}_id_$i"};
             $form->{"statement_1"}     = 1;
             $form->{"language_code_1"} = $form->{"language_code_$i"};
@@ -1473,7 +1473,7 @@
     
     for $i ( 1 .. $form->{rowcount} ) {
 
-        if ( $form->{"statement_$i"} ) {
+        if ( $form->{"statement_$i"} eq '1' ) {
             $form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
             $language_code            = $form->{"language_code_$i"};
             $curr                     = $form->{"curr_$i"};
@@ -1486,11 +1486,6 @@
                 $form->{"$form->{ct}_id"} = "";
                 $SIG{INT} = 'IGNORE';
             }
-            else {
-                $form->{"statement_1"}     = 1;
-                $form->{"language_code_1"} = $language_code;
-                $form->{"curr_1"}          = $curr;
-            }
     
             RP->aging( \%myconfig, \%$form );
     
@@ -1501,7 +1496,7 @@
     }
 
     $form->error( $locale->text('Nothing selected!') ) unless $selected;
-    
+   
     my $template = LedgerSMB::Template->new( 
       user => \%myconfig,
       template => $form->{'formname'} || $form->{'type'},
@@ -1546,11 +1541,11 @@
             $ctid = $ref->{ctid};
             $i++;
 
-            if ( $form->{"statement_$i"} ) {
+            if ( $form->{"statement_$i"} eq '1' ) {
 
                 for (@vars) { $form->{$_} = $ref->{$_} }
 
-                $form->{ $form->{ct} }    = $form->{name};
+                $form->{ $form->{ct} }    = $ref->{name};
                 $form->{"$form->{ct}_id"} = $ref->{ctid};
                 $form->{language_code}    = $form->{"language_code_$i"};
                 $form->{currency}         = $form->{"curr_$i"};

Modified: trunk/scripts/setup.pl
===================================================================
--- trunk/scripts/setup.pl	2011-08-23 17:06:28 UTC (rev 3679)
+++ trunk/scripts/setup.pl	2011-08-23 23:37:37 UTC (rev 3680)
@@ -227,6 +227,14 @@
           $hiddens->{"id_$count"} = $row->{id},
     }
     $hiddens->{count} = $count;
+    $buttons = [
+           { type => 'submit',
+             name => 'action',
+            value => 'fix_tests',
+             text => $request->{_locale}->text('Save and Retry'),
+            class => 'submit' },
+    ];
+
      # TODO:  Add this template render stuff.
 }
 

Modified: trunk/templates/demo/statement.tex
===================================================================
--- trunk/templates/demo/statement.tex	2011-08-23 17:06:28 UTC (rev 3679)
+++ trunk/templates/demo/statement.tex	2011-08-23 23:37:37 UTC (rev 3680)
@@ -55,7 +55,7 @@
   \hline
   \textbf{<?lsmb text('Invoice #') ?>} & \textbf{<?lsmb text('Order #') ?>} 
   & \textbf{<?lsmb text('Date') ?>} & \textbf{<?lsmb text('Due') ?>} &
-  \textbf<?lsmb text('Current') ?>} & \textbf{30} & \textbf{60} & \textbf{90} \\
+  \textbf{<?lsmb text('Current') ?>} & \textbf{30} & \textbf{60} & \textbf{90} \\
   \hline
 <?lsmb FOREACH invnumber ?>
 <?lsmb lc = loop.count - 1 ?>

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