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:

sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
162 162
  $sth->execute() || mydberror($query);
163 163

  
164 164
  my $query_update = "UPDATE parts SET buchungsgruppen_id = ?";
165
  $query_update .= ", inventory_accno_id = ?" if ($main::eur);
165
  $query_update .= ", inventory_accno_id = ?" if $::lx_office_conf{system}->{eur};
166 166
  $query_update .= " WHERE id = ?";
167 167
  my $sth_update = $dbh->prepare($query_update);
168 168

  
169 169
  while (my $ref = $sth->fetchrow_hashref()) {
170 170
    foreach my $bg (@{$buchungsgruppen}) {
171
      if (($main::eur ||
171
      if (($::lx_office_conf{system}->{eur} ||
172 172
           ($ref->{"inventory_accno_id"} == $bg->{"inventory_accno_id"})) &&
173 173
          ($ref->{"income_accno_id"} == $bg->{"income_accno_id_0"}) &&
174 174
          ($ref->{"expense_accno_id"} == $bg->{"expense_accno_id_0"})) {
175 175
        my @values = ($bg->{"id"}, $ref->{"id"});
176
        splice(@values, 1, 0, $bg->{"inventory_accno_id"}) if ($main::eur);
176
        splice(@values, 1, 0, $bg->{"inventory_accno_id"}) if $::lx_office_conf{system}->{eur};
177 177
        $sth_update->execute(@values) ||
178 178
          mydberror($query_update . " (" . join(", ", @values) . ")");
179 179
        last;
......
195 195
      if (($ref->{"income_accno_id"} == $bg->{"income_accno_id_0"}) &&
196 196
          ($ref->{"expense_accno_id"} == $bg->{"expense_accno_id_0"})) {
197 197
        my @values = ($bg->{"id"}, $ref->{"id"});
198
        splice(@values, 1, 0, undef) if ($main::eur);
198
        splice(@values, 1, 0, undef) if $::lx_office_conf{system}->{eur};
199 199
        $sth_update->execute(@values) ||
200 200
          mydberror($query_update . " (" . join(", ", @values) . ")");
201 201
        last;
......
299 299
    $entry->{"ACC_INVENTORY"} = $acc_inventory;
300 300
    $entry->{"ACC_INCOME"} = $acc_income;
301 301
    $entry->{"ACC_EXPENSE"} = $acc_expense;
302
    $entry->{"eur"} = $main::eur;
302
    $entry->{"eur"} = $::lx_office_conf{system}->{eur};
303 303
  }
304 304

  
305 305
  # $form->parse_html_template("dbupgrade/buchungsgruppen_parts")
......
439 439

  
440 440
  # If balancing is off then force parts.inventory_accno_id to
441 441
  # a single value for parts.
442
  force_inventory_accno_id_for_parts() if ($main::eur);
442
  force_inventory_accno_id_for_parts() if $::lx_office_conf{system}->{eur};
443 443

  
444 444
  # Force "IC" to be present in chart.link for all accounts
445 445
  # which have been used as inventory accounts in parts.

Auch abrufbar als: Unified diff