X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=5c76ae36f78748d9c2f2a4b056098dd5ae5056f7;hb=0e5b1ea3ee6a7ad8ec9b735971eb894c850c5a64;hp=bf2724ca02e9ca77e4fea5382aee2e9d9ea5b468;hpb=fb7fdc29172d26911de001f9a4a5daf3b8fa080b;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index bf2724ca0..5c76ae36f 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -36,12 +36,20 @@
 # $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::ReportGenerator;
 
 require "bin/mozilla/common.pl";
@@ -54,10 +62,12 @@ require "bin/mozilla/reportgenerator.pl";
 sub add {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add&db=$form->{db}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add&db=$form->{db}"
     unless $form->{callback};
 
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
@@ -71,16 +81,25 @@ sub add {
 sub search {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   $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();
 }
@@ -88,30 +107,25 @@ sub search {
 sub list_names {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
   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};
 
   my @columns = (
     'id',        'name',  "$form->{db}number", 'address',  'contact',  'phone',
@@ -119,6 +133,11 @@ sub list_names {
     'ordnumber', 'quonumber'
   );
 
+  my @includeable_custom_variables = grep { $_->{includeable} } @{ $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'), },
@@ -135,6 +154,7 @@ sub list_names {
     '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'), },
+    %column_defs_cvars,
   );
 
   map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns;
@@ -163,7 +183,7 @@ 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),
@@ -177,6 +197,12 @@ sub list_names {
 
   $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;
 
   foreach my $ref (@{ $form->{CT} }) {
@@ -208,13 +234,12 @@ sub list_names {
 sub edit {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   # show history button
   $form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
   #/show hhistory button
   
-  # $locale->text('Edit Customer')
-  # $locale->text('Edit Vendor')
-
   CT->get_tuple(\%myconfig, \%$form);
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
 
@@ -235,573 +260,41 @@ sub edit {
 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|
-        <tr>
-	  <th align=right nowrap>| . $locale->text('Bcc') . qq|</th>
-	  <td><input name=bcc size=35 value="$form->{bcc}"></td>
-	</tr>
-|;
-  }
-  $form->{obsolete} = "checked" if $form->{obsolete};
-
-  $lang = qq|<option value=""></option>|;
-  foreach $item (@{ $form->{languages} }) {
-    if ($form->{language_id} eq $item->{id}) {
-      $lang .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-    } else {
-      $lang .= qq|<option value="$item->{id}">$item->{description}</option>|;
-    }
-  }
-
-  $payment = qq|<option value=""></option>|;
-  foreach $item (@{ $form->{payment_terms} }) {
-    if ($form->{payment_id} eq $item->{id}) {
-      $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-    } else {
-      $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
-    }
-  }
-
-  if (!$form->{id}) {
-    if ($form->{db} eq "customer") {
-      $form->{taxzone_id} = 0;
-    } else {
-      $form->{taxzone_id} = 0;
-    }
-  }
-
-  %labels = ();
-  @values = ();
-  foreach my $item (@{ $form->{"ALL_TAXZONES"} }) {
-    push(@values, $item->{"id"});
-    $labels{$item->{"id"}} = $item->{"description"};
-  }
-
-  $taxzone = qq|
-		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
-      <td>| .
-        NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
-                             '-values' => \@values, '-labels' => \%labels)) . qq|
-      </td>
-|;
-
-  $get_contact_url =
-    "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_contact";
-
-  my $pjx = new CGI::Ajax( 'get_contact' => $get_contact_url );
-  $form->{selectcontact} = "<option value=0>" . $locale->text('New contact') . "</option>";
-  if (@{ $form->{CONTACTS} }) {
-    foreach $item (@{ $form->{CONTACTS} }) {
-      if ($item->{cp_id} == $form->{cp_id}) {
-        $form->{selectcontact} .=
-          qq|<option value=$item->{cp_id} selected>$item->{cp_name}</option>\n|;
-      } else {
-        $form->{selectcontact} .=
-          qq|<option value=$item->{cp_id}>$item->{cp_name}</option>\n|;
-      }
-
-    }
-  }
-  push(@ { $form->{AJAX} }, $pjx);
-  $ansprechpartner = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Ansprechpartner') . qq|</th>
-		<td><select id=cp_id name=cp_id onChange="get_contact(['cp_id__' + this.value], ['cp_name', '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'])">$form->{selectcontact}</select></td>
-		<input type=hidden name=selectcontact value="$form->{selectcontact}">
-	      </tr>|;
-  $get_shipto_url =
-    "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_shipto";
-
-  my $pjy = new CGI::Ajax( 'get_shipto' => $get_shipto_url );
-  $form->{selectshipto} = "<option value=0></option>";
-  $form->{selectshipto} .= "<option value=0>Alle</option>";
-  if (@{ $form->{SHIPTO} }) {
-    foreach $item (@{ $form->{SHIPTO} }) {
-      if ($item->{shipto_id} == $form->{shipto_id}) {
-        $form->{selectshipto} .=
-          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}\n";
-      } else {
-        $form->{selectshipto} .=
-          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment_1}\n";
-      }
-
-    }
-  }
-  push(@ { $form->{AJAX} }, $pjy);
-
-  $shipto = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select id=shipto_id name=shipto_id onChange="get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail'])">$form->{selectshipto}</select></td>
-		<input type=hidden name=selectshipto value="$form->{selectshipto}">
-	      </tr>|;
-
-
-  $get_delivery_url =
-    "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_delivery";
+  $auth->assert('customer_vendor_edit');
 
-  my $pjz = new CGI::Ajax( 'get_delivery' => $get_delivery_url );
+  $form->get_lists("employees" => "ALL_EMPLOYEES",
+                   "taxzones"  => "ALL_TAXZONES");
+  $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  push(@ { $form->{AJAX} }, $pjz);
+  $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 { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
+  $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) ) ];
 
-  $delivery = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select id=delivery_id name=delivery_id onChange="get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])">$form->{selectshipto}</select></td>
-	      </tr>|;
-
-  $form->{selectbusiness} = qq|<option>\n|;
-  map {
-    $form->{selectbusiness} .=
-      qq|<option value=$_->{id}>$_->{description}\n|
-  } @{ $form->{all_business} };
-  if ($form->{business_save}) {
-    $form->{selectbusiness} = $form->{business_save};
-  }
-  $form->{selectbusiness} =~
-    s/<option value=$form->{business}>/<option value=$form->{business} selected>/;
-
-  $label = ucfirst $form->{db};
-  if ($form->{title} eq "Edit") {
-    $form->{title} = $locale->text("$form->{title} $label") . " $form->{name}";
-  } else  {
-    $form->{title} = $locale->text("$form->{title} $label");
-  }
-  if ($form->{title_save}) {
-    $form->{title} = $form->{title_save};
-  }
-  if ($form->{db} eq 'vendor') {
-    $customer = qq|
-           <th align=right>| . $locale->text('Kundennummer') . qq|</th>
-           <td><input name=v_customer_id size=10 value="$form->{v_customer_id}"></td>
-|;
-  }
-
-  if ($form->{db} eq 'customer') {
-
-    $customer = qq|
-           <th align=right>| . $locale->text('KNr. beim Kunden') . qq|</th>
-           <td><input name=c_vendor_id size=10 value="$form->{c_vendor_id}"></td>
-|;
-  }
-
-  $business = qq|
- 	  <th align=right>| . $locale->text('Type of Business') . qq|</th>
-	  <td><select name=business>$form->{selectbusiness}</select></td>
-      |;
-
-  $salesman = "";
-
-  if ($form->{db} eq "customer") {
-    my (@salesman_values, %salesman_labels);
-    push(@salesman_values, undef);
-    foreach my $item (@{ $form->{ALL_SALESMEN} }) {
-      push(@salesman_values, $item->{id});
-      $salesman_labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
-    }
+  unshift @{ $form->{SHIPTO} },   +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' };
+  unshift @{ $form->{CONTACTS} }, +{ cp_id     => '0', cp_name => $locale->text('New contact') };
 
-    $salesman =
-      qq| <th align="right">| . $locale->text('Salesman') . qq|</th>
-          <td>| .
-      NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
-                           '-values' => \@salesman_values, '-labels' => \%salesman_labels))
-      . qq|</td>|;
-  }
+  $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);
 
-  $select_title = qq|&nbsp;<select name=selected_cp_title><option></option>|;
-  map({ $select_title .= qq|<option>$_</option>|; } @{ $form->{TITLES} });
-  $select_title .= qq|</select>|;
-
-  $select_greeting =
-    qq|&nbsp;<select name=selected_cp_greeting><option></option>|;
-  map(
-     { $select_greeting .= qq|<option>$_</option>|; } @{ $form->{GREETINGS} });
-  $select_greeting .= qq|</select>|;
-
-  $select_company_greeting =
-    qq|&nbsp;<select name=selected_company_greeting><option></option>|;
-  map(
-     { $select_company_greeting .= qq|<option>$_</option>|; } @{ $form->{COMPANY_GREETINGS} });
-  $select_company_greeting .= qq|</select>|;
-
-  $select_department =
-    qq|&nbsp;<select name=selected_cp_abteilung><option></option>|;
-  map(
-     { $select_department .= qq|<option>$_</option>|; } @{ $form->{DEPARTMENT} });
-  $select_department .= qq|</select>|;
-## /LINET
-
-  if ($form->{db} eq 'customer') {
-
-    #get pricegroup and form it
-    $form->get_pricegroup(\%myconfig, { all => 1 });
-
-    $form->{pricegroup}    = "$form->{klass}";
-    $form->{pricegroup_id} = "$form->{klass}";
-
-    if (@{ $form->{all_pricegroup} }) {
-
-      $form->{selectpricegroup} = qq|<option>\n|;
-      map {
-        $form->{selectpricegroup} .=
-          qq|<option value="$_->{id}">$_->{pricegroup}\n|
-      } @{ $form->{all_pricegroup} };
-    }
-
-    if ($form->{selectpricegroup}) {
-      $form->{selectpricegroup} = $form->unescape($form->{selectpricegroup});
+  $form->{NOTES} ||= [ ];
 
-      $pricegroup =
-        qq|<input type=hidden name=selectpricegroup value="|
-        . $form->escape($form->{selectpricegroup}, 1) . qq|">|;
+  $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
 
-      $form->{selectpricegroup} =~
-        s/(<option value="\Q$form->{klass}\E")/$1 selected/;
+  CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
 
-      $pricegroup .=
-        qq|<select name=klass>$form->{selectpricegroup}</select>|;
-
-    }
-  }
-
-  # $locale->text('Customer Number')
-  # $locale->text('Vendor Number')
-  $form->{fokus} = "ct.greeting";
-  $form->{jsscript} = 1;
   $form->header;
-
-  print qq|
-<body onLoad="fokus()">
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-</table>
-
-
-<form method=post name="ct" action=$form->{script} onKeyUp="highlight(event)" onClick="highlight(event)">
-
-
-
-<ul id="maintab" class="shadetabs">
-<li class="selected"><a href="#" rel="billing">|
-    . $locale->text('Billing Address') . qq|</a></li>
-<li><a href="#" rel="shipto">|
-    . $locale->text('Shipping Address') . qq|</a></li>
-<li><a href="#" rel="contacts">Ansprechpartner</a></li>
-<li><a href="#" rel="deliveries">|
-    . $locale->text('Lieferungen') . qq|</a></li>
-
-</ul>
-
-<div class="tabcontentstyle">
-
-<div id="billing" class="tabcontent">
-
-      <table width=100%>
-	<tr height="5"></tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text($label . ' Number') . qq|</th>
-	  <td><input name="$form->{db}number" size=35 value="$form->{"$form->{db}number"}"></td>
-	</tr>
-        <tr>
-          <th align=right nowrap>| . $locale->text('Greeting') . qq|</th>
-          <td><input id=greeting name=greeting size=30 value="$form->{greeting}">&nbsp;
-          $select_company_greeting</td>
-        </tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Company Name') . qq|</th>
-	  <td><input name=name size=35 maxlength=75 value="$form->{name}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Abteilung') . qq|</th>
-	  <td><input name=department_1 size=16 maxlength=75 value="$form->{department_1}">
-	  <input name=department_2 size=16 maxlength=75 value="$form->{department_2}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Street') . qq|</th>
-	  <td><input name=street size=35 maxlength=75 value="$form->{street}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>|
-    . $locale->text('Zipcode') . "/" . $locale->text('City') . qq|</th>
-	  <td><input name=zipcode size=5 maxlength=10 value="$form->{zipcode}">
-          <input name=city size=30 maxlength=75 value="$form->{city}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Country') . qq|</th>
-	  <td><input name=country size=35 maxlength=75 value="$form->{country}"></td>
-	</tr>
-	<tr>
-          <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
-          <td><input name=contact size=28 maxlength=75 value="$form->{contact}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Phone') . qq|</th>
-	  <td><input name=phone size=30 maxlength=30 value="$form->{phone}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Fax') . qq|</th>
-	  <td><input name=fax size=30 maxlength=30 value="$form->{fax}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
-	  <td><input name=email size=45 value="$form->{email}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Homepage') . qq|</th>
-	  <td><input name=homepage size=45 value="$form->{homepage}"></td>
-	</tr>
-</table>
-<table>
-	<tr>
-	  <th align=right>| . $locale->text('Credit Limit') . qq|</th>
-	  <td><input name=creditlimit size=9 value="$form->{creditlimit}"></td>
-	  <input type="hidden" name="terms" value="$form->{terms}">
-	  <th align=right>| . $locale->text('Payment Terms') . qq|</th>
-	  <td><select name=payment_id>$payment</select></td>
-	  <th align=right>| . $locale->text('Discount') . qq|</th>
-	  <td><input name=discount size=4 value="$form->{discount}">
-	  %</td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Tax Number / SSN') . qq|</th>
-	  <td><input name=taxnumber size=20 value="$form->{taxnumber}"></td>
-          <th align=right>| . $locale->text('USt-IdNr.') . qq|</th>
-	  <td><input name="ustid" maxlength="14" size="20" value="$form->{ustid}"></td>
-          $customer
-	</tr>
-        <tr>
-          <th align=right>| . $locale->text('Account Number') . qq|</th>
-          <td><input name="account_number" size="10" maxlength="15" value="$form->{account_number}"></td>
-          <th align=right>| . $locale->text('Bank Code Number') . qq|</th>
-          <td><input name="bank_code" size="10" maxlength="10" value="$form->{bank_code}"></td>
-          <th align=right>| . $locale->text('Bank') . qq|</th>
-          <td><input name=bank size=30 value="$form->{bank}"></td>
-        </tr>
-	<tr>
-          $business
-	  <th align=right>| . $locale->text('Language') . qq|</th>
-	  <td><select name=language_id>$lang
-                          </select></td>|;
-
-  if ($form->{db} eq 'customer') {
-
-    print qq|
-          <th align=right>| . $locale->text('Preisklasse') . qq|</th>
-          <td>$pricegroup</td>|;
-  }
-  print qq|        </tr>
-        <tr>
-          <td align=right>| . $locale->text('Obsolete') . qq|</td>
-          <td><input name=obsolete class=checkbox type=checkbox value=1 $form->{obsolete}></td>
-	</tr>
-        <tr>
-          $taxzone
-          $salesman
-        </tr>
-      </table>
-  <table>
-  <tr>
-    <th align=left nowrap>| . $locale->text('Notes') . qq|</th>
-  </tr>
-  <tr>
-    <td><textarea name=notes rows=3 cols=60 wrap=soft>$form->{notes}</textarea></td>
-  </tr>
-
-            </table>
-          </td>
-        </tr>
-</table>
-<br style="clear: left" /></div>|;
-
-print qq|
-      <div id="shipto" class="tabcontent">
-
-      <table width=100%>
-$shipto
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Company Name') . qq|</th>
-	  <td><input id=shiptoname name=shiptoname size=35 maxlength=75 value="$form->{shiptoname}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Abteilung') . qq|</th>
-          <td><input id=shiptodepartment_1 name=shiptodepartment_1 size=16 maxlength=75 value="$form->{shiptodepartment_1}">
-	  <input id=shiptodepartment_2 name=shiptodepartment_2 size=16 maxlength=75 value="$form->{shiptodepartment_2}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Street') . qq|</th>
-	  <td><input id=shiptostreet name=shiptostreet size=35 maxlength=75 value="$form->{shiptostreet}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>|
-    . $locale->text('Zipcode') . "/" . $locale->text('City') . qq|</th>
-	  <td><input id=shiptozipcode name=shiptozipcode size=5 maxlength=75 value="$form->{shiptozipcode}">
-          <input id=shiptocity name=shiptocity size=30 maxlength=75 value="$form->{shiptocity}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Country') . qq|</th>
-	  <td><input id=shiptocountry name=shiptocountry size=35 maxlength=75 value="$form->{shiptocountry}"></td>
-	</tr>
-	<tr>
-          <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
-	  <td><input id=shiptocontact name=shiptocontact size=30 maxlength=75 value="$form->{shiptocontact}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Phone') . qq|</th>
-	  <td><input id=shiptophone name=shiptophone size=30 maxlength=30 value="$form->{shiptophone}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Fax') . qq|</th>
-	  <td><input id=shiptofax name=shiptofax size=30 maxlength=30 value="$form->{shiptofax}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
-	  <td><input id=shiptoemail name=shiptoemail size=45 value="$form->{shiptoemail}"></td>
-	</tr>
-        <tr>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-           <td>&nbsp;</td>
-       </tr>
-
-    </table>
-<br style="clear: left" /></div>|;
-
-
-##LINET - added fields for contact person
-  print qq|   
-<div id="contacts" class="tabcontent">
-<table>
-    <tr>
-         <td colspan=3>
-	 	<input type=hidden name=cp_id value=$form->{cp_id}>
-                <table>
-                $ansprechpartner
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Greeting') . qq|</th>
-                  <td><input id=cp_greeting name=cp_greeting size=40 maxlength=75 value="$form->{cp_greeting}">&nbsp;
-                  $select_greeting</td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Title') . qq|</th>
-                  <td><input id=cp_title name=cp_title size=40 maxlength=75 value="$form->{cp_title}">&nbsp;
-                  $select_title</td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Department') . qq|</th>
-                  <td><input id=cp_abteilung name=cp_abteilung size=40 value="$form->{cp_abteilung}">&nbsp;
-                  $select_department</td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>|
-    . $locale->text('Given Name') . qq|</th>
-                  <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="$form->{cp_givenname}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Name') . qq|</th>
-                  <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="$form->{cp_name}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Phone1') . qq|</th>
-                  <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="$form->{cp_phone1}"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Phone2') . qq|</th>
-                  <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="$form->{cp_phone2}"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Fax') . qq|</th>
-                  <td><input id=cp_fax name=cp_fax size=40 value="$form->{cp_fax}"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Mobile1') . qq|</th>
-                  <td><input id=cp_mobile1 name=cp_mobile1 size=40 value="$form->{cp_mobile1}"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Mobile2') . qq|</th>
-                  <td><input id=cp_mobile2 name=cp_mobile2 size=40 value="$form->{cp_mobile2}"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Sat. Phone') . qq|</th>
-                  <td><input id=cp_satphone name=cp_satphone size=40 value="$form->{cp_satphone}"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>| . $locale->text('Sat. Fax') . qq|</th>
-                  <td><input id=cp_satfax name=cp_satfax size=40 value="$form->{cp_satfax}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Project') . qq|</th>
-                  <td><input id=cp_project name=cp_project size=40 value="$form->{cp_project}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('E-mail') . qq|</th>
-                  <td><input id=cp_email name=cp_email size=40 value="$form->{cp_email}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Private Phone') . qq|</th>
-                  <td><input id=cp_privatphone name=cp_privatphone size=40 value="$form->{cp_privatphone}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Private E-mail') . qq|</th>
-                  <td><input id=cp_privatemail name=cp_privatemail size=40 value="$form->{cp_privatemail}"></td>
-                </tr>
-                <tr>
-	          <th align=left nowrap>| . $locale->text('Birthday') . qq|</th>
-                  <td><input id=cp_birthday name=cp_birthday size=40 value="$form->{cp_birthday}"></td>
-                </tr>
-                
-          </table>
-        </td>
-        </tr>
-        <tr height="5"></tr>|;
-##/LINET
-  print qq|        $bcc
-	$tax
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      
-<br style="clear: left" /></div>
-<div id="deliveries" class="tabcontent">
-  <table>
-    $delivery
-    <tr>
-      <th align=left nowrap>| . $locale->text('From') . qq|</th>
-      <td><input id=from name=from size=10 maxlength=10 value="$form->{from}">
-        <input type="button" name="fromB" id="trigger_from" value="?"></td>
-      <th align=left nowrap>| . $locale->text('To (time)') . qq|</th>
-      <td><input id=to name=to size=10 maxlength=10 value="$form->{to}">
-        <input type="button" name="toB" id="trigger_to" value="?"></td>
-    </tr>       
-    <tr>
-     <td colspan=4>
-      <div id=delivery>
-      </div>
-      </td>
-    </tr>
-  </table>
-<br style="clear: left" /></div>
-
-</div>
-
-| . $form->write_trigger(\%myconfig, 2, "fromB", "BL", "trigger_from",
-                         "toB", "BL", "trigger_to");
+  print $form->parse_html_template('ct/form_header');
 
   $lxdebug->leave_sub();
 }
@@ -809,81 +302,18 @@ $shipto
 sub form_footer {
   $lxdebug->enter_sub();
 
-  $label     = ucfirst $form->{db};
-  $quotation =
-    ($form->{db} eq 'customer')
-    ? $locale->text('Save and Quotation')
-    : $locale->text('Save and RFQ');
-  $arap =
-    ($form->{db} eq 'customer')
-    ? $locale->text('Save and AR Transaction')
-    : $locale->text('Save and AP Transaction');
-
-##<input class=submit type=submit name=action value="|.$locale->text("Save and Quotation").qq|">
-##<input class=submit type=submit name=action value="|.$locale->text("Save and RFQ").qq|">
-##<input class=submit type=submit name=action value="|.$locale->text("Save and AR Transaction").qq|">
-##<input class=submit type=submit name=action value="|.$locale->text("Save and AP Transaction").qq|">
-
-  print qq|
-<input name=id type=hidden id=cvid value=$form->{id}>
-<input name=business_save type=hidden value="$form->{selectbusiness}">
-<input name=title_save type=hidden value="$form->{title}">
-
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input type=hidden name=callback value="$form->{callback}">
-<input type=hidden name=db id=db value=$form->{db}>
-
-
-
-<br>
-<input class=submit type=submit name=action accesskey="s" value="|
-    . $locale->text("Save") . qq|">
-<input class=submit type=submit name=action accesskey="s" value="|
-    . $locale->text("Save and Close") . qq|">
-<input class=submit type=submit name=action value="$arap">
-<input class=submit type=submit name=action value="|
-    . $locale->text("Save and Invoice") . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text("Save and Order") . qq|">
-<input class=submit type=submit name=action value="$quotation">
-|;
-
-  if ($form->{id} && $form->{status} eq 'orphaned') {
-    print qq|<input class=submit type=submit name=action value="|
-      . $locale->text('Delete')
-      . qq|">\n|;
-  }
-
-  # button for saving history
-  if($form->{id} ne "") {
-    print qq|
-  	  <input type=button class=submit onclick=set_history_window(|
-  	  . $form->{id} 
-  	  . qq|); name=history id=history value=|
-  	  . $locale->text('history') 
-  	  . qq|>|;
-  }
-  # /button for saving history
-
-  print qq|
-
-  </form>
-<script type="text/javascript">
-//Start Tab Content script for UL with id="maintab" Separate multiple ids each with a comma.
-initializetabcontent("maintab")
-</script>
-</body>
-</html>
-|;
+  $auth->assert('customer_vendor_edit');
 
+  print $form->parse_html_template('ct/form_footer', { is_orphaned => $form->{status} eq 'orphaned',
+                                                       is_customer => $form->{db}     eq 'customer' });
   $lxdebug->leave_sub();
 }
 
 sub add_transaction {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit & general_ledger');
+
 #  # saving the history
 #  if(!exists $form->{addition}) {
 #  	$form->{addition} = "ADD TRANSACTION";
@@ -902,7 +332,7 @@ sub add_transaction {
   $name = $form->escape("$form->{name}", 1);
 
   $form->{callback} =
-    "$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$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();
@@ -911,6 +341,8 @@ sub add_transaction {
 sub save_and_ap_transaction {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit & general_ledger');
+
   $form->{script} = "ap.pl";
   # saving the history
   if(!exists $form->{addition}) {
@@ -926,6 +358,8 @@ sub save_and_ap_transaction {
 sub save_and_ar_transaction {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit & general_ledger');
+
   $form->{script} = "ar.pl";
   # saving the history
   if(!exists $form->{addition}) {
@@ -941,6 +375,12 @@ sub save_and_ar_transaction {
 sub save_and_invoice {
   $lxdebug->enter_sub();
 
+  if ($form->{db} eq 'customer') {
+    $auth->assert('customer_vendor_edit & invoice_edit');
+  } else {
+    $auth->assert('customer_vendor_edit & vendor_invoice_edit');
+  }
+
   $form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl";
   $form->{type} = "invoice";
   # saving the history
@@ -957,6 +397,8 @@ sub save_and_invoice {
 sub save_and_rfq {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit & request_quotation_edit');
+
   $form->{script} = "oe.pl";
   $form->{type}   = "request_quotation";
   # saving the history
@@ -973,6 +415,8 @@ sub save_and_rfq {
 sub save_and_quotation {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit & sales_quotation_edit');
+
   $form->{script} = "oe.pl";
   $form->{type}   = "sales_quotation";
   # saving the history
@@ -989,6 +433,8 @@ sub save_and_quotation {
 sub save_and_order {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit & sales_order_edit');
+
   $form->{script} = "oe.pl";
   $form->{type}   =
     ($form->{db} eq 'customer') ? "sales_order" : "purchase_order";
@@ -1006,8 +452,7 @@ sub save_and_order {
 sub save_and_close {
   $lxdebug->enter_sub();
 
-  # $locale->text('Customer saved!')
-  # $locale->text('Vendor saved!')
+  $auth->assert('customer_vendor_edit');
 
   $msg = ucfirst $form->{db};
   $imsg .= " saved!";
@@ -1036,8 +481,7 @@ sub save_and_close {
 sub save {
   $lxdebug->enter_sub();
 
-  # $locale->text('Customer saved!')
-  # $locale->text('Vendor saved!')
+  $auth->assert('customer_vendor_edit');
 
   $msg = ucfirst $form->{db};
   $imsg .= " saved!";
@@ -1073,10 +517,7 @@ sub save {
 sub delete {
   $lxdebug->enter_sub();
 
-  # $locale->text('Customer deleted!')
-  # $locale->text('Cannot delete customer!')
-  # $locale->text('Vendor deleted!')
-  # $locale->text('Cannot delete vendor!')
+  $auth->assert('customer_vendor_edit');
 
   CT->delete(\%myconfig, \%$form);
 
@@ -1100,6 +541,8 @@ sub delete {
 sub display {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   &form_header();
   &form_footer();
 
@@ -1109,6 +552,8 @@ sub display {
 sub update {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   &display();
   $lxdebug->leave_sub();
 }
@@ -1116,13 +561,11 @@ sub update {
 sub get_contact {
   $lxdebug->enter_sub();
 
-  CT->get_contact(\%myconfig, \%$form);
+  $auth->assert('customer_vendor_edit');
 
-  my $q = new CGI;
-  $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 $q->header();
-  print $result;
+  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();
 
 }
@@ -1130,13 +573,11 @@ sub get_contact {
 sub get_shipto {
   $lxdebug->enter_sub();
 
-  CT->get_shipto(\%myconfig, \%$form);
+  $auth->assert('customer_vendor_edit');
 
-  my $q = new CGI;
-  $result = "$form->{shiptoname}";
-  map { $result .= "__pjx__" . $form->{$_} } qw(shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
-  print $q->header();
-  print $result;
+  CT->get_shipto(\%myconfig, \%$form);
+  print $cgi->header(),  join '__pjx__', map $form->{"shipto$_"},
+    qw(name department_1 department_2 street zipcode city country contact phone fax email used);
   $lxdebug->leave_sub();
 
 }
@@ -1144,84 +585,47 @@ sub get_shipto {
 sub get_delivery {
   $lxdebug->enter_sub();
 
+  $auth->assert('customer_vendor_edit');
+
   CT->get_delivery(\%myconfig, \%$form );
 
-  @column_index =
-    $form->sort_columns(shiptoname,
-                        invnumber,
-                        ordnumber,
-                        transdate,
-                        description,
-                        qty,
-                        unit);
-
-
-
-  $column_header{shiptoname} =
-    qq|<th class=listheading>| . $locale->text('Shipping Address') . qq|</th>|;
-  $column_header{invnumber} =
-      qq|<th class=listheading>|. $locale->text('Invoice'). qq|</th>|;
-  $column_header{ordnumber} =
-      qq|<th class=listheading>|. $locale->text('Order'). qq|</th>|;
-  $column_header{transdate} =
-    qq|<th class=listheading>| . $locale->text('Invdate') . qq|</th>|;
-  $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
-  $column_header{qty} =
-    qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
-  $column_header{unit} =
-    qq|<th class=listheading>| . $locale->text('Unit') . qq|</th>|;
-  $result .= qq|
-
-<table width=100%>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>
-|;
-
-  map { $result .= "$column_header{$_}\n" } @column_index;
-
-  $result .= qq|
-        </tr>
-|;
-
-
-  foreach $ref (@{ $form->{DELIVERY} }) {
-
-    if ($ref->{shiptoname} eq $sameshiptoname) {
-      map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } @column_index;
-      $column_data{shiptoname} = "<td>&nbsp;</td>";
-    } else {
-      map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } @column_index;
-    }
+  print $cgi->header(), $form->parse_html_template('ct/get_delivery');
 
-    $i++;
-    $i %= 2;
-    $result .= "
-        <tr class=listrow$i>
-";
+  $lxdebug->leave_sub();
+}
 
-    map { $result .= "$column_data{$_}\n" } @column_index;
+sub delete_shipto {
+  $main::lxdebug->enter_sub();
 
-    $result .= qq|
-        </tr>
-|;
+  $auth->assert('customer_vendor_edit');
 
-    $sameshiptoname = $ref->{shiptoname};
+  CT->get_shipto(\%myconfig, \%$form);
 
+  unless ($form->{shiptoused}) {
+    CT->delete_shipto($form->{shipto_id});
+    @$form{ grep /^shipto/, keys %$form } = undef;
   }
 
-  $result .= qq|
-      </table>
-|;
+  edit();
 
+  $main::lxdebug->leave_sub();
+}
 
-  my $q = new CGI;
-  print $q->header();
-  print $result;
-  $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}); }