/ - Diff - projekt kivitendo - wissen

       # connect to database
       my $dbh = $form->dbconnect_noauto($myconfig);
       my $query = "DELETE FROM units_language WHERE language_id = ?";
       $dbh->do($query, undef, $form->{"id"}) ||
         $form->dberror($query . " ($form->{id})");
       foreach my $table (qw(translation_payment_terms units_language)) {
         my $query = qq|DELETE FROM $table WHERE language_id = ?|;
         do_query($form, $dbh, $query, $form->{"id"});
+      }
       $query = "DELETE FROM language WHERE id = ?";
       $dbh->do($query, undef, $form->{"id"}) ||
         $form->dberror($query . " ($form->{id})");
       do_query($form, $dbh, $query, $form->{"id"});
       $dbh->commit();
       $dbh->disconnect;
-...
       my $ref = $sth->fetchrow_hashref(NAME_lc);
       map { $form->{$_} = $ref->{$_} } keys %$ref;
       $sth->finish();
       $query =
         qq|SELECT t.language_id, t.description_long, l.description AS language | .
         qq|FROM translation_payment_terms t | .
         qq|LEFT JOIN language l ON t.language_id = l.id | .
         qq|WHERE t.payment_terms_id = ? | .
         qq|UNION | .
         qq|SELECT l.id AS language_id, NULL AS description_long, | .
         qq|l.description AS language | .
         qq|FROM language l|;
       $sth = $dbh->prepare($query);
       $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
       my %mapping;
       while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
         $mapping{ $ref->{"language_id"} } = $ref
           unless (defined($mapping{ $ref->{"language_id"} }));
+      }
       $sth->finish;
       $form->{"TRANSLATION"} = [sort({ $a->{"language"} cmp $b->{"language"} }
                                      values(%mapping))];
       $dbh->disconnect;
       $main::lxdebug->leave_sub();
-...
       my ($self, $myconfig, $form) = @_;
       # connect to database
       my $dbh = $form->dbconnect($myconfig);
       my $dbh = $form->dbconnect_noauto($myconfig);
       my $query;
       if (!$form->{id}) {
         $query = qq|SELECT nextval('id'), MAX(sortkey) + 1 FROM payment_terms|;
         my $sortkey;
         ($form->{id}, $sortkey) = selectrow_query($form, $dbh, $query);
         $query = qq|INSERT INTO payment_terms (id, sortkey) VALUES (?, ?)|;
         do_query($form, $dbh, $query, $form->{id}, $sortkey);
       } else {
         $query =
           qq|DELETE FROM translation_payment_terms | .
           qq|WHERE payment_terms_id = ?|;
         do_query($form, $dbh, $query, $form->{"id"});
+      }
       $query = qq|UPDATE payment_terms SET
                   description = ?, description_long = ?,
                   ranking = ?,
                   terms_netto = ?, terms_skonto = ?,
                   percent_skonto = ?
                   WHERE id = ?|;
       my @values = ($form->{description}, $form->{description_long},
                     $form->{ranking} * 1,
                     $form->{terms_netto} * 1, $form->{terms_skonto} * 1,
                     $form->{percent_skonto} * 1);
                     $form->{percent_skonto} * 1,
                     $form->{id});
       do_query($form, $dbh, $query, @values);
       my $query;
       # id is the old record
       if ($form->{id}) {
         $query = qq|UPDATE payment_terms SET
                     description = ?, description_long = ?,
                     ranking = ?,
                     terms_netto = ?, terms_skonto = ?,
                     percent_skonto = ?
                     WHERE id = ?|;
         push(@values, $form->{"id"});
       } else {
         $query = qq|SELECT MAX(sortkey) + 1 FROM payment_terms|;
         my ($sortkey) = selectrow_query($form, $dbh, $query);
         $query = qq|INSERT INTO payment_terms
                     (description, description_long, ranking,
                      terms_netto, terms_skonto, percent_skonto, sortkey)
                     VALUES (?, ?, ?, ?, ?, ?, ?)|;
         push(@values, $sortkey);
       $query = qq|SELECT id FROM language|;
       my @language_ids;
       my $sth = $dbh->prepare($query);
       $sth->execute() || $form->dberror($query);
       while (my ($id) = $sth->fetchrow_array()) {
         push(@language_ids, $id);
+      }
       do_query($form, $dbh, $query, @values);
       $sth->finish();
       $query =
         qq|INSERT INTO translation_payment_terms | .
         qq|(language_id, payment_terms_id, description_long) | .
         qq|VALUES (?, ?, ?)|;
       $sth = $dbh->prepare($query);
       foreach my $language_id (@language_ids) {
         do_statement($form, $sth, $query, $language_id, $form->{"id"},
                      $form->{"description_long_${language_id}"});
+      }
       $sth->finish();
       $dbh->commit();
       $dbh->disconnect;
       $main::lxdebug->leave_sub();
-...
       my ($self, $myconfig, $form) = @_;
       # connect to database
       my $dbh = $form->dbconnect($myconfig);
       my $dbh = $form->dbconnect_noauto($myconfig);
       my $query = qq|DELETE FROM payment_terms WHERE id = ?|;
       do_query($form, $dbh, $query, $form->{"id"});
       $query =
         qq|DELETE FROM translation_payment_terms WHERE payment_terms_id = ?|;
       do_query($form, $dbh, $query, $form->{"id"});
       $dbh->commit();
       $dbh->disconnect;
       $main::lxdebug->leave_sub();

     require Exporter;
     @ISA = qw(Exporter);
     @EXPORT = qw(conv_i conv_date do_query selectrow_query dump_query);
     @EXPORT = qw(conv_i conv_date do_query selectrow_query do_statement dump_query);
     sub conv_i {
       my ($value, $default) = @_;
-...
+      }
+    }
     sub do_statement {
       my ($form, $sth, $query) = splice(@_, 0, 3);
       if (0 == scalar(@_)) {
         $sth->execute() || $form->dberror($query);
       } else {
         $sth->execute(@_) ||
           $form->dberror($query . " (" . join(", ", @_) . ")");
+      }
+    }
     sub dump_query {
       my ($level, $msg, $query) = splice(@_, 0, 3);
       while ($query =~ /\?/) {

       $form->{terms_netto} = 0;
       $form->{terms_skonto} = 0;
       $form->{percent_skonto} = 0;
       my @languages = AM->language(\%myconfig, $form, 1);
       map({ $_->{"language"} = $_->{"description"};
             $_->{"language_id"} = $_->{"id"}; } @languages);
       $form->{"TRANSLATION"} = \@languages;
       &payment_header;
       &form_footer;
-...
       $form->{title} = "Edit";
       AM->get_payment(\%myconfig, \%$form);
       AM->get_payment(\%myconfig, $form);
       $form->{percent_skonto} =
         $form->format_amount(\%myconfig, $form->{percent_skonto} * 100);
-...
         <th align=right>| . $locale->text('Long Description') . qq|</th>
         <td><input name=description_long size=50 value="$form->{description_long}"></td>
       </tr>
     |;
       foreach my $language (@{ $form->{"TRANSLATION"} }) {
         print qq|
       <tr>
         <th align="right">| .
         sprintf($locale->text('Translation (%s)'),
                 $language->{"language"})
         . qq|</th>
         <td><input name="description_long_$language->{language_id}" size="50"
              value="| . Q($language->{"description_long"}) . qq|"></td>
       </tr>
     |;
+      }
       print qq|
       <tr>
         <th align=right>| . $locale->text('Netto Terms') . qq|</th>
         <td><input name=terms_netto size=10 value="$form->{terms_netto}"></td>

locale/de/all
1049	1049	'Transfer' => 'Umlagerung',
1050	1050	'Transfer Inventory' => 'Ware umlagern',
1051	1051	'Transfer to' => 'umlagern nach',
	1052	'Translation (%s)' => 'Übersetzung (%s)',
1052	1053	'Trial Balance' => 'Saldenbilanz',
1053	1054	'Type' => 'Typ',
1054	1055	'Type of Business' => 'Kundentyp',

locale/de/am
255	255	'Top (Javascript)' => 'Oben (mit Javascript)',
256	256	'Transaction reversal enforced for all dates' => 'Fehleintragungen m?ssen f?r jeden Zeitraum mit einer Kontraeintragung ausgebessert werden',
257	257	'Transaction reversal enforced up to' => 'Fehleintragungen k?nnen bis zu dem angegebenen Zeitraum nur mit einer Kontraeintragung ausgebessert werden!',
	258	'Translation (%s)' => 'Übersetzung (%s)',
258	259	'Type of Business' => 'Kundentyp',
259	260	'UStVA-Nr. 35' => 'Kz. 35',
260	261	'UStVA-Nr. 36' => 'Kz. 36',

     -- @tag: payment_terms_translation
     -- @description: &Uuml;bersetzungen von Zahlungskonditionen
     -- @depends: release_2_4_1
     CREATE TABLE translation_payment_terms (
       payment_terms_id integer NOT NULL,
       language_id integer NOT NULL,
       description_long text,
       FOREIGN KEY (payment_terms_id) REFERENCES payment_terms (id),
       FOREIGN KEY (language_id) REFERENCES language (id)
     );

Projekt

Allgemein

Profil

projekt kivitendo

Revision dcef6ec7

Von Moritz Bunkus vor fast 18 Jahren hinzugefügt