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

[..hidden..]

Revision: 5265
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5265&view=rev
Author:   einhverfr
Date:     2012-11-26 07:04:55 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Merging with branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Form.pm
    trunk/bin/am.pl

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


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

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-26 06:59:25 UTC (rev 5264)
+++ trunk/Changelog	2012-11-26 07:04:55 UTC (rev 5265)
@@ -87,6 +87,8 @@
 * 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)
+* Added ar-transation.csv and ap-transaction.csvn templates (Erik H)
+* Fixed blank screen processing recurring transactiosn in fcgi (Chris T)
 
 Chris T is Chris Travers
 Kevin B is Kevin Bailey

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2012-11-26 06:59:25 UTC (rev 5264)
+++ trunk/LedgerSMB/Form.pm	2012-11-26 07:04:55 UTC (rev 5265)
@@ -1114,7 +1114,6 @@
     my $dd;
     $spc =~ s/\w//g;
     $spc = substr( $spc, 0, 1 );
-
     if ($date) {
 
         if ( $date =~ /\D/ ) {

Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl	2012-11-26 06:59:25 UTC (rev 5264)
+++ trunk/bin/am.pl	2012-11-26 07:04:55 UTC (rev 5265)
@@ -1874,7 +1874,6 @@
 }
 
 sub process_transactions {
-
     # save variables
     my $pt = new Form;
     for ( keys %$form ) { $pt->{$_} = $form->{$_} }
@@ -1895,7 +1894,7 @@
             $id = $pt->{"ndx_$i"};
 
             # process transaction
-            AM->recurring_details( \%myconfig, \%$pt, $id );
+            AM->recurring_details( \%myconfig, $pt, $id );
 
 
             # reset $form
@@ -1973,9 +1972,7 @@
                     # tax accounts
                     $form->all_taxaccounts( \%myconfig, undef,
                         $form->{transdate} );
-                    $form->{transdate} = $form->convert_date(
-                             $pt->{nextdate}, \%myconfig
-                    );
+                    $form->{transdate} = $pt->{nextdate};
                     # calculate duedate
                     $form->{duedate} =
                       $form->add_date( \%myconfig, $form->{transdate},

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