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

[..hidden..]

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

Modified Paths:
--------------
    trunk/bin/ir.pl
    trunk/bin/is.pl
    trunk/common.pl

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5248
   + /branches/1.3:3711-5250

Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl	2012-11-24 02:47:52 UTC (rev 5250)
+++ trunk/bin/ir.pl	2012-11-24 02:58:45 UTC (rev 5251)
@@ -1382,11 +1382,7 @@
     ( $form->{AP_paid} ) = split /--/, $form->{AP_paid};
 
     if ( IR->post_invoice( \%myconfig, \%$form ) ) {
-        if ($form->{batch_id}){
-            $form->{callback} .= "&batch_id=$form->{batch_id}";
-        }
-        $form->redirect(
-            $locale->text( 'Invoice [_1] posted!', $form->{invnumber} ) );
+        edit();
     }
     else {
         $form->error( $locale->text('Cannot post invoice!') );

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2012-11-24 02:47:52 UTC (rev 5250)
+++ trunk/bin/is.pl	2012-11-24 02:58:45 UTC (rev 5251)
@@ -1404,14 +1404,7 @@
     ( $form->{AR_paid} ) = split /--/, $form->{AR_paid};
 
     if ( IS->post_invoice( \%myconfig, \%$form ) ) {
-        if ($form->{batch_id}){
-            $form->{callback} .= "&batch_id=$form->{batch_id}";
-        } else {
-   	    $form->{callback} =
-	    "$form->{script}?action=edit&type=$form->{type}&login=$form->{login}&path=$form->{path}&sessionid=$form->{sessionid}&id=$form->{id}";
-        }
-        $form->redirect(
-            $locale->text( 'Invoice [_1] posted!', $form->{invnumber} ) );
+        &edit;
     }
     else {
         $form->error( $locale->text('Cannot post invoice!') );

Modified: trunk/common.pl
===================================================================
--- trunk/common.pl	2012-11-24 02:47:52 UTC (rev 5250)
+++ trunk/common.pl	2012-11-24 02:58:45 UTC (rev 5251)
@@ -36,11 +36,11 @@
         print "Content-type: text/html\n\n";
         return;
     }
-    if (first { $_ eq $script } @{LedgerSMB::Sysconfig::newscripts}){
+    #if (first { $_ eq $script } @{LedgerSMB::Sysconfig::newscripts}){
         print "Location: $form->{callback}\n";
         print "Content-type: text/html\n\n";
         return;
-    }
+    #}
     $form->error(
         $locale->text(
             __FILE__ . ':' . __LINE__ . ':' . $script . ':' . "Invalid Redirect"

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