From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Thu, 2 May 2013 08:55:07 +0000 (+0200)
Subject: Merge branch 'master' into currency
X-Git-Tag: release-3.1.0beta1~401^2~21^2~12
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/a23454bb1b039a31b7f77710ff663fa9152d530c?ds=inline;hp=-c

Merge branch 'master' into currency

Conflicts:
	locale/de/all
---

a23454bb1b039a31b7f77710ff663fa9152d530c
diff --combined SL/AM.pm
index 86b29d196,c85c47911..e4727047c
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@@ -213,11 -213,8 +213,8 @@@ sub save_account 
        qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice);
    }
  
-   if ($form->{AR_include_in_dropdown}) {
-     $form->{$form->{AR_include_in_dropdown}} = $form->{AR_include_in_dropdown};
-   }
-   if ($form->{AP_include_in_dropdown}) {
-     $form->{$form->{AP_include_in_dropdown}} = $form->{AP_include_in_dropdown};
+   for (qw(AR_include_in_dropdown AP_include_in_dropdown)) {
+     $form->{$form->{$_}} = $form->{$_} if $form->{$_};
    }
  
    $form->{link} = "";
@@@ -265,8 -262,8 +262,8 @@@
    if (!$form->{id} || $form->{id} eq "") {
      $query = qq|SELECT nextval('id')|;
      ($form->{"id"}) = selectrow_query($form, $dbh, $query);
-     $query = qq|INSERT INTO chart (id, accno) VALUES (?, ?)|;
-     do_query($form, $dbh, $query, $form->{"id"}, $form->{"accno"});
+     $query = qq|INSERT INTO chart (id, accno, link) VALUES (?, ?, ?)|;
+     do_query($form, $dbh, $query, $form->{"id"}, $form->{"accno"}, '');
    }
  
    @values = ();
@@@ -1063,6 -1060,10 +1060,6 @@@ sub save_defaults 
    my %accnos;
    map { ($accnos{$_}) = split(m/--/, $form->{$_}) } qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno ar_paid_accno);
  
 -  $form->{curr}  =~ s/ //g;
 -  my @currencies =  grep { $_ ne '' } split m/:/, $form->{curr};
 -  my $currency   =  join ':', @currencies;
 -
    # these defaults are database wide
  
    my $query =
@@@ -1083,8 -1084,10 +1080,9 @@@
          vendornumber       = ?,
          articlenumber      = ?,
          servicenumber      = ?,
+         assemblynumber     = ?,
          sdonumber          = ?,
          pdonumber          = ?,
 -        curr               = ?,
          businessnumber     = ?,
          weightunit         = ?,
          language_id        = ?|;
@@@ -1095,25 -1098,13 +1093,26 @@@
                  $form->{sqnumber},        $form->{rfqnumber},
                  $form->{customernumber},  $form->{vendornumber},
                  $form->{articlenumber},   $form->{servicenumber},
+                 $form->{assemblynumber},
                  $form->{sdonumber},       $form->{pdonumber},
 -                $currency,
                  $form->{businessnumber},  $form->{weightunit},
                  conv_i($form->{language_id}));
    do_query($form, $dbh, $query, @values);
  
 +  $main::lxdebug->message(0, "es gibt rowcount: " . $form->{rowcount});
 +
 +  for my $i (1..$form->{rowcount}) {
 +    if ($form->{"curr_$i"} ne $form->{"old_curr_$i"}) {
 +      $query = qq|UPDATE currencies SET curr = '| . $form->{"curr_$i"} . qq|' WHERE curr = '| . $form->{"old_curr_$i"} . qq|'|;
 +      do_query($form, $dbh, $query);
 +    }
 +  }
 +
 +  if (length($form->{new_curr}) > 0) {
 +    $query = qq|INSERT INTO currencies (curr) VALUES ('| . $form->{new_curr} . qq|')|;
 +    do_query($form, $dbh, $query);
 +  }
 +
    $dbh->commit();
  
    $main::lxdebug->leave_sub();
@@@ -1127,7 -1118,7 +1126,7 @@@ sub save_preferences 
  
    my $dbh = $form->get_standard_dbh($myconfig);
  
 -  my ($currency, $businessnumber) = selectrow_query($form, $dbh, qq|SELECT curr, businessnumber FROM defaults|);
 +  my ($businessnumber) = selectrow_query($form, $dbh, qq|SELECT businessnumber FROM defaults|);
  
    # update name
    my $query = qq|UPDATE employee SET name = ? WHERE login = ?|;
@@@ -1135,6 -1126,10 +1134,6 @@@
  
    my $rc = $dbh->commit();
  
 -  # save first currency in myconfig
 -  $currency               =~ s/:.*//;
 -  $form->{currency}       =  $currency;
 -
    $form->{businessnumber} =  $businessnumber;
  
    $myconfig = User->new(login => $form->{login});
@@@ -1291,28 -1286,6 +1290,28 @@@ sub defaultaccounts 
    }
  
    $sth->finish;
 +
 +  #Get currencies:
 +  $query = qq|SELECT curr FROM currencies ORDER BY id|;
 +
 +  $form->{CURRENCIES} = [];
 +
 +  $sth = prepare_execute_query($form, $dbh, $query);
 +  $sth->execute || $form->dberror($query);
 +  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
 +    push @{ $form->{ CURRENCIES } } , $ref;
 +  }
 +  $sth->finish;
 +
 +  #Which of them is the default currency?
 +  $query = qq|SELECT curr AS defaultcurrency FROM currencies WHERE id = (SELECT curr FROM defaults LIMIT 1);|;
 +  $sth   = $dbh->prepare($query);
 +  $sth->execute || $form->dberror($query);
 +
 +  $form->{defaultcurrency}               = ($sth->fetchrow_hashref("NAME_lc"))->{defaultcurrency};
 +
 +  $sth->finish;
 +
    $dbh->disconnect;
  
    $main::lxdebug->leave_sub();
@@@ -1744,7 -1717,7 +1743,7 @@@ sub taxes 
                     (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber,
                     (SELECT description FROM chart WHERE id = chart_id) AS account_description
                   FROM tax t
-                  ORDER BY taxkey|;
+                  ORDER BY taxkey, rate|;
  
    my $sth = $dbh->prepare($query);
    $sth->execute || $form->dberror($query);
@@@ -1804,6 -1777,7 +1803,7 @@@ sub get_tax 
                     taxdescription,
                     round(rate * 100, 2) AS rate,
                     chart_id,
+                    chart_categories,
                     (id IN (SELECT tax_id
                             FROM acc_trans)) AS tax_already_used
                   FROM tax
@@@ -1861,14 -1835,23 +1861,23 @@@ sub save_tax 
  
    $form->{rate} = $form->{rate} / 100;
  
-   my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id} );
+   my $chart_categories = '';
+   $chart_categories .= 'A' if $form->{asset};
+   $chart_categories .= 'L' if $form->{liability};
+   $chart_categories .= 'Q' if $form->{equity};
+   $chart_categories .= 'I' if $form->{revenue};
+   $chart_categories .= 'E' if $form->{expense};
+   $chart_categories .= 'C' if $form->{costs};
+ 
+   my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id}, $chart_categories);
    if ($form->{id} ne "") {
      $query = qq|UPDATE tax SET
                    taxkey         = ?,
                    taxdescription = ?,
                    rate           = ?,
                    chart_id       = ?,
-                   taxnumber      = (SELECT accno FROM chart WHERE id= ? )
+                   taxnumber      = (SELECT accno FROM chart WHERE id= ? ),
+                   chart_categories = ?
                  WHERE id = ?|;
      push(@values, $form->{id});
  
@@@ -1879,9 -1862,10 +1888,10 @@@
                    taxdescription,
                    rate,
                    chart_id,
-                   taxnumber
+                   taxnumber,
+                   chart_categories
                  )
-                 VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?) )|;
+                 VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ? )|;
    }
    do_query($form, $dbh, $query, @values);
  
diff --combined SL/DO.pm
index a12fac14b,15e16cc16..2eb93376f
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@@ -348,7 -348,7 +348,7 @@@ sub save 
           shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
           delivered = ?, department_id = ?, language_id = ?, shipto_id = ?,
           globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
 -         is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, curr = ?
 +         is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, curr = (SELECT id FROM currencies WHERE curr = ?)
         WHERE id = ?|;
  
    @values = ($form->{donumber}, $form->{ordnumber},
@@@ -616,7 -616,7 +616,7 @@@ sub retrieve 
           d.description AS department, dord.language_id,
           dord.shipto_id,
           dord.globalproject_id, dord.delivered, dord.transaction_description,
 -         dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr AS currency
 +         dord.taxzone_id, dord.taxincluded, dord.terms, (SELECT cu.curr FROM currencies cu WHERE cu.id=dord.curr) AS currency
         FROM delivery_orders dord
         JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
         LEFT JOIN employee e ON (dord.employee_id = e.id)
@@@ -638,6 -638,9 +638,6 @@@
    }
    $sth->finish();
  
 -  # remove any trailing whitespace
 -  $form->{currency} =~ s/\s*$//;
 -
    $form->{donumber_array} =~ s/\s*$//g;
  
    $form->{saved_donumber} = $form->{donumber};
@@@ -737,10 -740,7 +737,7 @@@
  sub order_details {
    $main::lxdebug->enter_sub();
  
-   my ($self)   = @_;
- 
-   my $myconfig = \%main::myconfig;
-   my $form     = $main::form;
+   my ($self, $myconfig, $form) = @_;
  
    # connect to database
    my $dbh = $form->get_standard_dbh($myconfig);
@@@ -805,7 -805,7 +802,7 @@@
    my $ic_cvar_configs = CVar->get_configs(module => 'IC');
  
    $form->{TEMPLATE_ARRAYS} = { };
-   IC->prepare_parts_for_printing();
+   IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
  
    my @arrays =
      qw(runningnumber number description longdescription qty unit
diff --combined SL/Form.pm
index 98a8b5e9a,7b5d257b8..c2385ce79
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -62,6 -62,7 +62,7 @@@ use SL::Mailer
  use SL::Menu;
  use SL::MoreCommon qw(uri_encode uri_decode);
  use SL::OE;
+ use SL::PrefixedNumber;
  use SL::Request;
  use SL::Template;
  use SL::User;
@@@ -470,11 -471,11 +471,11 @@@ sub header 
      main menu list_accounts jquery.autocomplete
      jquery.multiselect2side frame_header/header
      ui-lightness/jquery-ui
-     jquery-ui.custom
+     jquery-ui.custom jqModal
    );
  
    $layout->use_javascript("$_.js") for (qw(
-     jquery jquery-ui jquery.cookie jqModal jquery.checkall
+     jquery jquery-ui jquery.cookie jqModal jquery.checkall jquery.download
      common part_selection switchmenuframe
    ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
  
@@@ -997,7 -998,6 +998,6 @@@ sub parse_template 
      $ext_for_format = $self->{"format"} =~ m/pdf/ ? 'pdf' : 'odt';
  
    } elsif ($self->{"format"} =~ /(postscript|pdf)/i) {
-     $ENV{"TEXINPUTS"} = ".:" . getcwd() . "/" . $myconfig->{"templates"} . ":" . $ENV{"TEXINPUTS"};
      $template_type    = 'LaTeX';
      $ext_for_format   = 'pdf';
  
@@@ -1490,9 -1490,11 +1490,9 @@@ sub update_exchangerate 
      $main::lxdebug->leave_sub();
      return;
    }
 -  $query = qq|SELECT curr FROM defaults|;
 -
 -  my ($currency) = selectrow_query($self, $dbh, $query);
 -  my ($defaultcurrency) = split m/:/, $currency;
 +  $query = qq|SELECT curr FROM currencies WHERE id=(SELECT curr FROM defaults)|;
  
 +  my ($defaultcurrency) = selectrow_query($self, $dbh, $query);
  
    if ($curr eq $defaultcurrency) {
      $main::lxdebug->leave_sub();
@@@ -1500,7 -1502,7 +1500,7 @@@
    }
  
    $query = qq|SELECT e.curr FROM exchangerate e
 -                 WHERE e.curr = ? AND e.transdate = ?
 +                 WHERE e.curr = (SELECT cu.id FROM currencies cu WHERE cu.curr=?) AND e.transdate = ?
                   FOR UPDATE|;
    my $sth = prepare_execute_query($self, $dbh, $query, $curr, $transdate);
  
@@@ -1526,12 -1528,12 +1526,12 @@@
    if ($sth->fetchrow_array) {
      $query = qq|UPDATE exchangerate
                  SET $set
 -                WHERE curr = ?
 +                WHERE curr = (SELECT id FROM currencies WHERE curr = ?)
                  AND transdate = ?|;
  
    } else {
      $query = qq|INSERT INTO exchangerate (curr, buy, sell, transdate)
 -                VALUES (?, $buy, $sell, ?)|;
 +                VALUES ((SELECT id FROM currencies WHERE curr = ?), $buy, $sell, ?)|;
    }
    $sth->finish;
    do_query($self, $dbh, $query, $curr, $transdate);
@@@ -1571,17 -1573,18 +1571,17 @@@ sub get_exchangerate 
      return 1;
    }
  
 -  $query = qq|SELECT curr FROM defaults|;
 +  $query = qq|SELECT curr FROM currencies WHERE id = (SELECT curr FROM defaults)|;
  
 -  my ($currency) = selectrow_query($self, $dbh, $query);
 -  my ($defaultcurrency) = split m/:/, $currency;
 +  my ($defaultcurrency) = selectrow_query($self, $dbh, $query);
  
 -  if ($currency eq $defaultcurrency) {
 +  if ($curr eq $defaultcurrency) {
      $main::lxdebug->leave_sub();
      return 1;
    }
  
    $query = qq|SELECT e.$fld FROM exchangerate e
 -                 WHERE e.curr = ? AND e.transdate = ?|;
 +                 WHERE e.curr = (SELECT id FROM currencies WHERE curr = ?) AND e.transdate = ?|;
    my ($exchangerate) = selectrow_query($self, $dbh, $query, $curr, $transdate);
  
  
@@@ -1614,7 -1617,7 +1614,7 @@@ sub check_exchangerate 
  
    my $dbh   = $self->get_standard_dbh($myconfig);
    my $query = qq|SELECT e.$fld FROM exchangerate e
 -                 WHERE e.curr = ? AND e.transdate = ?|;
 +                 WHERE e.curr = (SELECT id FROM currencies WHERE curr = ?) AND e.transdate = ?|;
  
    my ($exchangerate) = selectrow_query($self, $dbh, $query, $currency, $transdate);
  
@@@ -1629,16 -1632,11 +1629,16 @@@ sub get_all_currencies 
    my $self     = shift;
    my $myconfig = shift || \%::myconfig;
    my $dbh      = $self->get_standard_dbh($myconfig);
 +  my @currencies =();
  
 -  my $query = qq|SELECT curr FROM defaults|;
 +  my $query = qq|SELECT curr FROM currencies|;
  
 -  my ($curr)     = selectrow_query($self, $dbh, $query);
 -  my @currencies = grep { $_ } map { s/\s//g; $_ } split m/:/, $curr;
 +  my $sth = prepare_execute_query($self, $dbh, $query);
 +
 +  while (my $ref = $sth->fetchrow_hashref()) {
 +    push(@currencies, $ref->{curr});
 +  }
 +  $sth->finish;
  
    $main::lxdebug->leave_sub();
  
@@@ -1649,14 -1647,11 +1649,14 @@@ sub get_default_currency 
    $main::lxdebug->enter_sub();
  
    my ($self, $myconfig) = @_;
 -  my @currencies        = $self->get_all_currencies($myconfig);
 +  my $dbh      = $self->get_standard_dbh($myconfig);
 +  my $query = qq|SELECT curr FROM currencies WHERE id = (SELECT curr FROM defaults)|;
 +
 +  my ($defaultcurrency) = selectrow_query($self, $dbh, $query);
  
    $main::lxdebug->leave_sub();
  
 -  return $currencies[0];
 +  return $defaultcurrency;
  }
  
  sub set_payment_options {
@@@ -2111,7 -2106,7 +2111,7 @@@ sub _get_taxcharts 
  
    my $where = @where ? ' WHERE ' . join(' AND ', map { "($_)" } @where) : '';
  
-   my $query = qq|SELECT * FROM tax $where ORDER BY taxkey|;
+   my $query = qq|SELECT * FROM tax $where ORDER BY taxkey, rate|;
  
    $self->{$key} = selectall_hashref_query($self, $dbh, $query);
  
@@@ -2196,7 -2191,9 +2196,7 @@@ $main::lxdebug->enter_sub()
  
    $key = "all_currencies" unless ($key);
  
 -  my $query = qq|SELECT curr AS currency FROM defaults|;
 -
 -  $self->{$key} = [split(/\:/ , selectfirst_hashref_query($self, $dbh, $query)->{currency})];
 +  $self->{$key} = [$self->get_all_currencies()];
  
    $main::lxdebug->leave_sub();
  }
@@@ -2707,7 -2704,7 +2707,7 @@@ sub create_links 
      $query =
        qq|SELECT
             a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid,
 -           a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
 +           a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.curr FROM currencies cu WHERE cu.id=a.curr) AS currency, a.notes,
             a.intnotes, a.department_id, a.amount AS oldinvtotal,
             a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
             a.globalproject_id, ${extra_columns}
@@@ -2725,6 -2722,9 +2725,6 @@@
        $self->{$key} = $ref->{$key};
      }
  
 -    # remove any trailing whitespace
 -    $self->{currency} =~ s/\s*$//;
 -
      my $transdate = "current_date";
      if ($self->{transdate}) {
        $transdate = $dbh->quote($self->{transdate});
@@@ -2808,11 -2808,9 +2808,11 @@@
      }
  
      $sth->finish;
 +    #check das:
      $query =
        qq|SELECT
 -           d.curr AS currencies, d.closedto, d.revtrans,
 +           d.closedto, d.revtrans,
 +           (SELECT cu.curr FROM currencies cu WHERE cu.id=d.curr) AS defaultcurrency,
             (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
             (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno
           FROM defaults d|;
@@@ -2824,8 -2822,7 +2824,8 @@@
      # get date
      $query =
         qq|SELECT
 -            current_date AS transdate, d.curr AS currencies, d.closedto, d.revtrans,
 +            current_date AS transdate, d.closedto, d.revtrans,
 +            (SELECT cu.curr FROM currencies cu WHERE cu.id=d.curr) AS defaultcurrency,
              (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
              (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno
            FROM defaults d|;
@@@ -2835,7 -2832,7 +2835,7 @@@
      if ($self->{"$self->{vc}_id"}) {
  
        # only setup currency
 -      ($self->{currency}) = split(/:/, $self->{currencies}) if !$self->{currency};
 +      ($self->{currency}) = $self->{defaultcurrency} if !$self->{currency};
  
      } else {
  
@@@ -2860,17 -2857,19 +2860,17 @@@ sub lastname_used 
    my ($arap, $where);
  
    $table         = $table eq "customer" ? "customer" : "vendor";
 -  my %column_map = ("a.curr"                  => "currency",
 -                    "a.${table}_id"           => "${table}_id",
 +  my %column_map = ("a.${table}_id"           => "${table}_id",
                      "a.department_id"         => "department_id",
                      "d.description"           => "department",
                      "ct.name"                 => $table,
 -                    "ct.curr"                 => "cv_curr",
 +                    "cu.curr"                 => "currency",
                      "current_date + ct.terms" => "duedate",
      );
  
    if ($self->{type} =~ /delivery_order/) {
      $arap  = 'delivery_orders';
 -    delete $column_map{"a.curr"};
 -    delete $column_map{"ct.curr"};
 +    delete $column_map{"cu.currency"};
  
    } elsif ($self->{type} =~ /_order/) {
      $arap  = 'oe';
@@@ -2899,12 -2898,18 +2899,12 @@@
                          FROM $arap a
                          LEFT JOIN $table     ct ON (a.${table}_id = ct.id)
                          LEFT JOIN department d  ON (a.department_id = d.id)
 +                        LEFT JOIN currencies cu ON (cu.id=ct.curr)
                          WHERE a.id = ?|;
    my $ref          = selectfirst_hashref_query($self, $dbh, $query, $trans_id);
  
    map { $self->{$_} = $ref->{$_} } values %column_map;
  
 -  # remove any trailing whitespace
 -  $self->{currency} =~ s/\s*$// if $self->{currency};
 -  $self->{cv_curr} =~ s/\s*$// if $self->{cv_curr};
 -
 -  # if customer/vendor currency is set use this
 -  $self->{currency} = $self->{cv_curr} if $self->{cv_curr};
 -
    $main::lxdebug->leave_sub();
  }
  
@@@ -3184,15 -3189,8 +3184,8 @@@ sub update_defaults 
    my ($var) = $sth->fetchrow_array;
    $sth->finish;
  
-   if ($var =~ m/\d+$/) {
-     my $new_var  = (substr $var, $-[0]) * 1 + 1;
-     my $len_diff = length($var) - $-[0] - length($new_var);
-     $var         = substr($var, 0, $-[0]) . ($len_diff > 0 ? '0' x $len_diff : '') . $new_var;
- 
-   } else {
-     $var = $var . '1';
-   }
- 
+   $var   = 0 if !defined($var) || ($var eq '');
+   $var   = SL::PrefixedNumber->new(number => $var)->get_next;
    $query = qq|UPDATE defaults SET $fld = ?|;
    do_query($self, $dbh, $query, $var);
  
@@@ -3409,7 -3407,7 +3402,7 @@@ sub prepare_for_printing 
    IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});
  
    if ($self->{type} =~ /_delivery_order$/) {
-     DO->order_details();
+     DO->order_details(\%::myconfig, $self);
    } elsif ($self->{type} =~ /sales_order|sales_quotation|request_quotation|purchase_order/) {
      OE->order_details(\%::myconfig, $self);
    } else {
diff --combined SL/IR.pm
index d52641e86,73b3e14ed..0179d6e78
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@@ -57,7 -57,6 +57,7 @@@ sub post_invoice 
    # connect to database, turn off autocommit
    my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
    $form->{defaultcurrency} = $form->get_default_currency($myconfig);
 +  my $defaultcurrency = $form->{defaultcurrency};
  
    my $ic_cvar_configs = CVar->get_configs(module => 'IC',
                                            dbh    => $dbh);
@@@ -71,16 -70,18 +71,16 @@@
  
    my $all_units = AM->retrieve_units($myconfig, $form);
  
 +#markierung
    if (!$payments_only) {
      if ($form->{id}) {
        &reverse_invoice($dbh, $form);
      } else {
        ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
 -      do_query($form, $dbh, qq|INSERT INTO ap (id, invnumber) VALUES (?, '')|, $form->{id});
 +      do_query($form, $dbh, qq|INSERT INTO ap (id, invnumber, curr) VALUES (?, '', (SELECT id FROM currencies WHERE curr=?))|, $form->{id}, $form->{currency});
      }
    }
  
 -  my ($currencies)    = selectfirst_array_query($form, $dbh, qq|SELECT curr FROM defaults|);
 -  my $defaultcurrency = (split m/:/, $currencies)[0];
 -
    if ($form->{currency} eq $defaultcurrency) {
      $form->{exchangerate} = 1;
    } else {
@@@ -215,14 -216,16 +215,16 @@@
  
        # check if we sold the item already and
        # make an entry for the expense and inventory
+       my $taxzone = $form->{taxzone_id} * 1;
        $query =
          qq|SELECT i.id, i.qty, i.allocated, i.trans_id, i.base_qty,
-              p.inventory_accno_id, p.expense_accno_id, a.transdate
-            FROM invoice i, ar a, parts p
+              bg.inventory_accno_id, bg.expense_accno_id_${taxzone} AS expense_accno_id, a.transdate
+            FROM invoice i, ar a, parts p, buchungsgruppen bg
             WHERE (i.parts_id = p.id)
               AND (i.parts_id = ?)
               AND ((i.base_qty + i.allocated) > 0)
               AND (i.trans_id = a.id)
+              AND (p.buchungsgruppen_id = bg.id)
             ORDER BY transdate|;
             # ORDER BY transdate guarantees FIFO
  
@@@ -268,7 -271,7 +270,7 @@@
  
              # allocated >= 0
              # add entry for inventory, this one is for the sold item
-             $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?,
+             $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id, chart_link) VALUES (?, ?, ?, ?,
                                 (SELECT taxkey_id
                                  FROM taxkeys
                                  WHERE chart_id= ?
@@@ -279,13 -282,13 +281,13 @@@
                                  WHERE chart_id= ?
                                  AND startdate <= ?
                                  ORDER BY startdate DESC LIMIT 1),
-                                (SELECT chart_link FROM chart WHERE id = ?))|;
+                                (SELECT link FROM chart WHERE id = ?))|;
              @values = ($ref->{trans_id},  $ref->{inventory_accno_id}, $linetotal, $ref->{transdate}, $ref->{inventory_accno_id}, $ref->{transdate}, $ref->{inventory_accno_id}, $ref->{transdate},
                         $ref->{inventory_accno_id});
              do_query($form, $dbh, $query, @values);
  
  # add expense
-             $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?,
+             $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id, chart_link) VALUES (?, ?, ?, ?,
                                  (SELECT taxkey_id
                                   FROM taxkeys
                                   WHERE chart_id= ?
@@@ -296,7 -299,7 +298,7 @@@
                                   WHERE chart_id= ?
                                   AND startdate <= ?
                                   ORDER BY startdate DESC LIMIT 1),
-                                 (SELECT chart_link FROM chart WHERE id = ?))|;
+                                 (SELECT link FROM chart WHERE id = ?))|;
              @values = ($ref->{trans_id},  $ref->{expense_accno_id}, ($linetotal * -1), $ref->{transdate}, $ref->{expense_accno_id}, $ref->{transdate}, $ref->{expense_accno_id}, $ref->{transdate},
                         $ref->{expense_accno_id});
              do_query($form, $dbh, $query, @values);
@@@ -683,7 -686,7 +685,7 @@@
                  orddate      = ?, quodate     = ?, vendor_id     = ?, amount      = ?,
                  netamount    = ?, paid        = ?, duedate       = ?,
                  invoice      = ?, taxzone_id  = ?, notes         = ?, taxincluded = ?,
 -                intnotes     = ?, curr        = ?, storno_id     = ?, storno      = ?,
 +                intnotes     = ?, storno_id   = ?, storno        = ?,
                  cp_id        = ?, employee_id = ?, department_id = ?,
                  globalproject_id = ?, direct_debit = ?
                WHERE id = ?|;
@@@ -692,7 -695,7 +694,7 @@@
        conv_date($form->{orddate}), conv_date($form->{quodate}),     conv_i($form->{vendor_id}),               $amount,
                  $netamount,                  $form->{paid},      conv_date($form->{duedate}),
              '1',                             $taxzone_id,                  $form->{notes},          $form->{taxincluded} ? 't' : 'f',
 -                $form->{intnotes},           $form->{currency},     conv_i($form->{storno_id}),     $form->{storno}      ? 't' : 'f',
 +                $form->{intnotes},           conv_i($form->{storno_id}),     $form->{storno}      ? 't' : 'f',
           conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}),
           conv_i($form->{globalproject_id}),
                  $form->{direct_debit} ? 't' : 'f',
@@@ -921,7 -924,8 +923,7 @@@ sub retrieve_invoice 
                 (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id)    AS income_accno,
                 (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id)   AS expense_accno,
                 (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id)    AS fxgain_accno,
 -               (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno,
 -               d.curr AS currencies
 +               (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno
                 $q_invdate
                 FROM defaults d|;
    $ref = selectfirst_hashref_query($form, $dbh, $query);
@@@ -938,12 -942,15 +940,12 @@@
    $query = qq|SELECT cp_id, invnumber, transdate AS invdate, duedate,
                  orddate, quodate, globalproject_id,
                  ordnumber, quonumber, paid, taxincluded, notes, taxzone_id, storno, gldate,
 -                intnotes, curr AS currency, direct_debit
 +                intnotes, (SELECT cu.curr FROM currencies cu WHERE cu.id=ap.curr) AS currency, direct_debit
                FROM ap
                WHERE id = ?|;
    $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
    map { $form->{$_} = $ref->{$_} } keys %$ref;
  
 -  # remove any trailing whitespace
 -  $form->{currency} =~ s/\s*$//;
 -
    $form->{exchangerate}  = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
  
    # get shipto
@@@ -1085,7 -1092,7 +1087,7 @@@ sub get_vendor 
           v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount,
           v.creditlimit, v.terms, v.notes AS intnotes,
           v.email, v.cc, v.bcc, v.language_id, v.payment_id,
 -         v.street, v.zipcode, v.city, v.country, v.taxzone_id, v.curr, v.direct_debit,
 +         v.street, v.zipcode, v.city, v.country, v.taxzone_id, (SELECT cu.curr FROM currencies cu WHERE cu.id=v.curr) AS curr, v.direct_debit,
           $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
           b.description AS business
         FROM vendor v
@@@ -1095,8 -1102,11 +1097,8 @@@
    my $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
    map { $params->{$_} = $ref->{$_} } keys %$ref;
  
 -  # remove any trailing whitespace
 -  $form->{curr} =~ s/\s*$//;
 -
 -  # use vendor currency if not empty
 -  $form->{currency} = $form->{curr} if $form->{curr};
 +  # use vendor currency
 +  $form->{currency} = $form->{curr};
  
    $params->{creditremaining} = $params->{creditlimit};
  
@@@ -1210,7 -1220,9 +1212,9 @@@ sub retrieve_item 
  
    my $transdate = "";
    if ($form->{type} eq "invoice") {
-     $transdate = $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";
+     $transdate = $form->{deliverydate} ? $dbh->quote($form->{deliverydate}) 
+                : $form->{invdate} ? $dbh->quote($form->{invdate}) 
+                : "current_date";
    } else {
      $transdate = $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
    }
@@@ -1380,7 -1392,7 +1384,7 @@@ sub vendor_details 
    # fax and phone and email as vendor*
    my $query =
      qq|SELECT ct.*, cp.*, ct.notes as vendornotes, phone as vendorphone, fax as vendorfax, email as vendoremail,
 -         ct.curr AS currency
 +         (SELECT cu.curr FROM currencies cu WHERE cu.id=ct.curr) AS currency
         FROM vendor ct
         LEFT JOIN contacts cp ON (ct.id = cp.cp_cv_id)
         WHERE (ct.id = ?) $contact
@@@ -1399,6 -1411,8 +1403,6 @@@
    }
  
    map { $form->{$_} = $ref->{$_} } keys %$ref;
 -  # remove any trailing whitespace
 -  $form->{currency} =~ s/\s*$// if ($form->{currency});
  
    my $custom_variables = CVar->get_custom_variables('dbh'      => $dbh,
                                                      'module'   => 'CT',
diff --combined SL/IS.pm
index cd4461891,ce8db64b9..c5147b1af
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@@ -144,7 -144,7 +144,7 @@@ sub invoice_details 
  
    $form->{discount} = [];
  
-   IC->prepare_parts_for_printing();
+   IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
  
    my $ic_cvar_configs = CVar->get_configs(module => 'IC');
  
@@@ -458,7 -458,7 +458,7 @@@ sub customer_details 
    my $query =
      qq|SELECT ct.*, cp.*, ct.notes as customernotes,
           ct.phone AS customerphone, ct.fax AS customerfax, ct.email AS customeremail,
 -         ct.curr AS currency
 +         (SELECT cu.curr FROM currencies cu WHERE cu.id=ct.curr) AS currency
         FROM customer ct
         LEFT JOIN contacts cp on ct.id = cp.cp_cv_id
         WHERE (ct.id = ?) $where
@@@ -478,6 -478,9 +478,6 @@@
  
    map { $form->{$_} = $ref->{$_} } keys %$ref;
  
 -  # remove any trailing whitespace
 -  $form->{currency} =~ s/\s*$// if ($form->{currency});
 -
    if ($form->{delivery_customer_id}) {
      $query =
        qq|SELECT *, notes as customernotes
@@@ -533,8 -536,6 +533,8 @@@ sub post_invoice 
    }
  
    $form->{defaultcurrency} = $form->get_default_currency($myconfig);
 +  my $defaultcurrency = $form->{defaultcurrency};
 +
    # Seit neuestem wird die department_id schon übergeben UND $form->department nicht mehr
    # korrekt zusammengebaut. Sehr wahrscheinlich beim Umstieg auf T8 kaputt gegangen
    # Ich lass den Code von 2005 erstmal noch stehen ;-) jb 03-2011
@@@ -555,8 -556,8 +555,8 @@@
        $query = qq|SELECT nextval('glid')|;
        ($form->{"id"}) = selectrow_query($form, $dbh, $query);
  
 -      $query = qq|INSERT INTO ar (id, invnumber) VALUES (?, ?)|;
 -      do_query($form, $dbh, $query, $form->{"id"}, $form->{"id"});
 +      $query = qq|INSERT INTO ar (id, invnumber, curr) VALUES (?, ?, (SELECT id FROM currencies WHERE curr=?))|;
 +      do_query($form, $dbh, $query, $form->{"id"}, $form->{"id"}, $form->{currency});
  
        if (!$form->{invnumber}) {
          $form->{invnumber} =
@@@ -569,6 -570,9 +569,6 @@@
    my ($netamount, $invoicediff) = (0, 0);
    my ($amount, $linetotal, $lastincomeaccno);
  
 -  my ($currencies)    = selectfirst_array_query($form, $dbh, qq|SELECT curr FROM defaults|);
 -  my $defaultcurrency = (split m/:/, $currencies)[0];
 -
    if ($form->{currency} eq $defaultcurrency) {
      $form->{exchangerate} = 1;
    } else {
@@@ -817,7 -821,7 +817,7 @@@
    }
  
    $project_id = conv_i($form->{"globalproject_id"});
- 
+   # entsprechend auch beim Bestimmen des Steuerschlüssels in Taxkey.pm berücksichtigen
    my $taxdate = $form->{deliverydate} ? $form->{deliverydate} : $form->{invdate};
  
    foreach my $trans_id (keys %{ $form->{amount_cogs} }) {
@@@ -1081,8 -1085,7 +1081,8 @@@
                  amount      = ?, netamount     = ?, paid          = ?,
                  duedate     = ?, deliverydate  = ?, invoice       = ?, shippingpoint = ?,
                  shipvia     = ?, terms         = ?, notes         = ?, intnotes      = ?,
 -                curr        = ?, department_id = ?, payment_id    = ?, taxincluded   = ?,
 +                curr        = (SELECT id FROM currencies WHERE curr= ?),
 +                department_id = ?, payment_id    = ?, taxincluded   = ?,
                  type        = ?, language_id   = ?, taxzone_id    = ?, shipto_id     = ?,
                  employee_id = ?, salesman_id   = ?, storno_id     = ?, storno        = ?,
                  cp_id       = ?, marge_total   = ?, marge_percent = ?,
@@@ -1555,7 -1558,8 +1555,7 @@@ sub retrieve_invoice 
           (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id)    AS income_accno,
           (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id)   AS expense_accno,
           (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id)    AS fxgain_accno,
 -         (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno,
 -         d.curr AS currencies
 +         (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno
           ${query_transdate}
         FROM defaults d|;
  
@@@ -1574,7 -1578,7 +1574,7 @@@
             a.orddate, a.quodate, a.globalproject_id,
             a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
             a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
 -           a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
 +           a.duedate, a.taxincluded, (SELECT cu.curr FROM currencies cu WHERE cu.id=a.curr) AS currency, a.shipto_id, a.cp_id,
             a.employee_id, a.salesman_id, a.payment_id,
             a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
             a.transaction_description, a.donumber, a.invnumber_for_credit_note,
@@@ -1586,6 -1590,9 +1586,6 @@@
      $ref = selectfirst_hashref_query($form, $dbh, $query, $id);
      map { $form->{$_} = $ref->{$_} } keys %{ $ref };
  
 -    # remove any trailing whitespace
 -    $form->{currency} =~ s/\s*$//;
 -
      $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
  
      # get shipto
@@@ -1750,7 -1757,7 +1750,7 @@@ sub get_customer 
           c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit, c.terms,
           c.email, c.cc, c.bcc, c.language_id, c.payment_id,
           c.street, c.zipcode, c.city, c.country,
 -         c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, c.curr,
 +         c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, (SELECT cu.curr FROM currencies cu WHERE cu.id=c.curr) AS curr,
           c.taxincluded_checked, c.direct_debit,
           $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
           b.discount AS tradediscount, b.description AS business
@@@ -1765,8 -1772,11 +1765,8 @@@
  
    map { $form->{$_} = $ref->{$_} } keys %$ref;
  
 -  # remove any trailing whitespace
 -  $form->{curr} =~ s/\s*$//;
 -
 -  # use customer currency if not empty
 -  $form->{currency} = $form->{curr} if $form->{curr};
 +  # use customer currency
 +  $form->{currency} = $form->{curr};
  
    $query =
      qq|SELECT sum(amount - paid) AS dunning_amount
diff --combined SL/OE.pm
index 5c1ecd7eb,3b3845c50..c5a8c26ae
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@@ -311,7 -311,7 +311,7 @@@ sub save 
      $query = qq|SELECT nextval('id')|;
      ($form->{id}) = selectrow_query($form, $dbh, $query);
  
 -    $query = qq|INSERT INTO oe (id, ordnumber, employee_id) VALUES (?, '', ?)|;
 +    $query = qq|INSERT INTO oe (id, ordnumber, employee_id, curr) VALUES (?, '', ?, (SELECT curr FROM defaults))|;
      do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
    }
  
@@@ -494,7 -494,7 +494,7 @@@
      qq|UPDATE oe SET
           ordnumber = ?, quonumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?,
           customer_id = ?, amount = ?, netamount = ?, reqdate = ?, taxincluded = ?,
 -         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?,
 +         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = (SELECT id FROM currencies WHERE curr=?), closed = ?,
           delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?,
           taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?,
           globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, marge_total = ?, marge_percent = ?
@@@ -506,7 -506,7 +506,7 @@@
               $amount, $netamount, conv_date($reqdate),
               $form->{taxincluded} ? 't' : 'f', $form->{shippingpoint},
               $form->{shipvia}, $form->{notes}, $form->{intnotes},
 -             substr($form->{currency}, 0, 3), $form->{closed} ? 't' : 'f',
 +             $form->{currency}, $form->{closed} ? 't' : 'f',
               $form->{delivered} ? "t" : "f", $form->{proforma} ? 't' : 'f',
               $quotation, conv_i($form->{department_id}),
               conv_i($form->{language_id}), conv_i($form->{taxzone_id}),
@@@ -759,13 -759,14 +759,13 @@@ sub retrieve 
                       (SELECT c.accno FROM chart c WHERE d.income_accno_id    = c.id) AS income_accno,
                       (SELECT c.accno FROM chart c WHERE d.expense_accno_id   = c.id) AS expense_accno,
                       (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id    = c.id) AS fxgain_accno,
 -                     (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id    = c.id) AS fxloss_accno,
 -              d.curr AS currencies
 +                     (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id    = c.id) AS fxloss_accno
                $query_add
                FROM defaults d|;
    my $ref = selectfirst_hashref_query($form, $dbh, $query);
    map { $form->{$_} = $ref->{$_} } keys %$ref;
  
 -  ($form->{currency}) = split(/:/, $form->{currencies}) unless ($form->{currency});
 +  $form->{currency} = $form->get_default_currency($myconfig);
  
    # set reqdate if this is an invoice->order conversion. If someone knows a better check to ensure
    # we come from invoices, feel free.
@@@ -784,7 -785,7 +784,7 @@@
      $query =
        qq|SELECT o.cp_id, o.ordnumber, o.transdate, o.reqdate,
             o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes,
 -           o.curr AS currency, e.name AS employee, o.employee_id, o.salesman_id,
 +           (SELECT cu.curr FROM currencies cu WHERE cu.id=o.curr) AS currency, e.name AS employee, o.employee_id, o.salesman_id,
             o.${vc}_id, cv.name AS ${vc}, o.amount AS invtotal,
             o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
             d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
@@@ -806,6 -807,9 +806,6 @@@
      if ($ref) {
        map { $form->{$_} = $ref->{$_} } keys %$ref;
  
 -      # remove any trailing whitespace
 -      $form->{currency} =~ s/\s*$//;
 -
        $form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"};
  
        # set all entries for multiple ids blank that yield different information
@@@ -1107,7 -1111,7 +1107,7 @@@ sub order_details 
    $form->{discount} = [];
  
    $form->{TEMPLATE_ARRAYS} = { };
-   IC->prepare_parts_for_printing();
+   IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
  
    my $ic_cvar_configs = CVar->get_configs(module => 'IC');
  
diff --combined bin/mozilla/ic.pl
index 17d589f56,222a4d1d5..8200b0110
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@@ -1489,7 -1489,8 +1489,7 @@@ sub link_part 
    IC->create_links("IC", \%myconfig, \%$form);
  
    # currencies
 -  map({ $form->{selectcurrency} .= "<option>$_\n" }
 -      split(/:/, $form->{currencies}));
 +  map({ $form->{selectcurrency} .= "<option>$_\n" } $::form->get_all_currencies());
  
    # parts and assemblies have the same links
    my $item = $form->{item};
@@@ -1674,15 -1675,15 +1674,15 @@@ sub assembly_row 
    }
  
    my %header = (
-    runningnumber => { text =>  $locale->text('No.'),              nowrap => 1, width => '5%'  },
-    qty           => { text =>  $locale->text('Qty'),              nowrap => 1, width => '10%' },
-    unit          => { text =>  $locale->text('Unit'),             nowrap => 1, width => '5%'  },
-    partnumber    => { text =>  $locale->text('Part Number'),      nowrap => 1, width => '20%' },
-    description   => { text =>  $locale->text('Part Description'), nowrap => 1, width => '50%' },
-    lastcost      => { text =>  $locale->text('Purchase Prices'),  nowrap => 1, width => '50%' },
-    total         => { text =>  $locale->text('Sale Prices'),      nowrap => 1,                },
-    bom           => { text =>  $locale->text('BOM'),                                          },
-    partsgroup    => { text =>  $locale->text('Group'),                                        },
+    runningnumber => { text =>  $locale->text('No.'),              nowrap => 1, width => '5%',  align => 'left',},
+    qty           => { text =>  $locale->text('Qty'),              nowrap => 1, width => '10%', align => 'left',},
+    unit          => { text =>  $locale->text('Unit'),             nowrap => 1, width => '5%',  align => 'left',},
+    partnumber    => { text =>  $locale->text('Part Number'),      nowrap => 1, width => '20%', align => 'left',},
+    description   => { text =>  $locale->text('Part Description'), nowrap => 1, width => '50%', align => 'left',},
+    lastcost      => { text =>  $locale->text('Purchase Prices'),  nowrap => 1, width => '50%', align => 'right',},
+    total         => { text =>  $locale->text('Sale Prices'),      nowrap => 1,                 align => 'right',},
+    bom           => { text =>  $locale->text('BOM'),                                           align => 'center',},
+    partsgroup    => { text =>  $locale->text('Group'),                                         align => 'left',},
    );
  
    my @ROWS;
@@@ -1760,12 -1761,14 +1760,14 @@@ sub update 
  
    # parse pricegroups. and no, don't rely on check_form for this...
    map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};
+   $form->{sellprice} = $form->parse_amount(\%myconfig, $form->{sellprice});
  
    # same for makemodel lastcosts
    # but parse_amount not necessary for assembly component lastcosts
    unless ($form->{item} eq "assembly") {
      map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};
    };
+   $form->{listprice} = $form->parse_amount(\%myconfig, $form->{listprice});
  
    if ($form->{item} eq "assembly") {
      my $i = $form->{assembly_rows};
diff --combined bin/mozilla/ir.pl
index 9b400bf92,143696311..4209fdf6a
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@@ -149,7 -149,7 +149,7 @@@ sub invoice_links 
      $form->{currency} = $currency;
    }
  
 -  my @curr = split(/:/, $form->{currencies}); #seems to be missing
 +  my @curr = $form->get_all_currencies();
    map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
  
    $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}";
@@@ -358,7 -358,6 +358,6 @@@ sub form_header 
    map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
  
    $form->{jsscript} = 1;
-   $::request->layout->use_stylesheet('presenter/record/record_list.css');
    $form->header();
  
    print $form->parse_html_template("ir/form_header", \%TMPL_VAR);
diff --combined locale/de/all
index bb7a9f350,cce6b2d0e..2e840320d
mode 100644,100755..100755
--- a/locale/de/all
+++ b/locale/de/all
@@@ -18,7 -18,6 +18,7 @@@ $self->{texts} = 
    '#1 h'                        => '#1 h',
    '#1 of #2 importable objects were imported.' => '#1 von #2 importierbaren Objekten wurden importiert.',
    '#1 prices were updated.'     => '#1 Preise wurden aktualisiert.',
 +  '(recommended) Insert the used currencies in the system. You can simply change the name of the currencies by editing the textfields above. Do not use a name of a currency that is already in use.' => '(empfohlen) Fügen Sie die verwaisten Währungen in Ihr System ein. Sie können den Namen der Währung einfach ändern, indem Sie die Felder oben bearbeiten. Benutzen Sie keine Namen von Währungen, die Sie bereits benutzen.',
    '* there are restrictions for the perpetual method, look at chapter "Bemerkungen zu Bestandsmethode"  in' => ' für die Bestandsmethode gibt es Einschränkungen, siehe Kapitel "Bemerkungen zu Bestandsmethode"  in',
    '*) Since version 2.7 these parameters ares set in the client database and not in the configuration file, details in chapter:' => '*) Seit 2.7 werden Gewinnermittlungsart, Versteuerungsart und Warenbuchungsmethode in der Mandanten-DB gesteuert und nicht mehr in der Konfigurationsdatei, Umstellungs-Details:',
    '*/'                          => '*/',
@@@ -98,6 -97,7 +98,7 @@@
    'Account Nummer'              => 'Kontonummer',
    'Account Type'                => 'Kontoart',
    'Account Type missing!'       => 'Kontoart fehlt!',
+   'Account categories'          => 'Kontoarten',
    'Account deleted!'            => 'Konto gelöscht!',
    'Account for fees'            => 'Konto f&uuml;r Geb&uuml;hren',
    'Account for interest'        => 'Konto f&uuml;r Zinsen',
@@@ -283,6 -283,8 +284,8 @@@
    'Basic Data'                  => 'Basisdaten',
    'Batch Printing'              => 'Druck',
    'Bcc'                         => 'Bcc',
+   'Bcc E-mail'                  => 'BCC (E-Mail)',
+   'Because the useability gets worth if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => 'Da die Benutzerfreundlichkeit durch doppelte Artikelnummern erheblich verschlechtert wird (zum Beispiel, wenn man einen Artikel für eine Rechnung sucht), sollten Artikelnummern eindeutig vergeben sein.',
    'Belegnummer'                 => 'Buchungsnummer',
    'Beratername'                 => 'Beratername',
    'Beraternummer'               => 'Beraternummer',
@@@ -316,7 -318,6 +319,7 @@@
    'Both'                        => 'Beide',
    'Bottom'                      => 'Unten',
    'Bought'                      => 'Gekauft',
 +  'Break up the update and contact a service provider.' => 'Diese Option bricht das Update ab. Bitte kontaktieren Sie Ihren Administrator oder beauftragen einen Dienstleister.',
    'Buchungsdatum'               => 'Buchungsdatum',
    'Buchungsgruppe'              => 'Buchungsgruppe',
    'Buchungsgruppe (database ID)' => 'Buchungsgruppe (Datenbank-ID)',
@@@ -393,6 -394,7 +396,7 @@@
    'Carry over shipping address' => 'Lieferadresse &uuml;bernehmen',
    'Cash'                        => 'Zahlungsverkehr',
    'Cc'                          => 'Cc',
+   'Cc E-mail'                   => 'CC (E-Mail)',
    'Change kivitendo installation settings (all menu entries beneath \'System\')' => 'Ver&auml;ndern der kivitendo-Installationseinstellungen (Men&uuml;punkte unterhalb von \'System\')',
    'Change representative to'    => 'Vertreter ändern in',
    'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' => 'Es ist nur sinnvoll Änderungen vorzunehmen, wenn das Konto KEIN Sammelkonto ist und wenn ein gültiger Steuerschlüssel für das Konto existiert. Gleichzeitig Haken bei Forderungen und Verbindlichkeiten zu setzen, macht auch NUR für den Zahlungsein- und Ausgang (bspw. Bank oder Kasse) Sinn.',
@@@ -605,8 -607,6 +609,8 @@@
    'Default Accounts'            => 'Standardkonten',
    'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
    'Default buchungsgruppe'      => 'Standardbuchungsgruppe',
 +  'Default currency'            => 'Standardwährung',
 +  'Default currency missing!'   => 'Standardwährung fehlt!',
    'Default output medium'       => 'Standardausgabekanal',
    'Default printer'             => 'Standarddrucker',
    'Default template format'     => 'Standardvorlagenformat',
@@@ -685,6 -685,7 +689,7 @@@
    'Documentation (in German)'   => 'Dokumentation',
    'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
    'Done'                        => 'Fertig',
+   'Double partnumbers'          => 'Doppelte Artikelnummern',
    'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',
    'Download sample file'        => 'Beispieldatei herunterladen',
    'Download the backup'         => 'Die Sicherungsdatei herunterladen',
@@@ -811,6 -812,7 +816,6 @@@
    'End date'                    => 'Enddatum',
    'Enter a description for this new draft.' => 'Geben Sie eine Beschreibung f&uuml;r diesen Entwurf ein.',
    'Enter longdescription'       => 'Langtext eingeben',
 -  'Enter the abbreviations separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' => 'Geben Sie Ihre und weitere Währungen als Abkürzungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)',
    'Enter the requested execution date or leave empty for the quickest possible execution:' => 'Geben Sie das jeweils gewünschte Ausführungsdatum an, oder lassen Sie das Feld leer für die schnellstmögliche Ausführung:',
    'Entries for which automatic conversion failed:' => 'Einträge, für die die automatische Umstellung fehlschlug:',
    'Entries for which automatic conversion succeeded:' => 'Einträge, für die die automatische Umstellung erfolgreich war:',
@@@ -857,6 -859,8 +862,8 @@@
    'Execution type'              => 'Ausführungsart',
    'Existing Buchungsgruppen'    => 'Existierende Buchungsgruppen',
    'Existing Datasets'           => 'Existierende Datenbanken',
+   'Existing contacts (with column \'cp_id\')' => 'Existierende Ansprechpersonen (mit Spalte \'cp_id\')',
+   'Existing customers/vendors with same customer/vendor number' => 'Existierende Kunden/Lieferanten mit derselben Kunden-/Lieferantennummer',
    'Existing file on server'     => 'Auf dem Server existierende Datei',
    'Existing pending follow-ups for this item' => 'Noch nicht erledigte Wiedervorlagen f&uuml;r dieses Dokument',
    'Existing profiles'           => 'Existierende Profile',
@@@ -868,6 -872,7 +875,7 @@@
    'Expenses EU with UStId'      => 'Aufwand EU m. UStId',
    'Expenses EU without UStId'   => 'Aufwand EU o. UStId',
    'Export Buchungsdaten'        => 'Export Buchungsdaten',
+   'Export Number'               => 'Exportnummer',
    'Export Stammdaten'           => 'Export Stammdaten',
    'Export as CSV'               => 'Als CSV exportieren',
    'Export as PDF'               => 'Als PDF exportieren',
@@@ -926,7 -931,8 +934,9 @@@
    'Fristsetzung'                => 'Fristsetzung',
    'From'                        => 'Von',
    'From Date'                   => 'Von',
 +  'From this version on it is necessary to name a default value.' => 'Ab dieser Version benötigt kivitendo eine Standardwährung.',
+   'From this version on a new feature is available.' => 'Ab dieser Version ist ein neues Feature verfügbar.',
+   'From this version on the partnumber of services, articles and assemblies have to be unique.' => 'Ab dieser Version müssen Artikelnummern eindeutig vergeben werden.',
    'From this version on the taxkey 0 must have a tax rate of 0 (for DATEV compatibility).' => 'Ab dieser Version muss der Steuerschlüssel 0 einen Steuersatz von 0% haben (auf Grund der DATEV-Kompatibilität).',
    'Full Access'                 => 'Vollzugriff',
    'Full Preview'                => 'Alles',
@@@ -983,6 -989,7 +993,6 @@@
    'ID-Nummer'                   => 'ID-Nummer (intern)',
    'II'                          => 'II',
    'III'                         => 'III',
 -  'IMPORTANT NOTE: You cannot safely change currencies, IF you have already booking entries!' => 'WICHTIGER HINWEIS: Falls schon Buchungen im Mandanten vorhanden sind, kann man nicht mehr UNKRITISCH neue oder andere Währungen konfigurieren!',
    'IV'                          => 'IV',
    'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' => 'Falls angehakt wird der DATEV-Steuerschlüssel bei Buchungen auf dieses Konto nicht beim DATEV-Export mitexportiert, allerdings nur wenn zusätzlich der Konto-Steuerschlüssel vom Buchungs (Hauptbuch) Steuerschlüssel abweicht',
    'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => 'Falls der Artikeltyp auf \'gemischt\' gestellt wird, muss eine Spalte namens \'type\' vorhanden sein.',
@@@ -990,11 -997,13 +1000,13 @@@
    'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => 'Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so k&ouml;nnen Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:',
    'If you chose to let kivitendo do the migration then kivitendo will also remove the old member file after creating a backup copy of it in the directory &quot;#1&quot;.' => 'Falls Sie sich entscheiden, kivitendo die Migration durchführen zu lassen, so wird kivitendo ein Backup der alten Dateien im Verzeichnis "#1" erstellen und die Dateien anschließend löschen.',
    'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => 'Wenn Sie f&uuml;r die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerpl&auml;tze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.',
+   'If you have not chosen for example the category revenue for a tax and you choose an revenue account to create a transfer in the general ledger, this tax will not be displayed in the tax dropdown.' => 'Wenn Sie z.B. die Kategory Erlös für eine Steuer nicht gewählt haben und ein Erlöskonto beim Erstellen einer Dialogbuchung wählen, wird diese Steuer auch nicht im Dropdown-Menü für die Steuern angezeigt.',
    'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => 'Wenn Sie diese Meldung sehen haben Sie wahrscheinlich ein frisches LX-Office Setup und noch keine Buchungsgruppen eingerichtet. Ein Administrator kann dies im Systemmen&uuml; erledigen.',
    'If you select a base unit then you also have to enter a factor.' => 'Wenn Sie eine Basiseinheit auswählen, dann müssen Sie auch einen Faktor eingeben.',
    'If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/kivitendo.conf&quot; and login into the admin module again.' => 'Wenn Sie einen der Parameter &auml;ndern wollen, so dr&uuml;cken Sie auf den &quot;Zur&uuml;ck&quot;-Button, bearbeiten Sie die Datei &quot;config/kivitendo.conf&quot;, und melden Sie sich erneut im Administrationsbereich an.',
    'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' => 'Wenn Sie eine solche Datenbank l&ouml;schen wollen, so m&uuml;ssen Sie zuerst die Benutzer bearbeiten, die die fragliche Datenbank benutzen, und sie so &auml;ndern, dass sie eine andere Datenbank benutzen.',
    'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' => 'Wenn Sie die Authentifizierungs-Datenbank selber einrichten wollen, so melden Sie sich im Administrationsbereich an. kivitendo wird dann die Datenbank und die erforderlichen Tabellen für Sie anlegen.',
+   'Illegal characters have been removed from the following fields: #1' => 'Ungültige Zeichen wurden aus den folgenden Feldern entfernt: #1',
    'Image'                       => 'Grafik',
    'Import'                      => 'Import',
    'Import CSV'                  => 'CSV-Import',
@@@ -1029,6 -1038,8 +1041,8 @@@
    'Increase'                    => 'Erhöhen',
    'Individual Items'            => 'Einzelteile',
    'Information'                 => 'Information',
+   'Insert with new customer/vendor number' => 'Mit neuer Kunden-/Lieferantennummer anlegen',
+   'Insert with new database ID' => 'Neu anlegen mit neuer Datenbank-ID',
    'Insert with new part number' => 'Mit neuer Artikelnummer einfügen',
    'Interest'                    => 'Zinsen',
    'Interest Rate'               => 'Zinssatz',
@@@ -1111,6 -1122,7 +1125,7 @@@
    'Languages and translations'  => 'Sprachen und Übersetzungen',
    'Last Action'                 => 'Letzte Aktivität',
    'Last Article Number'         => 'Letzte Artikelnummer',
+   'Last Assembly Number'        => 'Letzte Erzeugnisnummer',
    'Last Cost'                   => 'Einkaufspreis',
    'Last Credit Note Number'     => 'Letzte Gutschriftnummer',
    'Last Customer Number'        => 'Letzte Kundennummer',
@@@ -1207,7 -1219,7 +1222,7 @@@
    'Missing Method!'             => 'Fehlender Voranmeldungszeitraum',
    'Missing Tax Authoritys Preferences' => 'Fehlende Angaben zum Finanzamt!',
    'Missing amount'              => 'Fehlbetrag',
-   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
+   'Missing parameter #1 in call to sub #2.' => 'Fehlender Parameter \'#1\' in Funktionsaufruf \'#2\'.',
    'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
    'Missing taxkeys in invoices with taxes.' => 'Fehlende Steuerschl&uuml;ssel in Rechnungen mit Steuern',
    'Missing user id!'            => 'Benutzer ID fehlt!',
@@@ -1243,6 -1255,7 +1258,7 @@@
    'New bank account'            => 'Neues Bankkonto',
    'New contact'                 => 'Neue Ansprechperson',
    'New customer'                => 'Neuer Kunde',
+   'New filter for tax accounts' => 'Neue Filter für Steuerkonten',
    'New invoice'                 => 'Neue Rechnung',
    'New part'                    => 'Neue Ware',
    'New sales order'             => 'Neuer Auftrag',
@@@ -1273,7 -1286,6 +1289,7 @@@
    'No data was found.'          => 'Es wurden keine Daten gefunden.',
    'No databases have been found on this server.' => 'Auf diesem Server wurden keine Datenbanken gefunden.',
    'No datasets have been selected.' => 'Es wurden keine Datenbanken ausgew&auml;hlt.',
 +  'No default currency'         => 'Keine Standardwährung',
    'No department has been created yet.' => 'Es wurde noch keine Abteilung erfasst.',
    'No dunnings have been selected for printing.' => 'Es wurden keine Mahnungen zum Drucken ausgew&auml;hlt.',
    'No entries were found which had no unit assigned to them.' => 'Es wurden keine Eintr&auml;ge gefunden, denen keine Einheit zugeordnet war.',
@@@ -1359,7 -1371,6 +1375,7 @@@
    'Orders / Delivery Orders deleteable' => 'Aufträge / Lieferscheine löschbar',
    'Orientation'                 => 'Seitenformat',
    'Orphaned'                    => 'Nie benutzt',
 +  'Orphaned currencies'         => 'Verwaiste Währungen',
    'Other users\' follow-ups'    => 'Wiedervorlagen anderer Benutzer',
    'Other values are ignored.'   => 'Andere Eingaben werden ignoriert.',
    'Others'                      => 'Andere',
@@@ -1389,6 -1400,7 +1405,7 @@@
    'Part Notes'                  => 'Bemerkungen',
    'Part Number'                 => 'Artikelnummer',
    'Part Number missing!'        => 'Artikelnummer fehlt!',
+   'Partnumber'                  => 'Artikelnummer',
    'Partnumber must not be set to empty!' => 'Die Artikelnummer darf nicht auf leer ge&auml;ndert werden.',
    'Partnumber not unique!'      => 'Artikelnummer bereits vorhanden!',
    'Parts'                       => 'Waren',
@@@ -1436,11 -1448,12 +1453,13 @@@
    'Please Check the bank information for each customer:' => 'Bitte überprüfen Sie die Bankinformationen der Kunden:',
    'Please Check the bank information for each vendor:' => 'Bitte überprüfen Sie die Kontoinformationen der Lieferanten:',
    'Please ask your administrator to create warehouses and bins.' => 'Bitten Sie Ihren Administrator, dass er Lager und Lagerpl&auml;tze anlegt.',
+   'Please change the partnumber of the following parts and run the update again:' => 'Bitte ändern Sie daher die Artikelnumer folgender Artikel:',
+   'Please choose for which categories the taxes should be displayed:' => 'Bitte wählen Sie für welche Kontoarten die Steuer angezeigt werden soll:',
    'Please contact your administrator or a service provider.' => 'Bitte kontaktieren Sie Ihren Administrator oder einen Dienstleister.',
    'Please contact your administrator.' => 'Bitte wenden Sie sich an Ihren Administrator.',
    'Please define a taxkey for the following taxes and run the update again:' => 'Bitte definieren Sie einen Steuerschlüssel für die folgenden Steuern und starten Sie dann das Update erneut:',
    'Please enter a profile name.' => 'Bitte geben Sie einen Profilnamen an.',
 +  'Please enter the currency you are working with.' => 'Bitte geben Sie die Währung an, mit der Sie arbeiten.',
    'Please enter the login for the new user.' => 'Bitte geben Sie das Login für den neuen Benutzer ein.',
    'Please enter the name of the database that will be used as the template for the new database:' => 'Bitte geben Sie den Namen der Datenbank an, die als Vorlage f&uuml;r die neue Datenbank benutzt wird:',
    'Please enter the name of the dataset you want to restore the backup in.' => 'Bitte geben Sie den Namen der Datenbank ein, in der Sie die Sicherung wiederherstellen wollen.',
@@@ -1602,7 -1615,6 +1621,7 @@@
    'Removed spoolfiles!'         => 'Druckdateien entfernt!',
    'Removing marked entries from queue ...' => 'Markierte Einträge werden von der Warteschlange entfernt ...',
    'Rename the group'            => 'Gruppe umbenennen',
 +  'Replace the orphaned currencies by other not orphaned currencies. To do so, please delete the currency in the textfields above and replace it by another currency. You could loose or change unintentionally exchangerates. Go on very carefully since you could destroy transactions.' => 'Ersetze die Währungen durch andere gültige Währungen. Wenn Sie sich hierfür entscheiden, ersetzen Sie bitte alle Währungen, die oben angegeben sind, durch Währungen, die in Ihrem System ordnungsgemäß eingetragen sind. Alle eingetragenen Wechselkurse für die verwaiste Währung werden dabei gelöscht. Bitte gehen Sie sehr vorsichtig vor, denn die betroffenen Buchungen können unter Umständen kaputt gehen.',
    'Report Positions'            => 'Berichte',
    'Report about warehouse contents' => 'Lagerbestand anzeigen',
    'Report about warehouse transactions' => 'Lagerbuchungen anzeigen',
@@@ -1736,6 -1748,7 +1755,7 @@@
    'Service Items'               => 'Dienstleistungen',
    'Service Number missing!'     => 'Dienstleistungsnummer fehlt!',
    'Service unit'                => 'Dienstleistungseinheit',
+   'Service, assembly or part'   => 'Dienstleistung, Erzeugnis oder Ware',
    'Services'                    => 'Dienstleistungen',
    'Set Language Values'         => 'Spracheinstellungen',
    'Set eMail text'              => 'eMail Text eingeben',
@@@ -1791,9 -1804,10 +1811,10 @@@
    'Single values in item mode, cumulated values in invoice mode' => 'Einzelwerte im Artikelmodus, kumulierte Werte im Rechnungsmodus',
    'Skip'                        => 'Überspringen',
    'Skip entry'                  => 'Eintrag überspringen',
-   'Skipping due to existing entry in database' => 'Übersprungen, wegen existierender Artikelnummer',
+   'Skipping due to existing entry in database' => 'Wegen existierendem Eintrag mit selber Nummer übersprungen',
    'Skonto'                      => 'Skonto',
    'Skonto Terms'                => 'Zahlungsziel Skonto',
+   'So far you could use one partnumber for severel parts, for example a service and an article.' => 'Bisher war es möglich eine Artikelnummer für mehrere Artikel zu verwenden, zum Beispiel eine Artikelnummer für eine Dienstleistung, eine Ware und ein Erzeugnis.',
    'Sold'                        => 'Verkauft',
    'Solution'                    => 'Lösung',
    'Sort By'                     => 'Sortiert nach',
@@@ -1876,6 -1890,7 +1897,7 @@@
    'Tax deleted!'                => 'Steuer gelöscht!',
    'Tax number'                  => 'Steuernummer',
    'Tax paid'                    => 'Vorsteuer',
+   'Tax rate'                    => 'Steuersatz',
    'Tax saved!'                  => 'Steuer gespeichert!',
    'Tax-O-Matic'                 => 'Steuer',
    'Tax-o-matic Account'         => 'Automatikbuchung auf Konto',
@@@ -1908,7 -1923,6 +1930,7 @@@
    'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' => 'Textzeilen: \'MAXLENGTH=n\' setzt eine Maximall&auml;nge von n Zeichen.',
    'Text, text field and number variables: The default value will be used as-is.' => 'Textzeilen, Textfelder und Zahlenvariablen: Der Standardwert wird so wie er ist &uuml;bernommen.',
    'That export does not exist.' => 'Dieser Export existiert nicht.',
 +  'That is why kivitendo could not find a default currency.' => 'Daher konnte kivitendo keine Standardwährung finden.',
    'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
    'The AP transaction #1 has been deleted.' => 'Die Kreditorenbuchung #1 wurde gelöscht.',
    'The AR transaction #1 has been deleted.' => 'Die Debitorenbuchung #1 wurde gelöscht.',
@@@ -1988,7 -2002,6 +2010,7 @@@
    'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
    'The following Buchungsgruppen have already been created:' => 'Die folgenden Buchungsgruppen wurden bereits angelegt:',
    'The following Datasets need to be updated' => 'Folgende Datenbanken müssen aktualisiert werden',
 +  'The following currencies have been used, but they are not defined:' => 'Die folgenden Währungen wurden benutzt, sind aber nicht ordnungsgemäß in der Datenbank eingetragen:',
    'The following drafts have been saved and can be loaded.' => 'Die folgenden Entw&uuml;rfe wurden gespeichert und k&ouml;nnen geladen werden.',
    'The following old files whose settings have to be merged manually into the new configuration file "config/kivitendo.conf" still exist:' => 'Es existieren noch die folgenden alten Dateien, deren Einstellungen manuell in die neue Konfiguratsdatei "config/kivitendo.conf" migriert werden müssen:',
    'The following transaction contains wrong taxes:' => 'Die folgende Buchung enthält falsche Steuern:',
@@@ -2086,6 -2099,7 +2108,7 @@@
    'There are #1 more open invoices from this vendor with other currencies.' => 'Es gibt #1 weitere offene Rechnungen von diesem Lieferanten, die in anderen Währungen ausgestellt wurden.',
    'There are #1 unfinished follow-ups of which #2 are due.' => 'Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
    'There are bookings to the account 3803 after 01.01.2007. If you didn\'t change this account manually to 19% the bookings are probably incorrect.' => 'Das Konto 3803 wurde nach dem 01.01.2007 bebucht. Falls Sie dieses Konto nicht manuell auf 19% gestellt haben sind die Buchungen wahrscheinlich mit falscher Umsatzsteuer gebucht worden.',
+   'There are double partnumbers in your database.' => 'In ihrer Datenbank befinden sich mehrfach vergebene Artikelnummern.',
    'There are entries in tax where taxkey is NULL.' => 'In der Datenbank sind Steuern ohne Steuerschlüssel vorhanden (in der Tabelle tax Spalte taxkey).',
    'There are four tax zones.'   => 'Es gibt vier Steuerzonen.',
    'There are invalid taxnumbers in use.' => 'Es werden ungültige Steuerautomatik-Konten benutzt.',
@@@ -2093,10 -2107,8 +2116,10 @@@
    'There are no entries in the background job history.' => 'Es gibt keine Einträge im Hintergrund-Job-Verlauf.',
    'There are no items in stock.' => 'Dieser Artikel ist nicht eingelagert.',
    'There are no items on your TODO list at the moment.' => 'Ihre Aufgabenliste enth&auml;lt momentan keine Eintr&auml;ge.',
 +  'There are several options you can handle this problem, please select one:' => 'Bitte wählen Sie eine der folgenden Optionen, um mit dem Problem umzugehen:',
    'There are still entries in the database for which no unit has been assigned.' => 'Es gibt noch Eintr&auml;ge in der Datenbank, f&uuml;r die keine Einheit zugeordnet ist.',
    'There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?' => 'Einige der Lagerbewegungen sind nicht vollständig und Lagerbewegungen können nachträglich nicht mehr verändert werden. Wollen Sie wirklich fortfahren?',
 +  'There are undefined currencies in your system.' => 'In Ihrer Datenbank wurden Währungen benutzt, die nicht ordnungsgemäß in den Währungen eingetragen wurden.',
    'There are usually three ways to install Perl modules.' => 'Es gibt normalerweise drei Arten, ein Perlmodul zu installieren.',
    'There is already a taxkey 0 with tax rate not 0.' => 'Es existiert bereits ein Steuerschlüssel mit Steuersatz ungleich 0%.',
    'There is an inconsistancy in your database.' => 'In Ihrer Datenbank sind Unstimmigkeiten vorhanden.',
@@@ -2116,6 -2128,7 +2139,7 @@@
    'This corresponds to kivitendo\'s behavior prior to version 2.4.4.' => 'Dies entspricht kivitendos Verhalten vor Version 2.4.4.',
    'This could have happened for two reasons:' => 'Dies kann aus zwei Gründen geschehen sein:',
    'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.',
+   'This feature especially prevents mistakes by mixing up prior tax and sales tax.' => 'Dieses Feature vermeidet insbesondere Verwechslungen von Umsatz- und Vorsteuer.',
    'This group will be called &quot;Full Access&quot;.' => 'Diese Gruppe wird &quot;Vollzugriff&quot; genannt.',
    'This installation uses an unknown chart of accounts (&quot;#1&quot;). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;#1&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.',
    'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine &Auml;nderungen vorgenommen!',
@@@ -2222,8 -2235,10 +2246,10 @@@
    'Update complete'             => 'Update beendet.',
    'Update prices'               => 'Preise aktualisieren',
    'Update prices of existing entries' => 'Preise von vorhandenen Artikeln aktualisieren',
+   'Update properties of existing entries' => 'Eigenschaften von existierenden Einträgen aktualisieren',
    'Update?'                     => 'Aktualisieren?',
    'Updated'                     => 'Erneuert am',
+   'Updating existing entry in database' => 'Existierenden Eintrag in Datenbank aktualisieren',
    'Updating prices of existing entry in database' => 'Preis des Eintrags in der Datenbank wird aktualisiert',
    'Uploaded on #1, size #2 kB'  => 'Am #1 hochgeladen, Größe #2 kB',
    'Use As New'                  => 'Als neu verwenden',
@@@ -2311,6 -2326,7 +2337,7 @@@
    'You are logged out!'         => 'Auf Wiedersehen!',
    'You can also create new units now.' => 'Sie k&ouml;nnen jetzt auch neue Einheiten anlegen.',
    'You can also delete this transaction and re-enter it manually.' => 'Alternativ können Sie die Buchung auch mit löschen lassen und sie anschließend neu eingeben.',
+   'You can choose account categories for taxes. Depending on these categories taxes will be displayed for transfers in the general ledger or not.' => 'Sie können Kontoarten für Steuern auswählen. Abhängig von diesen Kontoarten werden dann Steuern bei Dialogbuchungen angezeigt oder nicht.',
    'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' => 'Sie haben die Möglichkeit, die Buchung zu korrigieren, indem Sie in den Drop-Down-Boxen die richtigen Steuerschlüssel auswählen und anschließend auf den Button "Buchung korrigieren" drücken.',
    'You can create a missing dataset by going back and chosing &quot;Create Dataset&quot;.' => 'Sie k&ouml;nnen eine fehlende Datenbank erstellen, indem Sie jetzt zu&uuml;ck gehen und den Punkt &quot;Neue Datenbank anlegen&quot; w&auml;hlen.',
    'You can create warehouses and bins via the menu "System -> Warehouses".' => 'Sie k&ouml;nnen Lager und Lagerpl&auml;tze &uuml;ber das Men&uuml; "System -> Lager" anlegen.',
@@@ -2318,6 -2334,7 +2345,7 @@@
    'You can either create a new database or chose an existing database.' => 'Sie können entweder eine neue Datenbank erstellen oder eine existierende auswählen.',
    'You can find information on the migration in the upgrade chapter of the documentation.' => 'Informationen über die Migration sind in der Upgrade Kapitel in der Dokumentation zu finden.',
    'You can only delete datasets that are not in use.' => 'Sie k&ouml;nnen nur Datenbanken l&ouml;schen, die momentan nicht in Benutzung sind.',
+   'You can update existing contacts by providing the \'cp_id\' column with their database IDs. Otherwise: ' => 'Sie können existierende Einträge aktualisieren, indem Sie eine Spalte \'cp_id\' mit der Datenbank-ID des Eintrags mitgeben. Andernfalls: ',
    'You can use the following strings in the long description and all translations. They will be replaced by their actual values by kivitendo before they\'re output.' => 'Sie können die folgenden Begriffe in den Langtexten und allen Übersetzungen benutzen. Sie werden von kivitendo vor der Ausgabe durch ihren tatsächlichen Wert ersetzt.',
    'You cannot adjust the price for pricegroup "#1" by a negative percentage.' => 'Sie können den Preis für Preisgruppe "#1" um einen negativen Prozentwert anpassen.',
    'You cannot continue before all required modules are installed.' => 'Sie k&ouml;nnen nicht fortfahren, bevor alle ben&ouml;tigten Pakete installiert sind.',
@@@ -2326,7 -2343,6 +2354,7 @@@
    'You cannot create an invoice for delivery orders from different vendors.' => 'Sie können keine Rechnung aus Lieferscheinen von verschiedenen Lieferanten erstellen.',
    'You do not have the permissions to access this function.' => 'Sie verf&uuml;gen nicht &uuml;ber die notwendigen Rechte, um auf diese Funktion zuzugreifen.',
    'You have entered or selected the following shipping address for this customer:' => 'Sie haben die folgende Lieferadresse eingegeben oder ausgew&auml;hlt:',
 +  'You have never worked with currencies.' => 'Sie haben noch nie  mit Währungen gearbeitet.',
    'You have not added bank accounts yet.' => 'Sie haben noch keine Bankkonten angelegt.',
    'You have not selected any delivery order.' => 'Sie haben keinen Lieferschein ausgewählt.',
    'You have not selected any export.' => 'Sie haben keinen Export ausgewählt.',
@@@ -2372,6 -2388,7 +2400,7 @@@
    'ap_aging_list'               => 'liste_offene_verbindlichkeiten',
    'ar_aging_list'               => 'liste_offene_forderungen',
    'as at'                       => 'zum Stand',
+   'assembly'                    => 'Erzeugnis',
    'assembly_list'               => 'erzeugnisliste',
    'averaged values, in invoice mode only useful when filtered by a part' => 'gemittelte Werte, im Rechnungsmodus nur sinnvoll wenn nach Artikel gefiltert wird',
    'back'                        => 'zurück',
@@@ -2419,6 -2436,7 +2448,7 @@@
    'ea'                          => 'St.',
    'emailed to'                  => 'gemailt an',
    'empty'                       => 'leer',
+   'every third month'           => 'vierteljährlich',
    'every time'                  => 'immer',
    'executed'                    => 'ausgeführt',
    'failed'                      => 'fehlgeschlagen',
@@@ -2487,6 -2505,7 +2517,7 @@@
    'order'                       => 'Reihenfolge',
    'our vendor number at customer' => 'Unsere Lieferanten-Nr. beim Kunden',
    'parsing csv'                 => 'Parse CSV Daten',
+   'part'                        => 'Ware',
    'part_list'                   => 'Warenliste',
    'percental'                   => 'prozentual',
    'periodic'                    => 'Aufwandsmethode',
@@@ -2505,7 -2524,6 +2536,6 @@@
    'purchase_order'              => 'Auftrag',
    'purchase_order_list'         => 'lieferantenauftragsliste',
    'quarter'                     => 'Vierteljährliche (quartalsweise) Abgabe',
-   'quarterly'                   => 'quartalsweise',
    'quotation_list'              => 'angebotsliste',
    'release_material'            => 'Materialausgabebe',
    'reorder item'                => 'Eintrag umsortieren',
@@@ -2527,6 -2545,7 +2557,7 @@@
    'saving data'                 => 'Speichere Daten',
    'sent'                        => 'gesendet',
    'sent to printer'             => 'an Drucker geschickt',
+   'service'                     => 'Dienstleistung',
    'service_list'                => 'dienstleistungsliste',
    'shipped'                     => 'verschickt',
    'singular first char'         => 'S',
diff --combined templates/webpages/am/edit_defaults.html
index 2780fec95,248953cf3..c8c91f60a
--- a/templates/webpages/am/edit_defaults.html
+++ b/templates/webpages/am/edit_defaults.html
@@@ -49,11 -49,16 +49,16 @@@
      <tr>
       <th align="right" nowrap>[% 'Last RFQ Number' | $T8 %]</th>
       <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
+      <th align="right" nowrap>[% 'Last Assembly Number' | $T8 %]</th>
+      <td><input name="assemblynumber" size="10" value="[% HTML.escape(defaults_assemblynumber) %]"></td>
      </tr>
  
      <tr>
       <th align="right" nowrap>[% 'Last Sales Delivery Order Number' | $T8 %]</th>
       <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
+     </tr>
+ 
+     <tr>
       <th align="right" nowrap>[% 'Last Purchase Delivery Order Number' | $T8 %]</th>
       <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
      </tr>
@@@ -137,18 -142,8 +142,18 @@@
      </tr>
  
      <tr>
 -     <th align="right">[% 'Currencies' | $T8 %] <sup>(1)</sup></th>
 -     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
 +     <th align="right">[% 'Default currency' | $T8 %]</th>
 +     <td colspan="3">[% HTML.escape(defaultcurrency) %]</td>
 +    </tr>
 +
 +    <tr>
 +     <input type="hidden" name="rowcount" value="[% CURRENCIES.size %]">
 +     <th align="right">[% 'Currencies' | $T8 %]</th>
 +     <td colspan="3">[% FOREACH row = CURRENCIES %]<input name="curr_[% loop.count %]" size="3" value="[% HTML.escape(row.curr) %]">
 +                                                   <input type=hidden name="old_curr_[% loop.count %]" value="[% HTML.escape(row.curr) %]">
 +                     [% END %]
 +                     <input name="new_curr" size="3" value="">
 +     </td>
      </tr>
  
      <tr>
@@@ -215,5 -210,8 +220,5 @@@
  
    <hr height="3" noshade>
  
 -  <p>
 -   (1) [% 'Enter the abbreviations separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' | $T8 %]
 -       [% 'IMPORTANT NOTE: You cannot safely change currencies, IF you have already booking entries!' | $T8 %]
    </p>
   </form>