Ermittlung der Folgekonten: Bei Ausgangsrechnungen wird zuerst das Lieferdatum, dann...

diff --git a/SL/IR.pm b/SL/IR.pm
index 025c65f2eefa138c35fff2601af2455c6b6f3b8c..90a17e0b33dd039afa8dad6009c7254ef15c96a6 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -866,10 +866,9 @@ sub retrieve_invoice {
     delete($ref->{id});
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     $sth->finish;
     delete($ref->{id});
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     $sth->finish;

-    my $transdate = "current_date";
-    if($form->{invdate}) {
-     $transdate = "'$form->{invdate}'";
-    }
+
+    my $transdate =
+      $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";

 
     if(!$form->{taxzone_id}) {
       $form->{taxzone_id} = 0;
 
     if(!$form->{taxzone_id}) {
       $form->{taxzone_id} = 0;


@@ -1110,6 +1109,9 @@ sub retrieve_item {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+

   my $i = $form->{rowcount};
 
   # don't include assemblies or obsolete parts
   my $i = $form->{rowcount};
 
   # don't include assemblies or obsolete parts


@@ -1138,20 +1140,13 @@ sub retrieve_item {
 
   my $transdate = "";
   if ($form->{type} eq "invoice") {
 
   my $transdate = "";
   if ($form->{type} eq "invoice") {

-    $transdate = "'$form->{invdate}'";
-  } elsif ($form->{type} eq "purchase_order") {
-    $transdate = "'$form->{transdate}'";
-  } elsif ($form->{type} eq "request_quotation") {
-    $transdate = "'$form->{transdate}'";
-  }
-
-  if ($transdate eq "") {
-    $transdate = "current_date";
+    $transdate =
+      $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";
+  } else {
+    $transdate =
+      $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";

   }
 
   }
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-

   my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
                         p.listprice, p.inventory_accno_id,
                         c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid,
   my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
                         p.listprice, p.inventory_accno_id,
                         c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid,

diff --git a/SL/IS.pm b/SL/IS.pm
index f9b95ec8b0348d74c99085581a01f98cfb9b45f1..7943fa60fc7ce69d6dd6956b491a101aba68535f 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1532,12 +1532,12 @@ sub retrieve_invoice {
     $sth->finish;
     map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
 
     $sth->finish;
     map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
 

-    my $transdate = "current_date";
-    if($form->{invdate}) {
-     $transdate = "'$form->{invdate}'";
-    }
+    my $transdate =
+      $form->{deliverydate} ? $dbh->quote($form->{deliverydate}) :
+      $form->{invdate} ? $dbh->quote($form->{invdate}) :
+      "current_date";

 
 

-    if(!$form->{taxzone_id}) {
+    if (!$form->{taxzone_id}) {

       $form->{taxzone_id} = 0;
     }
     # retrieve individual items
       $form->{taxzone_id} = 0;
     }
     # retrieve individual items


@@ -1848,6 +1848,9 @@ sub retrieve_item {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+

   my $i = $form->{rowcount};
 
   my $where = "NOT p.obsolete = '1'";
   my $i = $form->{rowcount};
 
   my $where = "NOT p.obsolete = '1'";


@@ -1872,22 +1875,18 @@ sub retrieve_item {
     $where .= " ORDER BY p.partnumber";
   }
 
     $where .= " ORDER BY p.partnumber";
   }
 

-  my $transdate = "";
+  my $transdate;

   if ($form->{type} eq "invoice") {
   if ($form->{type} eq "invoice") {

-    $transdate = "'$form->{invdate}'";
-  } elsif ($form->{type} eq "sales_order") {
-    $transdate = "'$form->{transdate}'";
-  } elsif ($form->{type} eq "sales_quotation") {
-    $transdate = "'$form->{transdate}'";
-  }
-
-  if ($transdate eq "") {
-    $transdate = "current_date";
+    $transdate =
+      $form->{deliverydate} ? $dbh->quote($form->{deliverydate}) :
+      $form->{invdate} ? $dbh->quote($form->{invdate}) :
+      "current_date";
+  } else {
+    $transdate =
+      $form->{transdate} ? $dbh->quote($form->{transdate}) :
+      "current_date";

   }
 
   }
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-

   my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
                         p.listprice, p.inventory_accno_id,
                         c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid,
   my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
                         p.listprice, p.inventory_accno_id,
                         c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid,

diff --git a/SL/OE.pm b/SL/OE.pm
index 18e48bdd666a1691ae58f9e4a5a8955f4b06a839..5dc3128f51074df67b5d4d29094dc79b4075d75a 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -787,10 +787,9 @@ sub retrieve {
     my %oid = ('Pg'     => 'oid',
                'Oracle' => 'rowid');
 
     my %oid = ('Pg'     => 'oid',
                'Oracle' => 'rowid');
 

-    my $transdate = "'$form->{transdate}'";
-    if (!$transdate) {
-      $transdate = "current_date";
-    }
+    my $transdate =
+      $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
+

     if(!$form->{taxzone_id}) {
       $form->{taxzone_id} = 0;
     }
     if(!$form->{taxzone_id}) {
       $form->{taxzone_id} = 0;
     }