X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=c3d095533f1de2469f1cd6fc7da7f53579e025fb;hb=b65a230d60e86d2c18a3ab7222379905aea5ecd7;hp=086565d7d4a20fbc10c1eb88ed2634dcbbf35669;hpb=a2aca2e1d8136681d2a95fefd240d509581c8bc8;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 086565d7d..c3d095533 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -55,14 +55,18 @@ 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(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; $form->{title} = "Add"; $form->{callback} = "$form->{script}?action=add&db=$form->{db}" unless $form->{callback}; @@ -72,13 +76,16 @@ sub add { &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'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my $locale = $main::locale; $form->{IS_CUSTOMER} = $form->{db} eq 'customer'; @@ -98,13 +105,17 @@ sub search { $form->header(); 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'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; $form->{IS_CUSTOMER} = $form->{db} eq 'customer'; @@ -121,46 +132,52 @@ 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('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}; 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'), }, + "$form->{db}number" => { 'text' => $locale->text('Number'), }, 'name' => { 'text' => $locale->text('Name'), }, - 'address' => { 'text' => $locale->text('Address'), }, '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_city), "$form->{db}number", @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); + my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_nondefault); $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir}); foreach (@columns) { @@ -195,7 +212,7 @@ sub list_names { $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}); @@ -230,24 +247,24 @@ 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'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; # show history button $form->{javascript} = qq||; #/show hhistory button - + 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 @@ -256,13 +273,17 @@ sub edit { &form_header; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub form_header { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit'); + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; $form->get_lists("employees" => "ALL_EMPLOYEES", "taxzones" => "ALL_TAXZONES"); @@ -273,7 +294,7 @@ sub form_header { $form->{is_admin} = $myconfig{role} eq 'admin'; $form->{is_customer} = $form->{db} eq 'customer'; $form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} }; - $form->{shipto_label} = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" }; + $form->{shipto_label} = sub { my $s = shift(@_); join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' ' }; $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} }; $form->{taxzone_id} = 0 if !$form->{id}; $form->{jsscript} = 1; @@ -283,7 +304,7 @@ sub form_header { unshift @{ $form->{SHIPTO} }, +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' }; unshift @{ $form->{CONTACTS} }, +{ cp_id => '0', cp_name => $locale->text('New contact') }; - $form->{title} = $form->{title_save} + $form->{title} = $form->{title_save} || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : ''); CT->query_titles_and_greetings(\%myconfig, \%$form); @@ -298,31 +319,39 @@ sub form_header { $form->header; print $form->parse_html_template('ct/form_header'); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub form_footer { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit'); + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; print $form->parse_html_template('ct/form_footer', { is_orphaned => $form->{status} eq 'orphaned', is_customer => $form->{db} eq 'customer' }); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub add_transaction { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit & general_ledger'); + $main::auth->assert('customer_vendor_edit & ' . + '(general_ledger | invoice_edit | vendor_invoice_edit | ' . + ' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit)'); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; # # saving the history # if(!exists $form->{addition}) { -# $form->{addition} = "ADD TRANSACTION"; -# $form->save_history($form->dbconnect(\%myconfig)); +# $form->{addition} = "ADD TRANSACTION"; +# $form->save_history($form->dbconnect(\%myconfig)); # } # # /saving the history - + $form->isblank("name", $locale->text("Name missing!")); if ($form->{"db"} eq "customer") { CT->save_customer(\%myconfig, \%$form); @@ -331,56 +360,65 @@ sub add_transaction { } $form->{callback} = $form->escape($form->{callback}, 1); - $name = $form->escape("$form->{name}", 1); + my $name = $form->escape("$form->{name}", 1); $form->{callback} = "$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}"; $form->redirect; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_ap_transaction { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit & general_ledger'); - $auth->assert('customer_vendor_edit & general_ledger'); + my $form = $main::form; + my %myconfig = %main::myconfig; $form->{script} = "ap.pl"; # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &add_transaction; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_ar_transaction { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit & general_ledger'); + $main::auth->assert('customer_vendor_edit & general_ledger'); + + my $form = $main::form; + my %myconfig = %main::myconfig; $form->{script} = "ar.pl"; # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &add_transaction; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_invoice { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; if ($form->{db} eq 'customer') { - $auth->assert('customer_vendor_edit & invoice_edit'); + $main::auth->assert('customer_vendor_edit & invoice_edit'); } else { - $auth->assert('customer_vendor_edit & vendor_invoice_edit'); + $main::auth->assert('customer_vendor_edit & vendor_invoice_edit'); } $form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl"; @@ -388,54 +426,67 @@ sub save_and_invoice { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &add_transaction; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_rfq { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit & request_quotation_edit'); + $main::auth->assert('customer_vendor_edit & request_quotation_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; $form->{script} = "oe.pl"; $form->{type} = "request_quotation"; # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &add_transaction; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_quotation { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit & sales_quotation_edit'); - $auth->assert('customer_vendor_edit & sales_quotation_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; $form->{script} = "oe.pl"; $form->{type} = "sales_quotation"; # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &add_transaction; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_order { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit & sales_order_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; + + if ($form->{db} eq 'customer') { + $main::auth->assert('customer_vendor_edit & sales_order_edit'); + } else { + $main::auth->assert('customer_vendor_edit & purchase_order_edit'); + } $form->{script} = "oe.pl"; $form->{type} = @@ -443,23 +494,28 @@ sub save_and_order { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &add_transaction; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save_and_close { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $msg = ucfirst $form->{db}; - $imsg .= " saved!"; + my $msg = ucfirst $form->{db}; + $msg .= " saved!"; $form->isblank("name", $locale->text("Name missing!")); + my $rc; if ($form->{"db"} eq "customer") { $rc = CT->save_customer(\%myconfig, \%$form); } else { @@ -472,21 +528,25 @@ sub save_and_close { if(!exists $form->{addition}) { $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history $form->redirect($locale->text($msg)); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub save { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $msg = ucfirst $form->{db}; - $imsg .= " saved!"; + my $msg = ucfirst $form->{db}; + $msg .= " saved!"; $form->isblank("name", $locale->text("Name missing!")); @@ -507,99 +567,120 @@ sub save { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history &edit; exit; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub delete { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit'); + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; CT->delete(\%myconfig, \%$form); - $msg = ucfirst $form->{db}; + my $msg = ucfirst $form->{db}; $msg .= " deleted!"; # saving the history if(!exists $form->{addition}) { $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); } - # /saving the history + # /saving the history $form->redirect($locale->text($msg)); $msg = "Cannot delete $form->{db}"; $form->error($locale->text($msg)); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub display { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; &form_header(); &form_footer(); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub update { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; &display(); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub get_contact { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; CT->get_contact(\%myconfig, \%$form); - print $cgi->header(), join '__pjx__', map $form->{"cp_$_"}, - qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used); - $lxdebug->leave_sub(); + print $form->ajax_response_header(), join '__pjx__', map $form->{"cp_$_"}, + qw(name title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used gender); + $main::lxdebug->leave_sub(); } sub get_shipto { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; CT->get_shipto(\%myconfig, \%$form); - print $cgi->header(), join '__pjx__', map $form->{"shipto$_"}, + print $form->ajax_response_header(), join '__pjx__', map $form->{"shipto$_"}, qw(name department_1 department_2 street zipcode city country contact phone fax email used); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub get_delivery { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + $main::auth->assert('customer_vendor_edit'); - $auth->assert('customer_vendor_edit'); + my $form = $main::form; + my %myconfig = %main::myconfig; CT->get_delivery(\%myconfig, \%$form ); + $form->{IS_CUSTOMER} = $form->{db} eq 'customer'; - print $cgi->header(), $form->parse_html_template('ct/get_delivery'); + print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery'); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub delete_shipto { $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit'); + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; CT->get_shipto(\%myconfig, \%$form); @@ -616,7 +697,10 @@ sub delete_shipto { sub delete_contact { $main::lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit'); + $main::auth->assert('customer_vendor_edit'); + + my $form = $main::form; + my %myconfig = %main::myconfig; CT->get_contact(\%myconfig, \%$form); @@ -630,4 +714,25 @@ sub delete_contact { $main::lxdebug->leave_sub(); } -sub continue { call_sub($form->{nextsub}); } +sub ajax_autocomplete { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + $form->{column} = 'name' unless $form->{column} =~ /^name$/; + $form->{vc} = 'customer' unless $form->{vc} =~ /^customer|vendor$/; + $form->{db} = $form->{vc}; # CT expects this + $form->{$form->{column}} = $form->{q} || ''; + $form->{limit} = ($form->{limit} * 1) || 10; + $form->{searchitems} ||= ''; + + CT->search(\%myconfig, $form); + + print $form->ajax_response_header(), + $form->parse_html_template('ct/ajax_autocomplete'); + + $main::lxdebug->leave_sub(); +} + +sub continue { call_sub($main::form->{nextsub}); }