Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 606e7e25

Von Moritz Bunkus vor mehr als 13 Jahren hinzugefügt

Konfigurationsort für viele Flags ist Abschnitt 'features', nicht 'system'

Hoffentlich Fix für Bug 1624.

Unterschiede anzeigen:

SL/Common.pm
336 336
  my ($form) = @_;
337 337

  
338 338
  return $main::lxdebug->leave_sub()
339
    unless ($::lx_office_conf{system}->{webdav} && $form->{id});
339
    unless ($::lx_office_conf{features}->{webdav} && $form->{id});
340 340

  
341 341
  my ($path, $number);
342 342

  
SL/Form.pm
810 810
  }
811 811

  
812 812
  $additional_params->{"conf_dbcharset"}              = $::lx_office_conf{system}->{dbcharset};
813
  $additional_params->{"conf_webdav"}                 = $::lx_office_conf{system}->{webdav};
814
  $additional_params->{"conf_lizenzen"}               = $::lx_office_conf{system}->{lizenzen};
813
  $additional_params->{"conf_webdav"}                 = $::lx_office_conf{features}->{webdav};
814
  $additional_params->{"conf_lizenzen"}               = $::lx_office_conf{features}->{lizenzen};
815 815
  $additional_params->{"conf_latex_templates"}        = $::lx_office_conf{print_templates}->{latex};
816 816
  $additional_params->{"conf_opendocument_templates"} = $::lx_office_conf{print_templates}->{opendocument};
817
  $additional_params->{"conf_vertreter"}              = $::lx_office_conf{system}->{vertreter};
817
  $additional_params->{"conf_vertreter"}              = $::lx_office_conf{features}->{vertreter};
818 818
  $additional_params->{"conf_show_best_before"}       = $::lx_office_conf{features}->{show_best_before};
819 819
  $additional_params->{"conf_parts_image_css"}        = $::lx_office_conf{features}->{parts_image_css};
820 820
  $additional_params->{"conf_parts_listing_images"}   = $::lx_office_conf{features}->{parts_listing_images};
bin/mozilla/am.pl
1111 1111
  $form->{title} = $locale->text('Type of Business');
1112 1112

  
1113 1113
  my @column_index = qw(description discount customernumberinit);
1114
  push @column_index, 'salesman' if $::lx_office_conf{system}->{vertreter};
1114
  push @column_index, 'salesman' if $::lx_office_conf{features}->{vertreter};
1115 1115
  my %column_header;
1116 1116
  $column_header{description} =
1117 1117
      qq|<th class=listheading width=60%>|
......
1224 1224
    $form->format_amount(\%myconfig, $form->{discount} * 100);
1225 1225

  
1226 1226
  my $salesman_code;
1227
  if ($::lx_office_conf{system}->{vertreter}) {
1227
  if ($::lx_office_conf{features}->{vertreter}) {
1228 1228
    $salesman_code = qq|
1229 1229
  <tr>
1230 1230
    <th align="right">| . $locale->text('Representative') . qq|</th>
bin/mozilla/ct.pl
300 300
                   taxzones  => "ALL_TAXZONES");
301 301
  $form->get_pricegroup(\%myconfig, { all => 1 });
302 302

  
303
  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{system}->{vertreter};
303
  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{features}->{vertreter};
304 304

  
305 305
  $form->{ALL_SALESMEN}   = $form->{ALL_EMPLOYEES};
306 306
  $form->{taxincluded}    = ($form->{taxincluded}) ? "checked" : "";
......
354 354

  
355 355
  $::form->isblank("name", $::locale->text("Name missing!"));
356 356

  
357
  if ($::form->{new_salesman_id} && $::lx_office_conf{system}->{vertreter}) {
357
  if ($::form->{new_salesman_id} && $::lx_office_conf{features}->{vertreter}) {
358 358
    $::form->{salesman_id} = $::form->{new_salesman_id};
359 359
    delete $::form->{new_salesman_id};
360 360
  }
bin/mozilla/do.pl
165 165
  $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
166 166

  
167 167
  # retrieve order/quotation
168
  $form->{webdav}   = $::lx_office_conf{system}->{webdav};
168
  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
169 169
  $form->{jsscript} = 1;
170 170

  
171 171
  my $editing = $form->{id};
bin/mozilla/io.pl
489 489
    qw(bin listprice inventory_accno income_accno expense_accno unit weight
490 490
       assembly taxaccounts partsgroup formel longdescription not_discountable
491 491
       part_payment_id partnotes id lastcost price_factor_id price_factor);
492
  push @new_fields, "lizenzen" if $::lx_office_conf{system}->{lizenzen};
492
  push @new_fields, "lizenzen" if $::lx_office_conf{features}->{lizenzen};
493 493
  push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] };
494 494

  
495 495
  my $i = 0;
......
497 497
  foreach my $ref (@{ $form->{item_list} }) {
498 498
    my $checked = ($i++) ? "" : "checked";
499 499

  
500
    if ($::lx_office_conf{system}->{lizenzen}) {
500
    if ($::lx_office_conf{features}->{lizenzen}) {
501 501
      if ($ref->{inventory_accno} > 0) {
502 502
        $ref->{"lizenzen"} = qq|<option></option>|;
503 503
        foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
......
622 622
    $form->{payment_id} = $form->{"part_payment_id_$i"};
623 623
  }
624 624

  
625
  if ($::lx_office_conf{system}->{lizenzen}) {
625
  if ($::lx_office_conf{features}->{lizenzen}) {
626 626
    map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
627 627
  }
628 628

  
bin/mozilla/ir.pl
100 100
  $form->{vc} = 'vendor';
101 101

  
102 102
  # create links
103
  $form->{webdav}   = $::lx_office_conf{system}->{webdav};
103
  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
104 104
  $form->{jsscript} = 1;
105 105

  
106 106
  $form->create_links("AP", \%myconfig, "vendor");
bin/mozilla/is.pl
132 132
  $form->{vc} = 'customer';
133 133

  
134 134
  # create links
135
  $form->{webdav}   = $::lx_office_conf{system}->{webdav};
136
  $form->{lizenzen} = $::lx_office_conf{system}->{lizenzen};
135
  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
136
  $form->{lizenzen} = $::lx_office_conf{features}->{lizenzen};
137 137

  
138 138
  $form->create_links("AR", \%myconfig, "customer");
139 139

  
......
561 561

  
562 562
        $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
563 563

  
564
        if ($::lx_office_conf{system}->{lizenzen}) {
564
        if ($::lx_office_conf{features}->{lizenzen}) {
565 565
          if ($form->{"inventory_accno_$i"} ne "") {
566 566
            $form->{"lizenzen_$i"} = qq|<option></option>|;
567 567
            foreach my $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) {
bin/mozilla/oe.pl
222 222
  $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
223 223

  
224 224
  # retrieve order/quotation
225
  $form->{webdav}   = $::lx_office_conf{system}->{webdav};
225
  $form->{webdav}   = $::lx_office_conf{features}->{webdav};
226 226
  $form->{jsscript} = 1;
227 227

  
228 228
  my $editing = $form->{id};
......
498 498

  
499 499
  print $form->parse_html_template("oe/form_footer", {
500 500
     %TMPL_VAR,
501
     webdav          => $::lx_office_conf{system}->{webdav},
501
     webdav          => $::lx_office_conf{features}->{webdav},
502 502
     print_options   => print_options(inline => 1),
503 503
     label_edit      => $locale->text("Edit the $form->{type}"),
504 504
     label_workflow  => $locale->text("Workflow $form->{type}"),

Auch abrufbar als: Unified diff