Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e059f9cf

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID e059f9cf786f9c2a8a04d5e589e86775d6185f4d
  • Vorgänger 65f7a07e

Angebots-/Auftragsbericht: Lieferadresse anzeigen und filtern

Unterschiede anzeigen:

bin/mozilla/oe.pl
1074 1074
    "order_probability",       "expected_billing_date", "expected_netamount",
1075 1075
    "payment_terms",           "intnotes",              "order_status",
1076 1076
    "items",
1077
    "shiptoname", "shiptodepartment_1", "shiptodepartment_2", "shiptostreet",
1078
    "shiptozipcode", "shiptocity", "shiptocountry",
1077 1079
  );
1078 1080

  
1079 1081
  # only show checkboxes if gotten here via sales_order form.
......
1123 1125
  push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
1124 1126

  
1125 1127
  my @hidden_variables = map { "l_${_}" } @columns;
1126
  push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
1127
                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id
1128
                                                        reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
1129
                                                        business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
1130
                                                        order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to
1131
                                                        parts_partnumber parts_description all department_id intnotes phone_notes fulltext order_status_id);
1128
  push @hidden_variables, "l_subtotal", $form->{vc}, qw(
1129
    l_closed l_notdelivered open closed delivered notdelivered ordnumber
1130
    quonumber cusordnumber transaction_description transdatefrom transdateto
1131
    type vc employee_id salesman_id reqdatefrom reqdateto projectnumber
1132
    project_id periodic_invoices_active periodic_invoices_inactive
1133
    business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom
1134
    insertdateto order_probability_op order_probability_value
1135
    expected_billing_date_from expected_billing_date_to parts_partnumber
1136
    parts_description all department_id intnotes phone_notes fulltext
1137
    order_status_id shiptoname shiptodepartment_1 shiptodepartment_2
1138
    shiptostreet shiptozipcode shiptocity shiptocountry
1139
  );
1132 1140
  push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
1133 1141

  
1134 1142
  my   @keys_for_url = grep { $form->{$_} } @hidden_variables;
......
1176 1184
    'intnotes'                => { 'text' => $locale->text('Internal Notes'), },
1177 1185
    'order_status'            => { 'text' => $locale->text('Status'), },
1178 1186
    'items'                   => { 'text' => $locale->text('Positions'), },
1187
    shiptoname                => { 'text' => $locale->text('Name (Shipping)'), },
1188
    shiptodepartment_1        => { 'text' => $locale->text('Department 1 (Shipping)'), },
1189
    shiptodepartment_2        => { 'text' => $locale->text('Department 2 (Shipping)'), },
1190
    shiptostreet              => { 'text' => $locale->text('Street (Shipping)'), },
1191
    shiptozipcode             => { 'text' => $locale->text('Zipcode (Shipping)'), },
1192
    shiptocity                => { 'text' => $locale->text('City (Shipping)'), },
1193
    shiptocountry             => { 'text' => $locale->text('Country (Shipping)'), },
1179 1194
    %column_defs_cvars,
1180 1195
  );
1181 1196

  
......
1222 1237
  push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"         if $form->{transaction_description};
1223 1238
  push @options, $locale->text('Quick Search')            . " : $form->{all}"                             if $form->{all};
1224 1239
  push @options, $locale->text('Shipping Point')          . " : $form->{shippingpoint}"                   if $form->{shippingpoint};
1240
  push @options, $locale->text('Name (Shipping)')         . " : $form->{shiptoname}"
1241
                  if $form->{shiptoname};
1242
  push @options, $locale->text('Department 1 (Shipping)') . " : $form->{shiptodepartment_1}"
1243
                  if $form->{shiptodepartment_1};
1244
  push @options, $locale->text('Department 2 (Shipping)') . " : $form->{shiptodepartment_2}"
1245
                  if $form->{shiptodepartment_2};
1246
  push @options, $locale->text('Street (Shipping)')       . " : $form->{shiptostreet}"
1247
                  if $form->{shiptostreet};
1248
  push @options, $locale->text('Zipcode (Shipping)')      . " : $form->{shiptozipcode}"
1249
                  if $form->{shiptozipcode};
1250
  push @options, $locale->text('City (Shipping)')         . " : $form->{shiptocity}"
1251
                  if $form->{shiptocity};
1252
  push @options, $locale->text('Country (Shipping)')      . " : $form->{shiptocountry}"
1253
                  if $form->{shiptocountry};
1225 1254
  push @options, $locale->text('Part Description')        . " : $form->{parts_description}"               if $form->{parts_description};
1226 1255
  push @options, $locale->text('Part Number')             . " : $form->{parts_partnumber}"                if $form->{parts_partnumber};
1227 1256
  push @options, $locale->text('Phone Notes')             . " : $form->{phone_notes}"                     if $form->{phone_notes};

Auch abrufbar als: Unified diff