Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 65f7a07e

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt

  • ID 65f7a07e4be81dde5698ecb2d7f01c324c054fb5
  • Vorgänger 06ec5141
  • Nachfolger e059f9cf

Rechnungsbericht: Lieferadresse anzeigen und filtern

Unterschiede anzeigen:

bin/mozilla/ar.pl
1068 1068

  
1069 1069
  my $report = SL::ReportGenerator->new(\%myconfig, $form);
1070 1070

  
1071
  @columns =
1072
    qw(ids transdate id type invnumber ordnumber cusordnumber donumber deliverydate name netamount tax amount paid
1073
       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
1074
       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone
1075
       payment_terms charts customertype direct_debit dunning_description department attachments
1076
       items customer_dunning_lock);
1071
  @columns = qw(
1072
    ids transdate id type invnumber ordnumber cusordnumber donumber
1073
    deliverydate name netamount tax amount paid datepaid due duedate
1074
    transaction_description notes salesman employee shippingpoint shipvia
1075
    marge_total marge_percent globalprojectnumber customernumber country
1076
    ustid taxzone payment_terms charts customertype direct_debit
1077
    dunning_description department attachments items customer_dunning_lock
1078
    shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet
1079
    shiptozipcode shiptocity shiptocountry
1080
  );
1077 1081

  
1078 1082
  my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
1079 1083
  my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
......
1083 1087
  push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
1084 1088

  
1085 1089
  my @hidden_variables = map { "l_${_}" } @columns;
1086
  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id
1087
                                           transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto
1088
                                           employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed show_not_mailed
1089
                                           shippingpoint shipvia taxzone_id payment_id);
1090
  push @hidden_variables, "l_subtotal", qw(
1091
    open closed customer invnumber ordnumber cusordnumber
1092
    transaction_description notes project_id transdatefrom transdateto
1093
    duedatefrom duedateto datepaidfrom datepaidto employee_id salesman_id
1094
    business_id parts_partnumber parts_description department_id
1095
    show_marked_as_closed show_not_mailed shippingpoint shipvia taxzone_id
1096
    payment_id shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet
1097
    shiptozipcode shiptocity shiptocountry
1098
  );
1090 1099
  push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
1091 1100

  
1092 1101
  $href =  $params{want_binary_pdf} ? '' : build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
......
1131 1140
    attachments               => { 'text' => $locale->text('Attachments'), },
1132 1141
    items                     => { 'text' => $locale->text('Positions'), },
1133 1142
    customer_dunning_lock     => { 'text' => $locale->text('Dunning lock'), },
1143
    shiptoname                => { 'text' => $locale->text('Name (Shipping)'), },
1144
    shiptodepartment_1        => { 'text' => $locale->text('Department 1 (Shipping)'), },
1145
    shiptodepartment_2        => { 'text' => $locale->text('Department 2 (Shipping)'), },
1146
    shiptostreet              => { 'text' => $locale->text('Street (Shipping)'), },
1147
    shiptozipcode             => { 'text' => $locale->text('Zipcode (Shipping)'), },
1148
    shiptocity                => { 'text' => $locale->text('City (Shipping)'), },
1149
    shiptocountry             => { 'text' => $locale->text('Country (Shipping)'), },
1134 1150
    %column_defs_cvars,
1135 1151
  );
1136 1152

  
......
1234 1250
  if ($form->{shippingpoint}) {
1235 1251
    push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}";
1236 1252
  }
1237

  
1253
  if ($form->{shiptoname}) {
1254
    push @options, $locale->text('Name (Shipping)') . " : $form->{shiptoname}";
1255
  }
1256
  if ($form->{shiptodepartment_1}) {
1257
    push @options, $locale->text('Department 1 (Shipping)') . " : $form->{shiptodepartment_1}";
1258
  }
1259
  if ($form->{shiptodepartment_2}) {
1260
    push @options, $locale->text('Department 2 (Shipping)') . " : $form->{shiptodepartment_2}";
1261
  }
1262
  if ($form->{shiptostreet}) {
1263
    push @options, $locale->text('Street (Shipping)') . " : $form->{shiptostreet}";
1264
  }
1265
  if ($form->{shiptozipcode}) {
1266
    push @options, $locale->text('Zipcode (Shipping)') . " : $form->{shiptozipcode}";
1267
  }
1268
  if ($form->{shiptocity}) {
1269
    push @options, $locale->text('City (Shipping)') . " : $form->{shiptocity}";
1270
  }
1271
  if ($form->{shiptocountry}) {
1272
    push @options, $locale->text('Country (Shipping)') . " : $form->{shiptocountry}";
1273
  }
1238 1274

  
1239 1275
  $form->{ALL_PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;
1240 1276

  

Auch abrufbar als: Unified diff