Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 1e6ab9b..0b2c5e9 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -70,6 +70,11 @@ sub flatten_to_form {
     _copy($item->project, $form, 'project', "_${idx}", 0,               qw(number description)) if _has($item, 'project_id');
 
     _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}");
+
+    if (ref($self) eq 'SL::DB::Invoice') {
+      $form->{"deliverydate_oe_${idx}"} = $item->deliverydate->to_lxoffice;
+      $form->{"reqdate_${idx}"}         = $item->deliverydate->to_lxoffice;
+    }
   }
 
   _copy_custom_variables($self, $form, 'vc_cvar_', '');

diff --git a/SL/DO.pm b/SL/DO.pm
index 584ad59..8fad24c 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -898,10 +898,12 @@ sub order_details {
     next if (!$form->{"id_$i"});
 
     if ($item->[1] ne $sameitem) {
-      push(@{ $form->{description} }, qq|$item->[1]|);
+      push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, qq|$item->[1]|);
       $sameitem = $item->[1];
 
-      map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+      map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} @arrays));
+      map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays));
+      $si_position++;
     }
 
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});

diff --git a/locale/de/all b/locale/de/all
index 942b361..5136a68 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -465,7 +465,7 @@ $self->{texts} = {
   'Cannot storno invoice for a closed period!' => 'Das Rechnungsdatum der zu stornierenden Rechnung fällt in einen abgeschlossenen Zeitraum!',
   'Cannot storno storno invoice!' => 'Kann eine Stornorechnung nicht stornieren',
   'Cannot transfer negative entries.' => 'Kann keine negativen Mengen auslagern.',
-  'Cannot transfer. <br> Reason:<br>#1' => 'Kann nicht auslagern. <br>Grund:<br>#1',
+  'Cannot transfer. <br> Reason:<br>#1' => 'Kann nicht ein-/auslagern. <br>Grund:<br>#1',
   'Carry over shipping address' => 'Lieferadresse &uuml;bernehmen',
   'Cash'                        => 'Zahlungsverkehr',
   'Cash accounting'             => 'Ist-Versteuerung',