X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/340fd4354e902230359ef4b166047ea08bea6b01..7bc44f0f59f35d7d3b555e98ff9bb61c8ffbea0b:/SL/DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index de9a728de..584ad59ad 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -298,6 +298,7 @@ SQL
 
     my $position = $i;
 
+    my $cvars;
     if (!$form->{"delivery_order_items_id_$i"}) {
       # there is no persistent id, therefore create one with all necessary constraints
       my $q_item_id = qq|SELECT nextval('delivery_order_items_id')|;
@@ -308,7 +309,23 @@ SQL
       do_query($form, $dbh, $query, conv_i($form->{"delivery_order_items_id_$i"}),
                 conv_i($form->{"id"}), conv_i($position), conv_i($form->{"id_$i"}));
       $h_item_id->finish();
+
+      # get values for CVars from master data for new items
+      $cvars = CVar->get_custom_variables(dbh      => $dbh,
+                                          module   => 'IC',
+                                          trans_id => $form->{"id_$i"},
+                                         );
+    } else {
+      # get values for CVars from custom_variables for existing items
+      $cvars = CVar->get_custom_variables(dbh        => $dbh,
+                                          module     => 'IC',
+                                          sub_module => 'delivery_order_items',
+                                          trans_id   => $form->{"delivery_order_items_id_$i"},
+                                         );
     }
+    # map only non-editable CVars to form (editable ones are already there)
+    map { $form->{"ic_cvar_$_->{name}_$i"} = $_->{value} unless $_->{flag_editable} } @{ $cvars };
+
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
 
     my $item_unit = $part_unit_map{$form->{"id_$i"}};
@@ -983,6 +1000,24 @@ sub order_details {
       }
     }
 
+    my $cvars;
+    if (! $form->{"delivery_order_items_id_$i"}) {
+      # get values for CVars from master data for new items
+      $cvars = CVar->get_custom_variables(dbh      => $dbh,
+                                          module   => 'IC',
+                                          trans_id => $form->{"id_$i"},
+                                         );
+    } else {
+      # get values for CVars from custom_variables for existing items
+      $cvars = CVar->get_custom_variables(dbh        => $dbh,
+                                          module     => 'IC',
+                                          sub_module => 'delivery_order_items',
+                                          trans_id   => $form->{"delivery_order_items_id_$i"},
+                                         );
+    }
+    # map only non-editable CVars to form (editable ones are already there)
+    map { $form->{"ic_cvar_$_->{name}_$i"} = $_->{value} unless $_->{flag_editable} } @{ $cvars };
+
     push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
       CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
         for @{ $ic_cvar_configs };