Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision be6f6cfd

Von Moritz Bunkus vor fast 14 Jahren hinzugefügt

  • ID be6f6cfd8dc7def5356edd0c5aacb814b4baded1
  • Vorgänger 2b339152
  • Nachfolger d29b0238

Globale Variablen für Systemeinstellungen und Features nach %::lx_office_conf verschoben

Betroffen sind:
$webdav
$vertreter
$lizenzen
$show_best_before
$parts_show_image
$parts_image_css
$parts_listing_images
$eur
$dbcharset
$language

Unterschiede anzeigen:

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}   = $main::webdav;
168
  $form->{webdav}   = $::lx_office_conf{system}->{webdav};
169 169
  $form->{jsscript} = 1;
170 170

  
171 171
  my $editing = $form->{id};
......
865 865
    map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
866 866
    map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice lastcost);
867 867

  
868
    if ($vc_discount){ # falls wir einen Lieferanten/Kundenrabatt haben 
868
    if ($vc_discount){ # falls wir einen Lieferanten/Kundenrabatt haben
869 869
      # und keinen anderen discount wert an $i ...
870 870
      $form->{"discount_$form->{rowcount}"} ||= $vc_discount; # ... nehmen wir diesen Rabatt
871 871
    }
......
1310 1310
      foreach my $request (@{ DO->unpack_stock_information('packed' => $form->{"stock_out_$i"}) }) {
1311 1311
        $request->{parts_id} = $form->{"id_$i"};
1312 1312
        $request->{base_qty} = $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
1313
        $request->{project_id} = $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id}; 
1313
        $request->{project_id} = $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id};
1314 1314

  
1315 1315
        my $map_key          = join '--', ($form->{"id_$i"}, @{$request}{qw(warehouse_id bin_id chargenumber bestbefore)});
1316 1316

  
......
1352 1352
        my $pinfo = $part_info_map{$request->{parts_id}};
1353 1353
        my $binfo = $bin_info_map{$request->{bin_id}};
1354 1354

  
1355
        if ($main::show_best_before) {
1355
        if ($::lx_office_conf{system}->{show_best_before}) {
1356 1356
            push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, #5, for the transfer of #6.",
1357 1357
                                                     $pinfo->{description},
1358 1358
                                                     $binfo->{warehouse_description},

Auch abrufbar als: Unified diff