Merge pull request #7707 from ehuelsmann/fix/1.11/consistency-backports

Consistency backports
ledgersmb · Nov 11, 2023 · 096095a · 096095a
2 parents 098c99f + f692a02
commit 096095a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/old/bin/aa.pl b/old/bin/aa.pl
@@ -107,7 +107,9 @@ sub copy_to_new{
 }
 
 sub new_screen {
-    my @reqprops = qw(ARAP vc dbh stylesheet batch_id script type _locale _wire);
+    my @reqprops = qw(
+        ARAP vc dbh stylesheet batch_id script type _locale _wire invdate
+        );
     $oldform = $form;
     $form = {};
     bless $form, 'Form';
@@ -120,8 +122,6 @@ sub new_screen {
 sub add {
     $form->{title} = "Add";
 
-    $form->{callback} = "$form->{script}?__action=add"
-      unless $form->{callback};
     if (defined $form->{type}
         and $form->{type} eq "credit_note"){
         $form->{reverse} = 1;
@@ -1329,7 +1329,7 @@ sub approve {
                 . qq|here</a>.</body></html>|;
 
     } else {
-        $form->info($locale->text('Draft Posted'));
+        update();
     }
 }
 

diff --git a/old/bin/gl.pl b/old/bin/gl.pl
@@ -143,7 +143,7 @@ sub new {
     }
     for my $fld (
         qw(description reference rowcount id workflow_id
-           transdate notes reversing reversing_reference )
+           notes reversing reversing_reference )
         ) {
         delete $form->{$fld};
     }

diff --git a/workflows/ar-ap.workflow.xml b/workflows/ar-ap.workflow.xml
@@ -77,6 +77,7 @@
   <state name="POSTED">
     <action name="save_info" resulting_state="NOCHANGE" />
     <action name="copy_to_new" resulting_state="NOCHANGE" />
+    <action name="new_screen" resulting_state="NOCHANGE" />
     <action name="void" resulting_state="VOIDED">
       <condition name="is_sales_invoice" />
     </action>

diff --git a/workflows/gl.workflow.xml b/workflows/gl.workflow.xml
@@ -32,6 +32,7 @@
       <condition name="acl-draft-modify" />
     </action>
     <action name="copy_to_new" resulting_state="NOCHANGE" />
+    <action name="new" resulting_state="NOCHANGE" />
     <action name="update" resulting_state="NOCHANGE" />
     <action name="schedule" resulting_state="NOCHANGE">
       <condition name="!is-batch-member" />
@@ -52,6 +53,7 @@
   <state name="POSTED">
     <action name="save_info" resulting_state="NOCHANGE" />
     <action name="copy_to_new" resulting_state="NOCHANGE" />
+    <action name="new" resulting_state="NOCHANGE" />
     <action name="reverse" resulting_state="REVERSED" />
     <action name="schedule" resulting_state="NOCHANGE" />
     <action name="print" resulting_state="NOCHANGE" />