Revision bc0386a4
Von Jan Büren vor mehr als 3 Jahren hinzugefügt
| SL/Controller/Order.pm | ||
|---|---|---|
| 1965 | 1965 |
$files{versions} = [ SL::File->get_all_versions(object_id => $self->order->id, object_type => $self->order->type, file_type => 'document') ];
|
| 1966 | 1966 |
$files{files} = [ SL::File->get_all( object_id => $self->order->id, object_type => $self->order->type, file_type => 'attachment') ];
|
| 1967 | 1967 |
$files{vc_files} = [ SL::File->get_all( object_id => $self->order->{$self->cv}->id, object_type => $self->cv, file_type => 'attachment') ];
|
| 1968 |
$files{project_files} = [ SL::File->get_all( object_id => $self->order->globalproject_id, object_type => 'project', file_type => 'attachment') ];
|
|
| 1968 | 1969 |
} |
| 1969 | 1970 |
|
| 1970 | 1971 |
my @parts = |
| bin/mozilla/io.pl | ||
|---|---|---|
| 2021 | 2021 |
} |
| 2022 | 2022 |
|
| 2023 | 2023 |
sub _get_files_for_email_dialog {
|
| 2024 |
my %files = map { ($_ => []) } qw(versions files vc_files part_files);
|
|
| 2024 |
my %files = map { ($_ => []) } qw(versions files vc_files part_files project_files);
|
|
| 2025 | 2025 |
|
| 2026 | 2026 |
return %files if !$::instance_conf->get_doc_storage; |
| 2027 | 2027 |
|
| ... | ... | |
| 2030 | 2030 |
$files{files} = [ SL::File->get_all( object_id => $::form->{id}, object_type => $::form->{type}, file_type => 'attachment') ];
|
| 2031 | 2031 |
$files{vc_files} = [ SL::File->get_all( object_id => $::form->{vc_id}, object_type => $::form->{vc}, file_type => 'attachment') ]
|
| 2032 | 2032 |
if $::form->{vc} && $::form->{"vc_id"};
|
| 2033 |
$files{project_files} = [ SL::File->get_all(object_id => $::form->{project_id}, object_type => 'project',file_type => 'attachment') ]
|
|
| 2034 |
if $::form->{project_id};
|
|
| 2033 | 2035 |
} |
| 2034 | 2036 |
|
| 2035 | 2037 |
my @parts = |
| js/kivi.SalesPurchase.js | ||
|---|---|---|
| 286 | 286 |
type: $('#type').val(),
|
| 287 | 287 |
vc: vc, |
| 288 | 288 |
vc_id: $('#' + vc + '_id').val(),
|
| 289 |
project_id: $('#globalproject_id').val(),
|
|
| 289 | 290 |
}; |
| 290 | 291 |
|
| 291 | 292 |
$('[name^=id_],[name^=partnumber_]').each(function(idx, elt) {
|
| templates/webpages/common/_send_email_dialog.html | ||
|---|---|---|
| 103 | 103 |
files = FILES.part_files |
| 104 | 104 |
checked = INSTANCE_CONF.get_email_attachment_part_files_checked |
| 105 | 105 |
label = LxERP.t8("Files from parts") %]
|
| 106 |
|
|
| 107 |
[% PROCESS attach_file_list |
|
| 108 |
files = FILES.project_files |
|
| 109 |
label = LxERP.t8("Files from projects") %]
|
|
| 106 | 110 |
[% END %] |
| 107 | 111 |
</tbody> |
| 108 | 112 |
</table> |
Auch abrufbar als: Unified diff
Dateianhänge aus Projekten auch in E-Mail anzeigen
In Anlehnung an odyn fa2f21bb7d9247782f5e
Im E-Mail-Dialog werden hochgeladene Dateianhänge aus einem
globalen Projekt angeboten und sind vorausgewählt.