More special chars

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

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 0b2c5e93effee753ea4f6e28324848667c495d05..83f36cde346488520324be44cef1bbf0d5925aaf 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -7,8 +7,6 @@ our @EXPORT = qw(flatten_to_form);
 
 use List::MoreUtils qw(any);
 
 
 use List::MoreUtils qw(any);
 

-use SL::CVar;
-

 sub flatten_to_form {
   my ($self, $form, %params) = @_;
 
 sub flatten_to_form {
   my ($self, $form, %params) = @_;
 


@@ -16,7 +14,7 @@ sub flatten_to_form {
 
   _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes cp_id
                                     employee_id salesman_id closed department_id language_id payment_id delivery_customer_id delivery_vendor_id shipto_id proforma
 
   _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes 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 invoice terms storno storno_id dunning_config_id
+                                    globalproject_id delivered transaction_description container_type accepted_by_customer invoice storno storno_id dunning_config_id

                                     orddate quodate reqdate gldate duedate deliverydate datepaid transdate delivery_term_id));
   $form->{currency} = $form->{curr} = $self->currency_id ? $self->currency->name || '' : '';
 
                                     orddate quodate reqdate gldate duedate deliverydate datepaid transdate delivery_term_id));
   $form->{currency} = $form->{curr} = $self->currency_id ? $self->currency->name || '' : '';
 


@@ -27,7 +25,7 @@ sub flatten_to_form {
     $form->{$transdate_idx} = $self->transdate->to_lxoffice;
   }
 
     $form->{$transdate_idx} = $self->transdate->to_lxoffice;
   }
 

-  $form->{vc} = $vc if ref($self) =~ /^SL::DB::.*Invoice/;
+  $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
 
   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


@@ -55,6 +53,7 @@ sub flatten_to_form {
   my $format_amounts = $params{format_amounts} ? 1 : 0;
   my $format_notnull = $params{format_amounts} ? 2 : 0;
   my $format_percent = $params{format_amounts} ? 3 : 0;
   my $format_amounts = $params{format_amounts} ? 1 : 0;
   my $format_notnull = $params{format_amounts} ? 2 : 0;
   my $format_percent = $params{format_amounts} ? 3 : 0;

+  my $format_noround = $params{format_amounts} ? 4 : 0;

   foreach my $item (@{ $self->items_sorted }) {
     next if _has($item, 'assemblyitem');
 
   foreach my $item (@{ $self->items_sorted }) {
     next if _has($item, 'assemblyitem');
 


@@ -62,18 +61,20 @@ sub flatten_to_form {
 
     $form->{"partsgroup_${idx}"} = $item->part->partsgroup->partsgroup if _has($item->part, 'partsgroup_id');
     _copy($item->part,    $form, '',        "_${idx}", 0,               qw(id partnumber weight));
 
     $form->{"partsgroup_${idx}"} = $item->part->partsgroup->partsgroup if _has($item->part, 'partsgroup_id');
     _copy($item->part,    $form, '',        "_${idx}", 0,               qw(id partnumber weight));

-    _copy($item->part,    $form, '',        "_${idx}", $format_amounts, qw(listprice));
+    _copy($item->part,    $form, '',        "_${idx}", 0,               qw(listprice));

     _copy($item,          $form, '',        "_${idx}", 0,               qw(description project_id ship serialnumber pricegroup_id ordnumber donumber cusordnumber unit
                                                                            subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate));
     _copy($item,          $form, '',        "_${idx}", 0,               qw(description project_id ship serialnumber pricegroup_id ordnumber donumber cusordnumber unit
                                                                            subtotal longdescription price_factor_id marge_price_factor approved_sellprice reqdate transdate));

-    _copy($item,          $form, '',        "_${idx}", $format_amounts, qw(qty sellprice marge_total marge_percent lastcost));
+    _copy($item,          $form, '',        "_${idx}", $format_noround, qw(qty sellprice));
+    _copy($item,          $form, '',        "_${idx}", $format_amounts, qw(marge_total marge_percent lastcost));

     _copy($item,          $form, '',        "_${idx}", $format_percent, qw(discount));
     _copy($item->project, $form, 'project', "_${idx}", 0,               qw(number description)) if _has($item, 'project_id');
 
     _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}");
 
     if (ref($self) eq 'SL::DB::Invoice') {
     _copy($item,          $form, '',        "_${idx}", $format_percent, qw(discount));
     _copy($item->project, $form, 'project', "_${idx}", 0,               qw(number description)) if _has($item, 'project_id');
 
     _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}");
 
     if (ref($self) eq 'SL::DB::Invoice') {

-      $form->{"deliverydate_oe_${idx}"} = $item->deliverydate->to_lxoffice;
-      $form->{"reqdate_${idx}"}         = $item->deliverydate->to_lxoffice;
+      my $date                          = $item->deliverydate ? $item->deliverydate->to_lxoffice : undef;
+      $form->{"deliverydate_oe_${idx}"} = $date;
+      $form->{"reqdate_${idx}"}         = $date;

     }
   }
 
     }
   }
 


@@ -93,29 +94,28 @@ sub _copy {
   @columns = grep { $src->can($_) } @columns;
 
   map { $form->{"${prefix}${_}${postfix}"} = ref($src->$_) eq 'DateTime' ? $src->$_->to_lxoffice : $src->$_             } @columns if !$format_amounts;
   @columns = grep { $src->can($_) } @columns;
 
   map { $form->{"${prefix}${_}${postfix}"} = ref($src->$_) eq 'DateTime' ? $src->$_->to_lxoffice : $src->$_             } @columns if !$format_amounts;

-  map { $form->{"${prefix}${_}${postfix}"} =                $::form->format_amount(\%::myconfig, $src->$_ * 1, 2)       } @columns if  $format_amounts == 1;
-  map { $form->{"${prefix}${_}${postfix}"} = $src->$_ * 1 ? $::form->format_amount(\%::myconfig, $src->$_ * 1, 2) : 0   } @columns if  $format_amounts == 2;
+  map { $form->{"${prefix}${_}${postfix}"} =                $::form->format_amount(\%::myconfig, $src->$_ * 1,   2)     } @columns if  $format_amounts == 1;
+  map { $form->{"${prefix}${_}${postfix}"} = $src->$_ * 1 ? $::form->format_amount(\%::myconfig, $src->$_ * 1,   2) : 0 } @columns if  $format_amounts == 2;

   map { $form->{"${prefix}${_}${postfix}"} = $src->$_ * 1 ? $::form->format_amount(\%::myconfig, $src->$_ * 100, 2) : 0 } @columns if  $format_amounts == 3;
   map { $form->{"${prefix}${_}${postfix}"} = $src->$_ * 1 ? $::form->format_amount(\%::myconfig, $src->$_ * 100, 2) : 0 } @columns if  $format_amounts == 3;

+  map { $form->{"${prefix}${_}${postfix}"} = $src->$_ * 1 ? $::form->format_amount(\%::myconfig, $src->$_ * 1,  -2) : 0 } @columns if  $format_amounts == 4;

 
   return $src;
 }
 
 sub _copy_custom_variables {
 
   return $src;
 }
 
 sub _copy_custom_variables {

-  my ($src, $form, $prefix, $postfix) = @_;
+  my ($src, $form, $prefix, $postfix, $format_amounts) = @_;

 
 

-  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);
+  my $obj = (any { ref($src) eq $_ } qw(SL::DB::OrderItem SL::DB::DeliveryOrderItem SL::DB::InvoiceItem))
+          ? $src
+          : $src->customervendor;

 
 

-  return unless $trans_id;
+  foreach my $cvar (@{ $obj->cvars_by_config }) {
+    my $value = ($cvar->config->type =~ m{^(?:bool|customer|vendor|part)$})
+              ? $cvar->value
+              : $cvar->value_as_text;

 
 

-  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 };
+    $form->{ $prefix . $cvar->config->name . $postfix } = $value;
+  }

 
   return $src;
 }
 
   return $src;
 }