X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=4d06662e298ee7cd55d6bf881e966c689ecd373d;hb=1d027d8883ed6b13cf6c78b95b3493acc1fb715f;hp=a091ff955d01b9ccf72fd13a00b715941bc631ae;hpb=bcb41cda2a33c1b7e8cd3386ae53b04ac7198f15;p=kivitendo-erp.git diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index a091ff955..4d06662e2 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -37,12 +37,15 @@ # $locale->text('Add Customer') # $locale->text('Add Vendor') -use SL::CT; -use CGI::Ajax; use CGI; -use Data::Dumper; +use CGI::Ajax; +use POSIX qw(strftime); + +use SL::CT; +use SL::ReportGenerator; require "bin/mozilla/common.pl"; +require "bin/mozilla/reportgenerator.pl"; 1; @@ -54,7 +57,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&db=$form->{db}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; CT->populate_drop_down_boxes(\%myconfig, \%$form); @@ -68,470 +71,136 @@ sub add { sub search { $lxdebug->enter_sub(); - $label = ucfirst $form->{db}; - $form->{title} = $locale->text($label . "s"); - - $form->header; - - print qq| - - -

{script}> - -{db}> - - - - - - - - - - - - -

$form->{title}

- - - - - - - - - - - - - - - - - - - - - - - - - -

| . $locale->text($label . ' Number') . qq|

{db}number size=35>

| . $locale->text('Company Name') . qq|

| . $locale->text('Contact') . qq|

| . $locale->text('E-mail') . qq|

| - . $locale->text('All') . qq| - | - . $locale->text('Orphaned') . qq|

| . $locale->text('Include in Report') . 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('Tax Number') . qq\|	\| - . $locale->text('SIC') . qq\|	\| - . $locale->text('Type of Business') . qq\|
\| - . $locale->text('Invoices') . qq\|	\| - . $locale->text('Orders') . qq\|	\| - . $locale->text('Quotations') . qq\|

- - - -{path}> -{login}> -{password}> - -
- -

- - - -|; - $lxdebug->leave_sub(); -} - -sub search_delivery { - $lxdebug->enter_sub(); - - $label = ucfirst $form->{db}; - $form->{title} = $locale->text($label . "s"); - - $form->header; - - print qq| - - -

{script}> - -{db}> - - - - - - - - - - - - -

$form->{title}

- - - - - - - - - - - - - - - - - - - - - - - - - -

| . $locale->text($label . ' Number') . qq|

{db}number size=35>

| . $locale->text('Company Name') . qq|

| . $locale->text('Contact') . qq|

| . $locale->text('E-mail') . qq|

| - . $locale->text('All') . qq| - | - . $locale->text('Orphaned') . qq|

| . $locale->text('Include in Report') . 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('Tax Number') . qq\|	\| - . $locale->text('SIC') . qq\|	\| - . $locale->text('Type of Business') . qq\|
\| - . $locale->text('Invoices') . qq\|	\| - . $locale->text('Orders') . qq\|	\| - . $locale->text('Quotations') . qq\|

+ $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; -{path}> -{login}> -{password}> + $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors'); + $form->{fokus} = 'Form.name'; -
- -

+ $form->header(); + print $form->parse_html_template2('ct/search'); - - -|; $lxdebug->leave_sub(); } sub list_names { $lxdebug->enter_sub(); - CT->search(\%myconfig, \%$form); + $form->{IS_CUSTOMER} = $form->{db} eq 'customer'; - $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, - sic_code, business, - invnumber, ordnumber, - quonumber); - - foreach $item (@columns) { - if ($form->{"l_$item"} eq "Y") { - push @column_index, $item; - - # add column to href and callback - $callback .= "&l_$item=Y"; - $href .= "&l_$item=Y"; - } - } - $number = - ($form->{db} eq "customer") - ? $locale->text('Customer Number') - : $locale->text('Vendor Number'); + CT->search(\%myconfig, \%$form); + my @options; if ($form->{status} eq 'all') { - $option = $locale->text('All'); - } - if ($form->{status} eq 'orphaned') { - $option .= $locale->text('Orphaned'); + push @options, $locale->text('All'); + + } elsif ($form->{status} eq 'orphaned') { + push @options, $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}"; + push @options, $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}"; + push @options, $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"}|; + push @options, $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}"; + push @options, $locale->text('E-mail') . " : $form->{email}"; } - $form->{callback} = "$callback&sort=$form->{sort}"; - $callback = $form->escape($form->{callback}); - - $column_header{id} = - qq|| . $locale->text('ID') . qq||; - $column_header{"$form->{db}number"} = - qq|{db}number>$number|; - $column_header{name} = - qq|| - . $locale->text('Name') - . qq||; - $column_header{address} = - qq|| - . $locale->text('Address') - . qq||; - $column_header{contact} = - qq|| - . $locale->text('Contact') - . qq||; - $column_header{phone} = - qq|| - . $locale->text('Phone') - . qq||; - $column_header{fax} = - qq|| - . $locale->text('Fax') - . qq||; - $column_header{email} = - qq|| - . $locale->text('E-mail') - . qq||; - $column_header{cc} = - qq|| - . $locale->text('Cc') - . qq||; - - $column_header{taxnumber} = - qq|| - . $locale->text('Tax Number') - . qq||; - $column_header{sic_code} = - qq|| - . $locale->text('SIC') - . qq||; - $column_header{business} = - qq|| - . $locale->text('Type of Business') - . qq||; - - $column_header{invnumber} = - qq|| - . $locale->text('Invoice') - . qq||; - $column_header{ordnumber} = - qq|| - . $locale->text('Order') - . qq||; - $column_header{quonumber} = - qq|| - . $locale->text('Quotation') - . qq||; - - $label = ucfirst $form->{db} . "s"; - $form->{title} = $locale->text($label); - - $form->header; - - print qq| - - - - - - - - - - - - - - - - -

$form->{title}

$option

- - -|; - - 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'; - - foreach $ref (@{ $form->{CT} }) { + my @columns = ( + 'id', 'name', "$form->{db}number", 'address', 'contact', 'phone', + 'fax', 'email', 'taxnumber', 'sic_code', 'business', 'invnumber', + 'ordnumber', 'quonumber' + ); + + my %column_defs = ( + 'id' => { 'text' => $locale->text('ID'), }, + "$form->{db}number" => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Customer Number') : $locale->text('Vendor 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'), }, + ); + + map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns; + + my @hidden_variables = (qw(db status obsolete), 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}); + + map { $column_defs{$_}->{link} = "${callback}&sort=${_}" } @columns; + + my ($ordertype, $quotationtype, $attachment_basename); + if ($form->{IS_CUSTOMER}) { + $form->{title} = $locale->text('Customers'); + $ordertype = 'sales_order'; + $quotationtype = 'sales_quotation'; + $attachment_basename = $locale->text('customer_list'); + + } else { + $form->{title} = $locale->text('Vendors'); + $ordertype = 'purchase_order'; + $quotationtype = 'request_quotation'; + $attachment_basename = $locale->text('vendor_list'); + } - if ($ref->{id} eq $sameid) { - map { $column_data{$_} = "" } @column_index; - } else { - map { $column_data{$_} = "" } @column_index; + my $report = SL::ReportGenerator->new(\%myconfig, $form); - map { $column_data{$_} = "" } - (invnumber, ordnumber, quonumber); + $report->set_options('top_info_text' => join("\n", @options), + 'raw_bottom_info_text' => $form->parse_html_template2('ct/list_names_bottom'), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + ); + $report->set_options_from_form(); - $column_data{name} = - ""; + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - if ($ref->{email}) { - $email = $ref->{email}; - $email =~ s//\>/; + $report->set_export_options('list_names', @hidden_variables); - $column_data{email} = - qq||; - } + $report->set_sort_indicator($form->{sort}, 1); - } + my $previous_id; - if ($ref->{formtype} eq 'invoice') { - $column_data{invnumber} = - ""; - } + foreach my $ref (@{ $form->{CT} }) { + my $row = { map { $_ => { 'data' => '' } } @columns }; - if ($ref->{formtype} eq 'order') { - $column_data{ordnumber} = - ""; - } + if ($ref->{id} ne $previous_id) { + $previous_id = $ref->{id}; + map { $row->{$_}->{data} = $ref->{$_} } @columns; - if ($ref->{formtype} eq 'quotation') { - $column_data{quonumber} = - ""; + $row->{name}->{link} = build_std_url('action=edit', 'id=' . E($ref->{id}), 'callback', @hidden_nondefault); + $row->{email}->{link} = 'mailto:' . E($ref->{email}); } - $i++; - $i %= 2; - print " - -"; - - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - - $sameid = $ref->{id}; + my $base_url = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault); + $row->{invnumber}->{link} = $base_url; + $row->{ordnumber}->{link} = $base_url . "&type=${ordertype}"; + $row->{quonumber}->{link} = $base_url . "&type=${quotationtype}"; + my $column = $ref->{formtype} eq 'invoice' ? 'invnumber' : $ref->{formtype} eq 'order' ? 'ordnumber' : 'quonumber'; + $row->{$column}->{data} = $ref->{$column}; + $report->add_data($row); } - print qq| -

$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

{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=$quotationtype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}

- -
- - - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -566,7 +235,8 @@ sub edit { sub form_header { $lxdebug->enter_sub(); - $form->get_lists("employees" => "ALL_SALESMEN"); + $form->get_lists("employees" => "ALL_SALESMEN", + "taxzones" => "ALL_TAXZONES"); $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; $form->{creditlimit} = @@ -609,30 +279,26 @@ sub form_header { } } - if (@{ $form->{TAXZONE} }) { - foreach $item (@{ $form->{TAXZONE} }) { - if ($item->{id} == $form->{taxzone_id}) { - $form->{selecttaxzone} .= - ""; + $form->{selectcontact} = ""; if (@{ $form->{CONTACTS} }) { foreach $item (@{ $form->{CONTACTS} }) { if ($item->{cp_id} == $form->{cp_id}) { @@ -653,7 +319,7 @@ sub form_header { |; $get_shipto_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_shipto"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_shipto"; my $pjy = new CGI::Ajax( 'get_shipto' => $get_shipto_url ); $form->{selectshipto} = ""; @@ -681,7 +347,7 @@ sub form_header { $get_delivery_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_delivery"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_delivery"; my $pjz = new CGI::Ajax( 'get_delivery' => $get_delivery_url ); @@ -716,7 +382,7 @@ sub form_header { if ($form->{db} eq 'vendor') { $customer = qq| | . $locale->text('Kundennummer') . qq| - + |; } @@ -724,7 +390,7 @@ sub form_header { $customer = qq| | . $locale->text('KNr. beim Kunden') . qq| - + |; } @@ -848,11 +514,11 @@ sub form_header { | . $locale->text($label . ' Number') . qq| - {db}number"}"> + {db}number"}"> | . $locale->text('Greeting') . qq| - + $select_company_greeting @@ -919,9 +585,9 @@ sub form_header { | . $locale->text('Account Number') . qq| - + | . $locale->text('Bank Code Number') . qq| - + | . $locale->text('Bank') . qq| @@ -982,12 +648,12 @@ $shipto | . $locale->text('Zipcode') . "/" . $locale->text('City') . qq| - + | . $locale->text('Country') . qq| - + | . $locale->text('Contact') . qq| @@ -1027,75 +693,75 @@ $shipto $ansprechpartner | . $locale->text('Greeting') . qq| - + $select_greeting | . $locale->text('Title') . qq| - + $select_title | . $locale->text('Department') . qq| - + $select_department | . $locale->text('Given Name') . qq| - + | . $locale->text('Name') . qq| - + | . $locale->text('Phone1') . qq| - + | . $locale->text('Phone2') . qq| - + | . $locale->text('Fax') . qq| - + | . $locale->text('Mobile1') . qq| - + | . $locale->text('Mobile2') . qq| - + | . $locale->text('Sat. Phone') . qq| - + | . $locale->text('Sat. Fax') . qq| - + | . $locale->text('Project') . qq| - + | . $locale->text('E-mail') . qq| - + | . $locale->text('Private Phone') . qq| - + | . $locale->text('Private E-mail') . qq| - + | . $locale->text('Birthday') . qq| - + @@ -1163,7 +829,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -1227,13 +892,17 @@ sub add_transaction { # # /saving the history $form->isblank("name", $locale->text("Name missing!")); - &{"CT::save_$form->{db}"}("", \%myconfig, \%$form); + if ($form->{"db"} eq "customer") { + CT->save_customer(\%myconfig, \%$form); + } else { + CT->save_vendor(\%myconfig, \%$form); + } $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->{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->redirect; $lxdebug->leave_sub(); @@ -1245,6 +914,7 @@ sub save_and_ap_transaction { $form->{script} = "ap.pl"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1259,6 +929,7 @@ sub save_and_ar_transaction { $form->{script} = "ar.pl"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1274,6 +945,7 @@ sub save_and_invoice { $form->{type} = "invoice"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1289,6 +961,7 @@ sub save_and_rfq { $form->{type} = "request_quotation"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1304,6 +977,7 @@ sub save_and_quotation { $form->{type} = "sales_quotation"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1320,6 +994,7 @@ sub save_and_order { ($form->{db} eq 'customer') ? "sales_order" : "purchase_order"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1338,13 +1013,18 @@ sub save_and_close { $imsg .= " saved!"; $form->isblank("name", $locale->text("Name missing!")); - $rc = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form); + if ($form->{"db"} eq "customer") { + $rc = CT->save_customer(\%myconfig, \%$form); + } else { + $rc = CT->save_vendor(\%myconfig, \%$form); + } if ($rc == 3) { $form->error($locale->text('customernumber not unique!')); } # saving the history if(!exists $form->{addition}) { - $form->{addition} = "SAVED"; + $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); + $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -1364,7 +1044,12 @@ sub save { $form->isblank("name", $locale->text("Name missing!")); - my $res = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form); + my $res; + if ($form->{"db"} eq "customer") { + $res = CT->save_customer(\%myconfig, \%$form); + } else { + $res = CT->save_vendor(\%myconfig, \%$form); + } if (3 == $res) { if ($form->{"db"} eq "customer") { @@ -1375,6 +1060,7 @@ sub save { } # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); $form->{addition} = "SAVED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1398,6 +1084,7 @@ sub delete { $msg .= " deleted!"; # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1466,7 +1153,8 @@ sub get_delivery { transdate, description, qty, - unit); + unit, + sellprice); @@ -1484,6 +1172,8 @@ sub get_delivery { qq|| . $locale->text('Qty') . qq||; $column_header{unit} = qq|| . $locale->text('Unit') . qq||; + $column_header{sellprice} = + qq|| . $locale->text('Sell Price') . qq||; $result .= qq| @@ -1508,7 +1198,7 @@ sub get_delivery { } else { map { $column_data{$_} = "" } @column_index; } - + $column_data{sellprice} = ""; $i++; $i %= 2; $result .= " @@ -1537,4 +1227,4 @@ sub get_delivery { } -sub continue { &{ $form->{nextsub} } } +sub continue { call_sub($form->{nextsub}); }

$ref->{$_}

". $form->format_amount(\%myconfig,$ref->{sellprice},2)."