Revision 3eab069a
Von Bernd Bleßmann vor mehr als 2 Jahren hinzugefügt
| SL/Controller/CustomerVendor.pm | ||
|---|---|---|
|
$self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
|
||
|
$self->{note_followup} = $self->{note}->follow_up;
|
||
|
$self->{note_followup_link} = $self->{note_followup}->follow_up_link;
|
||
|
|
||
|
} else {
|
||
|
$self->{note} = SL::DB::Note->new();
|
||
|
$self->{note_followup} = SL::DB::FollowUp->new();
|
||
| ... | ... | |
|
$self->{note_followup}->note($self->{note});
|
||
|
$self->{note_followup}->created_by($curr_employee->id);
|
||
|
|
||
|
if (delete $::form->{note_followup_done}) {
|
||
|
$self->{note_followup}->done(SL::DB::FollowUpDone->new) if !$self->{note_followup}->done;
|
||
|
$self->{note_followup}->done->employee_id(SL::DB::Manager::Employee->current->id);
|
||
|
}
|
||
|
|
||
|
$self->{note_followup_link}->trans_type($self->is_vendor() ? 'vendor' : 'customer');
|
||
|
$self->{note_followup_link}->trans_info($self->{cv}->name);
|
||
|
|
||
| SL/FU.pm | ||
|---|---|---|
|
if (!$params{id}) {
|
||
|
($params{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('follow_up_id')|);
|
||
|
|
||
|
$query = qq|INSERT INTO follow_ups (created_by, done, note_id, follow_up_date, id)
|
||
|
VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?)|;
|
||
|
$query = qq|INSERT INTO follow_ups (created_by, note_id, follow_up_date, id)
|
||
|
VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?)|;
|
||
|
|
||
|
push @values, $::myconfig{login};
|
||
|
|
||
|
} else {
|
||
|
$query = qq|UPDATE follow_ups SET done = ?, note_id = ?, follow_up_date = ? WHERE id = ?|;
|
||
|
$query = qq|UPDATE follow_ups SET note_id = ?, follow_up_date = ? WHERE id = ?|;
|
||
|
}
|
||
|
|
||
|
$params{note_id} = Notes->save('id' => $params{note_id},
|
||
| ... | ... | |
|
'body' => $params{body},
|
||
|
'dbh' => $dbh,);
|
||
|
|
||
|
$params{done} = 1 if (!defined $params{done});
|
||
|
do_query($form, $dbh, $query, @values, conv_i($params{note_id}), $params{follow_up_date}, conv_i($params{id}));
|
||
|
|
||
|
do_query($form, $dbh, $query, @values, $params{done} ? 't' : 'f', conv_i($params{note_id}), $params{follow_up_date}, conv_i($params{id}));
|
||
|
$params{done} = 1 if (!defined $params{done});
|
||
|
if ($params{done}) {
|
||
|
do_query($form, $dbh, qq|INSERT INTO follow_up_done (follow_up_id, employee_id) VALUES (?, (SELECT id FROM employee WHERE login = ?))|,
|
||
|
conv_i($params{id}), $::myconfig{login});
|
||
|
} else {
|
||
|
do_query($form, $dbh, qq|DELETE FROM follow_up_done WHERE follow_up_id = ?|, conv_i($params{id}));
|
||
|
}
|
||
|
|
||
|
do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|, conv_i($params{id}));
|
||
|
|
||
| ... | ... | |
|
my $myconfig = \%main::myconfig;
|
||
|
my $form = $main::form;
|
||
|
|
||
|
SL::DB->client->with_transaction(sub {
|
||
|
do_query($form, SL::DB->client->dbh, qq|UPDATE follow_ups SET done = TRUE WHERE id = ?|, conv_i($params{id}));
|
||
|
1;
|
||
|
}) or do { die SL::DB->client->error };
|
||
|
my ($done) = selectrow_query($::form, SL::DB->client->dbh, qq|SELECT id FROM follow_up_done WHERE follow_up_id = ?|, conv_i($params{id}));
|
||
|
if (!$done) {
|
||
|
SL::DB->client->with_transaction(sub {
|
||
|
do_query($form, SL::DB->client->dbh, qq|INSERT INTO follow_up_done (follow_up_id, employee_id) VALUES (?, (SELECT id FROM employee WHERE login = ?))|,
|
||
|
conv_i($params{id}), $myconfig->{login});
|
||
|
1;
|
||
|
}) or do { die SL::DB->client->error };
|
||
|
}
|
||
|
|
||
|
$main::lxdebug->leave_sub();
|
||
|
}
|
||
| ... | ... | |
|
my ($query, @values);
|
||
|
|
||
|
my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $::myconfig{login});
|
||
|
$query = qq|SELECT fu.*, n.subject, n.body, n.created_by
|
||
|
$query = qq|SELECT fu.*, n.subject, n.body, n.created_by,
|
||
|
follow_up_done.follow_up_id AS done,
|
||
|
date_trunc('second', follow_up_done.done_at) AS done_at,
|
||
|
COALESCE(done_by.name, done_by.login) AS done_by_employee_name
|
||
|
FROM follow_ups fu
|
||
|
LEFT JOIN notes n ON (fu.note_id = n.id)
|
||
|
LEFT JOIN follow_up_created_for_employees ON (follow_up_created_for_employees.follow_up_id = fu.id)
|
||
|
LEFT JOIN follow_up_done ON (follow_up_done.follow_up_id = fu.id)
|
||
|
LEFT JOIN employee done_by ON (follow_up_done.employee_id = done_by.id)
|
||
|
WHERE (fu.id = ?)
|
||
|
AND ( (fu.created_by = ?) OR (follow_up_created_for_employees.employee_id = ?)
|
||
|
OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?)))|;
|
||
| ... | ... | |
|
|
||
|
if ($params{done} ne $params{not_done}) {
|
||
|
my $not = $params{not_done} ? 'NOT' : '';
|
||
|
$where .= qq| AND $not COALESCE(fu.done, FALSE)|;
|
||
|
$where .= qq| AND $not EXISTS (SELECT id FROM follow_up_done WHERE follow_up_id = fu.id)|;
|
||
|
}
|
||
|
|
||
|
if ($params{not_id}) {
|
||
| ... | ... | |
|
$query = qq|SELECT DISTINCT fu.*, n.subject, n.body, n.created_by,
|
||
|
fu.follow_up_date <= current_date AS due,
|
||
|
fu.itime::DATE AS created_on,
|
||
|
COALESCE(eby.name, eby.login) AS created_by_name
|
||
|
COALESCE(eby.name, eby.login) AS created_by_name,
|
||
|
follow_up_done.follow_up_id AS done
|
||
|
FROM follow_ups fu
|
||
|
LEFT JOIN notes n ON (fu.note_id = n.id)
|
||
|
LEFT JOIN employee eby ON (n.created_by = eby.id)
|
||
|
LEFT JOIN follow_up_created_for_employees ON (follow_up_created_for_employees.follow_up_id = fu.id)
|
||
|
LEFT JOIN follow_up_done ON (follow_up_done.follow_up_id = fu.id)
|
||
|
WHERE ((fu.created_by = ?) OR (follow_up_created_for_employees.employee_id = ?)
|
||
|
$where_user)
|
||
|
$where
|
||
| css/common.css | ||
|---|---|---|
|
.thumbnail {
|
||
|
cursor: pointer;
|
||
|
}
|
||
|
|
||
|
.fu_finished {
|
||
|
background-color: #ADFFB6;
|
||
|
}
|
||
| locale/de/all | ||
|---|---|---|
|
'Financial controlling report for open sales orders' => 'Finanzcontrollingbericht für offene Verkaufsaufträge',
|
||
|
'Financial overview for #1' => 'Finanzübersicht für #1',
|
||
|
'Finish' => 'Abschließen',
|
||
|
'Finished' => 'Erledigt',
|
||
|
'First 20 Lines' => 'Nur erste 20 Datensätze',
|
||
|
'Firstname' => 'Vorname',
|
||
|
'Fix transaction' => 'Buchung korrigieren',
|
||
| ... | ... | |
|
'assembled' => 'Gefertigt',
|
||
|
'assembly' => 'Erzeugnis',
|
||
|
'assembly_list' => 'erzeugnisliste',
|
||
|
'at' => 'um',
|
||
|
'averaged values, in invoice mode only useful when filtered by a part' => 'gemittelte Werte, im Rechnungsmodus nur sinnvoll wenn nach Artikel gefiltert wird',
|
||
|
'averconsumed_br' => 'Ø mtl.',
|
||
|
'back' => 'zurück',
|
||
| ... | ... | |
|
'brutto' => 'brutto',
|
||
|
'building data' => 'Verarbeite Daten',
|
||
|
'building report' => 'Erstelle Bericht',
|
||
|
'by' => 'von',
|
||
|
'can not allocate #1 units of #2, missing #3 units' => 'Kann keine #1 Einheiten von #2 belegen, es fehlen #3 Einheiten',
|
||
|
'can not allocate enough resources for production' => 'Kann nicht genug Mengen für die Produktion belegen',
|
||
|
'can only parse a pdf file' => 'Kann nur eine gültige PDF-Datei verwenden.',
|
||
| locale/en/all | ||
|---|---|---|
|
'Financial controlling report for open sales orders' => '',
|
||
|
'Financial overview for #1' => '',
|
||
|
'Finish' => '',
|
||
|
'Finished' => '',
|
||
|
'First 20 Lines' => '',
|
||
|
'Firstname' => '',
|
||
|
'Fix transaction' => '',
|
||
| ... | ... | |
|
'assembled' => '',
|
||
|
'assembly' => '',
|
||
|
'assembly_list' => '',
|
||
|
'at' => '',
|
||
|
'averaged values, in invoice mode only useful when filtered by a part' => '',
|
||
|
'averconsumed_br' => 'Ø monthly',
|
||
|
'back' => '',
|
||
| ... | ... | |
|
'brutto' => '',
|
||
|
'building data' => '',
|
||
|
'building report' => '',
|
||
|
'by' => '',
|
||
|
'can not allocate #1 units of #2, missing #3 units' => '',
|
||
|
'can not allocate enough resources for production' => '',
|
||
|
'can only parse a pdf file' => '',
|
||
| templates/webpages/customer_vendor/tabs/vcnotes.html | ||
|---|---|---|
|
|
||
|
<p>
|
||
|
<table>
|
||
|
[% IF SELF.note_followup.done -%]
|
||
|
<tr class="fu_finished">
|
||
|
<td>[% 'Finished' | $T8 %]</td>
|
||
|
<td>[% 'by' | $T8 %] [% HTML.escape(SELF.note_followup.done.employee.safe_name) %]</td>
|
||
|
<td colspan="2">[% 'at' | $T8 %] [% HTML.escape(SELF.note_followup.done.done_at_as_timestamp_s) %]</td>
|
||
|
</tr>
|
||
|
[% END %]
|
||
|
<tr>
|
||
|
<td valign="right">[% 'Subject' | $T8 %]</td>
|
||
|
|
||
| ... | ... | |
|
<td>
|
||
|
<td valign="top">
|
||
|
<table>
|
||
|
<tr class="listheading"><th>[% LxERP.t8('Users that are a member in this group') %] ([% LxERP.t8('Click group to add the group\'s users') %])</th></tr>
|
||
|
<tr class="listheading"><th>[% LxERP.t8('Users that are a member in this group') %] ([% LxERP.t8('click on a group to add the group\'s users') %])</th></tr>
|
||
|
[% FOREACH auth_group = SELF.all_auth_groups %]
|
||
|
<tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">
|
||
|
<td class="listrow1"><b>← [% auth_group.name %]</b>: [% auth_group.description %]</td>
|
||
| ... | ... | |
|
<td> </td>
|
||
|
|
||
|
<td>
|
||
|
[% L.checkbox_tag('note_followup.done', checked = SELF.note_followup.done) %]
|
||
|
[% L.checkbox_tag('note_followup_done', checked = SELF.note_followup.done) %]
|
||
|
<label for="note_followup_done">[% 'Follow-Up done' | $T8 %]</label>
|
||
|
</td>
|
||
|
</tr>
|
||
| templates/webpages/fu/add_edit.html | ||
|---|---|---|
|
<input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
|
||
|
|
||
|
<table>
|
||
|
[% IF done_at -%]
|
||
|
<tr class="fu_finished">
|
||
|
<td>[% 'Finished' | $T8 %]</td>
|
||
|
<td>[% 'by' | $T8 %] [% HTML.escape(done_by_employee_name) %]</td>
|
||
|
<td colspan="2">[% 'at' | $T8 %] [% HTML.escape(done_at) %]</td>
|
||
|
</tr>
|
||
|
[% END %]
|
||
|
<tr>
|
||
|
<td align="top">[% 'Follow-Up for user' | $T8 %]</td>
|
||
|
<td valign="top">
|
||
| ... | ... | |
|
<td>
|
||
|
<td valign="top">
|
||
|
<table>
|
||
|
<tr class="listheading"><th>[% LxERP.t8('Users that are a member in this group') %] ([% LxERP.t8('Click group to add the group\'s users') %])</th></tr>
|
||
|
<tr class="listheading"><th>[% LxERP.t8('Users that are a member in this group') %] ([% LxERP.t8('click on a group to add the group\'s users') %])</th></tr>
|
||
|
[% FOREACH auth_group = all_auth_groups %]
|
||
|
<tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">
|
||
|
<td class="listrow1"><b>← [% auth_group.name %]</b>: [% auth_group.description %]</td>
|
||
Auch abrufbar als: Unified diff
Wiedervorlagen: Mehr Infos über Abschluss speichern und in den Masken zeigen