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

[..hidden..]

Revision: 6586
          http://sourceforge.net/p/ledger-smb/code/6586
Author:   einhverfr
Date:     2014-01-21 10:59:49 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
Merging in fix for intra-release bug 964

Modified Paths:
--------------
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/bin/io.pl
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl
    branches/1.3/bin/oe.pl

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2014-01-21 10:57:17 UTC (rev 6585)
+++ branches/1.3/LedgerSMB/Form.pm	2014-01-21 10:59:49 UTC (rev 6586)
@@ -3484,12 +3484,8 @@
 
     my ( $self, $myconfig, $fld,$dbh_parm,$nocommit) = @_;
 
-    if ( !$self->{dbh} && $self ) {
-        $self->db_init($myconfig);
-    }
+    my $dbh = LedgerSMB::App_State::DBH;
 
-    #my $dbh = $self->{dbh};
-
     #if ( !$self ) { #if !$self, previous statement would already have failed!
     #    $dbh = $_[3];
     #}

Modified: branches/1.3/bin/io.pl
===================================================================
--- branches/1.3/bin/io.pl	2014-01-21 10:57:17 UTC (rev 6585)
+++ branches/1.3/bin/io.pl	2014-01-21 10:59:49 UTC (rev 6586)
@@ -44,6 +44,7 @@
 use LedgerSMB::Sysconfig;
 use LedgerSMB::Company_Config;
 use LedgerSMB::File;
+use Carp::Always;
 
 # any custom scripts for this one
 if ( -f "bin/custom/io.pl" ) {
@@ -901,7 +902,7 @@
 
 
 sub check_form {
-
+    my $nodisplay = shift;
     my @a     = ();
     my $count = 0;
     my $i;
@@ -1053,7 +1054,7 @@
 
         }
     }
-    return if $form->{action} =~ /(save|post)/;
+    return if $form->{action} =~ /(save|post)/ or $nodisplay;
     &display_form;
 
 }
@@ -1622,9 +1623,8 @@
         $form->{parts_files} = \%parts_files;
         $form->{file_path} = $file->file_path;
     }
+    check_form(1);
 
-    &validate_items;
-
     $form->{"${inv}date"} = $form->{transdate};
 
     $form->isblank( "email", $locale->text('E-mail address missing!') )
@@ -2202,13 +2202,16 @@
 print qq|
 
 <button class="submit" type="submit" name="action" value="continuenew">|
-. $locale->text('Continue')
+. $locale->text('Use Shipto')
 . qq|
 </button>
 <button class="submit" type="submit" name="action" value="updatenew">|
-. $locale->text('Update')
+. $locale->text('Add To List')
 . qq|
 </button>
+<button class="submit" type="submit" name="action" value="update">|.
+$locale->text('Cancel')
+.qq|</button>
 
 </form>
 

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2014-01-21 10:57:17 UTC (rev 6585)
+++ branches/1.3/bin/ir.pl	2014-01-21 10:59:49 UTC (rev 6586)
@@ -1315,10 +1315,8 @@
         &update;
         $form->finalize_request();
     }
-    check_form();
+    check_form(1);
 
-    &validate_items;
-
     $closedto  = $form->datetonum( \%myconfig, $form->{closedto} );
     $transdate = $form->datetonum( \%myconfig, $form->{transdate} );
 

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2014-01-21 10:57:17 UTC (rev 6585)
+++ branches/1.3/bin/is.pl	2014-01-21 10:59:49 UTC (rev 6586)
@@ -1373,8 +1373,7 @@
         &update;
         $form->finalize_request();
     }
-    check_form();
-    &validate_items;
+    check_form(1);
 
     $closedto  = $form->datetonum( \%myconfig, $form->{closedto} );
     $transdate = $form->datetonum( \%myconfig, $form->{transdate} );

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2014-01-21 10:57:17 UTC (rev 6585)
+++ branches/1.3/bin/oe.pl	2014-01-21 10:59:49 UTC (rev 6586)
@@ -2265,8 +2265,7 @@
     $form->isblank( "exchangerate", $locale->text('Exchange rate missing!') )
       if ( $form->{currency} ne $form->{defaultcurrency} );
 
-    check_form();
-    &validate_items;
+    check_form(1);
 
 
     # if the name changed get new values

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits