From: Moritz Bunkus Date: Wed, 12 Jan 2011 15:36:54 +0000 (+0100) Subject: Mechanismus zur Konvertierung von RDBO-Objekten nach $form für $form->parse_template X-Git-Tag: release-2.6.3~61^2~7^2~1^2~2^2~45 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c692dae18a650bc62c89ca658603d0e0ab2f9a86;p=kivitendo-erp.git Mechanismus zur Konvertierung von RDBO-Objekten nach $form für $form->parse_template Noch leicht unvollständig Conflicts: SL/DB/Order.pm --- diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm new file mode 100644 index 000000000..710fb337b --- /dev/null +++ b/SL/DB/Helper/FlattenToForm.pm @@ -0,0 +1,99 @@ +package SL::DB::Helper::FlattenToForm; + +use strict; + +use parent qw(Exporter); +our @EXPORT = qw(flatten_to_form); + +use List::MoreUtils qw(any); + +use SL::CVar; + +sub flatten_to_form { + my ($self, $form, $format_amounts) = @_; + + my $vc = $self->can('customer_id') && $self->customer_id ? 'customer' : 'vendor'; + + _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)); + + if (_has($self, 'transdate')) { + my $transdate_idx = ref($self) eq 'SL::DB::Order' ? ($self->quotation ? 'quodate' : 'orddate') + : ref($self) eq 'SL::DB::Invoice' ? 'invdate' + : 'transdate'; + $form->{$transdate_idx} = $self->transdate->to_lxoffice; + } + + _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); + _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'); + _copy($self->employee, $form, 'employee', '', 0, map { $_->name } SL::DB::Employee->meta->columns) if _has($self, 'employee_id'); + _copy($self->salesman, $form, 'salesman', '', 0, map { $_->name } SL::DB::Employee->meta->columns) if _has($self, 'salesman_id'); + _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->{language} = $self->language_code if _has($self, 'language_id'); + $form->{department} = $self->department->description if _has($self, 'department_id'); + $form->{rowcount} = scalar(@{ $self->items }); + + my $idx = 0; + foreach my $item (@{ $self->items }) { + next if _has($item, 'assemblyitem'); + + $idx++; + + $form->{"id_${idx}"} = $item->parts_id; + $form->{"number_${idx}"} = $item->part->partnumber; + _copy($item, $form, '', "_${idx}", 0, qw(description project_id ship serialnumber pricegroup_id ordnumber cusordnumber unit + subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate)); + _copy($item, $form, '', "_${idx}", $format_amounts, qw(qty sellprice discount marge_total marge_percent lastcost)); + _copy($item->project, $form, 'project', "_${idx}", 0, qw(number description)) if _has($item, 'project_id'); + + _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}"); + } + + _copy_custom_variables($self, $form, 'vc_cvar_', ''); + # TODO: CustomVariables + + return $self; +} + +sub _has { + my ($obj, $column) = @_; + return $obj->can($column) && $obj->$column; +} + +sub _copy { + my ($src, $form, $prefix, $postfix, $format_amounts, @columns) = @_; + + map { $form->{"${prefix}${_}${postfix}"} = ref($src->$_) eq 'DateTime' ? $src->$_->to_lxoffice : $src->$_ if $src->can($_) } @columns if !$format_amounts; + map { $form->{"${prefix}${_}${postfix}"} = $::form->format_amount(\%::myconfig, $src->$_ * 1, 2) if $src->can($_) } @columns if $format_amounts; + + return $src; +} + +sub _copy_custom_variables { + my ($src, $form, $prefix, $postfix) = @_; + + my ($module, $sub_module, $trans_id) = ref($src) eq 'SL::DB::OrderItem' ? ('IC', 'orderitems', $src->id) + : ref($src) eq 'SL::DB::DeliveryOrderItem' ? ('IC', 'delivery_order_items', $src->id) + : ref($src) eq 'SL::DB::InvoiceItem' ? ('IC', 'invoice', $src->id) + : ('CT', undef, _has($src, 'customer_id') ? $src->customer_id : $src->vendor_id); + + return unless $trans_id; + + my $cvars = CVar->get_custom_variables(dbh => $src->db->dbh, + module => $module, + sub_module => $sub_module, + trans_id => $trans_id, + ); + map { $form->{ $prefix . $_->{name} . $postfix } = $_->{value} } @{ $cvars }; + + return $src; +} + +1; diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 7f36e54db..401d08865 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -10,6 +10,7 @@ use List::Util qw(first); use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; +use SL::DB::Helper::FlattenToForm; use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::PriceTaxCalculator; use SL::DB::Helper::PriceUpdater; diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm index d74f9414d..daab5dd7d 100644 --- a/SL/DB/Order.pm +++ b/SL/DB/Order.pm @@ -10,6 +10,7 @@ use List::Util qw(max); use SL::DB::MetaSetup::Order; use SL::DB::Manager::Order; use SL::DB::Invoice; +use SL::DB::Helper::FlattenToForm; use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::PriceTaxCalculator; use SL::DB::Helper::PriceUpdater;