Suchen auch nach positionsbezogenen Projektnummern bei Debitoren- und Kreditorenbuchu...

Bei den Berichten für Verkaus- und Einkaufsrechnungen wird auch auf die
positionsbezogenen Projektnummern bei Debitoren- und Kreditorenbuchungen
gefiltert.

diff --git a/SL/AP.pm b/SL/AP.pm
index ef7ca812683b29f1f9019b4aa2d936076057a1a7..33d09f16caf9ea6deca4b55889acb5e5e62daf1a 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -445,8 +445,12 @@ sub ap_transactions {
     $where .=
       qq|AND ((a.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
     $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});
+      qq|   WHERE i.project_id = ? AND i.trans_id = a.id) | .
+      qq| OR EXISTS | .
+      qq|  (SELECT * FROM acc_trans at | .
+      qq|   WHERE at.project_id = ? AND at.trans_id = a.id)| .
+      qq|  )|;
+    push(@values, $form->{project_id}, $form->{project_id}, $form->{project_id});

   }
 
   if ($form->{transdatefrom}) {
   }
 
   if ($form->{transdatefrom}) {

diff --git a/SL/AR.pm b/SL/AR.pm
index a3284ed9265f1541d84fa29733a98324068f4804..01a2ee6f5de20f1c991602bed25e1e9bcc84c3c8 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -472,8 +472,12 @@ sub ar_transactions {
     $where .=
       qq|AND ((a.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
     $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"});
+      qq|   WHERE i.project_id = ? AND i.trans_id = a.id) | .
+      qq| OR EXISTS | .
+      qq|  (SELECT * FROM acc_trans at | .
+      qq|   WHERE at.project_id = ? AND at.trans_id = a.id)| .
+      qq|  )|;
+    push(@values, $form->{project_id}, $form->{project_id}, $form->{project_id});

   }
 
   if ($form->{transdatefrom}) {
   }
 
   if ($form->{transdatefrom}) {

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 886ff65f359709b1a30238b75b3d8061486813c0..e98a1cfecfdc8409cb218cf4730c9ad2f33125be 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1290,7 +1290,7 @@ sub ap_transactions {
     'transaction_description' => { 'text' => $locale->text('Transaction description'), },
     'notes'                   => { 'text' => $locale->text('Notes'), },
     'employee'                => { 'text' => $locale->text('Employee'), },
     'transaction_description' => { 'text' => $locale->text('Transaction description'), },
     'notes'                   => { 'text' => $locale->text('Notes'), },
     'employee'                => { 'text' => $locale->text('Employee'), },

-    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
+    'globalprojectnumber'     => { 'text' => $locale->text('Document Project Number'), },

     'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
     'country'                 => { 'text' => $locale->text('Country'), },
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
     'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
     'country'                 => { 'text' => $locale->text('Country'), },
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 0fcc0e4a751e416114710eb3d1d9f5f082a3d696..b225370f90891b527bf9d2a6fdc98fff92239194 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1364,7 +1364,7 @@ sub ar_transactions {
     'employee'                => { 'text' => $locale->text('Employee'), },
     'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
     'shipvia'                 => { 'text' => $locale->text('Ship via'), },
     'employee'                => { 'text' => $locale->text('Employee'), },
     'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
     'shipvia'                 => { 'text' => $locale->text('Ship via'), },

-    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
+    'globalprojectnumber'     => { 'text' => $locale->text('Document Project Number'), },

     'marge_total'             => { 'text' => $locale->text('Ertrag'), },
     'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
     'customernumber'          => { 'text' => $locale->text('Customer Number'), },
     'marge_total'             => { 'text' => $locale->text('Ertrag'), },
     'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
     'customernumber'          => { 'text' => $locale->text('Customer Number'), },

diff --git a/doc/changelog b/doc/changelog
index ed4221f3c61b1cb0f696b0c0fbaeab9c951373d5..34ba0dbeddec4a545f1e88dc838766cf57d63845 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -2,6 +2,10 @@
 # Veränderungen von Lx-Office ERP #
 ###################################
 
 # Veränderungen von Lx-Office ERP #
 ###################################
 

+- Bei den Berichten für Verkaus- und Einkaufsrechnungen wird auch auf die
+  positionsbezogenen Projektnummern bei Debitoren- und Kreditorenbuchungen
+  gefiltert.
+

 - Es kann eine Standardsprache eingestellt werden, die automatisch bei neu
   anzulegenden Kunden und Lieferanten vorausgewählt ist.
 
 - Es kann eine Standardsprache eingestellt werden, die automatisch bei neu
   anzulegenden Kunden und Lieferanten vorausgewählt ist.
 

diff --git a/locale/de/all b/locale/de/all
index 80d5796f503b8ef219924ac9a311827db18ca30a..d1445b8e5d3ba1b8f4c1271ee03c33694f6e83e4 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -617,6 +617,7 @@ $self->{texts} = {
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => 'Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
   'Do you want to store the existing onhand values into a new warehouse?' => 'Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?',
   'Document'                    => 'Dokument',
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => 'Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
   'Do you want to store the existing onhand values into a new warehouse?' => 'Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?',
   'Document'                    => 'Dokument',

+  'Document Project Number'     => 'Projektnummer des Belegs',

   'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
   'Done'                        => 'Fertig',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',
   'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
   'Done'                        => 'Fertig',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',

diff --git a/locale/de_DE/all b/locale/de_DE/all
index de782549af6bb19bc5d5174f2c1ac5ee198fd67a..379570e51828bd6fae83ca6c6af7941d5c689b0d 100644 (file)
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -581,6 +581,7 @@ $self->{texts} = {
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => 'Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
   'Do you want to store the existing onhand values into a new warehouse?' => 'Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?',
   'Document'                    => 'Dokument',
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => 'Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
   'Do you want to store the existing onhand values into a new warehouse?' => 'Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?',
   'Document'                    => 'Dokument',

+  'Document Project Number'     => 'Projektnummer des Belegs',

   'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
   'Done'                        => 'Fertig',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',
   'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
   'Done'                        => 'Fertig',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',

diff --git a/locale/en/all b/locale/en/all
index 5a9ab8552470d22b8744d795df1e459b8ad6ccc6..9b2cdd0d457763d7a407257add179bdbeff30c76 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -584,6 +584,7 @@ $self->{texts} = {
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => '',
   'Do you want to store the existing onhand values into a new warehouse?' => '',
   'Document'                    => '',
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => '',
   'Do you want to store the existing onhand values into a new warehouse?' => '',
   'Document'                    => '',

+  'Document Project Number'     => '',

   'Documents in the WebDAV repository' => '',
   'Done'                        => '',
   'Download SEPA XML export file' => '',
   'Documents in the WebDAV repository' => '',
   'Done'                        => '',
   'Download SEPA XML export file' => '',

diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
index 4b11397903a4a9c54c58b192f716f3a6dbd718ba..f9e497d9b494e123bf6de981e48a653fcccc9af7 100644 (file)
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -138,7 +138,7 @@
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>

-           <td nowrap>[% 'Project Number' | $T8 %]</td>
+           <td nowrap>[% 'Document Project Number' | $T8 %]</td>

          </tr>
          <tr>
           <td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td>
          </tr>
          <tr>
           <td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td>

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index c45f28613eedd6fee68bd26f8751926f529b8f20..a70816efe40f6ca5eb73c6df2db33e74c6f67404 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -201,7 +201,7 @@
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>

-           <td nowrap>[% 'Project Number' | $T8 %]</td>
+           <td nowrap>[% 'Document Project Number' | $T8 %]</td>

            <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Transaction description' | $T8 %]</td>
           </tr>
            <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Transaction description' | $T8 %]</td>
           </tr>