[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

Revision: 5033
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5033&view=rev
Author:   einhverfr
Date:     2012-07-24 03:53:06 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/bin/gl.pl
    trunk/bin/ic.pl

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5029
   + /branches/1.3:3711-5032

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-24 03:26:34 UTC (rev 5032)
+++ trunk/Changelog	2012-07-24 03:53:06 UTC (rev 5033)
@@ -85,6 +85,8 @@
 * Fixed shipping redirection not displaying orders (Chris T, h/t Nigel T)
 * Recon screen now groups journal entries by transaction (Chris T, h/t Nick P)
 * Fixed empty string working as empty source for cash recon (Chris T)
+* Saving a part now returns to editing the same part (Chris T, h/t Brian W)
+* If pos.conf.pl is not found, now returns an intelligible error (Chris T)
 
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)

Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl	2012-07-24 03:26:34 UTC (rev 5032)
+++ trunk/bin/gl.pl	2012-07-24 03:53:06 UTC (rev 5033)
@@ -86,7 +86,9 @@
 
 sub pos_adjust {
     $form->{rowcount} = 3;
-    require "pos.conf.pl";
+    eval {require "pos.conf.pl"} || $form->error($locale->text(
+      "Could not open pos.conf.pl in [_1] line [_2]: [_3]", 
+       __FILE__, __LINE__, $!));
     $form->{accno_1} = $pos_config{'close_cash_accno'};
     $form->{accno_2} = $pos_config{'coa_prefix'};
     $form->{accno_3} = $pos_config{'coa_prefix'};

Modified: trunk/bin/ic.pl
===================================================================
--- trunk/bin/ic.pl	2012-07-24 03:26:34 UTC (rev 5032)
+++ trunk/bin/ic.pl	2012-07-24 03:53:06 UTC (rev 5033)
@@ -743,6 +743,7 @@
 
     print qq|
 <body>
+| . $form->open_status_div . qq|
 
 <form method=post action="$form->{script}">
 |;
@@ -954,7 +955,7 @@
 
     print qq|
 </form>
-
+| . $form->close_status_div . qq|
 </body>
 </html>
 |;
@@ -3743,9 +3744,9 @@
     }
 
     if ($rc) {
-
+        edit();
         # redirect
-        $form->redirect("Part Saved");
+        # $form->redirect("Part Saved");
     }
     else {
         $form->error;

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