Behebt Bugs für Währungen

Vergessene Anpassungen von der Spaltenumbenennung in currencies.pl
wurden noch repariert (auch in currencies.pl selbst). Weiterhin
wurden noch andere Bugs repariert, wie Anlegen von Kunden, korrekte
Anzeige der Währung bei Lieferanten und Kunden, speichern von Rechnungen
(VK und EK), Angebot und Lieferschein erfassen.

diff --git a/SL/CT.pm b/SL/CT.pm
index bc307098fec5e9104584819dd6b0e1eafe973ef8..39c29b0651b1f3788eb69be8422a1f4fe8ae6ca8 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -72,7 +72,7 @@ sub get_tuple {
 
   #get name of currency instead of id:
   $query = qq|SELECT name AS curr FROM currencies WHERE id=?|;
 
   #get name of currency instead of id:
   $query = qq|SELECT name AS curr FROM currencies WHERE id=?|;

-  ($form->{curr}) = selectrow_query($form, $dbh, $query, conv_i($form->{curr}));
+  ($form->{curr}) = selectrow_query($form, $dbh, $query, conv_i($form->{currency_id}));

 
   if ( $form->{salesman_id} ) {
     my $query =
 
   if ( $form->{salesman_id} ) {
     my $query =


@@ -276,7 +276,7 @@ sub save_customer {
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 

-    $query = qq|INSERT INTO customer (id, name) VALUES (?, '')|;
+    $query = qq|INSERT INTO customer (id, name, currency_id) VALUES (?, '', (SELECT currency_id FROM defaults))|;

     do_query($form, $dbh, $query, $form->{id});
   }
 
     do_query($form, $dbh, $query, $form->{id});
   }
 


@@ -423,7 +423,7 @@ sub save_vendor {
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 

-    $query = qq|INSERT INTO vendor (id, name) VALUES (?, '')|;
+    $query = qq|INSERT INTO vendor (id, name, currency_id) VALUES (?, '', (SELECT currency_id FROM defaults))|;

     do_query($form, $dbh, $query, $form->{id});
 
     my $vendornumber      = SL::TransNumber->new(type   => 'vendor',
     do_query($form, $dbh, $query, $form->{id});
 
     my $vendornumber      = SL::TransNumber->new(type   => 'vendor',

diff --git a/SL/DO.pm b/SL/DO.pm
index 75ab8c3f86f858eeea9005c2ba5bc6e8e9282e13..5d406dc2baac246c10cd53c1a4285cd2420097e1 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -227,7 +227,7 @@ sub save {
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 

-    $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id) VALUES (?, '', ?)|;
+    $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1))|;

     do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}));
   }
 
     do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}));
   }
 


@@ -362,7 +362,7 @@ sub save {
              conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
              $form->{transaction_description},
              $form->{type} =~ /^sales/ ? 't' : 'f',
              conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
              $form->{transaction_description},
              $form->{type} =~ /^sales/ ? 't' : 'f',

-             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), substr($form->{currency}, 0, 3),
+             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{currency},

              conv_i($form->{id}));
   do_query($form, $dbh, $query, @values);
 
              conv_i($form->{id}));
   do_query($form, $dbh, $query, @values);
 

diff --git a/SL/Form.pm b/SL/Form.pm
index c4c643751a150680ce53e969f3245d8cc1bd3635..0080dccd8545e36ced33ad84374c9b6dd98f2f14 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2864,7 +2864,7 @@ sub lastname_used {
                     "a.department_id"         => "department_id",
                     "d.description"           => "department",
                     "ct.name"                 => $table,
                     "a.department_id"         => "department_id",
                     "d.description"           => "department",
                     "ct.name"                 => $table,

-                    "cu.name AS curr"         => "currency",
+                    "cu.name"                 => "currency",

                     "current_date + ct.terms" => "duedate",
     );
 
                     "current_date + ct.terms" => "duedate",
     );
 

diff --git a/sql/Pg-upgrade2/currencies.pl b/sql/Pg-upgrade2/currencies.pl
index a89784902fd34f876a0f13e4ff81f99e73567dea..9a4a8fd5e535fb6d8332ad96af658b479664978e 100644 (file)
--- a/sql/Pg-upgrade2/currencies.pl
+++ b/sql/Pg-upgrade2/currencies.pl
@@ -141,11 +141,11 @@ sub create_and_fill_table {
   $self->db_query($query);
 
   #Check wheather defaultcurrency is already in table currencies:
   $self->db_query($query);
 
   #Check wheather defaultcurrency is already in table currencies:

-  $query = qq|SELECT curr FROM currencies WHERE curr = '| . $main::form->{defaultcurrency} . qq|'|;
+  $query = qq|SELECT name FROM currencies WHERE name = '| . $main::form->{defaultcurrency} . qq|'|;

   my ($insert_default) = $self->dbh->selectrow_array($query);
 
   if (!$insert_default) {
   my ($insert_default) = $self->dbh->selectrow_array($query);
 
   if (!$insert_default) {

-    $query = qq|INSERT INTO currencies (curr) VALUES ('| . $main::form->{defaultcurrency} . qq|')|;
+    $query = qq|INSERT INTO currencies (name) VALUES ('| . $main::form->{defaultcurrency} . qq|')|;

     $self->db_query($query);
   }
 
     $self->db_query($query);
   }
 

diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index 825a4b82e614e1fc4d5736da550a62ef394aea9b..ff2d36b90ba672fcfd7b0554078796f8cc5b1305 100644 (file)
--- a/templates/webpages/ct/form_header.html
+++ b/templates/webpages/ct/form_header.html
@@ -233,7 +233,7 @@
       <td>[% L.input_tag('bic', bic, maxlength=100, size=30) %]</td>
       [%- IF ALL_CURRENCIES.size %]
         <th align="right">[% 'Currency' | $T8 %]</th>
       <td>[% L.input_tag('bic', bic, maxlength=100, size=30) %]</td>
       [%- IF ALL_CURRENCIES.size %]
         <th align="right">[% 'Currency' | $T8 %]</th>

-        <td>[% L.select_tag('currency', ALL_CURRENCIES, default = currency, with_empty = 1) %]</td>
+        <td>[% L.select_tag('currency', ALL_CURRENCIES, default = currency) %]</td>

       [%- END %]
      </tr>
 
       [%- END %]
      </tr>