customer_vendor_picker bei CVars und Summen- und Saldenliste

[mfinanz.git] / SL / OE.pm

diff --git a/SL/OE.pm b/SL/OE.pm
index 506db6bdc873271122cd5fa0adc7f4b77672703e..58792acef96e6c7987c894685b04f2efa1314557 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -515,29 +515,31 @@ sub save {
       $pricegroup_id *= 1;
       $pricegroup_id  = undef if !$pricegroup_id;
 
       $pricegroup_id *= 1;
       $pricegroup_id  = undef if !$pricegroup_id;
 

+      my $position = $i;
+

       # save detail record in orderitems table
       if (! $form->{"orderitems_id_$i"}) {
         $query = qq|SELECT nextval('orderitemsid')|;
         ($form->{"orderitems_id_$i"}) = selectrow_query($form, $dbh, $query);
 
       # save detail record in orderitems table
       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));

       }
       my $orderitems_id = $form->{"orderitems_id_$i"};
       push @processed_orderitems, $orderitems_id;
 
        $query = <<SQL;
          UPDATE orderitems SET
       }
       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 = ?,
           sellprice = ?, discount = ?, unit = ?, reqdate = ?, project_id = ?, serialnumber = ?, ship = ?,
           pricegroup_id = ?, ordnumber = ?, transdate = ?, cusordnumber = ?, subtotal = ?,
           marge_percent = ?, marge_total = ?, lastcost = ?, price_factor_id = ?,

-          active_price_source = ?,
+          active_price_source = ?, active_discount_source = ?,

           price_factor = (SELECT factor FROM price_factors WHERE id = ?), marge_price_factor = ?
         WHERE id = ?
 SQL
       @values = (
           price_factor = (SELECT factor FROM price_factors WHERE id = ?), marge_price_factor = ?
         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"},
            $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}),
            $form->{"qty_$i"}, $baseqty,
            $fxsellprice, $form->{"discount_$i"},


@@ -546,10 +548,9 @@ SQL
            $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
            $form->{"cusordnumber_$i"}, $form->{"subtotal_$i"} ? 't' : 'f',
            $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
            $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
            $form->{"cusordnumber_$i"}, $form->{"subtotal_$i"} ? 't' : 'f',
            $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},

-           $form->{"lastcost_$i"},
-           $form->{"active_price_source_$i"},
-           conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
-           conv_i($form->{"marge_price_factor_$i"}),
+           $form->{"lastcost_$i"}, conv_i($form->{"price_factor_id_$i"}),
+           $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
+           conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}),

            conv_i($orderitems_id),
       );
 
            conv_i($orderitems_id),
       );
 


@@ -947,7 +948,7 @@ sub retrieve {
            o.sellprice, o.parts_id AS id, o.unit, o.discount, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
            o.reqdate, o.project_id, o.serialnumber, o.ship, o.lastcost,
            o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,
            o.sellprice, o.parts_id AS id, o.unit, o.discount, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
            o.reqdate, o.project_id, o.serialnumber, o.ship, o.lastcost,
            o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,

-           o.price_factor_id, o.price_factor, o.marge_price_factor, o.active_price_source,
+           o.price_factor_id, o.price_factor, o.marge_price_factor, o.active_price_source, o.active_discount_source,

            pr.projectnumber, p.formel,
            pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
          FROM orderitems o
            pr.projectnumber, p.formel,
            pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
          FROM orderitems o


@@ -961,7 +962,7 @@ sub retrieve {
       ($form->{id}
        ? qq|WHERE o.trans_id = ?|
        : qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
       ($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);
 
     @ids = $form->{id} ? ($form->{id}) : @ids;
     $sth = prepare_execute_query($form, $dbh, $query, @values);


@@ -1093,7 +1094,7 @@ sub retrieve_simple {
   my $dbh         = $params{dbh} || $form->get_standard_dbh($myconfig);
 
   my $oe_query    = qq|SELECT * FROM oe         WHERE id = ?|;
   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}));
 
   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}));