X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4be9b9dc16a69c791e47e53790307458bcf7ad7b..d3897394:/bin/mozilla/ct.pl diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 2a2d1a1f4..bc4f42829 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -37,11 +37,11 @@ # $locale->text('Add Customer') # $locale->text('Add 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 +54,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,13 +73,22 @@ 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_template('ct/search'); @@ -88,30 +99,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 +125,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 +146,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; @@ -177,6 +189,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,6 +226,8 @@ sub list_names { sub edit { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + # show history button $form->{javascript} = qq||; #/show hhistory button @@ -235,10 +255,13 @@ sub edit { sub form_header { $lxdebug->enter_sub(); - $form->get_lists("employees" => "ALL_SALESMEN", + $auth->assert('customer_vendor_edit'); + + $form->get_lists("employees" => "ALL_EMPLOYEES", "taxzones" => "ALL_TAXZONES"); $form->get_pricegroup(\%myconfig, { all => 1 }); + $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'; @@ -252,7 +275,7 @@ sub form_header { unshift @{ $form->{CONTACTS} }, +{ cp_id => '0', cp_name => $locale->text('New contact') }; push @{ $form->{AJAX} }, map { - new CGI::Ajax( "get_$_" => "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_$_" ) + new CGI::Ajax( "get_$_" => "$form->{script}?action=get_$_" ) } qw(shipto contact delivery); $form->{title} = $form->{title_save} @@ -263,6 +286,12 @@ sub form_header { map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT); ## /LINET + $form->{NOTES} ||= [ ]; + + $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} }); + $form->header; print $form->parse_html_template('ct/form_header'); @@ -272,81 +301,18 @@ sub form_header { 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'); - -## -## -## -## - - print qq| -{id}> - - - -{login}> -{password}> - - -{db}> - - - -
- - - - - - -|; - - if ($form->{id} && $form->{status} eq 'orphaned') { - print qq|\n|; - } - - # button for saving history - if($form->{id} ne "") { - print qq| - {id} - . qq|); name=history id=history value=| - . $locale->text('history') - . qq|>|; - } - # /button for saving history - - print qq| - - - - - -|; + $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"; @@ -365,7 +331,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(); @@ -374,6 +340,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}) { @@ -389,6 +357,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}) { @@ -404,6 +374,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 @@ -420,6 +396,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 @@ -436,6 +414,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 @@ -452,6 +432,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"; @@ -469,6 +451,8 @@ sub save_and_order { sub save_and_close { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + # $locale->text('Customer saved!') # $locale->text('Vendor saved!') @@ -499,6 +483,8 @@ sub save_and_close { sub save { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + # $locale->text('Customer saved!') # $locale->text('Vendor saved!') @@ -536,6 +522,8 @@ sub save { sub delete { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + # $locale->text('Customer deleted!') # $locale->text('Cannot delete customer!') # $locale->text('Vendor deleted!') @@ -563,6 +551,8 @@ sub delete { sub display { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + &form_header(); &form_footer(); @@ -572,6 +562,8 @@ sub display { sub update { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + &display(); $lxdebug->leave_sub(); } @@ -579,13 +571,13 @@ sub update { sub get_contact { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + CT->get_contact(\%myconfig, \%$form); - 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; + print $cgi->header(), $result; $lxdebug->leave_sub(); } @@ -593,13 +585,13 @@ sub get_contact { sub get_shipto { $lxdebug->enter_sub(); + $auth->assert('customer_vendor_edit'); + CT->get_shipto(\%myconfig, \%$form); - 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; + print $cgi->header(), $result; $lxdebug->leave_sub(); } @@ -607,87 +599,13 @@ sub get_shipto { sub get_delivery { $lxdebug->enter_sub(); - CT->get_delivery(\%myconfig, \%$form ); - - @column_index = - $form->sort_columns(shiptoname, - invnumber, - ordnumber, - transdate, - description, - qty, - unit, - sellprice); - - - - $column_header{shiptoname} = - qq|| . $locale->text('Shipping Address') . qq||; - $column_header{invnumber} = - qq||. $locale->text('Invoice'). qq||; - $column_header{ordnumber} = - qq||. $locale->text('Order'). qq||; - $column_header{transdate} = - qq|| . $locale->text('Invdate') . qq||; - $column_header{description} = - qq|| . $locale->text('Description') . qq||; - $column_header{qty} = - qq|| . $locale->text('Qty') . qq||; - $column_header{unit} = - qq|| . $locale->text('Unit') . qq||; - $column_header{sellprice} = - qq|| . $locale->text('Sell Price') . qq||; - $result .= qq| - - - -
- - -|; - - map { $result .= "$column_header{$_}\n" } @column_index; - - $result .= qq| - -|; - - - foreach $ref (@{ $form->{DELIVERY} }) { - - if ($ref->{shiptoname} eq $sameshiptoname) { - map { $column_data{$_} = "" } @column_index; - $column_data{shiptoname} = ""; - } else { - map { $column_data{$_} = "" } @column_index; - } - $column_data{sellprice} = ""; - $i++; - $i %= 2; - $result .= " - -"; - - map { $result .= "$column_data{$_}\n" } @column_index; + $auth->assert('customer_vendor_edit'); - $result .= qq| - -|; - - $sameshiptoname = $ref->{shiptoname}; - - } - - $result .= qq| -
$ref->{$_}  $ref->{$_} ". $form->format_amount(\%myconfig,$ref->{sellprice},2)." 
-|; + CT->get_delivery(\%myconfig, \%$form ); + print $cgi->header(), $form->parse_html_template('ct/get_delivery'); - my $q = new CGI; - print $q->header(); - print $result; $lxdebug->leave_sub(); - } sub continue { call_sub($form->{nextsub}); }