X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fct.pl;h=de0a436596f99bb3a4dda02adf73a3b4d49905ff;hb=540030ff9826439d94f3f4292ab79b9be8795acc;hp=e3b516bd19d95f7b484c7f9249a424e58975a40b;hpb=0925bc9f366038b578167a1837098ebe837012c1;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index e3b516bd1..de0a43659 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -36,115 +36,170 @@ # $locale->text('Vendors') # $locale->text('Add Customer') # $locale->text('Add Vendor') +# $locale->text('Edit Customer') +# $locale->text('Edit Vendor') +# $locale->text('Customer saved!') +# $locale->text('Vendor saved!') +# $locale->text('Customer deleted!') +# $locale->text('Cannot delete customer!') +# $locale->text('Vendor deleted!') +# $locale->text('Cannot delete vendor!') -use CGI; -use CGI::Ajax; use POSIX qw(strftime); use SL::CT; +use SL::CVar; +use SL::DB::Business; +use SL::DB::Default; use SL::ReportGenerator; require "bin/mozilla/common.pl"; require "bin/mozilla/reportgenerator.pl"; +use strict; 1; # end of main sub add { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $form->{title} = "Add"; + $main::auth->assert('customer_vendor_edit'); - $form->{callback} = - "$form->{script}?action=add&db=$form->{db}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; + my $form = $main::form; + my %myconfig = %main::myconfig; + + $form->{title} = "Add"; + $form->{callback} = "$form->{script}?action=add&db=$form->{db}" unless $form->{callback}; CT->populate_drop_down_boxes(\%myconfig, \%$form); &form_header; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub search { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my $locale = $main::locale; $form->{IS_CUSTOMER} = $form->{db} eq 'customer'; $form->get_lists("business_types" => "ALL_BUSINESS_TYPES"); $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0; - $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors'); - $form->{fokus} = 'Form.name'; + $form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT'); + ($form->{CUSTOM_VARIABLES_FILTER_CODE}, + $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES}, + 'include_prefix' => 'l_', + 'include_value' => 'Y'); + + $form->{jsscript} = 1; + $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors'); + $form->{fokus} = 'Form.name'; $form->header(); - print $form->parse_html_template2('ct/search'); + print $form->parse_html_template('ct/search'); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub list_names { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; $form->{IS_CUSTOMER} = $form->{db} eq 'customer'; + report_generator_set_default_sort('name', 1); + CT->search(\%myconfig, \%$form); + my $cvar_configs = CVar->get_configs('module' => 'CT'); + my @options; if ($form->{status} eq 'all') { push @options, $locale->text('All'); - } elsif ($form->{status} eq 'orphaned') { push @options, $locale->text('Orphaned'); } - if ($form->{name}) { - push @options, $locale->text('Name') . " : $form->{name}"; - } - if ($form->{contact}) { - push @options, $locale->text('Contact') . " : $form->{contact}"; - } - if ($form->{"$form->{db}number"}) { - push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}|; - } - if ($form->{email}) { - push @options, $locale->text('E-mail') . " : $form->{email}"; + 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}; + + if ($form->{business_id}) { + my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id}); + if ($business) { + my $label = $form->{IS_CUSTOMER} ? $::locale->text('Customer type') : $::locale->text('Vendor type'); + push @options, $label . " : " . $business->description; + } } my @columns = ( - 'id', 'name', "$form->{db}number", 'address', 'contact', 'phone', - 'fax', 'email', 'taxnumber', 'sic_code', 'business', 'invnumber', - 'ordnumber', 'quonumber' + 'id', 'name', "$form->{db}number", 'contact', 'phone', + 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city', + 'business', 'invnumber', 'ordnumber', 'quonumber' ); + my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; + my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs }; + my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables; + + push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables; + my %column_defs = ( 'id' => { 'text' => $locale->text('ID'), }, - "$form->{db}number" => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Customer Number') : $locale->text('Vendor Number'), }, - 'name' => { 'text' => $locale->text('Name'), }, - 'address' => { 'text' => $locale->text('Address'), }, + "$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'), }, 'phone' => { 'text' => $locale->text('Phone'), }, 'fax' => { 'text' => $locale->text('Fax'), }, 'email' => { 'text' => $locale->text('E-mail'), }, 'cc' => { 'text' => $locale->text('Cc'), }, 'taxnumber' => { 'text' => $locale->text('Tax Number'), }, - 'sic_code' => { 'text' => $locale->text('SIC'), }, 'business' => { 'text' => $locale->text('Type of Business'), }, 'invnumber' => { 'text' => $locale->text('Invoice'), }, 'ordnumber' => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Sales Order') : $locale->text('Purchase Order'), }, 'quonumber' => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Quotation') : $locale->text('Request for Quotation'), }, + 'street' => { 'text' => $locale->text('Street'), }, + 'zipcode' => { 'text' => $locale->text('Zipcode'), }, + 'city' => { 'text' => $locale->text('City'), }, + %column_defs_cvars, ); map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns; - my @hidden_variables = (qw(db status obsolete), map { "l_$_" } @columns); + my @hidden_variables = ( qw( + db status obsolete name contact email cp_name addr_street addr_zipcode + addr_city business_id + ), "$form->{db}number", + map({ "cvar_$_->{name}" } @searchable_custom_variables), + map({ "l_$_" } @columns), + ); + my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables); - my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_variables); - $form->{callback} = "$callback&sort=" . E($form->{sort}); + my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_nondefault); + $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir}); - map { $column_defs{$_}->{link} = "${callback}&sort=${_}" } @columns; + foreach (@columns) { + my $sortdir = $form->{sort} eq $_ ? 1 - $form->{sortdir} : $form->{sortdir}; + $column_defs{$_}->{link} = "${callback}&sort=${_}&sortdir=${sortdir}"; + } my ($ordertype, $quotationtype, $attachment_basename); if ($form->{IS_CUSTOMER}) { @@ -163,19 +218,26 @@ sub list_names { my $report = SL::ReportGenerator->new(\%myconfig, $form); $report->set_options('top_info_text' => join("\n", @options), - 'raw_bottom_info_text' => $form->parse_html_template2('ct/list_names_bottom'), + 'raw_bottom_info_text' => $form->parse_html_template('ct/list_names_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), ); $report->set_options_from_form(); + $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv'; $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options('list_names', @hidden_variables); + $report->set_export_options('list_names', @hidden_variables, qw(sort sortdir)); + + $report->set_sort_indicator($form->{sort}, $form->{sortdir}); - $report->set_sort_indicator($form->{sort}, 1); + CVar->add_custom_variables_to_report('module' => 'CT', + 'trans_id_field' => 'id', + 'configs' => $cvar_configs, + 'column_defs' => \%column_defs, + 'data' => $form->{CT}); my $previous_id; @@ -202,792 +264,287 @@ sub list_names { $report->generate_with_headers(); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub edit { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; # show history button $form->{javascript} = qq||; #/show hhistory button - - # $locale->text('Edit Customer') - # $locale->text('Edit Vendor') CT->get_tuple(\%myconfig, \%$form); CT->populate_drop_down_boxes(\%myconfig, \%$form); - # format " into " - map { $form->{$_} =~ s/\"/"/g } keys %$form; - $form->{title} = "Edit"; # format discount $form->{discount} *= 100; + # format uri + $form->{homepage} = 'http://' . $form->{homepage} unless $form->{homepage} =~ m|^https?://|; &form_header; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub form_header { - $lxdebug->enter_sub(); - - $form->get_lists("employees" => "ALL_SALESMEN", - "taxzones" => "ALL_TAXZONES"); - - $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; - $form->{creditlimit} = - $form->format_amount(\%myconfig, $form->{creditlimit}, 0); - $form->{discount} = $form->format_amount(\%myconfig, $form->{discount}); - - if ($myconfig{role} eq 'admin') { - $bcc = qq| -
$form->{title} | -
---|