Weitere Positionen verknüpft II

[kivitendo-erp.git] / SL / OE.pm

diff --git a/SL/OE.pm b/SL/OE.pm
index a179b2d..3dd91bb 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -381,12 +381,6 @@ sub save {
   $form->{$number_field} ||= $trans_number->create_unique;
 
   if ($form->{id}) {
-    $query = qq|DELETE FROM custom_variables
-                WHERE (config_id IN (SELECT id FROM custom_variable_configs WHERE module = 'IC'))
-                  AND (sub_module = 'orderitems')
-                  AND (trans_id IN (SELECT id FROM orderitems WHERE trans_id = ?))|;
-    do_query($form, $dbh, $query, $form->{id});
-
     $query = qq|DELETE FROM shipto | .
              qq|WHERE trans_id = ? AND module = 'OE'|;
     do_query($form, $dbh, $query, $form->{id});
@@ -515,20 +509,39 @@ sub save {
       $pricegroup_id *= 1;
       $pricegroup_id  = undef if !$pricegroup_id;
 
+      my $position = $i;
+
       # save detail record in orderitems table
+      my $cvars;
       if (! $form->{"orderitems_id_$i"}) {
         $query = qq|SELECT nextval('orderitemsid')|;
         ($form->{"orderitems_id_$i"}) = selectrow_query($form, $dbh, $query);
 
-        $query = qq|INSERT INTO orderitems (id) VALUES (?)|;
-        do_query($form, $dbh, $query, $form->{"orderitems_id_$i"});
+        $query = qq|INSERT INTO orderitems (id, position) VALUES (?, ?)|;
+        do_query($form, $dbh, $query, $form->{"orderitems_id_$i"}, conv_i($position));
+
+        # 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 => 'orderitems',
+                                            trans_id   => $form->{"orderitems_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 };
+
       my $orderitems_id = $form->{"orderitems_id_$i"};
       push @processed_orderitems, $orderitems_id;
 
        $query = <<SQL;
          UPDATE orderitems SET
-          trans_id = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
+          trans_id = ?, position = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
           sellprice = ?, discount = ?, unit = ?, reqdate = ?, project_id = ?, serialnumber = ?, ship = ?,
           pricegroup_id = ?, ordnumber = ?, transdate = ?, cusordnumber = ?, subtotal = ?,
           marge_percent = ?, marge_total = ?, lastcost = ?, price_factor_id = ?,
@@ -537,7 +550,7 @@ sub save {
         WHERE id = ?
 SQL
       @values = (
-           conv_i($form->{id}), conv_i($form->{"id_$i"}),
+           conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}),
            $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}),
            $form->{"qty_$i"}, $baseqty,
            $fxsellprice, $form->{"discount_$i"},
@@ -565,6 +578,21 @@ SQL
                                   name_prefix  => 'ic_',
                                   name_postfix => "_$i",
                                   dbh          => $dbh);
+      # link previous items with orderitems
+      foreach (qw(quotation_orderitems orderitems invoice)) {
+        if ($form->{"converted_from_${_}_id_$i"}) {
+          my $table = $_;
+          $table    = 'orderitems' if $table eq 'quotation_orderitems';
+          RecordLinks->create_links('dbh'        => $dbh,
+                                    'mode'       => 'ids',
+                                    'from_table' => $table,
+                                    'from_ids'   => $form->{"converted_from_${_}_id_$i"},
+                                    'to_table'   => 'orderitems',
+                                    'to_id'      => $orderitems_id,
+          );
+          delete $form->{"converted_from_${_}_id_$i"};
+        }
+      }
     }
   }
   # search for orphaned ids
@@ -960,7 +988,7 @@ sub retrieve {
       ($form->{id}
        ? qq|WHERE o.trans_id = ?|
        : qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
-      qq|ORDER BY o.oid|;
+      qq|ORDER BY o.trans_id, o.position|;
 
     @ids = $form->{id} ? ($form->{id}) : @ids;
     $sth = prepare_execute_query($form, $dbh, $query, @values);
@@ -1092,7 +1120,7 @@ sub retrieve_simple {
   my $dbh         = $params{dbh} || $form->get_standard_dbh($myconfig);
 
   my $oe_query    = qq|SELECT * FROM oe         WHERE id = ?|;
-  my $oi_query    = qq|SELECT * FROM orderitems WHERE trans_id = ?|;
+  my $oi_query    = qq|SELECT * FROM orderitems WHERE trans_id = ? ORDER BY position|;
 
   my $order            = selectfirst_hashref_query($form, $dbh, $oe_query, conv_i($params{id}));
   $order->{orderitems} = selectall_hashref_query(  $form, $dbh, $oi_query, conv_i($params{id}));
@@ -1381,6 +1409,24 @@ sub order_details {
         $sth->finish;
       }
 
+      my $cvars;
+      if (! $form->{"orderitems_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 => 'orderitems',
+                                            trans_id   => $form->{"orderitems_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 };