Merge 7d09225 into 558940c

ledgersmb · Jul 28, 2023 · c9ef297 · c9ef297
2 parents 558940c + 7d09225
commit c9ef297
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/old/bin/ir.pl b/old/bin/ir.pl
@@ -813,7 +813,7 @@ sub form_footer {
     <td>
 |;
 
-    IIAA->print_wf_history_table($form);
+    IIAA->print_wf_history_table($form, 'AR/AP');
 
     print qq|
     </td>

diff --git a/old/bin/is.pl b/old/bin/is.pl
@@ -890,7 +890,7 @@ sub form_footer {
     <td>
 |;
 
-    IIAA->print_wf_history_table($form);
+    IIAA->print_wf_history_table($form, 'AR/AP');
 
     print qq|
     </td>

diff --git a/old/bin/oe.pl b/old/bin/oe.pl
@@ -868,7 +868,7 @@ sub form_footer {
     <td>
 |;
 
-    IIAA->print_wf_history_table($form);
+    IIAA->print_wf_history_table($form, 'Order/Quote');
 
     print qq|
     </td>

diff --git a/old/lib/LedgerSMB/IIAA.pm b/old/lib/LedgerSMB/IIAA.pm
@@ -322,7 +322,7 @@ sub prepare_invoice {
 }
 
 sub print_wf_history_table {
-    my ($self, $form) = @_;
+    my ($self, $form, $type) = @_;
     my $locale = $form->{_locale};
 
     print sprintf(q|
@@ -332,12 +332,8 @@ sub print_wf_history_table {
          <tbody>
 |, $locale->text('Action'), $locale->text('User Name'), $locale->text('Time'));
     # insert history items
-    my ($wf_id) =
-        $form->{dbh}->selectrow_array(
-            q{select workflow_id from transactions where id = ?},
-            {}, $form->{id});
     my $wf = $form->{_wire}->get('workflows')
-        ->fetch_workflow( 'AR/AP', $wf_id );
+        ->fetch_workflow( $type, $form->{workflow_id} );
     if ($wf) {
         my @history = $wf->get_history;
         for my $h (sort { $a->id <=> $b->{id} } @history) {