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

[..hidden..]

Revision: 5885
          http://sourceforge.net/p/ledger-smb/code/5885
Author:   einhverfr
Date:     2013-05-30 13:09:13 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Post as shown renamed to save as shown, no longer approves

Modified Paths:
--------------
    trunk/LedgerSMB/IS.pm
    trunk/bin/aa.pl
    trunk/bin/gl.pl
    trunk/bin/ir.pl
    trunk/bin/is.pl

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2013-05-30 12:04:22 UTC (rev 5884)
+++ trunk/LedgerSMB/IS.pm	2013-05-30 13:09:13 UTC (rev 5885)
@@ -1246,7 +1246,7 @@
             $sth->execute(
                 $form->{id},               $form->{"id_$i"},
                 $form->{"description_$i"}, $form->{"qty_$i"},
-                $form->{"sellprice_$i"},   $form->{"precision_$i"},
+                $form->{"sellprice_$i"},   $decimalplaces,
                 $fxsellprice,              $form->{"discount_$i"},
                 $allocated,                $form->{"unit_$i"},        
                 $form->{"deliverydate_$i"}, 

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2013-05-30 12:04:22 UTC (rev 5884)
+++ trunk/bin/aa.pl	2013-05-30 13:09:13 UTC (rev 5885)
@@ -982,7 +982,7 @@
                    key   => 'O', 
                    value => $locale->text('Post as Saved') };
            if (grep /^lsmb_$form->{company}__draft_edit$/, @{$form->{_roles}}){
-               $button{edit_and_approve} = { 
+               $button{edit_and_save} = { 
                    ndx   => 4, 
                    key   => 'E', 
                    value => $locale->text('Post as Shown') };
@@ -1134,7 +1134,7 @@
     $form->redirect( $locale->text('Template Saved!') );
 }
 
-sub edit_and_approve {
+sub edit_and_save {
     use LedgerSMB::DBObject::Draft;
     use LedgerSMB;
     my $lsmb = LedgerSMB->new();
@@ -1143,7 +1143,7 @@
     $draft->delete();
     delete $form->{id};
     AA->post_transaction( \%myconfig, \%$form );
-    approve();
+    edit();
 }
 
 sub approve {

Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl	2013-05-30 12:04:22 UTC (rev 5884)
+++ trunk/bin/gl.pl	2013-05-30 13:09:13 UTC (rev 5885)
@@ -96,7 +96,7 @@
     $form->{accno_3} = $pos_config{'coa_prefix'};
 }
 
-sub edit_and_approve {
+sub edit_and_save {
     use LedgerSMB::DBObject::Draft;
     use LedgerSMB;
     check_balanced($form);
@@ -105,7 +105,7 @@
     my $draft = LedgerSMB::DBObject::Draft->new({base => $lsmb});
     $draft->delete();
     GL->post_transaction( \%myconfig, \%$form, $locale);
-    approve();
+    edit();
 }
 
 sub approve {
@@ -308,9 +308,9 @@
 			key   => 'S', 
 			value => $locale->text('Post as Saved') };
 		$a{approve} = 1;
-		$a{edit_and_approve} = 1;
+		$a{edit_and_save} = 1;
 		if (grep /__draft_edit$/, @{$form->{_roles}}){
-		    $button{edit_and_approve} = { 
+		    $button{edit_and_save} = { 
 			ndx   => 4, 
 			key   => 'O', 
 			value => $locale->text('Post as Shown') };

Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl	2013-05-30 12:04:22 UTC (rev 5884)
+++ trunk/bin/ir.pl	2013-05-30 13:09:13 UTC (rev 5885)
@@ -58,7 +58,7 @@
     update();
 }
 
-sub edit_and_approve {
+sub edit_and_save {
     use LedgerSMB::DBObject::Draft;
     use LedgerSMB;
     my $lsmb = LedgerSMB->new();
@@ -67,7 +67,7 @@
     $draft->delete();
     delete $form->{id};
     IR->post_invoice( \%myconfig, \%$form );
-    approve();
+    edit();
 }
 
 sub approve {
@@ -945,10 +945,10 @@
                        key   => 'O', 
                        value => $locale->text('Post as Saved') };
                if (grep /^lsmb_$form->{company}__draft_modify$/, @{$form->{_roles}}){
-                   $button{edit_and_approve} = { 
+                   $button{edit_and_save} = { 
                        ndx   => 4, 
                        key   => 'E', 
-                       value => $locale->text('Post as Shown') };
+                       value => $locale->text('Save as Shown') };
               }
                delete $button{post_as_new};
                delete $button{post};

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2013-05-30 12:04:22 UTC (rev 5884)
+++ trunk/bin/is.pl	2013-05-30 13:09:13 UTC (rev 5885)
@@ -64,7 +64,7 @@
     update();
 }
 
-sub edit_and_approve {
+sub edit_and_save {
     use LedgerSMB::DBObject::Draft;
     use LedgerSMB;
     my $lsmb = LedgerSMB->new();
@@ -73,7 +73,7 @@
     $draft->delete();
     delete $form->{id};
     IS->post_invoice( \%myconfig, \%$form );
-    approve();
+    edit();
 }
 
 sub new_screen {
@@ -1012,7 +1012,7 @@
 
 
         if ($from->{separate_duties} or $form->{batch_id}){
-           $button{'post'}->{value} = $locale->text('Save') unless $form->{id};
+           $button{'post'}->{value} = $locale->text('Save');
         }
        delete $button{void} if $form->{invnumber} =~ /-VOID/;
 
@@ -1029,10 +1029,10 @@
                        key   => 'O', 
                        value => $locale->text('Post as Saved') };
                if (grep /^lsmb_$form->{company}__draft_modify$/, @{$form->{_roles}}){
-                   $button{edit_and_approve} = { 
+                   $button{edit_and_save} = { 
                        ndx   => 4, 
                        key   => 'E', 
-                       value => $locale->text('Post as Shown') };
+                       value => $locale->text('Save as Shown') };
               }
                delete $button{post_as_new};
                delete $button{post};

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