From: Moritz Bunkus Date: Mon, 22 Nov 2010 17:02:38 +0000 (+0100) Subject: Mehr Felder setzen (bessere Kompatibilität mit älterem Lx-Office-Code) X-Git-Tag: release-2.6.3~61^2~7^2~1^2~2^2~44 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=79cc78cabcd7792319f36aa278fa9b984bc7fe99;p=kivitendo-erp.git Mehr Felder setzen (bessere Kompatibilität mit älterem Lx-Office-Code) --- diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm index 710fb337b..eb034d647 100644 --- a/SL/DB/Helper/FlattenToForm.pm +++ b/SL/DB/Helper/FlattenToForm.pm @@ -16,8 +16,8 @@ sub flatten_to_form { _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes curr cp_id employee_id salesman_id closed department_id language_id payment_id delivery_customer_id delivery_vendor_id shipto_id proforma - globalproject_id delivered transaction_description container_type accepted_by_customer orddate quodate reqdate gldate duedate deliverydate - datepaid invoice terms storno storno_id dunning_config_id)); + globalproject_id delivered transaction_description container_type accepted_by_customer invoice terms storno storno_id dunning_config_id + orddate quodate reqdate gldate duedate deliverydate datepaid transdate)); if (_has($self, 'transdate')) { my $transdate_idx = ref($self) eq 'SL::DB::Order' ? ($self->quotation ? 'quodate' : 'orddate') @@ -26,6 +26,8 @@ sub flatten_to_form { $form->{$transdate_idx} = $self->transdate->to_lxoffice; } + $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);