Merge branch 'rb-wiederkehrende-rechnungen' into 263

[kivitendo-erp.git] / SL / DB / Helper / FlattenToForm.pm

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index edd3018..9fc9b5c 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -10,7 +10,7 @@ use List::MoreUtils qw(any);
 use SL::CVar;
 
 sub flatten_to_form {
-  my ($self, $form, $format_amounts) = @_;
+  my ($self, $form, %params) = @_;
 
   my $vc = $self->can('customer_id') && $self->customer_id ? 'customer' : 'vendor';
 
@@ -26,7 +26,7 @@ sub flatten_to_form {
     $form->{$transdate_idx} = $self->transdate->to_lxoffice;
   }
 
-  $self->{vc} = $vc if ref($self) =~ /^SL::DB::.*Invoice/;
+  $form->{vc} = $vc if ref($self) =~ /^SL::DB::.*Invoice/;
 
   my @vc_fields          = (qw(account_number bank bank_code bic business city contact country creditlimit discount
                                email fax homepage iban language name payment_terms phone street taxnumber zipcode),
@@ -44,11 +44,12 @@ sub flatten_to_form {
   _copy($self->acceptance_confirmed_by, $form, 'acceptance_confirmed_by_', '', 0, map { $_->name } SL::DB::Employee->meta->columns)        if _has($self, 'acceptance_confirmed_by_id');
 
   $form->{employee}   = $self->employee->name          if _has($self, 'employee_id');
-  $form->{language}   = $self->language_code           if _has($self, 'language_id');
+  $form->{language}   = $self->language->template_code if _has($self, 'language_id');
   $form->{department} = $self->department->description if _has($self, 'department_id');
   $form->{rowcount}   = scalar(@{ $self->items });
 
   my $idx = 0;
+  my $format_amounts = $params{format_amounts};
   foreach my $item (@{ $self->items }) {
     next if _has($item, 'assemblyitem');
 
@@ -65,7 +66,6 @@ sub flatten_to_form {
   }
 
   _copy_custom_variables($self, $form, 'vc_cvar_', '');
-  # TODO: CustomVariables
 
   return $self;
 }