X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=0a62ab538eb567184c567d3fdf1d68a3abf90a97;hb=549f187d3a2b1d15f96c4556714666ed954447bb;hp=555768d8472db4feeacacac3d08750e4400bad7b;hpb=564b5410a5b4913215b53e659be6ee2a9cf259be;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 555768d84..0a62ab538 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -58,6 +58,7 @@ use SL::DB::DeliveryTerm; use SL::ReportGenerator; use SL::Locale::String qw(t8); use SL::MoreCommon qw(uri_encode); +use SL::ZUGFeRD; require "bin/mozilla/common.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -67,11 +68,14 @@ use strict; # end of main +sub _zugferd_settings { + return ([ -1, $::locale->text('Use settings from client configuration') ], + @SL::ZUGFeRD::customer_settings); +} + sub search { $main::lxdebug->enter_sub(); - $main::auth->assert('customer_vendor_edit'); - my $form = $main::form; my $locale = $main::locale; @@ -89,6 +93,8 @@ sub search { $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors'); + $form->{ZUGFERD_SETTINGS} = [ _zugferd_settings() ]; + setup_ct_search_action_bar(); $form->header(); @@ -99,7 +105,6 @@ sub search { sub search_contact { $::lxdebug->enter_sub; - $::auth->assert('customer_vendor_edit'); $::form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'Contacts'); ($::form->{CUSTOM_VARIABLES_FILTER_CODE}, @@ -120,8 +125,6 @@ sub search_contact { sub list_names { $main::lxdebug->enter_sub(); - $main::auth->assert('customer_vendor_edit'); - my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; @@ -141,17 +144,22 @@ 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->{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}; + my @zugferd_settings_list = _zugferd_settings(); + my $zugferd_filter = $form->{create_zugferd_invoices} eq '' ? undef : $zugferd_settings_list[$form->{create_zugferd_invoices} + 1]->[1]; + + 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('All phone numbers') . " : $form->{all_phonenumbers}" if $form->{all_phonenumbers}; + 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}; + push @options, $locale->text('Factur-X/ZUGFeRD settings') . " : $zugferd_filter" if $zugferd_filter; if ($form->{business_id}) { my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id}); @@ -175,11 +183,11 @@ sub list_names { my @columns = ( 'id', 'name', "$form->{db}number", 'contact', 'main_contact_person', - 'phone', 'discount', + 'department_1', 'department_2', 'phone', 'discount', 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city', 'business', 'payment', 'invnumber', 'ordnumber', 'quonumber', 'salesman', 'country', 'gln', 'insertdate', 'pricegroup', 'contact_origin', 'invoice_mail', - 'creditlimit', 'ustid', 'commercial_court' + 'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail' ); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; @@ -194,6 +202,8 @@ sub list_names { 'name' => { 'text' => $form->{IS_CUSTOMER} ? $::locale->text('Customer Name') : $::locale->text('Vendor Name'), }, 'contact' => { 'text' => $locale->text('Contact'), }, 'main_contact_person' => { 'text' => $locale->text('Main Contact Person'), }, + 'department_1' => { 'text' => $locale->text('Department') . " 1", }, + 'department_2' => { 'text' => $locale->text('Department') . " 2", }, 'phone' => { 'text' => $locale->text('Phone'), }, 'fax' => { 'text' => $locale->text('Fax'), }, 'email' => { 'text' => $locale->text('E-mail'), }, @@ -214,10 +224,12 @@ sub list_names { 'insertdate' => { 'text' => $locale->text('Insert Date'), }, 'pricegroup' => { 'text' => $locale->text('Pricegroup'), }, 'invoice_mail' => { 'text' => $locale->text('Email of the invoice recipient'), }, + 'delivery_order_mail' => { 'text' => $locale->text('Email of the delivery order recipient'), }, 'contact_origin' => { 'text' => $locale->text('Origin of personal data'), }, 'creditlimit' => { 'text' => $locale->text('Credit Limit'), }, 'ustid' => { 'text' => $locale->text('VAT ID'), }, 'commercial_court' => { 'text' => $locale->text('Commercial court'), }, + create_zugferd_invoices => { text => $locale->text('Factur-X/ZUGFeRD settings'), }, %column_defs_cvars, ); @@ -226,8 +238,11 @@ sub list_names { my @hidden_variables = ( qw( db status obsolete name contact email cp_name addr_street addr_zipcode addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all + all_phonenumbers ), "$form->{db}number", map({ "cvar_$_->{name}" } @searchable_custom_variables), + map({'cvar_'. $_->{name} .'_from'} grep({$_->{type} eq 'date'} @searchable_custom_variables)), + map({'cvar_'. $_->{name} .'_to'} grep({$_->{type} eq 'date'} @searchable_custom_variables)), map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)), map({ "l_$_" } @columns), ); @@ -323,7 +338,6 @@ sub list_names { sub list_contacts { $::lxdebug->enter_sub; - $::auth->assert('customer_vendor_edit'); $::form->{sortdir} = 1 unless defined $::form->{sortdir};