X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=0128c29e49ffdf214d854ec3c88629dedc2db350;hb=3b3ef5ba0b9d0d6fb45e082cbfafa524243ae6f7;hp=29a0283cdf461fcbbe939d8b2e8ea100dd1b4c9b;hpb=08ca74a8fe8fc1f9e528b0cc1172062c80283a36;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 29a0283cd..0128c29e4 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -121,46 +121,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 +201,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});
 
@@ -241,13 +247,10 @@ sub edit {
   # show history button
   $form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
   #/show hhistory button
-  
+
   CT->get_tuple(\%myconfig, \%$form);
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
 
-  # format " into &quot;
-  map { $form->{$_} =~ s/\"/&quot;/g } keys %$form;
-
   $form->{title} = "Edit";
 
   # format discount
@@ -273,7 +276,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 +286,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);
@@ -314,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}) {
@@ -322,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);
@@ -435,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}   =
@@ -531,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}";
@@ -566,8 +575,8 @@ sub get_contact {
   $auth->assert('customer_vendor_edit');
 
   CT->get_contact(\%myconfig, \%$form);
-  print $form->ajax_response_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);
+  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();
 
 }