Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 882b2620

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt

  • ID 882b262021722702560e82b20fe4de5b6c5cc52d
  • Vorgänger ec4a82db
  • Nachfolger 4312ae07

EmailJournal: Workflow mit Callback zu Bericht

Unterschiede anzeigen:

SL/AP.pm
1106 1106
    )->load;
1107 1107
    $email_journal->link_to_record_with_attachment(
1108 1108
      $ap_transaction_storno,
1109
      delete $::form->{workflow_email_attachment_id}
1109
      delete $form->{workflow_email_attachment_id}
1110 1110
    );
1111
    $form->{callback} = delete $form->{workflow_email_callback};
1111 1112
  }
1112 1113

  
1113 1114
  return 1;
SL/AR.pm
989 989
    )->load;
990 990
    $email_journal->link_to_record_with_attachment(
991 991
      $ar_transaction_storno,
992
      delete $::form->{workflow_email_attachment_id}
992
      delete $form->{workflow_email_attachment_id}
993 993
    );
994
    $form->{callback} = delete $form->{workflow_email_callback};
994 995
  }
995 996

  
996 997
  return 1;
SL/Controller/DeliveryOrder.pm
158 158
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
159 159
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
160 160
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
161
  $::form->{workflow_email_callback}      = delete $::form->{callback};
161 162

  
162 163
  $self->action_edit();
163 164
}
......
575 576
    from_type  => $self->order->type,
576 577
    email_journal_id    => $::form->{workflow_email_journal_id},
577 578
    email_attachment_id => $::form->{workflow_email_attachment_id},
579
    callback            => $::form->{workflow_email_callback},
578 580
    %additional_params,
579 581
  );
580 582
}
......
590 592
    from_id    => $self->order->id,
591 593
    email_journal_id    => $::form->{workflow_email_journal_id},
592 594
    email_attachment_id => $::form->{workflow_email_attachment_id},
595
    callback            => $::form->{workflow_email_callback},
593 596
  );
594 597
}
595 598

  
SL/Controller/EmailJournal.pm
408 408
    $additional_params{action} = 'load_record_template_from_email_journal';
409 409
    $additional_params{id} = $record_id;
410 410
    $additional_params{form_defaults} = {
411
      email_journal_id => $email_journal_id,
411
      email_journal_id    => $email_journal_id,
412 412
      email_attachment_id => $attachment_id,
413
      callback            => $::form->{back_to},
413 414
    };
414 415
  } else { # workflow_record
415 416
    $additional_params{action} = 'edit_with_email_journal_workflow';
......
421 422
    type                => $record_type,
422 423
    email_journal_id    => $email_journal_id,
423 424
    email_attachment_id => $attachment_id,
425
    callback            => $::form->{back_to},
424 426
    %additional_params,
425 427
  );
426 428
}
......
493 495

  
494 496
  $::auth->assert('email_journal');
495 497

  
496
  my $back_to = $::form->{back_to} || $self->url_for(action => 'list');
497

  
498 498
  $self->entry(SL::DB::EmailJournal->new(id => $::form->{id})->load);
499 499

  
500 500
  if (!$self->can_view_all && ($self->entry->sender_id != SL::DB::Manager::Employee->current->id)) {
SL/Controller/Order.pm
169 169
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
170 170
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
171 171
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
172
  $::form->{workflow_email_callback}      = delete $::form->{callback};
172 173

  
173 174
  $self->action_edit();
174 175
}
......
830 831
    from_type  => $self->order->type,
831 832
    email_journal_id    => $::form->{workflow_email_journal_id},
832 833
    email_attachment_id => $::form->{workflow_email_attachment_id},
834
    callback            => $::form->{workflow_email_callback},
833 835
    %additional_params,
834 836
  );
835 837
}
......
844 846
    action     => 'oe_invoice_from_order',
845 847
    email_journal_id    => $::form->{workflow_email_journal_id},
846 848
    email_attachment_id => $::form->{workflow_email_attachment_id},
849
    callback            => $::form->{workflow_email_callback},
847 850
  );
848 851
}
849 852

  
......
856 859
    new_invoice_type => 'invoice_for_advance_payment',
857 860
    email_journal_id    => $::form->{workflow_email_journal_id},
858 861
    email_attachment_id => $::form->{workflow_email_attachment_id},
862
    callback            => $::form->{workflow_email_callback},
859 863
  );
860 864
}
861 865

  
......
868 872
    new_invoice_type => 'final_invoice',
869 873
    email_journal_id    => $::form->{workflow_email_journal_id},
870 874
    email_attachment_id => $::form->{workflow_email_attachment_id},
875
    callback            => $::form->{workflow_email_callback},
871 876
  );
872 877
}
873 878

  
......
880 885
    use_shipto => $::form->{use_shipto},
881 886
    email_journal_id    => $::form->{workflow_email_journal_id},
882 887
    email_attachment_id => $::form->{workflow_email_attachment_id},
888
    callback            => $::form->{workflow_email_callback},
883 889
  );
884 890
}
885 891

  
......
892 898
    action     => 'add_from_purchase_order',
893 899
    email_journal_id    => $::form->{workflow_email_journal_id},
894 900
    email_attachment_id => $::form->{workflow_email_attachment_id},
901
    callback            => $::form->{workflow_email_callback},
895 902
  );
896 903
}
897 904

  
SL/Controller/Reclamation.pm
162 162
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
163 163
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
164 164
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
165
  $::form->{workflow_email_callback}      = delete $::form->{callback};
165 166

  
166 167
  $self->action_edit();
167 168
}
......
548 549
    from_type  => $self->reclamation->type,
549 550
    email_journal_id    => $::form->{workflow_email_journal_id},
550 551
    email_attachment_id => $::form->{workflow_email_attachment_id},
552
    callback            => $::form->{workflow_email_callback},
551 553
    %additional_params,
552 554
  );
553 555
}
......
572 574
    from_id    => $self->reclamation->id,
573 575
    email_journal_id    => $::form->{workflow_email_journal_id},
574 576
    email_attachment_id => $::form->{workflow_email_attachment_id},
577
    callback            => $::form->{workflow_email_callback},
575 578
  );
576 579
}
577 580

  
SL/GL.pm
805 805
    )->load;
806 806
    $email_journal->link_to_record_with_attachment(
807 807
      $ar_transaction_storno,
808
      delete $::form->{workflow_email_attachment_id}
808
      delete $form->{workflow_email_attachment_id}
809 809
    );
810
    $form->{callback} = delete $form->{workflow_email_callback};
810 811
  }
811 812
  return 1;
812 813
}
bin/mozilla/ap.pl
1066 1066

  
1067 1067
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
1068 1068
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
1069
  $form->{callback}            = delete $form->{workflow_email_callback};
1069 1070

  
1070 1071
  map { delete $form->{$_} } qw(printed emailed queued invnumber deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno convert_from_oe_id);
1071 1072
  $form->{paidaccounts} = 1;
......
1470 1471
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
1471 1472
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
1472 1473
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
1474
  $::form->{workflow_email_callback}      = delete $::form->{callback};
1473 1475

  
1474 1476
  &edit;
1475 1477
}
bin/mozilla/ar.pl
297 297
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
298 298
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
299 299
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
300
  $::form->{workflow_email_callback}      = delete $::form->{callback};
300 301

  
301 302
  &edit;
302 303
}
......
937 938

  
938 939
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
939 940
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
941
  $form->{callback}            = delete $form->{workflow_email_callback};
940 942

  
941 943
  map { delete $form->{$_} } qw(printed emailed queued invnumber deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
942 944
  $form->{paidaccounts} = 1;
bin/mozilla/gl.pl
268 268
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
269 269
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
270 270
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
271
  $::form->{workflow_email_callback}      = delete $::form->{callback};
271 272

  
272 273
  &edit;
273 274
}
bin/mozilla/io.pl
1020 1020

  
1021 1021
  $::form->{email_journal_id}    = delete $::form->{workflow_email_journal_id};
1022 1022
  $::form->{email_attachment_id} = delete $::form->{workflow_email_attachment_id};
1023
  $::form->{callback}            = delete $::form->{workflow_email_callback};
1023 1024

  
1024 1025
  _order();
1025 1026

  
......
1225 1226
    type       => 'sales_reclamation',
1226 1227
    email_journal_id    => $::form->{workflow_email_journal_id},
1227 1228
    email_attachment_id => $::form->{workflow_email_attachment_id},
1229
    callback            => $::form->{workflow_email_callback},
1228 1230
    from_id    => $id,
1229 1231
    from_type  => $type,
1230 1232
  );
......
1242 1244
    type       => 'purchase_reclamation',
1243 1245
    email_journal_id    => $::form->{workflow_email_journal_id},
1244 1246
    email_attachment_id => $::form->{workflow_email_attachment_id},
1247
    callback            => $::form->{workflow_email_callback},
1245 1248
    from_id    => $id,
1246 1249
    from_type  => $type,
1247 1250
  );
bin/mozilla/ir.pl
113 113
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
114 114
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
115 115
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
116
  $::form->{workflow_email_callback}      = delete $::form->{callback};
116 117

  
117 118
  &edit;
118 119
}
......
836 837

  
837 838
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
838 839
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
840
  $form->{callback}          ||= delete $form->{workflow_email_callback};
841
  $form->{after_action} = 'callback' if $form->{callback};
839 842

  
840 843
  if ($form->{storno}) {
841 844
    $form->error($locale->text('Cannot storno storno invoice!'));
......
897 900

  
898 901
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
899 902
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
903
  $form->{callback}            = delete $form->{workflow_email_callback};
900 904

  
901 905
  map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
902 906
  $form->{paidaccounts} = 1;
bin/mozilla/is.pl
133 133
  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
134 134
  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
135 135
  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
136
  $::form->{workflow_email_callback}      = delete $::form->{callback};
136 137

  
137 138
  &edit;
138 139
}
......
1303 1304

  
1304 1305
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
1305 1306
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
1307
  $form->{callback}            = delete $form->{workflow_email_callback};
1306 1308

  
1307 1309
  delete @{ $form }{qw(printed emailed queued invnumber invdate exchangerate forex deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked qr_unstructured_message)};
1308 1310
  $form->{rowcount}--;
......
1331 1333

  
1332 1334
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
1333 1335
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
1336
  $form->{callback}            = delete $form->{workflow_email_callback};
1334 1337

  
1335 1338
  delete @{ $form }{qw(printed emailed queued invnumber invdate exchangerate forex deliverydate datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)};
1336 1339
  $form->{convert_from_ar_ids} = $form->{id};
......
1358 1361

  
1359 1362
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
1360 1363
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
1364
  $form->{callback}            = delete $form->{workflow_email_callback};
1361 1365

  
1362 1366
  my $related_invoices = IS->_get_invoices_for_advance_payment($form->{id});
1363 1367

  
......
1433 1437

  
1434 1438
  my $email_journal_id    = delete $form->{workflow_email_journal_id};
1435 1439
  my $email_attachment_id = delete $form->{workflow_email_attachment_id};
1440
  my $callback            = delete $form->{workflow_email_callback};
1436 1441
  map({ my $key = $_; delete($form->{$key}) unless (grep({ $key eq $_ } qw(id login password type))); } keys(%{ $form }));
1437 1442

  
1438 1443
  $form->{email_journal_id}    = $email_journal_id;
1439 1444
  $form->{email_attachment_id} = $email_attachment_id;
1445
  $form->{callback}            = $callback;
1440 1446

  
1441 1447
  invoice_links();
1442 1448
  prepare_invoice();
......
1462 1468
  # post expects the field as user input
1463 1469
  $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
1464 1470
  $form->{script}       = 'is.pl';
1465
  post();
1471
  if ($form->{callback}) {
1472
    post_and_close();
1473
  } else {
1474
    post();
1475
  }
1466 1476
  $main::lxdebug->leave_sub();
1467 1477
}
1468 1478

  
......
1493 1503

  
1494 1504
  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
1495 1505
  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
1506
  $form->{callback}            = delete $form->{workflow_email_callback};
1496 1507

  
1497 1508
  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
1498 1509

  
templates/design40_webpages/ap/form_header.html
46 46
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
47 47
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
48 48
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
49
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
49 50

  
50 51
[% FOREACH i IN [1..paidaccounts] %]
51 52
  [% temp = "acc_trans_id_"_ i %]
templates/design40_webpages/ar/form_header.html
31 31
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
32 32
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
33 33
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
34
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
34 35

  
35 36
[% IF saved_message %]<p class="message message_info">[% saved_message | html  %]</p>[% END %]
36 37

  
templates/design40_webpages/delivery_order/form.html
29 29
  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
30 30
  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
31 31
  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
32
  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
32 33

  
33 34
  [% IF !SELF.order.id %]
34 35
  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
templates/design40_webpages/email_journal/list.html
36 36
      [% IF SELF.can_view_all %]
37 37
        <td>[% IF entry.sender %] [% HTML.escape(entry.sender.name) %] [% ELSE %] [% LxERP.t8("kivitendo") %] [% END %]</td>
38 38
      [% END %]
39
      <td><a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]"> [% HTML.escape(entry.from) %] </a></td>
39
      [% action_show_link = SELF.url_for(
40
           action => 'show', id => entry.id,
41
           back_to => SELF.models.get_callback(),
42
      ) %]
43
      <td><a href="[% action_show_link %]"> [% HTML.escape(entry.from) %] </a></td>
40 44
      <td>[% HTML.escape(entry.recipients) %]</td>
41
      <td><a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]"> [% HTML.escape(entry.subject) %] </a></td>
45
      <td><a href="[% action_show_link %]"> [% HTML.escape(entry.subject) %] </a></td>
42 46
      <td>[% HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
43 47
      <td> [% P.email_journal.entry_status(entry) %] </td>
44 48
      <td>[% HTML.escape(entry.extended_status) %]</td>
templates/design40_webpages/email_journal/show.html
52 52
<div class="wrapper input-panel control-panel" style="display:block">
53 53
  <form method="post" action="controller.pl" id="record_action_form">
54 54
    [% L.hidden_tag('email_journal_id', SELF.entry.id) %]
55
    [% L.hidden_tag('back_to', back_to) %]
55 56
    <h2>[% LxERP.t8("Email Journal Workflow") %]</h2>
56 57

  
57 58
    <div id="action_div"><div class="input-panel" style="margin:0">
templates/design40_webpages/gl/form_header.html
36 36
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
37 37
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
38 38
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
39
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
39 40

  
40 41
<input type=hidden name=title value="[% hide_title | html %]">
41 42

  
templates/design40_webpages/ir/form_header.html
33 33
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
34 34
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
35 35
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
36
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
36 37

  
37 38
[% INCLUDE 'common/flash.html' %]
38 39
[% INCLUDE 'generic/set_longdescription.html' %]
templates/design40_webpages/is/form_header.html
36 36
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
37 37
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
38 38
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
39
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
39 40

  
40 41
[% IF saved_message != '' %]<p>[% saved_message %]</p>[% END %]
41 42

  
templates/design40_webpages/order/form.html
31 31
  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
32 32
  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
33 33
  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
34
  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
34 35

  
35 36
  [% IF !SELF.order.id %]
36 37
  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
templates/design40_webpages/reclamation/form.html
30 30
  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
31 31
  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
32 32
  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
33
  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
33 34

  
34 35
  [% IF !SELF.reclamation.id %]
35 36
  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
templates/webpages/ap/form_header.html
55 55
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
56 56
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
57 57
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
58
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
58 59

  
59 60
[% FOREACH i IN [1..paidaccounts] %]
60 61
  [% temp = "acc_trans_id_"_ i %]
templates/webpages/ar/form_header.html
30 30
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
31 31
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
32 32
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
33
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
33 34

  
34 35
[%- IF saved_message %]<p>[% saved_message | html  %]</p>[% END %]
35 36

  
templates/webpages/delivery_order/form.html
29 29
  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
30 30
  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
31 31
  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
32
  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
32 33

  
33 34
  [% IF !SELF.order.id %]
34 35
  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
templates/webpages/email_journal/list.html
42 42
     [% END %]
43 43
    </td>
44 44
   [% END %]
45
   <td>
46
    <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">
47
     [%- HTML.escape(entry.from) %]
48
    </a>
49
   </td>
45
   [% action_show_link = SELF.url_for(
46
        action => 'show', id => entry.id,
47
        back_to => SELF.models.get_callback(),
48
   ) %]
49
   <td><a href="[% action_show_link %]">[%- HTML.escape(entry.from) %]</a></td>
50 50
   <td>[%- HTML.escape(entry.recipients) %]</td>
51
   <td>
52
    <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">
53
     [%- HTML.escape(entry.subject) %]
54
    </a>
55
   </td>
51
   <td><a href="[% action_show_link %]">[%- HTML.escape(entry.subject) %]</a></td>
56 52
   <td>[%- HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
57 53
   <td> [% P.email_journal.entry_status(entry) %] </td>
58 54
   <td>[%- HTML.escape(entry.extended_status) %]</td>
templates/webpages/email_journal/show.html
41 41
[% IF SELF.entry.status == 'imported' %]
42 42
<form method="post" action="controller.pl" id="record_action_form">
43 43
  [% L.hidden_tag('email_journal_id', SELF.entry.id) %]
44
  [% L.hidden_tag('back_to', back_to) %]
44 45
  <h2>[% LxERP.t8("Email Journal Workflow") %]</h2>
45 46

  
46 47
  <table> <tr>
templates/webpages/gl/form_header.html
2 2
[%- USE LxERP %]
3 3
[%- USE T8 %]
4 4
[%- USE L %]
5
<h1>[% title | html %]</h1>
5

  
6
<h1>
7
  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
8
  [% title | html %]
9
</h1>
6 10

  
7 11
[%- INCLUDE 'common/flash.html' %]
8 12

  
......
27 31
[% IF !id %]
28 32
[%   L.hidden_tag('form_validity_token', form_validity_token) %]
29 33
[% END %]
34
[% L.hidden_tag('email_journal_id',             email_journal_id) %]
35
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
36
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
37
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
38
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
30 39

  
31 40
<input type=hidden name=title value="[% hide_title | html %]">
32 41

  
......
38 47
<div id="gl_tabs" class="tabwidget">
39 48
 <ul>
40 49
  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
50
[% IF email_attachment_id || workflow_email_attachment_id %]
51
  <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
52
[% END %]
41 53
[%- IF INSTANCE_CONF.get_webdav %]
42 54
  <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
43 55
[%- END %]
templates/webpages/ir/form_header.html
32 32
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
33 33
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
34 34
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
35
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
35 36

  
36 37
[%- INCLUDE 'common/flash.html' %]
37 38
[%- INCLUDE 'generic/set_longdescription.html' %]
templates/webpages/is/form_header.html
30 30
[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
31 31
[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
32 32
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
33
[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
33 34

  
34 35
<h1>
35 36
  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
templates/webpages/order/form.html
31 31
  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
32 32
  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
33 33
  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
34
  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
34 35

  
35 36
  [% IF !SELF.order.id %]
36 37
  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
templates/webpages/reclamation/form.html
30 30
  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
31 31
  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
32 32
  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
33
  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
33 34

  
34 35
  [% IF !SELF.reclamation.id %]
35 36
  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]

Auch abrufbar als: Unified diff