Consolidation and extended test runs
[kivitendo-erp.git] / SL / IS.pm
index 3603618..fde061d 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -36,6 +36,7 @@ package IS;
 
 use List::Util qw(max);
 
+use Carp;
 use SL::AM;
 use SL::ARAP;
 use SL::CVar;
@@ -60,6 +61,8 @@ use strict;
 sub invoice_details {
   $main::lxdebug->enter_sub();
 
+  # prepare invoice for printing
+
   my ($self, $myconfig, $form, $locale) = @_;
 
   $form->{duedate} ||= $form->{invdate};
@@ -68,9 +71,6 @@ sub invoice_details {
   my $dbh = $form->get_standard_dbh;
   my $sth;
 
-  my $query = qq|SELECT date | . conv_dateq($form->{duedate}) . qq| - date | . conv_dateq($form->{invdate}) . qq| AS terms|;
-  ($form->{terms}) = selectrow_query($form, $dbh, $query);
-
   my (@project_ids);
   $form->{TEMPLATE_ARRAYS} = {};
 
@@ -144,18 +144,21 @@ sub invoice_details {
 
   $form->{discount} = [];
 
-  IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
+  # get some values of parts from db on store them in extra array,
+  # so that they can be sorted in later
+  my %prepared_template_arrays = IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
+  my @prepared_arrays          = keys %prepared_template_arrays;
 
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
   my $project_cvar_configs = CVar->get_configs(module => 'Projects');
 
   my @arrays =
-    qw(runningnumber number description longdescription qty ship unit bin
-       deliverydate_oe ordnumber_oe donumber_do transdate_oe validuntil
-       partnotes serialnumber reqdate sellprice listprice netprice
-       discount p_discount discount_sub nodiscount_sub
-       linetotal  nodiscount_linetotal tax_rate projectnumber projectdescription
-       price_factor price_factor_name partsgroup weight lineweight);
+    qw(runningnumber number description longdescription qty qty_nofmt unit bin
+       deliverydate_oe ordnumber_oe donumber_do transdate_oe invnumber invdate
+       partnotes serialnumber reqdate sellprice sellprice_nofmt listprice listprice_nofmt netprice netprice_nofmt
+       discount discount_nofmt p_discount discount_sub discount_sub_nofmt nodiscount_sub nodiscount_sub_nofmt
+       linetotal linetotal_nofmt nodiscount_linetotal nodiscount_linetotal_nofmt tax_rate projectnumber projectdescription
+       price_factor price_factor_name partsgroup weight weight_nofmt lineweight lineweight_nofmt);
 
   push @arrays, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
   push @arrays, map { "project_cvar_$_->{name}" } @{ $project_cvar_configs };
@@ -164,23 +167,92 @@ sub invoice_details {
 
   my @payment_arrays = qw(payment paymentaccount paymentdate paymentsource paymentmemo);
 
-  map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @tax_arrays, @payment_arrays);
+  map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @tax_arrays, @payment_arrays, @prepared_arrays);
 
   my $totalweight = 0;
   foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
     $i = $item->[0];
 
     if ($item->[1] ne $sameitem) {
+      push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type}  }, 'partsgroup');
       push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, qq|$item->[1]|);
       $sameitem = $item->[1];
 
-      map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+      map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } (@arrays, @prepared_arrays)));
     }
 
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
 
     if ($form->{"id_$i"} != 0) {
 
+      # Prepare linked items for printing
+      if ( $form->{"invoice_id_$i"} ) {
+
+        require SL::DB::InvoiceItem;
+        my $invoice_item = SL::DB::Manager::InvoiceItem->find_by( id => $form->{"invoice_id_$i"} );
+        my $linkeditems  = $invoice_item->linked_records( direction => 'from', recursive => 1 );
+
+        # check for (recursively) linked sales quotation items, sales order
+        # items and sales delivery order items.
+
+        # The checks for $form->{"ordnumber_$i"} and quo and do are for the old
+        # behaviour, where this data was stored in its own database fields in
+        # the invoice items, and there were no record links for the items.
+
+        # If this information were to be fetched in retrieve_invoice, e.g. for showing
+        # this information in the second row, then these fields will already have
+        # been set and won't be calculated again. This shouldn't be done there
+        # though, as each invocation creates several database calls per item, and would
+        # make the interface very slow for many items. So currently these
+        # requests are only made when printing the record.
+
+        # When using the workflow an invoice item can only be (recursively) linked to at
+        # most one sales quotation item and at most one delivery order item.  But it may
+        # be linked back to several order items, if collective orders were involved. If
+        # that is the case we will always choose the very first order item from the
+        # original order, i.e. where it first appeared in an order.
+
+        # TODO: credit note items aren't checked for a record link to their
+        # invoice item
+
+        unless ( $form->{"ordnumber_$i"} ) {
+
+          # $form->{"ordnumber_$i"} comes from ordnumber in invoice, if an
+          # entry exists this must be from before the change from ordnumber to linked items.
+          # So we just use that value and don't check for linked items.
+          # In that case there won't be any links for quo or do items either
+
+          # sales order items are fetched and sorted by id, the lowest id is first
+          # It is assumed that the id always grows, so the item we want (the original) will have the lowest id
+          # better solution: filter the order_item that doesn't have any links from other order_items
+          #                  or maybe fetch linked_records with param save_path and order by _record_length_depth
+          my @linked_orderitems = grep { $_->isa("SL::DB::OrderItem") && $_->record->type eq 'sales_order' } @{$linkeditems};
+          if ( scalar @linked_orderitems ) {
+            @linked_orderitems = sort { $a->id <=> $b->id } @linked_orderitems;
+            my $orderitem = $linked_orderitems[0]; # 0: the original order item, -1: the last collective order item
+
+            $form->{"ordnumber_$i"}       = $orderitem->record->record_number;
+            $form->{"transdate_oe_$i"}    = $orderitem->record->transdate->to_kivitendo;
+            $form->{"cusordnumber_oe_$i"} = $orderitem->record->cusordnumber;
+          };
+
+          my @linked_quoitems = grep { $_->isa("SL::DB::OrderItem") && $_->record->type eq 'sales_quotation' } @{$linkeditems};
+          if ( scalar @linked_quoitems ) {
+            croak "an invoice item may only be linked back to 1 sales quotation item, something is wrong\n" unless scalar @linked_quoitems == 1;
+            $form->{"quonumber_$i"}     = $linked_quoitems[0]->record->record_number;
+            $form->{"transdate_quo_$i"} = $linked_quoitems[0]->record->transdate->to_kivitendo;
+          };
+
+          my @linked_deliveryorderitems = grep { $_->isa("SL::DB::DeliveryOrderItem") && $_->record->type eq 'sales_delivery_order' } @{$linkeditems};
+          if ( scalar @linked_deliveryorderitems ) {
+            croak "an invoice item may only be linked back to 1 sales delivery item, something is wrong\n" unless scalar @linked_deliveryorderitems == 1;
+            $form->{"donumber_$i"}     = $linked_deliveryorderitems[0]->record->record_number;
+            $form->{"transdate_do_$i"} = $linked_deliveryorderitems[0]->record->transdate->to_kivitendo;
+          };
+        };
+      };
+
+
       # add number, description and qty to $form->{number},
       if ($form->{"subtotal_$i"} && !$subtotal_header) {
         $subtotal_header = $i;
@@ -198,6 +270,9 @@ sub invoice_details {
 
       my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 };
 
+      push(@{ $form->{TEMPLATE_ARRAYS}->{$_} },                $prepared_template_arrays{$_}[$i - 1]) for @prepared_arrays;
+
+      push @{ $form->{TEMPLATE_ARRAYS}->{entry_type} },        'normal';
       push @{ $form->{TEMPLATE_ARRAYS}->{runningnumber} },     $position;
       push @{ $form->{TEMPLATE_ARRAYS}->{number} },            $form->{"partnumber_$i"};
       push @{ $form->{TEMPLATE_ARRAYS}->{serialnumber} },      $form->{"serialnumber_$i"};
@@ -211,16 +286,23 @@ sub invoice_details {
       push @{ $form->{TEMPLATE_ARRAYS}->{deliverydate_oe} },   $form->{"reqdate_$i"};
       push @{ $form->{TEMPLATE_ARRAYS}->{sellprice} },         $form->{"sellprice_$i"};
       push @{ $form->{TEMPLATE_ARRAYS}->{sellprice_nofmt} },   $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+      # linked item print variables
+      push @{ $form->{TEMPLATE_ARRAYS}->{quonumber_quo} },     $form->{"quonumber_$i"};
+      push @{ $form->{TEMPLATE_ARRAYS}->{transdate_quo} },     $form->{"transdate_quo_$i"};
       push @{ $form->{TEMPLATE_ARRAYS}->{ordnumber_oe} },      $form->{"ordnumber_$i"};
+      push @{ $form->{TEMPLATE_ARRAYS}->{transdate_oe} },      $form->{"transdate_oe_$i"};
+      push @{ $form->{TEMPLATE_ARRAYS}->{cusordnumber_oe} },   $form->{"cusordnumber_oe_$i"};
       push @{ $form->{TEMPLATE_ARRAYS}->{donumber_do} },       $form->{"donumber_$i"};
-      push @{ $form->{TEMPLATE_ARRAYS}->{transdate_oe} },      $form->{"transdate_$i"};
+      push @{ $form->{TEMPLATE_ARRAYS}->{transdate_do} },      $form->{"transdate_do_$i"};
+
       push @{ $form->{TEMPLATE_ARRAYS}->{invnumber} },         $form->{"invnumber"};
       push @{ $form->{TEMPLATE_ARRAYS}->{invdate} },           $form->{"invdate"};
       push @{ $form->{TEMPLATE_ARRAYS}->{price_factor} },      $price_factor->{formatted_factor};
       push @{ $form->{TEMPLATE_ARRAYS}->{price_factor_name} }, $price_factor->{description};
       push @{ $form->{TEMPLATE_ARRAYS}->{partsgroup} },        $form->{"partsgroup_$i"};
       push @{ $form->{TEMPLATE_ARRAYS}->{reqdate} },           $form->{"reqdate_$i"};
-      push(@{ $form->{TEMPLATE_ARRAYS}->{listprice} },         $form->{"listprice_$i"});
+      push @{ $form->{TEMPLATE_ARRAYS}->{listprice} },         $form->format_amount($myconfig, $form->{"listprice_$i"}, 2);
+      push(@{ $form->{TEMPLATE_ARRAYS}->{listprice_nofmt} },   $form->{"listprice_$i"});
 
       my $sellprice     = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
       my ($dec)         = ($sellprice =~ /\.(\d+)/);
@@ -346,7 +428,7 @@ sub invoice_details {
           $sortorder = qq|ORDER BY a.oid|;
         }
 
-        $query =
+        my $query =
           qq|SELECT p.partnumber, p.description, p.unit, a.qty, pg.partsgroup
              FROM assembly a
              JOIN parts p ON (a.parts_id = p.id)
@@ -356,23 +438,31 @@ sub invoice_details {
 
         while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
           if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
-            map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+            map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } (@arrays, @prepared_arrays)));
             $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
+            push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type}  }, 'assembly-item-partsgroup');
             push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, $sameitem);
           }
 
           map { $form->{"a_$_"} = $ref->{$_} } qw(partnumber description);
 
+          push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type}  }, 'assembly-item');
           push(@{ $form->{TEMPLATE_ARRAYS}->{description} },
                $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}
                  )
                  . qq| -- $form->{"a_partnumber"}, $form->{"a_description"}|);
-          map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+          map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } (@arrays, @prepared_arrays)));
 
         }
         $sth->finish;
       }
 
+      CVar->get_non_editable_ic_cvars(form               => $form,
+                                      dbh                => $dbh,
+                                      row                => $i,
+                                      sub_module         => 'invoice',
+                                      may_converted_from => ['delivery_order_items', 'orderitems', 'invoice']);
+
       push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
         CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
           for @{ $ic_cvar_configs };
@@ -581,8 +671,12 @@ sub post_invoice {
   my $all_units = AM->retrieve_units($myconfig, $form);
 
   if (!$payments_only) {
+    if ($form->{storno}) {
+      _delete_transfers($dbh, $form, $form->{storno_id});
+    }
     if ($form->{id}) {
       &reverse_invoice($dbh, $form);
+      _delete_transfers($dbh, $form, $form->{id});
 
     } else {
       my $trans_number   = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{invnumber}, save => 1);
@@ -648,6 +742,7 @@ sub post_invoice {
 
     if ($form->{"id_$i"}) {
       my $item_unit;
+      my $position = $i;
 
       if (defined($baseunits{$form->{"id_$i"}})) {
         $item_unit = $baseunits{$form->{"id_$i"}};
@@ -733,7 +828,7 @@ sub post_invoice {
 
         if ($form->{"assembly_$i"}) {
           # record assembly item as allocated
-          &process_assembly($dbh, $myconfig, $form, $form->{"id_$i"}, $baseqty);
+          &process_assembly($dbh, $myconfig, $form, $position, $form->{"id_$i"}, $baseqty);
 
         } else {
           $allocated = &cogs($dbh, $myconfig, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i);
@@ -748,36 +843,42 @@ sub post_invoice {
       $pricegroup_id *= 1;
       $pricegroup_id  = undef if !$pricegroup_id;
 
+      CVar->get_non_editable_ic_cvars(form               => $form,
+                                      dbh                => $dbh,
+                                      row                => $i,
+                                      sub_module         => 'invoice',
+                                      may_converted_from => ['delivery_order_items', 'orderitems', 'invoice']);
+
       if (!$form->{"invoice_id_$i"}) {
         # there is no persistent id, therefore create one with all necessary constraints
         my $q_invoice_id = qq|SELECT nextval('invoiceid')|;
         my $h_invoice_id = prepare_query($form, $dbh, $q_invoice_id);
         do_statement($form, $h_invoice_id, $q_invoice_id);
         $form->{"invoice_id_$i"}  = $h_invoice_id->fetchrow_array();
-        my $q_create_invoice_id = qq|INSERT INTO invoice (id, trans_id, parts_id) values (?, ?, ?)|;
-        do_query($form, $dbh, $q_create_invoice_id, conv_i($form->{"invoice_id_$i"}), conv_i($form->{id}), conv_i($form->{"id_$i"}));
+        my $q_create_invoice_id = qq|INSERT INTO invoice (id, trans_id, position, parts_id) values (?, ?, ?, ?)|;
+        do_query($form, $dbh, $q_create_invoice_id, conv_i($form->{"invoice_id_$i"}),
+                 conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}));
         $h_invoice_id->finish();
       }
 
       # save detail record in invoice table
       $query = <<SQL;
-        UPDATE invoice SET trans_id = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?,
+        UPDATE invoice SET trans_id = ?, position = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?,
                            sellprice = ?, fxsellprice = ?, discount = ?, allocated = ?, assemblyitem = ?,
                            unit = ?, deliverydate = ?, project_id = ?, serialnumber = ?, pricegroup_id = ?,
-                           ordnumber = ?, donumber = ?, transdate = ?, cusordnumber = ?, base_qty = ?, subtotal = ?,
+                           base_qty = ?, subtotal = ?,
                            marge_percent = ?, marge_total = ?, lastcost = ?, active_price_source = ?, active_discount_source = ?,
                            price_factor_id = ?, price_factor = (SELECT factor FROM price_factors WHERE id = ?), marge_price_factor = ?
         WHERE id = ?
 SQL
 
-      @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}),
+      @values = (conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}),
                  $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"},
                  $form->{"sellprice_$i"}, $fxsellprice,
                  $form->{"discount_$i"}, $allocated, 'f',
                  $form->{"unit_$i"}, conv_date($form->{"reqdate_$i"}), conv_i($form->{"project_id_$i"}),
                  $form->{"serialnumber_$i"}, $pricegroup_id,
-                 $form->{"ordnumber_$i"}, $form->{"donumber_$i"}, conv_date($form->{"transdate_$i"}),
-                 $form->{"cusordnumber_$i"}, $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
+                 $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
                  $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
                  $form->{"lastcost_$i"},
                  $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
@@ -796,6 +897,19 @@ SQL
                                   name_postfix => "_$i",
                                   dbh          => $dbh);
     }
+    # link previous items with invoice items
+    foreach (qw(delivery_order_items orderitems invoice)) {
+      if (!$form->{useasnew} && $form->{"converted_from_${_}_id_$i"}) {
+        RecordLinks->create_links('dbh'        => $dbh,
+                                  'mode'       => 'ids',
+                                  'from_table' => $_,
+                                  'from_ids'   => $form->{"converted_from_${_}_id_$i"},
+                                  'to_table'   => 'invoice',
+                                  'to_id'      => $form->{"invoice_id_$i"},
+        );
+      }
+      delete $form->{"converted_from_${_}_id_$i"};
+    }
   }
 
   # total payments, don't move we need it here
@@ -852,9 +966,12 @@ SQL
     }
   }
 
-  $form->{amount}{ $form->{id} }{ $form->{AR} } = $netamount + $tax;
-  $form->{paid} =
-    $form->round_amount($form->{paid} * $form->{exchangerate} + $diff, 2);
+  # Invoice Summary includes Rounding
+  my $totalamount = $netamount + $tax;
+  my $rounding = $form->round_amount( $form->round_amount( $totalamount, 2, 1 ) - $totalamount, 2 );
+  my $rnd_accno = $rounding == 0 ? 0 : $rounding > 0 ? $form->{rndgain_accno} : $form->{rndloss_accno};
+  $form->{amount}{ $form->{id} }{ $form->{AR} } = $totalamount = $form->round_amount( $totalamount, 2, 1 );
+  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate} + $diff, 2);
 
   # reverse AR
   $form->{amount}{ $form->{id} }{ $form->{AR} } *= -1;
@@ -872,9 +989,7 @@ SQL
   foreach my $trans_id (keys %{ $form->{amount_cogs} }) {
     foreach my $accno (keys %{ $form->{amount_cogs}{$trans_id} }) {
       next unless ($form->{expense_inventory} =~ /\Q$accno\E/);
-
       $form->{amount_cogs}{$trans_id}{$accno} = $form->round_amount($form->{amount_cogs}{$trans_id}{$accno}, 2);
-
       if (!$payments_only && ($form->{amount_cogs}{$trans_id}{$accno} != 0)) {
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, tax_id, taxkey, project_id, chart_link)
@@ -887,7 +1002,6 @@ SQL
 
     foreach my $accno (keys %{ $form->{amount_cogs}{$trans_id} }) {
       $form->{amount_cogs}{$trans_id}{$accno} = $form->round_amount($form->{amount_cogs}{$trans_id}{$accno}, 2);
-
       if (!$payments_only && ($form->{amount_cogs}{$trans_id}{$accno} != 0)) {
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, tax_id, taxkey, project_id, chart_link)
@@ -901,9 +1015,7 @@ SQL
   foreach my $trans_id (keys %{ $form->{amount} }) {
     foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
       next unless ($form->{expense_inventory} =~ /\Q$accno\E/);
-
       $form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2);
-
       if (!$payments_only && ($form->{amount}{$trans_id}{$accno} != 0)) {
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, tax_id, taxkey, project_id, chart_link)
@@ -929,10 +1041,8 @@ SQL
         $form->{amount}{$trans_id}{$accno} = 0;
       }
     }
-
     foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
       $form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2);
-
       if (!$payments_only && ($form->{amount}{$trans_id}{$accno} != 0)) {
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, tax_id, taxkey, project_id, chart_link)
@@ -957,6 +1067,14 @@ SQL
         do_query($form, $dbh, $query, @values);
       }
     }
+    if (!$payments_only && ($rnd_accno != 0)) {
+      $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, tax_id, taxkey, project_id, chart_link)
+             VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, (SELECT id FROM tax WHERE taxkey=0), 0, ?, (SELECT link FROM chart WHERE accno = ?))|;
+      @values = (conv_i($trans_id), $rnd_accno, $rounding, conv_date($form->{invdate}), conv_i($project_id), $rnd_accno);
+      do_query($form, $dbh, $query, @values);
+      $rnd_accno = 0;
+    }
   }
 
   # deduct payment differences from diff
@@ -1119,7 +1237,7 @@ SQL
     return;
   }
 
-  $amount = $netamount + $tax;
+  $amount = $form->round_amount( $netamount + $tax, 2, 1);
 
   # save AR record
   #erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb
@@ -1129,7 +1247,7 @@ SQL
                 transdate   = ?, orddate       = ?, quodate       = ?, customer_id   = ?,
                 amount      = ?, netamount     = ?, paid          = ?,
                 duedate     = ?, deliverydate  = ?, invoice       = ?, shippingpoint = ?,
-                shipvia     = ?, terms         = ?, notes         = ?, intnotes      = ?,
+                shipvia     = ?,                    notes         = ?, intnotes      = ?,
                 currency_id = (SELECT id FROM currencies WHERE name = ?),
                 department_id = ?, payment_id    = ?, taxincluded   = ?,
                 type        = ?, language_id   = ?, taxzone_id    = ?, shipto_id     = ?,
@@ -1144,7 +1262,7 @@ SQL
              conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}),
                        $amount,                        $netamount,                       $form->{"paid"},
              conv_date($form->{"duedate"}),  conv_date($form->{"deliverydate"}),    '1',                                $form->{"shippingpoint"},
-                       $form->{"shipvia"},      conv_i($form->{"terms"}),                $form->{"notes"},              $form->{"intnotes"},
+                       $form->{"shipvia"},                                $restricter->process($form->{"notes"}),       $form->{"intnotes"},
                        $form->{"currency"},     conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}),        $form->{"taxincluded"} ? 't' : 'f',
                        $form->{"type"},         conv_i($form->{"language_id"}),   conv_i($form->{"taxzone_id"}), conv_i($form->{"shipto_id"}),
                 conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),   conv_i($form->{storno_id}),           $form->{"storno"} ? 't' : 'f',
@@ -1193,14 +1311,16 @@ SQL
   }
 
   # Link this record to the records it was created from.
-  RecordLinks->create_links('dbh'        => $dbh,
-                            'mode'       => 'ids',
-                            'from_table' => 'oe',
-                            'from_ids'   => $form->{convert_from_oe_ids},
-                            'to_table'   => 'ar',
-                            'to_id'      => $form->{id},
-    );
-  delete $form->{convert_from_oe_ids};
+  if ($form->{convert_from_oe_ids}) {
+    RecordLinks->create_links('dbh'        => $dbh,
+                              'mode'       => 'ids',
+                              'from_table' => 'oe',
+                              'from_ids'   => $form->{convert_from_oe_ids},
+                              'to_table'   => 'ar',
+                              'to_id'      => $form->{id},
+      );
+    delete $form->{convert_from_oe_ids};
+  }
 
   my @convert_from_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{convert_from_do_ids};
 
@@ -1241,8 +1361,6 @@ SQL
       exporttype => DATEV_ET_BUCHUNGEN,
       format     => DATEV_FORMAT_KNE,
       dbh        => $dbh,
-      from       => $transdate,
-      to         => $transdate,
       trans_id   => $form->{id},
     );
 
@@ -1262,6 +1380,135 @@ SQL
   return $rc;
 }
 
+sub transfer_out {
+  $::lxdebug->enter_sub;
+
+  my ($self, $form, $dbh) = @_;
+
+  my (@errors, @transfers);
+
+  # do nothing, if transfer default is not requeseted at all
+  if (!$::instance_conf->get_transfer_default) {
+    $::lxdebug->leave_sub;
+    return \@errors;
+  }
+
+  require SL::WH;
+
+  foreach my $i (1 .. $form->{rowcount}) {
+    next if !$form->{"id_$i"};
+    my ($err, $wh_id, $bin_id) = _determine_wh_and_bin($dbh, $::instance_conf,
+                                                       $form->{"id_$i"},
+                                                       $form->{"qty_$i"},
+                                                       $form->{"unit_$i"});
+    if (!@{ $err } && $wh_id && $bin_id) {
+      push @transfers, {
+        'parts_id'         => $form->{"id_$i"},
+        'qty'              => $form->{"qty_$i"},
+        'unit'             => $form->{"unit_$i"},
+        'transfer_type'    => 'shipped',
+        'src_warehouse_id' => $wh_id,
+        'src_bin_id'       => $bin_id,
+        'project_id'       => $form->{"project_id_$i"},
+        'invoice_id'       => $form->{"invoice_id_$i"},
+        'comment'          => $::locale->text("Default transfer invoice"),
+      };
+    }
+
+    push @errors, @{ $err };
+  }
+
+  if (!@errors) {
+    WH->transfer(@transfers);
+  }
+
+  $::lxdebug->leave_sub;
+  return \@errors;
+}
+
+sub _determine_wh_and_bin {
+  $::lxdebug->enter_sub(2);
+
+  my ($dbh, $conf, $part_id, $qty, $unit) = @_;
+  my @errors;
+
+  my $part = SL::DB::Part->new(id => $part_id)->load;
+
+  # ignore service if they are not configured to be transfered
+  if ($part->is_service && !$conf->get_transfer_default_services) {
+    $::lxdebug->leave_sub(2);
+    return (\@errors);
+  }
+
+  # test negative qty
+  if ($qty < 0) {
+    push @errors, $::locale->text("Cannot transfer negative quantities.");
+    return (\@errors);
+  }
+
+  # get/test default bin
+  my ($default_wh_id, $default_bin_id);
+  if ($conf->get_transfer_default_use_master_default_bin) {
+    $default_wh_id  = $conf->get_warehouse_id if $conf->get_warehouse_id;
+    $default_bin_id = $conf->get_bin_id       if $conf->get_bin_id;
+  }
+  my $wh_id  = $part->warehouse_id || $default_wh_id;
+  my $bin_id = $part->bin_id       || $default_bin_id;
+
+  # check qty and bin
+  if ($bin_id) {
+    my ($max_qty, $error) = WH->get_max_qty_parts_bin(dbh      => $dbh,
+                                                      parts_id => $part->id,
+                                                      bin_id   => $bin_id);
+    if ($error == 1) {
+      push @errors, $::locale->text('Part "#1" has chargenumber or best before date set. So it cannot be transfered automaticaly.',
+                                    $part->description);
+    }
+    my $form_unit_obj = SL::DB::Unit->new(name => $unit)->load;
+    my $part_unit_qty = $form_unit_obj->convert_to($qty, $part->unit_obj);
+    my $diff_qty      = $max_qty - $part_unit_qty;
+    if (!@errors && $diff_qty < 0) {
+      push @errors, $::locale->text('For part "#1" there are missing #2 #3 in the default warehouse/bin "#4/#5".',
+                                    $part->description,
+                                    $::form->format_amount(\%::myconfig, -1*$diff_qty),
+                                    $part->unit_obj->name,
+                                    SL::DB::Warehouse->new(id => $wh_id)->load->description,
+                                    SL::DB::Bin->new(      id => $bin_id)->load->description);
+    }
+  } else {
+    push @errors, $::locale->text('For part "#1" there is no default warehouse and bin defined.',
+                                  $part->description);
+  }
+
+  # transfer to special "ignore onhand" bin if requested and default bin does not work
+  if (@errors && $conf->get_transfer_default_ignore_onhand && $conf->get_bin_id_ignore_onhand) {
+    $wh_id  = $conf->get_warehouse_id_ignore_onhand;
+    $bin_id = $conf->get_bin_id_ignore_onhand;
+    if ($wh_id && $bin_id) {
+      @errors = ();
+    } else {
+      push @errors, $::locale->text('For part "#1" there is no default warehouse and bin for ignoring onhand defined.',
+                                    $part->description);
+    }
+  }
+
+  $::lxdebug->leave_sub(2);
+  return (\@errors, $wh_id, $bin_id);
+}
+
+sub _delete_transfers {
+  $::lxdebug->enter_sub;
+
+  my ($dbh, $form, $id) = @_;
+
+  my $query = qq|DELETE FROM inventory WHERE invoice_id
+                  IN (SELECT id FROM invoice WHERE trans_id = ?)|;
+
+  do_query($form, $dbh, $query, $id);
+
+  $::lxdebug->leave_sub;
+}
+
 sub _delete_payments {
   $main::lxdebug->enter_sub();
 
@@ -1373,7 +1620,7 @@ sub post_payment {
 sub process_assembly {
   $main::lxdebug->enter_sub();
 
-  my ($dbh, $myconfig, $form, $id, $totalqty) = @_;
+  my ($dbh, $myconfig, $form, $position, $id, $totalqty) = @_;
 
   my $query =
     qq|SELECT a.parts_id, a.qty, p.assembly, p.partnumber, p.description, p.unit,
@@ -1394,7 +1641,7 @@ sub process_assembly {
     $ref->{qty} *= $totalqty;
 
     if ($ref->{assembly}) {
-      &process_assembly($dbh, $myconfig, $form, $ref->{parts_id}, $ref->{qty});
+      &process_assembly($dbh, $myconfig, $form, $position, $ref->{parts_id}, $ref->{qty});
       next;
     } else {
       if ($ref->{inventory_accno_id}) {
@@ -1404,9 +1651,10 @@ sub process_assembly {
 
     # save detail record for individual assembly item in invoice table
     $query =
-      qq|INSERT INTO invoice (trans_id, description, parts_id, qty, sellprice, fxsellprice, allocated, assemblyitem, unit)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)|;
-    my @values = (conv_i($form->{id}), $ref->{description}, conv_i($ref->{parts_id}), $ref->{qty}, 0, 0, $allocated, 't', $ref->{unit});
+      qq|INSERT INTO invoice (trans_id, position, description, parts_id, qty, sellprice, fxsellprice, allocated, assemblyitem, unit)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+    my @values = (conv_i($form->{id}), conv_i($position), $ref->{description},
+                  conv_i($ref->{parts_id}), $ref->{qty}, 0, 0, $allocated, 't', $ref->{unit});
     do_query($form, $dbh, $query, @values);
 
   }
@@ -1567,6 +1815,7 @@ sub delete_invoice {
   my $dbh = $form->get_standard_dbh;
 
   &reverse_invoice($dbh, $form);
+  _delete_transfers($dbh, $form, $form->{id});
 
   my @values = (conv_i($form->{id}));
 
@@ -1626,7 +1875,9 @@ 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
+         (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id)    AS fxloss_accno,
+         (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id)   AS rndgain_accno,
+         (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id)   AS rndloss_accno
          ${query_transdate}
        FROM defaults d|;
 
@@ -1644,18 +1895,23 @@ sub retrieve_invoice {
            a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
            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.shippingpoint, a.shipvia, a.notes, a.intnotes, a.taxzone_id,
            a.duedate, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.shipto_id, a.cp_id,
            a.employee_id, a.salesman_id, a.payment_id,
+           a.mtime, a.itime,
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
            a.transaction_description, a.donumber, a.invnumber_for_credit_note,
            a.marge_total, a.marge_percent, a.direct_debit, a.delivery_term_id,
+           dc.dunning_description,
            e.name AS employee
          FROM ar a
          LEFT JOIN employee e ON (e.id = a.employee_id)
+         LEFT JOIN dunning_config dc ON (a.dunning_config_id = dc.id)
          WHERE a.id = ?|;
     $ref = selectfirst_hashref_query($form, $dbh, $query, $id);
     map { $form->{$_} = $ref->{$_} } keys %{ $ref };
+    $form->{mtime} = $form->{itime} if !$form->{mtime};
+    $form->{lastmtime} = $form->{mtime};
 
     $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
 
@@ -1708,7 +1964,7 @@ sub retrieve_invoice {
          LEFT JOIN chart c2 ON ((SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c2.id)
          LEFT JOIN chart c3 ON ((SELECT tc.expense_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c3.id)
 
-         WHERE (i.trans_id = ?) AND NOT (i.assemblyitem = '1') ORDER BY i.id|;
+         WHERE (i.trans_id = ?) AND NOT (i.assemblyitem = '1') ORDER BY i.position|;
 
     $sth = prepare_execute_query($form, $dbh, $query, $id);
 
@@ -1791,45 +2047,39 @@ sub get_customer {
   my $dateformat = $myconfig->{dateformat};
   $dateformat .= "yy" if $myconfig->{dateformat} !~ /^y/;
 
-  my (@values, $duedate, $ref, $query);
-
-  if ($form->{invdate}) {
-    $duedate = "to_date(?, '$dateformat')";
-    push @values, $form->{invdate};
-  } else {
-    $duedate = "current_date";
-  }
+  my (@values, $ref, $query);
 
   my $cid = conv_i($form->{customer_id});
   my $payment_id;
 
-  if ($form->{payment_id}) {
-    $payment_id = "(pt.id = ?) OR";
-    push @values, conv_i($form->{payment_id});
-  }
-
   # get customer
   $query =
     qq|SELECT
-         c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit, c.terms,
+         c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit,
          c.email, c.cc, c.bcc, c.language_id, c.payment_id, c.delivery_term_id,
          c.street, c.zipcode, c.city, c.country,
          c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, cu.name AS curr,
          c.taxincluded_checked, c.direct_debit,
-         $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
          b.discount AS tradediscount, b.description AS business
        FROM customer c
        LEFT JOIN business b ON (b.id = c.business_id)
-       LEFT JOIN payment_terms pt ON ($payment_id (c.payment_id = pt.id))
        LEFT JOIN currencies cu ON (c.currency_id=cu.id)
        WHERE c.id = ?|;
   push @values, $cid;
   $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
 
   delete $ref->{salesman_id} if !$ref->{salesman_id};
+  delete $ref->{payment_id}  if $form->{payment_id};
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
+  if ($form->{payment_id}) {
+    my $reference_date = $form->{invdate} ? DateTime->from_kivitendo($form->{invdate}) : undef;
+    $form->{duedate}   = SL::DB::PaymentTerm->new(id => $form->{payment_id})->load->calc_date(reference_date => $reference_date)->to_kivitendo;
+  } else {
+    $form->{duedate}   = DateTime->today_local->to_kivitendo;
+  }
+
   # use customer currency
   $form->{currency} = $form->{curr};