Merge pull request #7517 from ehuelsmann/feature/save-gl-notes

Add 'Save Info' button to change 'Notes' field
ledgersmb · Jul 17, 2023 · a740fad · a740fad
2 parents 171a4f9 + 227520e
commit a740fad
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/old/bin/gl.pl b/old/bin/gl.pl
@@ -99,6 +99,18 @@ sub edit_and_save {
     edit();
 }
 
+sub save_info {
+    GL->save_notes( \%myconfig, \%$form, $locale);
+    if ($form->{workflow_id}) {
+        my $wf = $form->{_wire}->get('workflows')->fetch_workflow(
+            'GL', $form->{workflow_id}
+            );
+        $wf->context->param( transdate => $form->{transdate} );
+        $wf->execute_action( $form->{__action} );
+    }
+    edit();
+}
+
 sub approve {
     $form->call_procedure(funcname=>'draft_approve', args => [ $form->{id} ]);
     if ($form->{workflow_id}) {
@@ -127,11 +139,9 @@ sub new {
             delete $form->{"${fld}_${row}"};
         }
     }
-    delete $form->{description};
-    delete $form->{reference};
-    delete $form->{rowcount};
-    delete $form->{id};
-    delete $form->{workflow_id};
+    for my $fld (qw(description reference rowcount id workflow_id transdate notes)) {
+        delete $form->{$fld};
+    }
     add();
 }
 

diff --git a/old/lib/LedgerSMB/GL.pm b/old/lib/LedgerSMB/GL.pm
@@ -259,6 +259,14 @@ UPDATE gl
     return 1;
 }
 
+sub save_notes {
+    my ( $self, $myconfig, $form ) = @_;
+
+    my $query = 'UPDATE gl SET notes = ? where id = ?';
+    $form->{dbh}->do( $query, {}, $form->{notes}, $form->{id} );
+    $form->dberror( $query ) if $form->{dbh}->err;
+}
+
 sub transaction {
 
     my ( $self, $myconfig, $form ) = @_;

diff --git a/workflows/gl.actions.xml b/workflows/gl.actions.xml
@@ -96,11 +96,11 @@ TODO! Check workflow when 'separate duties' is false!
           text="Reverse"
           history-text="Reversed"
           class="LedgerSMB::Workflow::Action::Null" />
-  <!-- action name="save_info"
+  <action name="save_info"
           group="main"
           order="19"
           text="Save Info"
-          class="LedgerSMB::Workflow::Action::Null" / -->
+          class="LedgerSMB::Workflow::Action::Null" />
   <action name="new"
           group="main"
           order="20"

diff --git a/workflows/gl.workflow.xml b/workflows/gl.workflow.xml
@@ -37,14 +37,14 @@
     </action>
   </state>
   <state name="POSTED">
-    <!-- action name="save_info" resulting_state="NOCHANGE" / -->
+    <action name="save_info" resulting_state="NOCHANGE" />
     <action name="copy_to_new" resulting_state="NOCHANGE" />
     <action name="reverse" resulting_state="REVERSED" />
     <action name="schedule" resulting_state="NOCHANGE" />
     <action name="print" resulting_state="NOCHANGE" />
   </state>
   <state name="REVERSED">
-    <!-- action name="save_info" resulting_state="NOCHANGE" / -->
+    <action name="save_info" resulting_state="NOCHANGE" />
     <action name="copy_to_new" resulting_state="NOCHANGE" />
   </state>
   <state name="DELETED" />