From: David Ohlbrecht Date: Thu, 19 Nov 2009 09:24:45 +0000 (+0100) Subject: Kundennummer in Auftragssuche in vcnumber umbenannt um Lieferantenaufträge mit abzude... X-Git-Tag: release-2.6.1beta1~89 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=130ba50ded16e214dd1f6482ac8c54b3affc25f9;p=kivitendo-erp.git Kundennummer in Auftragssuche in vcnumber umbenannt um Lieferantenaufträge mit abzudecken. Fix für Bugs 1264 und 1266. --- diff --git a/SL/OE.pm b/SL/OE.pm index dcfca7a05..1bf8a719a 100644 --- a/SL/OE.pm +++ b/SL/OE.pm @@ -90,7 +90,7 @@ sub transactions { qq| ex.$rate AS exchangerate, | . qq| pr.projectnumber AS globalprojectnumber, | . qq| e.name AS employee, s.name AS salesman, | . - qq| ct.customernumber, ct.country, ct.ustid | . + qq| ct.${vc}number AS vcnumber, ct.country, ct.ustid | . qq|FROM oe o | . qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | . qq|LEFT JOIN employee e ON (o.employee_id = e.id) | . diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index d33db6264..f05bcfb85 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -745,7 +745,7 @@ sub orders { "shipvia", "globalprojectnumber", "transaction_description", "open", "delivered", "marge_total", "marge_percent", - "customernumber", "ustid", + "vcnumber", "ustid", "country", ); @@ -808,7 +808,7 @@ sub orders { 'delivered' => { 'text' => $locale->text('Delivered'), }, 'marge_total' => { 'text' => $locale->text('Ertrag'), }, 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), }, - 'customernumber' => { 'text' => $locale->text('Customer Number'), }, + 'vcnumber' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), }, 'country' => { 'text' => $locale->text('Country'), }, 'ustid' => { 'text' => $locale->text('USt-IdNr.'), }, ); diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html index d2cca794b..0ebe9e01c 100644 --- a/templates/webpages/oe/search_de.html +++ b/templates/webpages/oe/search_de.html @@ -1,5 +1,6 @@ [%- USE HTML %] [%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %] +[%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %]
@@ -227,12 +228,12 @@ - Kunde + [% HTML.escape(vclabel) %] - - + + diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html index 9a3df3978..cc0a2cbf3 100644 --- a/templates/webpages/oe/search_master.html +++ b/templates/webpages/oe/search_master.html @@ -1,5 +1,6 @@ [%- USE HTML %] [%- SET vclabel = vc == 'customer' ? 'Customer' : 'Vendor' %] +[%- SET vcnumberlabel = vc == 'customer' ? 'Customer Number' : 'Vendor Number' %] @@ -227,12 +228,12 @@ - Customer + [% HTML.escape(vclabel) %] - - + +