X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=35f10647579d90a420962ed80b4ac0837751870f;hb=429203bfb57dd673aa807d749ab43c8e3332f8c8;hp=7c15fd7b483fecf720762b087479996899e8c675;hpb=0631ab0eb9cacdcd7cff6ba46a3f3ba3be243026;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 7c15fd7b4..35f106475 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -36,6 +36,14 @@ # $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::Ajax; use POSIX qw(strftime); @@ -56,11 +64,8 @@ sub add { $auth->assert('customer_vendor_edit'); - $form->{title} = "Add"; - - $form->{callback} = - "$form->{script}?action=add&db=$form->{db}" - unless $form->{callback}; + $form->{title} = "Add"; + $form->{callback} = "$form->{script}?action=add&db=$form->{db}" unless $form->{callback}; CT->populate_drop_down_boxes(\%myconfig, \%$form); @@ -103,6 +108,8 @@ sub list_names { $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'); @@ -114,49 +121,58 @@ 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); - $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}) { @@ -185,9 +201,9 @@ 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}, 1); + $report->set_sort_indicator($form->{sort}, $form->{sortdir}); CVar->add_custom_variables_to_report('module' => 'CT', 'trans_id_field' => 'id', @@ -231,16 +247,10 @@ sub edit { # 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 @@ -266,26 +276,21 @@ 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; $form->{fokus} = "ct.greeting"; + $form->{AJAX} = [ new CGI::Ajax( map {; "get_$_" => "$form->{script}?action=get_$_" } qw(shipto contact delivery) ) ]; unshift @{ $form->{SHIPTO} }, +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' }; unshift @{ $form->{CONTACTS} }, +{ cp_id => '0', cp_name => $locale->text('New contact') }; - push @{ $form->{AJAX} }, map { - new CGI::Ajax( "get_$_" => "$form->{script}?action=get_$_" ) - } qw(shipto contact delivery); - - $form->{title} = $form->{title_save} + $form->{title} = $form->{title_save} || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : ''); -## LINET: Create a drop-down box with all prior titles and greetings. CT->query_titles_and_greetings(\%myconfig, \%$form); map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT); -## /LINET $form->{NOTES} ||= [ ]; @@ -312,7 +317,9 @@ sub form_footer { sub add_transaction { $lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit & general_ledger'); + $auth->assert('customer_vendor_edit & ' . + '(general_ledger | invoice_edit | vendor_invoice_edit | ' . + ' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit)'); # # saving the history # if(!exists $form->{addition}) { @@ -320,7 +327,7 @@ sub 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); @@ -433,7 +440,11 @@ sub save_and_quotation { sub save_and_order { $lxdebug->enter_sub(); - $auth->assert('customer_vendor_edit & sales_order_edit'); + if ($form->{db} eq 'customer') { + $auth->assert('customer_vendor_edit & sales_order_edit'); + } else { + $auth->assert('customer_vendor_edit & purchase_order_edit'); + } $form->{script} = "oe.pl"; $form->{type} = @@ -454,9 +465,6 @@ sub save_and_close { $auth->assert('customer_vendor_edit'); - # $locale->text('Customer saved!') - # $locale->text('Vendor saved!') - $msg = ucfirst $form->{db}; $imsg .= " saved!"; @@ -486,9 +494,6 @@ sub save { $auth->assert('customer_vendor_edit'); - # $locale->text('Customer saved!') - # $locale->text('Vendor saved!') - $msg = ucfirst $form->{db}; $imsg .= " saved!"; @@ -525,11 +530,6 @@ sub delete { $auth->assert('customer_vendor_edit'); - # $locale->text('Customer deleted!') - # $locale->text('Cannot delete customer!') - # $locale->text('Vendor deleted!') - # $locale->text('Cannot delete vendor!') - CT->delete(\%myconfig, \%$form); $msg = ucfirst $form->{db}; @@ -540,7 +540,7 @@ sub delete { $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}"; @@ -575,10 +575,8 @@ sub get_contact { $auth->assert('customer_vendor_edit'); CT->get_contact(\%myconfig, \%$form); - - $result = "$form->{cp_name}"; - map { $result .= "__pjx__" . $form->{$_} } qw(cp_greeting cp_title cp_givenname cp_phone1 cp_phone2 cp_email cp_abteilung cp_fax cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday); - print $cgi->header(), $result; + 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); $lxdebug->leave_sub(); } @@ -589,10 +587,8 @@ sub get_shipto { $auth->assert('customer_vendor_edit'); CT->get_shipto(\%myconfig, \%$form); - - $result = "$form->{shiptoname}"; - map { $result .= "__pjx__" . $form->{$_} } qw(shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail); - print $cgi->header(), $result; + 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(); } @@ -603,10 +599,45 @@ sub get_delivery { $auth->assert('customer_vendor_edit'); 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(); } +sub delete_shipto { + $main::lxdebug->enter_sub(); + + $auth->assert('customer_vendor_edit'); + + CT->get_shipto(\%myconfig, \%$form); + + unless ($form->{shiptoused}) { + CT->delete_shipto($form->{shipto_id}); + @$form{ grep /^shipto/, keys %$form } = undef; + } + + edit(); + + $main::lxdebug->leave_sub(); +} + +sub delete_contact { + $main::lxdebug->enter_sub(); + + $auth->assert('customer_vendor_edit'); + + CT->get_contact(\%myconfig, \%$form); + + unless ($form->{cp_used}) { + CT->delete_shipto($form->{cp_id}); + @$form{ grep /^cp_/, keys %$form } = undef; + } + + edit(); + + $main::lxdebug->leave_sub(); +} + sub continue { call_sub($form->{nextsub}); }