Revision 743249b4
Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt
SL/AR.pm | ||
---|---|---|
use SL::IO;
|
||
use SL::MoreCommon;
|
||
use SL::DB::Default;
|
||
use SL::DB::Invoice;
|
||
use SL::DB::EmailJournal;
|
||
use SL::DB::ValidityToken;
|
||
use SL::TransNumber;
|
||
use SL::Util qw(trim);
|
||
... | ... | |
|
||
map { IO->set_datepaid(table => 'ar', id => $_, dbh => $dbh) } ($id, $new_id);
|
||
|
||
if ($form->{workflow_email_journal_id}) {
|
||
my $ar_transaction_storno = SL::DB::Invoice->new(id => $new_id)->load;
|
||
my $email_journal = SL::DB::EmailJournal->new(
|
||
id => delete $form->{workflow_email_journal_id}
|
||
)->load;
|
||
$email_journal->link_to_record_with_attachment(
|
||
$ar_transaction_storno,
|
||
delete $::form->{email_attachment_id}
|
||
);
|
||
}
|
||
|
||
return 1;
|
||
}
|
||
|
bin/mozilla/ar.pl | ||
---|---|---|
use SL::DB::InvoiceItem;
|
||
use SL::DB::RecordTemplate;
|
||
use SL::DB::Tax;
|
||
use SL::DB::EmailJournal;
|
||
use SL::DB::ValidityToken;
|
||
use SL::Helper::Flash qw(flash flash_later);
|
||
use SL::Locale::String qw(t8);
|
||
... | ... | |
|
||
AR->get_transdate(\%myconfig, $form);
|
||
$form->{initial_transdate} = $form->{transdate};
|
||
$form->{initial_customer_id} = $form->{customer_id};
|
||
create_links(dont_save => 1);
|
||
$form->{transdate} = $form->{initial_transdate};
|
||
$form->{customer_id} = $form->{initial_customer_id} if $form->{initial_customer_id};
|
||
|
||
if ($form->{customer_id}) {
|
||
my $last_used_ar_chart = SL::DB::Customer->load_cached($form->{customer_id})->last_used_ar_chart;
|
||
... | ... | |
$main::lxdebug->leave_sub();
|
||
}
|
||
|
||
sub add_from_email_journal {
|
||
die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
|
||
&add;
|
||
}
|
||
|
||
sub edit_with_email_journal_workflow {
|
||
my ($self) = @_;
|
||
die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
|
||
$::form->{workflow_email_journal_id} = delete $::form->{email_journal_id};
|
||
$::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
|
||
|
||
&edit;
|
||
}
|
||
|
||
sub edit {
|
||
$main::lxdebug->enter_sub();
|
||
|
||
... | ... | |
}
|
||
# /saving the history
|
||
|
||
if ($form->{email_journal_id} && $form->{id} ne "") {
|
||
my $ar_transaction = SL::DB::Invoice->new(id => $form->{id})->load;
|
||
my $email_journal = SL::DB::EmailJournal->new(
|
||
id => delete $form->{email_journal_id}
|
||
)->load;
|
||
$email_journal->link_to_record_with_attachment($ar_transaction, delete $::form->{email_attachment_id});
|
||
}
|
||
|
||
if (!$inline) {
|
||
my $msg = $locale->text("AR transaction '#1' posted (ID: #2)", $form->{invnumber}, $form->{id});
|
||
if ($::instance_conf->get_ar_add_doc && $::instance_conf->get_doc_storage) {
|
||
... | ... | |
my $form = $main::form;
|
||
my %myconfig = %main::myconfig;
|
||
|
||
$form->{email_journal_id} = delete $form->{workflow_email_journal_id};
|
||
$form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
|
||
|
||
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);
|
||
$form->{paidaccounts} = 1;
|
||
$form->{rowcount}--;
|
templates/design40_webpages/ar/form_header.html | ||
---|---|---|
[% USE LxERP %]
|
||
[% USE P %]
|
||
|
||
<h1>[% title | html %]</h1>
|
||
<h1>
|
||
[% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
|
||
[% title %]
|
||
</h1>
|
||
|
||
[% INCLUDE 'common/flash.html' %]
|
||
|
||
... | ... | |
[% IF !id %]
|
||
[% L.hidden_tag('form_validity_token', form_validity_token) %]
|
||
[% END %]
|
||
[% L.hidden_tag('email_journal_id', email_journal_id) %]
|
||
[% L.hidden_tag('email_attachment_id', email_attachment_id) %]
|
||
[% L.hidden_tag('workflow_email_journal_id', workflow_email_journal_id) %]
|
||
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
|
||
|
||
[% IF saved_message %]<p class="message message_info">[% saved_message | html %]</p>[% END %]
|
||
|
||
... | ... | |
|
||
<ul>
|
||
<li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
|
||
[% IF email_attachment_id || workflow_email_attachment_id %]
|
||
<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>
|
||
[% END %]
|
||
[% IF id %]
|
||
[% IF INSTANCE_CONF.get_doc_storage %]
|
||
<li><a href="controller.pl?action=File/list&file_type=attachment&object_type=invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
|
||
... | ... | |
|
||
<div id="ui-tabs-basic-data">
|
||
|
||
[% IF email_attachment_id || workflow_email_attachment_id%]
|
||
<div class="wrapper" id="email_attachment_wrapper">
|
||
[%
|
||
BLOCK panel_1;
|
||
P.email_journal.attachment_preview(
|
||
email_attachment_id || workflow_email_attachment_id,
|
||
style="height:600px"
|
||
);
|
||
END;
|
||
INCLUDE 'common/toggle_panel.html'
|
||
block_name='panel_1'
|
||
button_closed = LxERP.t8('Show Attachment')
|
||
button_open = LxERP.t8('Hide Attachment')
|
||
;
|
||
%]
|
||
</div>
|
||
[% END %]
|
||
|
||
<div class="wrapper">
|
||
|
||
<table class="tbl-horizontal">
|
templates/webpages/ar/form_header.html | ||
---|---|---|
[%- USE T8 %]
|
||
[%- USE LxERP %][%- USE P -%]
|
||
|
||
<h1>[% title | html %]</h1>
|
||
<h1>
|
||
[% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
|
||
[% title | html %]
|
||
</h1>
|
||
|
||
[%- INCLUDE 'common/flash.html' %]
|
||
|
||
... | ... | |
[% IF !id %]
|
||
[% L.hidden_tag('form_validity_token', form_validity_token) %]
|
||
[% END %]
|
||
[% L.hidden_tag('email_journal_id', email_journal_id) %]
|
||
[% L.hidden_tag('email_attachment_id', email_attachment_id) %]
|
||
[% L.hidden_tag('workflow_email_journal_id', workflow_email_journal_id) %]
|
||
[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
|
||
|
||
[%- IF saved_message %]<p>[% saved_message | html %]</p>[% END %]
|
||
|
||
<div class="tabwidget">
|
||
<ul>
|
||
<li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
|
||
[% IF email_attachment_id || workflow_email_attachment_id %]
|
||
<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>
|
||
[% END %]
|
||
[%- IF id %]
|
||
[%- IF INSTANCE_CONF.get_doc_storage %]
|
||
<li><a href="controller.pl?action=File/list&file_type=attachment&object_type=invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
|
Auch abrufbar als: Unified diff
Workflow: E-Mail → Debitorenbuchung hinzugefügt