Einkaufs- und Verkaufsrechnungen: Filtermöglichkeiten nach Projektnummer sowie Anzeig...

diff --git a/SL/AP.pm b/SL/AP.pm
index 4c705410a77e3977a709a201cd179e93d7e9d463..f20d61a41a5c10e38ea26a94a2a56e0ef33018c6 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -404,10 +404,13 @@ sub ap_transactions {
   my $query =
     qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | .
     qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
   my $query =
     qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | .
     qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .

+    qq|  a.globalproject_id, | .
+    qq|  pr.projectnumber AS globalprojectnumber, | .

     qq|  e.name AS employee | .
     qq|FROM ap a | .
     qq|JOIN vendor v ON (a.vendor_id = v.id) | .
     qq|  e.name AS employee | .
     qq|FROM ap a | .
     qq|JOIN vendor v ON (a.vendor_id = v.id) | .

-    qq|LEFT JOIN employee e ON (a.employee_id = e.id)|;
+    qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
+    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;

 
   my $where;
   my @values;
 
   my $where;
   my @values;


@@ -436,6 +439,13 @@ sub ap_transactions {
     $where .= " AND lower(a.notes) LIKE ?";
     push(@values, $form->like($form->{notes}));
   }
     $where .= " AND lower(a.notes) LIKE ?";
     push(@values, $form->like($form->{notes}));
   }

+  if ($form->{project_id}) {
+    $where .=
+      qq|AND ((a.globalproject_id = ?) OR EXISTS | .
+      qq|  (SELECT * FROM invoice i | .
+      qq|   WHERE i.project_id = ? AND i.trans_id = a.id))|;
+    push(@values, $form->{project_id}, $form->{project_id});
+  }

 
   if ($form->{transdatefrom}) {
     $where .= " AND a.transdate >= ?";
 
   if ($form->{transdatefrom}) {
     $where .= " AND a.transdate >= ?";

diff --git a/SL/AR.pm b/SL/AR.pm
index 65eb3f03ca68272a9717f8e5b4beed3d9aaa2c44..a38259a2ab963581c09980a18f201e142a11cf90 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -552,14 +552,18 @@ sub ar_transactions {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

+  my @values;
+

   my $query = qq|SELECT a.id, a.invnumber, a.ordnumber, a.transdate,
                  a.duedate, a.netamount, a.amount, a.paid, c.name,
                 a.invoice, a.datepaid, a.terms, a.notes, a.shipvia,
   my $query = qq|SELECT a.id, a.invnumber, a.ordnumber, a.transdate,
                  a.duedate, a.netamount, a.amount, a.paid, c.name,
                 a.invoice, a.datepaid, a.terms, a.notes, a.shipvia,

-                a.shippingpoint, a.storno,
+                a.shippingpoint, a.storno, a.globalproject_id,
+                 pr.projectnumber AS globalprojectnumber,

                 e.name AS employee
                 FROM ar a
              JOIN customer c ON (a.customer_id = c.id)
                 e.name AS employee
                 FROM ar a
              JOIN customer c ON (a.customer_id = c.id)

-             LEFT JOIN employee e ON (a.employee_id = e.id)|;
+             LEFT JOIN employee e ON (a.employee_id = e.id)
+                 LEFT JOIN project pr ON a.globalproject_id = pr.id|;

 
   my $where = "1 = 1";
   if ($form->{customer_id}) {
 
   my $where = "1 = 1";
   if ($form->{customer_id}) {


@@ -586,6 +590,13 @@ sub ar_transactions {
     my $notes = $form->like(lc $form->{notes});
     $where .= " AND lower(a.notes) LIKE '$notes'";
   }
     my $notes = $form->like(lc $form->{notes});
     $where .= " AND lower(a.notes) LIKE '$notes'";
   }

+  if ($form->{"project_id"}) {
+    $where .=
+      qq|AND ((a.globalproject_id = ?) OR EXISTS | .
+      qq|  (SELECT * FROM invoice i | .
+      qq|   WHERE i.project_id = ? AND i.trans_id = a.id))|;
+    push(@values, $form->{"project_id"}, $form->{"project_id"});
+  }

 
   $where .= " AND a.transdate >= '$form->{transdatefrom}'"
     if $form->{transdatefrom};
 
   $where .= " AND a.transdate >= '$form->{transdatefrom}'"
     if $form->{transdatefrom};


@@ -603,11 +614,12 @@ sub ar_transactions {
   my $sortorder = join ', ', $form->sort_columns(@a);
   $sortorder = $form->{sort} if $form->{sort};
 
   my $sortorder = join ', ', $form->sort_columns(@a);
   $sortorder = $form->{sort} if $form->{sort};
 

-  $query .= "WHERE $where
+  $query .= " WHERE $where

              ORDER by $sortorder";
 
   my $sth = $dbh->prepare($query);
              ORDER by $sortorder";
 
   my $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute(@values) ||
+    $form->dberror($query . " (" . join(", ", @values) . ")");

 
   while (my $ar = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{AR} }, $ar;
 
   while (my $ar = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{AR} }, $ar;

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 2cfff88d61574f6e8b013f7bf792a2a1990ec8c3..34b285de3445e2de29b9dcbce497b1284be8e586 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -36,6 +36,7 @@ use SL::IR;
 use SL::PE;
 
 require "$form->{path}/arap.pl";
 use SL::PE;
 
 require "$form->{path}/arap.pl";

+require "bin/mozilla/common.pl";

 
 1;
 
 
 1;
 


@@ -1101,6 +1102,19 @@ sub search {
                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
   }
 
                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
   }
 

+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 1 });
+
+  my %labels = ();
+  my @values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+  my $projectnumber =
+    NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+                         '-labels' => \%labels));
+

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|


@@ -1133,6 +1147,10 @@ sub search {
          <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        </tr>
          <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        </tr>

+        <tr>
+          <th align="right">| . $locale->text("Project Number") . qq|</th>
+          <td colspan="3">$projectnumber</td>
+        </tr>

        <tr>
          <th align=right nowrap>| . $locale->text('From') . qq|</th>
          $button1
        <tr>
          <th align=right nowrap>| . $locale->text('From') . qq|</th>
          $button1


@@ -1197,6 +1215,8 @@ sub search {
              <tr>
                <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Subtotal') . qq|</td>
              <tr>
                <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Subtotal') . qq|</td>

+               <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Project Number') . qq|</td>

              </tr>
            </table>
          </td>
              </tr>
            </table>
          </td>


@@ -1299,10 +1319,14 @@ sub ap_transactions {
     $option   .= "\n<br>" if ($option);
     $option   .= $locale->text('Closed');
   }
     $option   .= "\n<br>" if ($option);
     $option   .= $locale->text('Closed');
   }

+  if ($form->{globalproject_id}) {
+    $callback .= "&globalproject_id=" . E($form->{globalproject_id});
+    $href     .= "&globalproject_id=" . E($form->{globalproject_id});
+  }

 
 

-  @columns = $form->sort_columns(
-    qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee)
-  );
+  @columns =
+    qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+       due duedate notes employee globalprojectnumber);

 
   foreach $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
 
   foreach $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {


@@ -1362,6 +1386,8 @@ sub ap_transactions {
   $column_header{employee} =
     "<th><a class=listheading href=$href&sort=employee>"
     . $locale->text('Employee') . "</th>";
   $column_header{employee} =
     "<th><a class=listheading href=$href&sort=employee>"
     . $locale->text('Employee') . "</th>";

+  $column_header{globalprojectnumber} =
+    qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;

 
   $form->{title} = $locale->text('AP Transactions');
 
 
   $form->{title} = $locale->text('AP Transactions');
 


@@ -1452,6 +1478,8 @@ sub ap_transactions {
     $ap->{notes} =~ s/\r\n/<br>/g;
     $column_data{notes}    = "<td>$ap->{notes}&nbsp;</td>";
     $column_data{employee} = "<td>$ap->{employee}&nbsp;</td>";
     $ap->{notes} =~ s/\r\n/<br>/g;
     $column_data{notes}    = "<td>$ap->{notes}&nbsp;</td>";
     $column_data{employee} = "<td>$ap->{employee}&nbsp;</td>";

+    $column_data{globalprojectnumber}  =
+      "<td>" . H($ap->{globalprojectnumber}) . "</td>";

 
     $i++;
     $i %= 2;
 
     $i++;
     $i %= 2;

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 45c0b59abf22966c47cee69f5ddcd027d5008b35..291ad068d5eff4b991c0f0221fdc1a8dc3ab75a2 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -37,6 +37,7 @@ use SL::PE;
 use Data::Dumper;
 
 require "$form->{path}/arap.pl";
 use Data::Dumper;
 
 require "$form->{path}/arap.pl";

+require "bin/mozilla/common.pl";

 
 1;
 
 
 1;
 


@@ -1129,6 +1130,19 @@ sub search {
                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
   }
 
                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
   }
 

+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 1 });
+
+  my %labels = ();
+  my @values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+  my $projectnumber =
+    NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+                         '-labels' => \%labels));
+

   $form->{fokus} = "search.customer";
   $form->header;
 
   $form->{fokus} = "search.customer";
   $form->header;
 


@@ -1160,6 +1174,10 @@ sub search {
          <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        </tr>
          <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        </tr>

+        <tr>
+          <th align="right">| . $locale->text("Project Number") . qq|</th>
+          <td colspan="3">$projectnumber</td>
+        </tr>

        <tr>
          <th align=right nowrap>| . $locale->text('From') . qq|</th>
           $button1
        <tr>
          <th align=right nowrap>| . $locale->text('From') . qq|</th>
           $button1


@@ -1226,6 +1244,8 @@ sub search {
              <tr>
                <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Subtotal') . qq|</td>
              <tr>
                <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Subtotal') . qq|</td>

+               <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Project Number') . qq|</td>

              </tr>
            </table>
          </td>
              </tr>
            </table>
          </td>


@@ -1331,10 +1351,15 @@ sub ar_transactions {
     $option   .= "\n<br>" if ($option);
     $option   .= $locale->text('Closed');
   }
     $option   .= "\n<br>" if ($option);
     $option   .= $locale->text('Closed');
   }

+  if ($form->{globalproject_id}) {
+    $callback .= "&globalproject_id=" . E($form->{globalproject_id});
+    $href     .= "&globalproject_id=" . E($form->{globalproject_id});
+  }

 
 

-  @columns = $form->sort_columns(
-    qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia)
-  );
+  @columns =
+    qw(transdate id type invnumber ordnumber name netamount tax amount paid
+       datepaid due duedate notes employee shippingpoint shipvia
+       globalprojectnumber);

 
   $form->{"l_type"} = "Y";
 
 
   $form->{"l_type"} = "Y";
 


@@ -1407,6 +1432,8 @@ sub ar_transactions {
       "<th><a class=listheading href=$href&sort=shipvia>"
     . $locale->text('Ship via')
     . "</a></th>";
       "<th><a class=listheading href=$href&sort=shipvia>"
     . $locale->text('Ship via')
     . "</a></th>";

+  $column_header{globalprojectnumber} =
+    qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;

 
   $form->{title} = $locale->text('AR Transactions');
 
 
   $form->{title} = $locale->text('AR Transactions');
 


@@ -1505,6 +1532,8 @@ sub ar_transactions {
     $column_data{shippingpoint} = "<td>$ar->{shippingpoint}&nbsp;</td>";
     $column_data{shipvia}       = "<td>$ar->{shipvia}&nbsp;</td>";
     $column_data{employee}      = "<td>$ar->{employee}&nbsp;</td>";
     $column_data{shippingpoint} = "<td>$ar->{shippingpoint}&nbsp;</td>";
     $column_data{shipvia}       = "<td>$ar->{shipvia}&nbsp;</td>";
     $column_data{employee}      = "<td>$ar->{employee}&nbsp;</td>";

+    $column_data{globalprojectnumber}  =
+      "<td>" . H($ar->{globalprojectnumber}) . "</td>";

 
     $i++;
     $i %= 2;
 
     $i++;
     $i %= 2;

diff --git a/locale/de/ap b/locale/de/ap
index 194ece44cc0ad2679e8b81836e05940171601380..d6d3d63260eb946e005732fb8ebd4aae3ee24b49 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -75,6 +75,7 @@ $self->{texts} = {
   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Project'                     => 'Projekt',
   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Project'                     => 'Projekt',

+  'Project Number'              => 'Projektnummer',

   'Project not on file!'        => 'Dieses Projekt ist nicht in der Datenbank!',
   'Remaining'                   => 'Rest',
   'Select from one of the names below' => 'Wählen Sie einen der untenstehenden Namen',
   'Project not on file!'        => 'Dieses Projekt ist nicht in der Datenbank!',
   'Remaining'                   => 'Rest',
   'Select from one of the names below' => 'Wählen Sie einen der untenstehenden Namen',

diff --git a/locale/de/ar b/locale/de/ar
index 11f3bc2025aef55f98ac0b32b818cae58ac4631b..aab9c8af6910a307802ef095378d083497423ea8 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -78,6 +78,7 @@ $self->{texts} = {
   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Project'                     => 'Projekt',
   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Project'                     => 'Projekt',

+  'Project Number'              => 'Projektnummer',

   'Project not on file!'        => 'Dieses Projekt ist nicht in der Datenbank!',
   'Remaining'                   => 'Rest',
   'Sales Invoice'               => 'Rechnung',
   'Project not on file!'        => 'Dieses Projekt ist nicht in der Datenbank!',
   'Remaining'                   => 'Rest',
   'Sales Invoice'               => 'Rechnung',