X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=66fd60ce812d60d03377daa4ea8d91b80b246679;hb=5ff43c9827db9fe9af6171a390d40bccdefc7e73;hp=95c6e3315ba1843ca2a5cdf8be286bc859064498;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 95c6e3315..66fd60ce8 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -40,42 +40,41 @@ use SL::CT; 1; -# end of main - +# end of main sub add { $lxdebug->enter_sub(); - $form->{title} = "Add"; - $form->{callback} = "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; + $form->{callback} = + "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}" + unless $form->{callback}; CT->taxaccounts(\%myconfig, \%$form); - + &form_header; &form_footer; - + $lxdebug->leave_sub(); } - sub search { $lxdebug->enter_sub(); - $label = ucfirst $form->{db}; - $form->{title} = $locale->text($label."s"); + $form->{title} = $locale->text($label . "s"); if ($form->{db} eq 'vendor') { $gifi = qq| - |.$locale->text('GIFI').qq| + | + . $locale->text('GIFI') . qq| |; } - + $form->header; - + print qq| @@ -92,52 +91,68 @@ sub search { - + - + - + - + - + - + @@ -157,7 +172,8 @@ sub search { {password}>
- + @@ -166,16 +182,24 @@ sub search { $lxdebug->leave_sub(); } - sub list_names { $lxdebug->enter_sub(); CT->search(\%myconfig, \%$form); - - $callback = "$form->{script}?action=list_names&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}"; + + $callback = + "$form->{script}?action=list_names&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}"; $href = $callback; - - @columns = $form->sort_columns(id, name, "$form->{db}number", address, contact, phone, fax, email, taxnumber, gifi_accno, sic_code, business, invnumber, ordnumber, quonumber); + + @columns = + $form->sort_columns(id, name, + "$form->{db}number", address, + contact, phone, + fax, email, + taxnumber, gifi_accno, + sic_code, business, + invnumber, ordnumber, + quonumber); foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { @@ -183,11 +207,14 @@ sub list_names { # add column to href and callback $callback .= "&l_$item=Y"; - $href .= "&l_$item=Y"; + $href .= "&l_$item=Y"; } } - $number = ($form->{db} eq "customer") ? $locale->text('Customer Number') : $locale->text('Vendor Number') ; - + $number = + ($form->{db} eq "customer") + ? $locale->text('Customer Number') + : $locale->text('Vendor Number'); + if ($form->{status} eq 'all') { $option = $locale->text('All'); } @@ -195,50 +222,96 @@ sub list_names { $option .= $locale->text('Orphaned'); } if ($form->{name}) { - $callback .= "&name=".$form->escape($form->{name},1); - $href .= "&name=".$form->escape($form->{name}); - $option .= "\n
".$locale->text('Name')." : $form->{name}"; + $callback .= "&name=" . $form->escape($form->{name}, 1); + $href .= "&name=" . $form->escape($form->{name}); + $option .= "\n
" . $locale->text('Name') . " : $form->{name}"; } if ($form->{contact}) { - $callback .= "&contact=".$form->escape($form->{contact},1); - $href .= "&contact=".$form->escape($form->{contact}); - $option .= "\n
".$locale->text('Contact')." : $form->{contact}"; + $callback .= "&contact=" . $form->escape($form->{contact}, 1); + $href .= "&contact=" . $form->escape($form->{contact}); + $option .= "\n
" . $locale->text('Contact') . " : $form->{contact}"; } if ($form->{"$form->{db}number"}) { - $callback .= qq|&$form->{db}number=|.$form->escape($form->{"$form->{db}number"},1); - $href .= "&$form->{db}number=".$form->escape($form->{"$form->{db}number"}); - $option .= "\n
".$locale->text('Number').qq| : $form->{"$form->{db}number"}|; + $callback .= + qq|&$form->{db}number=| . $form->escape($form->{"$form->{db}number"}, 1); + $href .= + "&$form->{db}number=" . $form->escape($form->{"$form->{db}number"}); + $option .= + "\n
" . $locale->text('Number') . qq| : $form->{"$form->{db}number"}|; } if ($form->{email}) { - $callback .= "&email=".$form->escape($form->{email},1); - $href .= "&email=".$form->escape($form->{email}); - $option .= "\n
".$locale->text('E-mail')." : $form->{email}"; + $callback .= "&email=" . $form->escape($form->{email}, 1); + $href .= "&email=" . $form->escape($form->{email}); + $option .= "\n
" . $locale->text('E-mail') . " : $form->{email}"; } $form->{callback} = "$callback&sort=$form->{sort}"; $callback = $form->escape($form->{callback}); - - $column_header{id} = qq||; - $column_header{"$form->{db}number"} = qq||; - $column_header{name} = qq||; - $column_header{address} = qq||; - $column_header{contact} = qq||; - $column_header{phone} = qq||; - $column_header{fax} = qq||; - $column_header{email} = qq||; - $column_header{cc} = qq||; - - $column_header{taxnumber} = qq||; - $column_header{gifi_accno} = qq||; - $column_header{sic_code} = qq||; - $column_header{business} = qq||; - - $column_header{invnumber} = qq||; - $column_header{ordnumber} = qq||; - $column_header{quonumber} = qq||; - - - $label = ucfirst $form->{db}."s"; + + $column_header{id} = + qq||; + $column_header{"$form->{db}number"} = + qq||; + $column_header{name} = + qq||; + $column_header{address} = + qq||; + $column_header{contact} = + qq||; + $column_header{phone} = + qq||; + $column_header{fax} = + qq||; + $column_header{email} = + qq||; + $column_header{cc} = + qq||; + + $column_header{taxnumber} = + qq||; + $column_header{gifi_accno} = + qq||; + $column_header{sic_code} = + qq||; + $column_header{business} = + qq||; + + $column_header{invnumber} = + qq||; + $column_header{ordnumber} = + qq||; + $column_header{quonumber} = + qq||; + + $label = ucfirst $form->{db} . "s"; $form->{title} = $locale->text($label); $form->header; @@ -261,14 +334,15 @@ sub list_names { |; map { print "$column_header{$_}\n" } @column_index; - + print qq| |; $ordertype = ($form->{db} eq 'customer') ? 'sales_order' : 'purchase_order'; - $quotationtype = ($form->{db} eq 'customer') ? 'sales_quotation' : 'request_quotation'; - + $quotationtype = + ($form->{db} eq 'customer') ? 'sales_quotation' : 'request_quotation'; + foreach $ref (@{ $form->{CT} }) { if ($ref->{id} eq $sameid) { @@ -276,35 +350,40 @@ sub list_names { } else { map { $column_data{$_} = "" } @column_index; - map { $column_data{$_} = "" } (invnumber, ordnumber, quonumber); - - $column_data{name} = ""; + map { $column_data{$_} = "" } + (invnumber, ordnumber, quonumber); + + $column_data{name} = + ""; if ($ref->{email}) { - $email = $ref->{email}; - $email =~ s//\>/; - - $column_data{email} = qq||; + $email = $ref->{email}; + $email =~ s//\>/; + + $column_data{email} = + qq||; } - + } - - + if ($ref->{formtype} eq 'invoice') { - $column_data{invnumber} = ""; + $column_data{invnumber} = + ""; } - + if ($ref->{formtype} eq 'order') { - $column_data{ordnumber} = ""; + $column_data{ordnumber} = + ""; } if ($ref->{formtype} eq 'quotation') { - $column_data{quonumber} = ""; + $column_data{quonumber} = + ""; } - - - $i++; $i %= 2; + + $i++; + $i %= 2; print " "; @@ -314,7 +393,7 @@ sub list_names { print qq| |; - + $sameid = $ref->{id}; } @@ -338,7 +417,8 @@ sub list_names { {login}> {password}> -|; +|; if ($form->{menubar}) { require "$form->{path}/menu.pl"; @@ -351,17 +431,15 @@ sub list_names { |; - + $lxdebug->leave_sub(); } - sub edit { $lxdebug->enter_sub(); - -# $locale->text('Edit Customer') -# $locale->text('Edit Vendor') + # $locale->text('Edit Customer') + # $locale->text('Edit Vendor') CT->get_tuple(\%myconfig, \%$form); @@ -372,31 +450,30 @@ sub edit { # format discount $form->{discount} *= 100; - + &form_header; &form_footer; $lxdebug->leave_sub(); } - sub form_header { $lxdebug->enter_sub(); - $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; - $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0); + $form->{creditlimit} = + $form->format_amount(\%myconfig, $form->{creditlimit}, 0); if ($myconfig{role} eq 'admin') { $bcc = qq| - + |; } - $form->{obsolete} = "checked" if $form->{obsolete}; - %langs = (de=>"deutsch", en=>"englisch", fr=>"französisch"); + $form->{obsolete} = "checked" if $form->{obsolete}; + %langs = (de => "deutsch", en => "englisch", fr => "französisch"); $lang = qq||; foreach $item (keys %langs) { if ($form->{language} eq $item) { @@ -405,71 +482,76 @@ sub form_header { $lang .= qq||; } } - + foreach $item (split / /, $form->{taxaccounts}) { if (($form->{tax}{$item}{taxable}) || !($form->{id})) { - $taxable .= qq|  $form->{tax}{$item}{description}|; + $taxable .= + qq|  $form->{tax}{$item}{description}|; } else { - $taxable .= qq|  $form->{tax}{$item}{description}|; + $taxable .= + qq|  $form->{tax}{$item}{description}|; } } ##LINET - $taxable=""; + $taxable = ""; if ($taxable) { $tax = qq| - + |; } - $form->{selectbusiness} = qq| + |; } - + if ($form->{db} eq 'customer') { - - $customer = qq| - + + $customer = qq| + |; } $business_salesman = ""; - $business = ""; + $business = ""; if ($vertreter) { $business_salesman = qq| @@ -1012,7 +1140,7 @@ sub select_salesman { # delete variables map { delete $form->{$_} } qw(action name_list header); - + # save all other form variables foreach $key (keys %${form}) { $form->{$key} =~ s/\"/"/g; @@ -1024,7 +1152,8 @@ sub select_salesman {
- + @@ -1034,18 +1163,15 @@ sub select_salesman { $lxdebug->leave_sub(); } - - sub salesman_selected { $lxdebug->enter_sub(); - # replace the variable with the one checked # index for new item $i = $form->{ndx}; - - $form->{salesman} = $form->{"new_name_$i"}; + + $form->{salesman} = $form->{"new_name_$i"}; $form->{"salesman_id"} = $form->{"new_id_$i"}; $form->{"oldsalesman"} = $form->{salesman}; @@ -1053,7 +1179,7 @@ sub salesman_selected { for $i (1 .. $form->{lastndx}) { map { delete $form->{"new_${_}_$i"} } (id, name); } - + map { delete $form->{$_} } qw(ndx lastndx nextsub); &update(1); @@ -1061,7 +1187,4 @@ sub salesman_selected { $lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } }; - - - +sub continue { &{ $form->{nextsub} } }
|.$locale->text($label . ' Number').qq|| . $locale->text($label . ' Number') . qq| {db}number size=35>
|.$locale->text('Company Name').qq|| . $locale->text('Company Name') . qq|
|.$locale->text('Contact').qq|| . $locale->text('Contact') . qq|
|.$locale->text('E-mail').qq|| . $locale->text('E-mail') . qq|
 |.$locale->text('All').qq| -  |.$locale->text('Orphaned').qq| | + . $locale->text('All') . qq| +  | + . $locale->text('Orphaned') . qq|
|.$locale->text('Include in Report').qq|| . $locale->text('Include in Report') . qq| - - - - + + + + - - - - + + + + - + $gifi - - + + - - - + + +
|.$locale->text('ID').qq| |.$locale->text($label . ' Number').qq| |.$locale->text('Company Name').qq| |.$locale->text('Address').qq| | + . $locale->text('ID') . qq| | + . $locale->text($label . ' Number') . qq| | + . $locale->text('Company Name') . qq| | + . $locale->text('Address') . qq|
|.$locale->text('Contact').qq| |.$locale->text('Phone').qq| |.$locale->text('Fax').qq| |.$locale->text('E-mail').qq| | + . $locale->text('Contact') . qq| | + . $locale->text('Phone') . qq| | + . $locale->text('Fax') . qq| | + . $locale->text('E-mail') . qq|
|.$locale->text('Tax Number').qq| | + . $locale->text('Tax Number') . qq| |.$locale->text('SIC').qq| |.$locale->text('Type of Business').qq| | + . $locale->text('SIC') . qq| | + . $locale->text('Type of Business') . qq|
|.$locale->text('Invoices').qq| |.$locale->text('Orders').qq| |.$locale->text('Quotations').qq| | + . $locale->text('Invoices') . qq| | + . $locale->text('Orders') . qq| | + . $locale->text('Quotations') . qq|
|.$locale->text('ID').qq|{db}number>$number|.$locale->text('Name').qq||.$locale->text('Address').qq||.$locale->text('Contact').qq||.$locale->text('Phone').qq||.$locale->text('Fax').qq||.$locale->text('E-mail').qq||.$locale->text('Cc').qq||.$locale->text('Tax Number').qq||.$locale->text('GIFI').qq||.$locale->text('SIC').qq||.$locale->text('Type of Business').qq||.$locale->text('Invoice').qq||.$locale->text('Order').qq||.$locale->text('Quotation').qq|| . $locale->text('ID') . qq|{db}number>$number| + . $locale->text('Name') + . qq|| + . $locale->text('Address') + . qq|| + . $locale->text('Contact') + . qq|| + . $locale->text('Phone') + . qq|| + . $locale->text('Fax') + . qq|| + . $locale->text('E-mail') + . qq|| + . $locale->text('Cc') + . qq|| + . $locale->text('Tax Number') + . qq|| + . $locale->text('GIFI') + . qq|| + . $locale->text('SIC') + . qq|| + . $locale->text('Type of Business') + . qq|| + . $locale->text('Invoice') + . qq|| + . $locale->text('Order') + . qq|| + . $locale->text('Quotation') + . qq|
$ref->{$_} $ref->{$_} {script}?action=edit&id=$ref->{id}&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name} $ref->{$_} {script}?action=edit&id=$ref->{id}&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name} $email$email{module}.pl?action=edit&id=$ref->{invid}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber} {module}.pl?action=edit&id=$ref->{invid}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber} {module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber} {module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber} {module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber} {module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber} 
|.$locale->text('Bcc').qq|| . $locale->text('Bcc') . qq|
|.$locale->text('Taxable').qq|| . $locale->text('Taxable') . qq| - +
$taxable {taxincluded}>|.$locale->text('Tax Included').qq|| . $locale->text('Tax Included') . qq|
|.$locale->text('Kundennummer').qq|| . $locale->text('Kundennummer') . qq| |.$locale->text('KNr. beim Kunden').qq|| . $locale->text('KNr. beim Kunden') . qq|
- + - + @@ -477,31 +559,65 @@ sub form_header { |; $business = qq| - + - - |; + + |; } else { - $business = qq| - + $business = qq| + |; - } - + } + ## LINET: Create a drop-down box with all prior titles and greetings. CT->query_titles_and_greetings(\%myconfig, \%$form); - + $select_title = qq| |; - $select_greeting = qq| |; + map( + { $select_greeting .= qq||; } @{ $form->{GREETINGS} }); $select_greeting .= qq||; ## /LINET -# $locale->text('Customer Number') -# $locale->text('Vendor Number') + 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| - + @@ -684,21 +812,26 @@ sub form_header { $lxdebug->leave_sub(); } - - 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'); + $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'); if ($vertreter) { - $update_button = qq||; + $update_button = + qq||; } else { $update_button = ""; } - + ## ## ## @@ -717,17 +850,24 @@ sub form_footer { {db}> + +
$update_button - + - - + + |; if ($form->{id} && $form->{status} eq 'orphaned') { - print qq|\n|; + print qq|\n|; } if ($form->{menubar}) { @@ -736,7 +876,7 @@ $update_button } print qq| - + @@ -746,131 +886,116 @@ $update_button $lxdebug->leave_sub(); } - sub add_transaction { $lxdebug->enter_sub(); - $form->isblank("name", $locale->text("Name missing!")); - &{ "CT::save_$form->{db}" }("", \%myconfig, \%$form); - - $form->{callback} = $form->escape($form->{callback},1); - $name = $form->escape("$form->{name}",1); + &{"CT::save_$form->{db}"}("", \%myconfig, \%$form); - $form->{callback} = "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}"; + $form->{callback} = $form->escape($form->{callback}, 1); + $name = $form->escape("$form->{name}", 1); + + $form->{callback} = + "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}"; $form->redirect; - + $lxdebug->leave_sub(); } sub save_and_ap_transaction { $lxdebug->enter_sub(); - $form->{script} = "ap.pl"; &add_transaction; $lxdebug->leave_sub(); } - sub save_and_ar_transaction { $lxdebug->enter_sub(); - $form->{script} = "ar.pl"; &add_transaction; $lxdebug->leave_sub(); } - sub save_and_invoice { $lxdebug->enter_sub(); - $form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl"; $form->{type} = "invoice"; &add_transaction; - + $lxdebug->leave_sub(); } - sub save_and_rfq { $lxdebug->enter_sub(); - $form->{script} = "oe.pl"; - $form->{type} = "request_quotation"; + $form->{type} = "request_quotation"; &add_transaction; $lxdebug->leave_sub(); } - sub save_and_quotation { $lxdebug->enter_sub(); - $form->{script} = "oe.pl"; - $form->{type} = "sales_quotation"; + $form->{type} = "sales_quotation"; &add_transaction; $lxdebug->leave_sub(); } - sub save_and_order { $lxdebug->enter_sub(); - $form->{script} = "oe.pl"; - $form->{type} = ($form->{db} eq 'customer') ? "sales_order" : "purchase_order"; + $form->{type} = + ($form->{db} eq 'customer') ? "sales_order" : "purchase_order"; &add_transaction; $lxdebug->leave_sub(); } - sub save { $lxdebug->enter_sub(); - -# $locale->text('Customer saved!') -# $locale->text('Vendor saved!') + # $locale->text('Customer saved!') + # $locale->text('Vendor saved!') $msg = ucfirst $form->{db}; $imsg .= " saved!"; - + $form->isblank("name", $locale->text("Name missing!")); if ($vertreter && $form->{db} eq "customer") { $form->isblank("salesman_id", $locale->text("Salesman missing!")); } - &{ "CT::save_$form->{db}" }("", \%myconfig, \%$form); - + &{"CT::save_$form->{db}"}("", \%myconfig, \%$form); + $form->redirect($locale->text($msg)); - + $lxdebug->leave_sub(); } - sub delete { $lxdebug->enter_sub(); - -# $locale->text('Customer deleted!') -# $locale->text('Cannot delete customer!') -# $locale->text('Vendor deleted!') -# $locale->text('Cannot delete vendor!') + # $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}; $msg .= " deleted!"; $form->redirect($locale->text($msg)); - + $msg = "Cannot delete $form->{db}"; $form->error($locale->text($msg)); @@ -890,7 +1015,8 @@ sub update { $lxdebug->enter_sub(); &check_salesman($form->{salesman}); -# $form->get_salesman(\%myconfig, $form->{salesman}); + + # $form->get_salesman(\%myconfig, $form->{salesman}); &display(); $lxdebug->leave_sub(); } @@ -903,50 +1029,49 @@ sub check_salesman { my ($new_name, $new_id) = split /--/, $form->{$name}; my $i = 0; - # check name, combine name and id - if ($form->{"oldsalesman"} ne$ form->{"salesman"} ) { + # check name, combine name and id + if ($form->{"oldsalesman"} ne $form->{"salesman"}) { - # return one name or a list of names in $form->{name_list} - if (($i = $form->get_salesman(\%myconfig, $name)) > 1) { - &select_salesman($name); - exit; - } + # return one name or a list of names in $form->{name_list} + if (($i = $form->get_salesman(\%myconfig, $name)) > 1) { + &select_salesman($name); + exit; + } - if ($i == 1) { - # we got one name - $form->{"salesman_id"} = $form->{salesman_list}[0]->{id}; - $form->{salesman} = $form->{salesman_list}[0]->{name}; - $form->{"oldsalesman"} = $form->{salesman}; - - } else { - # name is not on file - # $locale->text('Customer not on file!') - # $locale->text('Vendor not on file!') - $msg = ucfirst $name . " not on file or locked!"; - $form->error($locale->text($msg)); - } + if ($i == 1) { + + # we got one name + $form->{"salesman_id"} = $form->{salesman_list}[0]->{id}; + $form->{salesman} = $form->{salesman_list}[0]->{name}; + $form->{"oldsalesman"} = $form->{salesman}; + + } else { + + # name is not on file + # $locale->text('Customer not on file!') + # $locale->text('Vendor not on file!') + $msg = ucfirst $name . " not on file or locked!"; + $form->error($locale->text($msg)); } - + } $lxdebug->leave_sub(); return $i; } - - - sub select_salesman { $lxdebug->enter_sub(); my ($table) = @_; - + @column_index = qw(ndx name); - $label = ucfirst $table; - $column_data{ndx} = qq||; - $column_data{name} = qq||; - + $label = ucfirst $table; + $column_data{ndx} = qq||; + $column_data{name} = + qq||; + # list items with radio button on a form $form->header; @@ -968,7 +1093,7 @@ sub select_salesman { |; map { print "\n$column_data{$_}" } @column_index; - + print qq| |; @@ -978,11 +1103,14 @@ sub select_salesman { $checked = ($i++) ? "" : "checked"; $ref->{name} =~ s/\"/"/g; - - $column_data{ndx} = qq||; - $column_data{name} = qq||; - - $j++; $j %= 2; + + $column_data{ndx} = + qq||; + $column_data{name} = + qq||; + + $j++; + $j %= 2; print qq| |; @@ -996,7 +1124,7 @@ sub select_salesman { |; } - + print qq|
|.$locale->text('Type of Business').qq|| . $locale->text('Type of Business') . qq| |.$locale->text('Salesman').qq|| . $locale->text('Salesman') . qq|
|.$locale->text('Username').qq|| . $locale->text('Username') . qq| |.$locale->text('Password').qq|| . $locale->text('Password') . qq||.$locale->text('Type of Business').qq|| . $locale->text('Type of Business') . qq| - - + + $business_salesman - + - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -587,34 +706,36 @@ sub form_header { {cp_id}>
|.$locale->text('Billing Address').qq||.$locale->text('Shipping Address').qq|| + . $locale->text('Billing Address') . qq|| + . $locale->text('Shipping Address') . qq|
|.$locale->text($label .' Number').qq|| . $locale->text($label . ' Number') . qq| {db}number"}">
|.$locale->text('Company Name').qq|| . $locale->text('Company Name') . qq|
|.$locale->text('Abteilung').qq|| . $locale->text('Abteilung') . qq|
|.$locale->text('Street').qq|| . $locale->text('Street') . qq|
|.$locale->text('Zipcode')."/".$locale->text('City').qq|| + . $locale->text('Zipcode') . "/" . $locale->text('City') . qq|
|.$locale->text('Country').qq|| . $locale->text('Country') . qq|
|.$locale->text('Contact').qq|| . $locale->text('Contact') . qq|
|.$locale->text('Phone').qq|| . $locale->text('Phone') . qq|
|.$locale->text('Fax').qq|| . $locale->text('Fax') . qq|
|.$locale->text('E-mail').qq|| . $locale->text('E-mail') . qq|
|.$locale->text('Homepage').qq|| . $locale->text('Homepage') . qq|
- + - + - + - + - + - + - + - + @@ -622,7 +743,7 @@ sub form_header { |; -##/LINET +##/LINET print qq| $bcc $tax
|.$locale->text('Contact Person').qq|| + . $locale->text('Contact Person') . qq|
|.$locale->text('Greeting').qq|| . $locale->text('Greeting') . qq|   $select_greeting|.$locale->text('Title').qq|| . $locale->text('Title') . qq|   $select_title
|.$locale->text('Given Name').qq|| + . $locale->text('Given Name') . qq| |.$locale->text('Name').qq|| . $locale->text('Name') . qq|
|.$locale->text('Phone1').qq|| . $locale->text('Phone1') . qq| |.$locale->text('Phone2').qq|| . $locale->text('Phone2') . qq|
|.$locale->text('E-mail').qq|| . $locale->text('E-mail') . qq|
@@ -632,45 +753,52 @@ sub form_header { 		- + - - - + + + - + - + $customer - + - + - - + + $business - + |; + if ($form->{db} eq 'customer') { + + print qq| + + |; + } print qq| - +
|.$locale->text('Credit Limit').qq|| . $locale->text('Credit Limit') . qq| |.$locale->text('Terms: Net').qq||.$locale->text('days').qq||.$locale->text('Discount').qq|| . $locale->text('Terms: Net') . qq|| + . $locale->text('days') . qq|| . $locale->text('Discount') . qq| %
|.$locale->text('Tax Number / SSN').qq|| . $locale->text('Tax Number / SSN') . qq| |.$locale->text('USt-IdNr.').qq|| . $locale->text('USt-IdNr.') . qq|
|.$locale->text('Account Number').qq|| . $locale->text('Account Number') . qq| |.$locale->text('Bank Code Number').qq|| . $locale->text('Bank Code Number') . qq| |.$locale->text('Bank').qq|| . $locale->text('Bank') . qq|
|.$locale->text('Language').qq|| . $locale->text('Language') . qq| | . $locale->text('Preisklasse') . qq|$pricegroup
|.$locale->text('Obsolete').qq|| . $locale->text('Obsolete') . qq| {obsolete}>
|.$locale->text('Notes').qq|| . $locale->text('Notes') . qq|
 |.$locale->text($label).qq| | . $locale->text($label) . qq|
$ref->{name}$ref->{name}