X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FOE.pm;h=13e735a384fcec8b3d3f738129301787efb9335c;hb=b2e51e71121b798a53ec6a60891bdcce08df2eeb;hp=ae3ff08075698a66234b57633abd2893ea8ce2b3;hpb=1e542cc70c846448b75be1f36becd61601a4b3d3;p=kivitendo-erp.git

diff --git a/SL/OE.pm b/SL/OE.pm
index ae3ff0807..13e735a38 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -46,6 +46,7 @@ use SL::DB::Status;
 use SL::DB::Tax;
 use SL::DBUtils;
 use SL::IC;
+use SL::TransNumber;
 
 use strict;
 
@@ -79,10 +80,32 @@ sub transactions {
 
   my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
 
+  my %billed_amount;
+  my %billed_netamount;
+  if ($form->{l_remaining_amount} || $form->{l_remaining_netamount}) {
+    $query = <<'';
+      SELECT from_id, ar.amount, ar.netamount FROM (
+        SELECT from_id, to_id
+        FROM record_links
+        WHERE from_table = 'oe' AND to_table = 'ar'
+        UNION
+        SELECT rl1.from_id, rl2.to_id
+        FROM record_links rl1
+        LEFT JOIN record_links rl2 ON (rl1.to_table = rl2.from_table AND rl1.to_id = rl2.from_id)
+        WHERE rl1.from_table = 'oe' AND rl2.to_table = 'ar'
+      ) rl
+      LEFT JOIN ar ON ar.id = rl.to_id
+
+    for my $ref (@{ selectall_hashref_query($form, $dbh, $query) }) {
+      $billed_amount{   $ref->{from_id}} += $ref->{amount};
+      $billed_netamount{$ref->{from_id}} += $ref->{netamount};
+    }
+  }
+
   $query =
     qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
     qq|  o.amount, ct.${vc}number, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
-    qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
+    qq|  o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | .
     qq|  o.transaction_description, | .
     qq|  o.marge_total, o.marge_percent, | .
     qq|  ex.$rate AS exchangerate, | .
@@ -174,6 +197,11 @@ SQL
     push(@values, '%' . $form->{$ordnumber} . '%');
   }
 
+  if ($form->{cusordnumber}) {
+    $query .= qq| AND o.cusordnumber ILIKE ?|;
+    push(@values, '%' . $form->{cusordnumber} . '%');
+  }
+
   if($form->{transdatefrom}) {
     $query .= qq| AND o.transdate >= ?|;
     push(@values, conv_date($form->{transdatefrom}));
@@ -221,6 +249,7 @@ SQL
     "reqdate"                 => "o.reqdate",
     "id"                      => "o.id",
     "ordnumber"               => "o.ordnumber",
+    "cusordnumber"            => "o.cusordnumber",
     "quonumber"               => "o.quonumber",
     "name"                    => "ct.name",
     "employee"                => "e.name",
@@ -242,6 +271,10 @@ SQL
   my %id = ();
   $form->{OE} = [];
   while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    $ref->{billed_amount}    = $billed_amount{$ref->{id}};
+    $ref->{billed_netamount} = $billed_netamount{$ref->{id}};
+    $ref->{remaining_amount} = $ref->{amount} - $ref->{billed_amount};
+    $ref->{remaining_netamount} = $ref->{netamount} - $ref->{billed_netamount};
     $ref->{exchangerate} = 1 unless $ref->{exchangerate};
     push @{ $form->{OE} }, $ref if $ref->{id} != $id{ $ref->{id} };
     $id{ $ref->{id} } = $ref->{id};
@@ -314,6 +347,10 @@ sub save {
 
   my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
 
+  my $number_field         = $form->{type} =~ m{order} ? 'ordnumber' : 'quonumber';
+  my $trans_number         = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{$number_field}, id => $form->{id});
+  $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'))
@@ -1070,10 +1107,10 @@ sub order_details {
     %projects_by_id = map { $_->id => $_ } @$projects;
   }
 
-  $form->{globalprojectnumber} = $projects_by_id{$form->{"globalproject_id"}}->projectnumber;
-  $form->{globalprojectdescription} = $projects_by_id{$form->{"globalproject_id"}}->description;
-
   if ($projects_by_id{$form->{"globalproject_id"}}) {
+    $form->{globalprojectnumber} = $projects_by_id{$form->{"globalproject_id"}}->projectnumber;
+    $form->{globalprojectdescription} = $projects_by_id{$form->{"globalproject_id"}}->description;
+
     for (@{ $projects_by_id{$form->{"globalproject_id"}}->cvars_by_config }) {
       $form->{"project_cvar_" . $_->config->name} = $_->value_as_text;
     }