X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=33b0c83329fbd605887c1a28048cb8d04b1d554e;hb=f3490e85153f60ce199993585fc11613185c3896;hp=a05158289fc80f6fa46837884c91c2152f828ae8;hpb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index a05158289..33b0c8332 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -45,12 +45,12 @@
 # $locale->text('Vendor deleted!')
 # $locale->text('Cannot delete vendor!')
 
-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";
@@ -184,8 +184,14 @@ sub list_names {
 
   map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns;
 
-  my @hidden_variables  = (qw(db status obsolete name contact email cp_name addr_street addr_zipcode addr_city business_id),
-                           "$form->{db}number", @searchable_custom_variables, 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_nondefault);
   $form->{callback}     = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
@@ -280,6 +286,8 @@ sub edit {
 
   # format discount
   $form->{discount} *= 100;
+  # format uri
+  $form->{homepage} = 'http://' . $form->{homepage} unless $form->{homepage} =~ m|^https?://|;
 
   &form_header;
   &form_footer;
@@ -287,6 +295,15 @@ sub edit {
   $main::lxdebug->leave_sub();
 }
 
+sub _shipto_label {
+  my $s = shift(@_);
+  join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' '
+}
+
+sub _contacts_label {
+  join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname};
+}
+
 sub form_header {
   $main::lxdebug->enter_sub();
 
@@ -300,31 +317,34 @@ sub form_header {
                    taxzones  => "ALL_TAXZONES");
   $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{system}->{vertreter};
+  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{features}->{vertreter};
 
   $form->{ALL_SALESMEN}   = $form->{ALL_EMPLOYEES};
   $form->{taxincluded}    = ($form->{taxincluded}) ? "checked" : "";
-  $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 { 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->{shipto_label}   = \&_shipto_label;
+  $form->{contacts_label} = \&_contacts_label;
   $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') };
+  $form->{SHIPTO_ALL}     = [ +{ shipto_id => '0', shiptoname => $::locale->text('All') }, @{ $form->{SHIPTO} } ];
 
   $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);
-  map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT);
+  map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(COMPANY_GREETINGS);
 
   $form->{NOTES} ||= [ ];
 
+  if (!$form->{'language_id'}) {
+    my $l_id = SL::DB::Default->get->{'language_id'};
+    if ($l_id) {
+      $form->{'default_language_id'} = $l_id;
+    }
+  }
+
   $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
 
   CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
@@ -354,7 +374,7 @@ sub _do_save {
 
   $::form->isblank("name", $::locale->text("Name missing!"));
 
-  if ($::form->{new_salesman_id} && $::lx_office_conf{system}->{vertreter}) {
+  if ($::form->{new_salesman_id} && $::lx_office_conf{features}->{vertreter}) {
     $::form->{salesman_id} = $::form->{new_salesman_id};
     delete $::form->{new_salesman_id};
   }
@@ -640,14 +660,15 @@ sub get_contact {
 
   $main::auth->assert('customer_vendor_edit');
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
+  CT->populate_drop_down_boxes(\%::myconfig, $::form);
+  CT->query_titles_and_greetings(\%::myconfig, $::form);
+  CT->get_contact(\%::myconfig, $::form) if $::form->{cp_id};
 
-  CT->get_contact(\%myconfig, \%$form);
-  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();
+  $::form->{contacts_label} = \&_contacts_label;
 
+  print $::form->ajax_response_header(), $::form->parse_html_template('ct/_contact');
+
+  $main::lxdebug->leave_sub();
 }
 
 sub get_shipto {
@@ -655,13 +676,14 @@ sub get_shipto {
 
   $main::auth->assert('customer_vendor_edit');
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
+  CT->populate_drop_down_boxes(\%::myconfig, $::form);
+  CT->get_shipto(\%::myconfig, $::form) if $::form->{shipto_id};
 
-  CT->get_shipto(\%myconfig, \%$form);
-  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)));
-  $main::lxdebug->leave_sub();
+  $::form->{shipto_label} = \&_shipto_label;
 
+  print $::form->ajax_response_header(), $::form->parse_html_template('ct/_shipto');
+
+  $main::lxdebug->leave_sub();
 }
 
 sub get_delivery {
@@ -711,7 +733,7 @@ sub delete_contact {
   CT->get_contact(\%myconfig, \%$form);
 
   unless ($form->{cp_used}) {
-    CT->delete_shipto($form->{cp_id});
+    CT->delete_contact($form->{cp_id});
     @$form{ grep /^cp_/, keys %$form } = undef;
   }