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

[..hidden..]

Revision: 5800
          http://sourceforge.net/p/ledger-smb/code/5800
Author:   einhverfr
Date:     2013-05-16 08:57:27 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Updating changelog, fixing parojects dropdown ordering and selection

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/bin/aa.pl
    branches/1.3/bin/is.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-16 08:52:03 UTC (rev 5799)
+++ branches/1.3/Changelog	2013-05-16 08:57:27 UTC (rev 5800)
@@ -4,6 +4,8 @@
 
 Changelog for 1.3.33
 * Fixed <?lsmb YYMMMDD ?> interpolation in settings (Chris T)
+* Fixed Department dropdown ordering and selection (Chris T, 810)
+* Fixed Project dropdown ordering and selection (Chris T, 809)
 
 Changelog for 1.3.32
 * Fixed em-dash handling for pdfs (Chris T)

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2013-05-16 08:52:03 UTC (rev 5799)
+++ branches/1.3/LedgerSMB/Form.pm	2013-05-16 08:57:27 UTC (rev 5800)
@@ -2304,7 +2304,7 @@
 			SELECT pr.*, t.description AS translation
 			FROM project pr
 			LEFT JOIN translation t ON (t.trans_id = pr.id)
-			WHERE t.language_code = ?|;
+			          AND t.language_code = ?|;
         push( @queryargs, $self->{language_code} );
     }
 
@@ -2316,22 +2316,9 @@
 
     $query .= qq| ORDER BY projectnumber|;
  
-    #my $sth = $dbh->prepare($query);
-    #$sth->execute(@queryargs) || $self->dberror($query);
-    
-     #temporary query
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@queryargs) || $self->dberror($query);
 
-     $query=qq|SELECT pr.*, e.name AS customer
-               FROM project pr
-               LEFT JOIN entity_credit_account c ON (c.id = pr.credit_id) 
-               left join entity e on(e.id=c.entity_id)
-              |;
-my $sth = $dbh->prepare($query);
-    $sth->execute() || $self->dberror($query);
-    #temparary query	
-
-    
-
     @{ $self->{all_project} } = ();
 
     while ( my $ref = $sth->fetchrow_hashref('NAME_lc') ) {

Modified: branches/1.3/bin/aa.pl
===================================================================
--- branches/1.3/bin/aa.pl	2013-05-16 08:52:03 UTC (rev 5799)
+++ branches/1.3/bin/aa.pl	2013-05-16 08:57:27 UTC (rev 5800)
@@ -1126,6 +1126,7 @@
 sub update {
     my $display = shift;
     $is_update = 1;
+    &create_links;
     if ( !$display ) {
 
         $form->{invtotal} = 0;

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-05-16 08:52:03 UTC (rev 5799)
+++ branches/1.3/bin/is.pl	2013-05-16 08:57:27 UTC (rev 5800)
@@ -114,6 +114,7 @@
     $form->{type} = "invoice";
 
     # create links
+    $form->all_projects;
     $form->create_links( module => "AR",
 			 myconfig => \%myconfig,
 			 vc => "customer",

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