Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b8a93e44

Von Bernd Bleßmann vor fast 3 Jahren hinzugefügt

  • ID b8a93e44bab8cd0e5de93560609350b172c79f00
  • Vorgänger 5a325220
  • Nachfolger fa91a37b

Rechnungsbericht: Dateianhänge anzeigen können.

Unterschiede anzeigen:

bin/mozilla/ar.pl
1028 1028
    qw(ids transdate id type invnumber ordnumber cusordnumber donumber deliverydate name netamount tax amount paid
1029 1029
       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
1030 1030
       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone
1031
       payment_terms charts customertype direct_debit dunning_description department);
1031
       payment_terms charts customertype direct_debit dunning_description department attachments);
1032 1032

  
1033 1033
  my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
1034 1034
  my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
......
1082 1082
    'direct_debit'            => { 'text' => $locale->text('direct debit'), },
1083 1083
    'department'              => { 'text' => $locale->text('Department'), },
1084 1084
    dunning_description       => { 'text' => $locale->text('Dunning level'), },
1085
    attachments               => { 'text' => $locale->text('Attachments'), },
1085 1086
    %column_defs_cvars,
1086 1087
  );
1087 1088

  
......
1206 1207
    $subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0;
1207 1208
    $totals{marge_percent}    = $totals{netamount}    ? ($totals{marge_total}    * 100 / $totals{netamount}   ) : 0;
1208 1209

  
1210
    # Preserve $ar->{type} before changing it to the abbreviation letter for
1211
    # getting files from file management below.
1212
    $ar->{object_type} = $ar->{type};
1213

  
1209 1214
    my $is_storno  = $ar->{storno} &&  $ar->{storno_id};
1210 1215
    my $has_storno = $ar->{storno} && !$ar->{storno_id};
1211 1216

  
......
1249 1254
      align    => 'center',
1250 1255
    };
1251 1256

  
1257
    if ($::instance_conf->get_doc_storage && $form->{l_attachments}) {
1258
      my @files  = SL::File->get_all_versions(object_id   => $ar->{id},
1259
                                              object_type => $ar->{object_type} || 'invoice',
1260
                                              file_type   => 'attachment',);
1261
      if (scalar @files) {
1262
        my $html            = join '<br>', map { SL::Presenter::FileObject::file_object($_) } @files;
1263
        my $text            = join "\n",   map { $_->file_name                              } @files;
1264
        $row->{attachments} = { 'raw_data' => $html, data => $text };
1265
      } else {
1266
        $row->{attachments} = { };
1267
      }
1268

  
1269
    }
1270

  
1252 1271
    my $row_set = [ $row ];
1253 1272

  
1254 1273
    if (($form->{l_subtotal} eq 'Y')
templates/webpages/ar/search.html
208 208
           <td align=right><input name="l_direct_debit" id="l_direct_debit" class=checkbox type=checkbox value=Y></td>
209 209
           <td nowrap>[% 'direct debit' | $T8 %]</td>
210 210
          </tr>
211
[% IF INSTANCE_CONF.get_doc_storage -%]
212
          <tr>
213
           <td align=right><input name="l_attachments" id="l_attachments" class=checkbox type=checkbox value=Y></td>
214
           <td nowrap>[% 'Attachments' | $T8 %]</td>
215
          </tr>
216
[% END-%]
211 217
          <tr>
212 218
           <td colspan=4 align=left><b>[% 'Customer' | $T8 %]</b></td>
213 219
          </tr>

Auch abrufbar als: Unified diff