X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;fp=bin%2Fmozilla%2Fct.pl;h=0a62ab538eb567184c567d3fdf1d68a3abf90a97;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=ec1ccbfbaeab7cad7be3b985b3379eba84c40b5f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index ec1ccbfba..0a62ab538 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,9 +55,10 @@ 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::Locale::String qw(t8); use SL::MoreCommon qw(uri_encode); +use SL::ZUGFeRD; require "bin/mozilla/common.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -66,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; @@ -88,6 +93,10 @@ 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(); print $form->parse_html_template('ct/search'); @@ -96,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}, @@ -106,6 +114,8 @@ sub search_contact { 'include_value' => 'Y'); $::form->{title} = $::locale->text('Search contacts'); + + setup_ct_search_contact_action_bar(); $::form->header; print $::form->parse_html_template('ct/search_contact'); @@ -115,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; @@ -136,15 +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->{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}; + 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}); @@ -167,10 +182,12 @@ sub list_names { }; my @columns = ( - 'id', 'name', "$form->{db}number", 'contact', 'phone', 'discount', + 'id', 'name', "$form->{db}number", 'contact', 'main_contact_person', + 'department_1', 'department_2', 'phone', 'discount', 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city', 'business', 'payment', 'invnumber', 'ordnumber', 'quonumber', 'salesman', - 'country', 'insertdate', 'pricegroup' + 'country', 'gln', 'insertdate', 'pricegroup', 'contact_origin', 'invoice_mail', + 'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail' ); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; @@ -184,6 +201,9 @@ sub list_names { "$form->{db}number" => { 'text' => $locale->text('Number'), }, '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'), }, @@ -197,11 +217,19 @@ 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'), }, '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, ); @@ -209,9 +237,12 @@ 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 + 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), ); @@ -271,6 +302,7 @@ sub list_names { if ($ref->{id} ne $previous_id) { $previous_id = $ref->{id}; $ref->{discount} = $form->format_amount(\%myconfig, $ref->{discount} * 100.0, 2); + $ref->{creditlimit} = $form->format_amount(\%myconfig, $ref->{creditlimit}, 2); map { $row->{$_}->{data} = $ref->{$_} } @columns; $row->{name}->{link} = build_std_url('script=controller.pl', 'action=CustomerVendor/edit', 'id=' . E($ref->{id}), 'callback', @hidden_nondefault); @@ -278,6 +310,12 @@ sub list_names { } my $base_url = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault); + if ($::instance_conf->get_feature_experimental_order) { + if ('oe' eq $ref->{module}) { + $base_url = build_std_url("script=controller.pl", 'action=Order/edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault); + } + } + $row->{invnumber}->{link} = $base_url; $row->{ordnumber}->{link} = $base_url . "&type=${ordertype}"; $row->{quonumber}->{link} = $base_url . "&type=${quotationtype}"; @@ -292,6 +330,7 @@ sub list_names { $report->add_data($row); } + setup_ct_list_names_action_bar(); $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -299,7 +338,6 @@ sub list_names { sub list_contacts { $::lxdebug->enter_sub; - $::auth->assert('customer_vendor_edit'); $::form->{sortdir} = 1 unless defined $::form->{sortdir}; @@ -423,9 +461,51 @@ sub list_contacts { $report->add_data($row); } - $report->generate_with_headers; + $report->generate_with_headers(); $::lxdebug->leave_sub; } +sub setup_ct_search_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Search'), + submit => [ '#form', { action => 'list_names' } ], + accesskey => 'enter', + ], + ); + } +} + +sub setup_ct_list_names_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Add'), + submit => [ '#new_form', { action => 'CustomerVendor/add' } ], + accesskey => 'enter', + ], + ); + } +} + +sub setup_ct_search_contact_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Search'), + submit => [ '#form', { action => 'list_contacts' } ], + accesskey => 'enter', + ], + ); + } +} + sub continue { call_sub($main::form->{nextsub}); }