From: Bernd Blessmann Date: Thu, 18 Aug 2011 08:54:03 +0000 (+0200) Subject: Suchen auch nach positionsbezogenen Projektnummern bei Debitoren- und Kreditorenbuchu... X-Git-Tag: release-2.7.0beta1~327 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d8e0c6d81c47bc3a58af6607019ffebc74becc16;p=kivitendo-erp.git Suchen auch nach positionsbezogenen Projektnummern bei Debitoren- und Kreditorenbuchungen. 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 ef7ca8126..33d09f16c 100644 --- 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 | . - 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}) { diff --git a/SL/AR.pm b/SL/AR.pm index a3284ed92..01a2ee6f5 100644 --- 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 | . - 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}) { diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 886ff65f3..e98a1cfec 100644 --- 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'), }, - '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.'), }, diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 0fcc0e4a7..b225370f9 100644 --- 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'), }, - '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'), }, diff --git a/doc/changelog b/doc/changelog index ed4221f3c..34ba0dbed 100644 --- a/doc/changelog +++ b/doc/changelog @@ -2,6 +2,10 @@ # 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. diff --git a/locale/de/all b/locale/de/all index 80d5796f5..d1445b8e5 100644 --- 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', + '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', diff --git a/locale/de_DE/all b/locale/de_DE/all index de782549a..379570e51 100644 --- 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', + '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', diff --git a/locale/en/all b/locale/en/all index 5a9ab8552..9b2cdd0d4 100644 --- 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' => '', + 'Document Project Number' => '', '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 4b1139790..f9e497d9b 100644 --- a/templates/webpages/ap/search.html +++ b/templates/webpages/ap/search.html @@ -138,7 +138,7 @@ [% 'Subtotal' | $T8 %] - [% 'Project Number' | $T8 %] + [% 'Document Project Number' | $T8 %] [% 'Vendor' | $T8 %] diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html index c45f28613..a70816efe 100644 --- a/templates/webpages/ar/search.html +++ b/templates/webpages/ar/search.html @@ -201,7 +201,7 @@ [% 'Subtotal' | $T8 %] - [% 'Project Number' | $T8 %] + [% 'Document Project Number' | $T8 %] [% 'Transaction description' | $T8 %]