From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 22 Nov 2010 17:13:25 +0000 (+0100)
Subject: Kunden-/Lieferantenfelder richtig zur Verfügung stellen
X-Git-Tag: release-2.6.3~61^2~7^2~1^2~2^2~43
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0a382648a783af65ddf69cc02124379bf0c24844;p=kivitendo-erp.git

Kunden-/Lieferantenfelder richtig zur Verfügung stellen
---

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index eb034d647..80dcf57ff 100644
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -28,9 +28,14 @@ sub flatten_to_form {
 
   $self->{vc} = $vc if ref($self) =~ /^SL::DB::.*Invoice/;
 
-  _copy($self,                          $form, '',              '', 1, qw(amount netamount marge_total marge_percent container_remaining_weight container_remaining_volume
-                                                                          paid));
-  _copy($self->$vc,                     $form, "${vc}_",        '', 0, map { $_->name } ref($self->$vc)->meta->columns);
+  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),
+                            "${vc}number");
+  my @vc_prefixed_fields = qw(email fax notes number phone);
+
+  _copy($self,                          $form, '',              '', 1, qw(amount netamount marge_total marge_percent container_remaining_weight container_remaining_volume paid));
+  _copy($self->$vc,                     $form, '',              '', 0, @vc_fields);
+  _copy($self->$vc,                     $form, $vc,             '', 0, @vc_prefixed_fields);
   _copy($self->contact,                 $form, '',              '', 0, grep { /^cp_/    } map { $_->name } SL::DB::Contact->meta->columns) if _has($self, 'cp_id');
   _copy($self->shipto,                  $form, '',              '', 0, grep { /^shipto/ } map { $_->name } SL::DB::Shipto->meta->columns)  if _has($self, 'shipto_id');
   _copy($self->globalproject,           $form, 'globalproject', '', 0, qw(number description))                                             if _has($self, 'globalproject_id');