CVar: Dokumentation um Lieferadressen-CVars ergänzt

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

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 969d6da..4d7f54c 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -18,6 +18,12 @@ sub flatten_to_form {
                                     orddate quodate reqdate gldate duedate deliverydate datepaid transdate delivery_term_id));
   $form->{currency} = $form->{curr} = $self->currency_id ? $self->currency->name || '' : '';
 
+  if ( $vc eq 'customer' ) {
+    $form->{customer_id} = $self->customer_id;
+  } else {
+    $form->{vendor_id} = $self->vendor_id;
+  };
+
   if (_has($self, 'transdate')) {
     my $transdate_idx = ref($self) eq 'SL::DB::Order'   ? ($self->quotation ? 'quodate' : 'orddate')
                       : ref($self) eq 'SL::DB::Invoice' ? 'invdate'
@@ -28,7 +34,7 @@ sub flatten_to_form {
   $form->{vc} = $vc if ref($self) =~ m{^SL::DB::(?:.*Invoice|Order)};
 
   my @vc_fields          = (qw(account_number bank bank_code bic business city contact country creditlimit
-                               department_1 department_2 discount email fax homepage iban language name
+                               department_1 department_2 discount email fax gln homepage iban language name
                                payment_terms phone street taxnumber ustid zipcode),
                             "${vc}number",
                             ($vc eq 'customer')? 'c_vendor_id': 'v_customer_id');
@@ -47,6 +53,7 @@ sub flatten_to_form {
   $form->{employee}   = $self->employee->name          if _has($self, 'employee_id');
   $form->{language}   = $self->language->template_code if _has($self, 'language_id');
   $form->{department} = $self->department->description if _has($self, 'department_id');
+  $form->{business}   = $self->$vc->business->description if _has($self->$vc, 'business_id');
   $form->{rowcount}   = scalar(@{ $self->items });
 
   my $items_name = ref($self) eq 'SL::DB::Order'         ? 'orderitems'