Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e68a2521

Von Tamino Steinert vor 9 Monaten hinzugefügt

  • ID e68a252155190e2601301f97f7e09473be521c09
  • Vorgänger 48508b25
  • Nachfolger 8bb63908

EmailJournal: Workflow mit Callback zu Bericht

Unterschiede anzeigen:

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;

Auch abrufbar als: Unified diff