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

[..hidden..]

Revision: 5955
          http://sourceforge.net/p/ledger-smb/code/5955
Author:   einhverfr
Date:     2013-08-22 08:56:56 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Resaving orders/quotes problem not fully fixed but this reduces error messages: closing form should only happen if we have confirmed saving the document

Modified Paths:
--------------
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB/Template/HTML.pm
    trunk/UI/oe-save_warn.html
    trunk/bin/io.pl
    trunk/bin/oe.pl

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2013-08-21 20:37:20 UTC (rev 5954)
+++ trunk/LedgerSMB/Form.pm	2013-08-22 08:56:56 UTC (rev 5955)
@@ -189,7 +189,6 @@
     if ( ($self->{action} eq 'redirect') || ($self->{nextsub} eq 'redirect') ) {
         $self->error( "Access Denied", __LINE__, __FILE__ );
     }
-    
     $self;
 }
 

Modified: trunk/LedgerSMB/Template/HTML.pm
===================================================================
--- trunk/LedgerSMB/Template/HTML.pm	2013-08-21 20:37:20 UTC (rev 5954)
+++ trunk/LedgerSMB/Template/HTML.pm	2013-08-22 08:56:56 UTC (rev 5955)
@@ -95,7 +95,6 @@
     my $vars = shift @_;
     if (defined $vars){
         $vars = escapeHTML($vars);
-        $vars =~ s|\n|<br \/>|gm;#better syntax-look under gvim with escaped slash
         return $vars;
     }
     return undef;

Modified: trunk/UI/oe-save_warn.html
===================================================================
--- trunk/UI/oe-save_warn.html	2013-08-21 20:37:20 UTC (rev 5954)
+++ trunk/UI/oe-save_warn.html	2013-08-22 08:56:56 UTC (rev 5955)
@@ -15,7 +15,7 @@
       name="action" 
      class="submit" 
       type="submit" 
-     value="continue"
+     value="save"
       text=text('Continue')
 } ?>
 </form>

Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl	2013-08-21 20:37:20 UTC (rev 5954)
+++ trunk/bin/io.pl	2013-08-22 08:56:56 UTC (rev 5955)
@@ -1107,7 +1107,6 @@
 
         }
     }
-
     &display_form;
 
 }

Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl	2013-08-21 20:37:20 UTC (rev 5954)
+++ trunk/bin/oe.pl	2013-08-22 08:56:56 UTC (rev 5955)
@@ -46,6 +46,7 @@
 use LedgerSMB::PE;
 use LedgerSMB::Tax;
 use LedgerSMB::Locale;
+use Carp::Always;
 
 require "bin/arap.pl";
 require "bin/io.pl";
@@ -1239,13 +1240,6 @@
 
 sub save {
     delete $form->{display_form};
-    if (!$form->close_form()){
-       $form->{notice} = $locale->text(
-                'Could not save the data.  Please try again'
-       );
-       &update;
-       $form->finalize_request();
-    }
 
      
     if ( $form->{type} =~ /_order$/ ) {
@@ -1325,9 +1319,15 @@
           hiddens => $form
        });
     }
+    if (!$form->close_form()){
+       $form->{notice} = $locale->text(
+                'Could not save the data.  Please try again'
+       );
+       &update;
+       $form->finalize_request();
+    }
 
  
-
     if ( OE->save( \%myconfig, \%$form ) ) {
        edit(); 
     }

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


------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits