X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=a4243757b4d77f15920504b1e35f478f1ed71bc1;hb=a3a6d136cbd97bd18b5943937b80b1b1b504ef3b;hp=ec1ccbfbaeab7cad7be3b985b3379eba84c40b5f;hpb=32e816b5faa06c33f4927271b04d29a92bb943d3;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index ec1ccbfba..a4243757b 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -25,7 +25,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # customer/vendor module @@ -54,7 +55,6 @@ use SL::Request qw(flatten); use SL::DB::Business; use SL::DB::Default; use SL::DB::DeliveryTerm; -use SL::Helper::Flash; use SL::ReportGenerator; use SL::MoreCommon qw(uri_encode); @@ -136,15 +136,17 @@ sub list_names { push @options, $locale->text('Orphaned'); } - push @options, $locale->text('Name') . " : $form->{name}" if $form->{name}; - push @options, $locale->text('Contact') . " : $form->{contact}" if $form->{contact}; - push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"}; - push @options, $locale->text('E-mail') . " : $form->{email}" if $form->{email}; - push @options, $locale->text('Contact person (surname)') . " : $form->{cp_name}" if $form->{cp_name}; - push @options, $locale->text('Billing/shipping address (city)') . " : $form->{addr_city}" if $form->{addr_city}; - push @options, $locale->text('Billing/shipping address (zipcode)') . " : $form->{zipcode}" if $form->{addr_zipcode}; - push @options, $locale->text('Billing/shipping address (street)') . " : $form->{street}" if $form->{addr_street}; - push @options, $locale->text('Billing/shipping address (country)') . " : $form->{country}" if $form->{addr_country}; + push @options, $locale->text('Name') . " : $form->{name}" if $form->{name}; + push @options, $locale->text('Contact') . " : $form->{contact}" if $form->{contact}; + push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"}; + push @options, $locale->text('E-mail') . " : $form->{email}" if $form->{email}; + push @options, $locale->text('Contact person (surname)') . " : $form->{cp_name}" if $form->{cp_name}; + push @options, $locale->text('Billing/shipping address (city)') . " : $form->{addr_city}" if $form->{addr_city}; + push @options, $locale->text('Billing/shipping address (zipcode)') . " : $form->{addr_zipcode}" if $form->{addr_zipcode}; + push @options, $locale->text('Billing/shipping address (street)') . " : $form->{addr_street}" if $form->{addr_street}; + push @options, $locale->text('Billing/shipping address (country)') . " : $form->{addr_country}" if $form->{addr_country}; + push @options, $locale->text('Billing/shipping address (GLN)') . " : $form->{addr_gln}" if $form->{addr_gln}; + push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all}; if ($form->{business_id}) { my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id}); @@ -170,7 +172,7 @@ sub list_names { 'id', 'name', "$form->{db}number", 'contact', 'phone', 'discount', 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city', 'business', 'payment', 'invnumber', 'ordnumber', 'quonumber', 'salesman', - 'country', 'insertdate', 'pricegroup' + 'country', 'gln', 'insertdate', 'pricegroup' ); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; @@ -197,6 +199,7 @@ sub list_names { 'zipcode' => { 'text' => $locale->text('Zipcode'), }, 'city' => { 'text' => $locale->text('City'), }, 'country' => { 'text' => $locale->text('Country'), }, + 'gln' => { 'text' => $locale->text('GLN'), }, 'salesman' => { 'text' => $locale->text('Salesman'), }, 'discount' => { 'text' => $locale->text('Discount'), }, 'payment' => { 'text' => $locale->text('Payment Terms'), }, @@ -209,7 +212,7 @@ sub list_names { my @hidden_variables = ( qw( db status obsolete name contact email cp_name addr_street addr_zipcode - addr_city addr_country business_id salesman_id insertdateto insertdatefrom + addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all ), "$form->{db}number", map({ "cvar_$_->{name}" } @searchable_custom_variables), map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)),