X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=86d1f5da448c88d073f41e2803111374dd2229e1;hb=10c5bcd8845b264febd0c7bfd1a690e287703b54;hp=e8c6efd54ed4c389876d383355a1eb7f6788bc6d;hpb=dccb820ac74462367f37c2d7d4afab8b214a37ad;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index e8c6efd54..86d1f5da4 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"; @@ -69,16 +70,12 @@ use strict; sub _zugferd_settings { return ([ -1, $::locale->text('Use settings from client configuration') ], - [ 0, $::locale->text('Do not create ZUGFeRD invoices') ], - [ 1, $::locale->text('Create ZUGFeRD invoices') ], - [ 2, $::locale->text('Create ZUGFeRD invoices in test mode') ]); + @SL::ZUGFeRD::customer_settings); } sub search { $main::lxdebug->enter_sub(); - $main::auth->assert('customer_vendor_edit'); - my $form = $main::form; my $locale = $main::locale; @@ -108,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}, @@ -129,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; @@ -164,7 +158,7 @@ sub list_names { 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('ZUGFeRD settings') . " : $zugferd_filter" if $zugferd_filter; + 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}); @@ -188,7 +182,7 @@ 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', @@ -207,6 +201,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'), }, @@ -232,7 +228,7 @@ sub list_names { '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('ZUGFeRD settings'), }, + create_zugferd_invoices => { text => $locale->text('Factur-X/ZUGFeRD settings'), }, %column_defs_cvars, ); @@ -340,7 +336,6 @@ sub list_names { sub list_contacts { $::lxdebug->enter_sub; - $::auth->assert('customer_vendor_edit'); $::form->{sortdir} = 1 unless defined $::form->{sortdir};