From aa0fece0399b780eae5688a4498d8c982b6a33d4 Mon Sep 17 00:00:00 2001
From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 May 2013 17:05:07 +0200
Subject: [PATCH] =?utf8?q?Behebt=20Bugs=20f=C3=BCr=20W=C3=A4hrungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.
---
 SL/CT.pm                               | 6 +++---
 SL/DO.pm                               | 4 ++--
 SL/Form.pm                             | 2 +-
 sql/Pg-upgrade2/currencies.pl          | 4 ++--
 templates/webpages/ct/form_header.html | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SL/CT.pm b/SL/CT.pm
index bc307098f..39c29b065 100644
--- 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=?|;
-  ($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 =
@@ -276,7 +276,7 @@ sub save_customer {
     $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});
   }
 
@@ -423,7 +423,7 @@ sub save_vendor {
     $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',
diff --git a/SL/DO.pm b/SL/DO.pm
index 75ab8c3f8..5d406dc2b 100644
--- 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|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}));
   }
 
@@ -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->{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);
 
diff --git a/SL/Form.pm b/SL/Form.pm
index c4c643751..0080dccd8 100644
--- 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,
-                    "cu.name AS curr"         => "currency",
+                    "cu.name"                 => "currency",
                     "current_date + ct.terms" => "duedate",
     );
 
diff --git a/sql/Pg-upgrade2/currencies.pl b/sql/Pg-upgrade2/currencies.pl
index a89784902..9a4a8fd5e 100644
--- 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:
-  $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) {
-    $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);
   }
 
diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index 825a4b82e..ff2d36b90 100644
--- 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.select_tag('currency', ALL_CURRENCIES, default = currency, with_empty = 1) %]</td>
+        <td>[% L.select_tag('currency', ALL_CURRENCIES, default = currency) %]</td>
       [%- END %]
      </tr>
 
-- 
2.20.1