typ customer korrekt ans template system übergeben

diff --git a/SL/CVar.pm b/SL/CVar.pm
index 2408222782c2ab8a13b0e573a2336415ccf1723e..bd58cbd7eff9b5dda1fbd26822420053f3565cc2 100644 (file)
--- a/SL/CVar.pm
+++ b/SL/CVar.pm
@@ -716,6 +716,16 @@ sub parse {
   return $value;
 }
 
   return $value;
 }
 

+sub format_to_template {
+  my ($self, $value, $config) = @_;
+  # stupid template expects everything formated. except objects
+  # do not use outside of print routines for legacy templates
+
+  return $::form->parse_amount(\%::myconfig, $value) if $config->{type} eq 'number';
+  return $value->to_lxoffice if $config->{type} eq 'date' && blessed $value && $value->can('to_lxoffice');
+  return $value;
+}
+

 1;
 
 __END__
 1;
 
 __END__

diff --git a/SL/DO.pm b/SL/DO.pm
index f6c56b6f8dd71a166057e5cca30363f0ce6de64b..17d896f6ecc6d119ee2ec75cd0a9cb5be9f75e6f 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -888,7 +888,9 @@ sub order_details {
       }
     }
 
       }
     }
 

-    map { push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} }, $form->{"ic_cvar_$_->{name}_$i"} } @{ $ic_cvar_configs };
+    push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
+      CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
+        for @{ $ic_cvar_configs };

   }
 
   $h_pg->finish();
   }
 
   $h_pg->finish();

diff --git a/SL/IS.pm b/SL/IS.pm
index da801fd5296272beaa6404b18a7f7cdfdac0cfe6..bd385ef7d2354606e25eb80f992f4331545fbef3 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -353,7 +353,9 @@ sub invoice_details {
         $sth->finish;
       }
 
         $sth->finish;
       }
 

-      map { push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} }, $form->{"ic_cvar_$_->{name}_$i"} } @{ $ic_cvar_configs };
+      push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
+        CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
+          for @{ $ic_cvar_configs };

     }
   }
 
     }
   }
 


@@ -877,7 +879,7 @@ sub post_invoice {
   # record payments and offsetting AR
   if (!$form->{storno}) {
     for my $i (1 .. $form->{paidaccounts}) {
   # record payments and offsetting AR
   if (!$form->{storno}) {
     for my $i (1 .. $form->{paidaccounts}) {

-      
+

       if ($form->{"acc_trans_id_$i"}
           && $payments_only
           && ($::lx_office_conf{features}->{payments_changeable} == 0)) {
       if ($form->{"acc_trans_id_$i"}
           && $payments_only
           && ($::lx_office_conf{features}->{payments_changeable} == 0)) {

diff --git a/SL/OE.pm b/SL/OE.pm
index 61360996b658c813bdf6b11154ccbdca52ab25b8..cfe5e25b152ece29ce12c3a45c33b722e240f172 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1293,7 +1293,9 @@ sub order_details {
         $sth->finish;
       }
 
         $sth->finish;
       }
 

-      map { push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} }, $form->{"ic_cvar_$_->{name}_$i"} } @{ $ic_cvar_configs };
+      push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
+        CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
+          for @{ $ic_cvar_configs };

     }
   }
 
     }
   }