X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=35a7761cba5a04896d9cf54750ef187af2b8472f;hb=f3f2ec384d905c686df842ac7175d48792273487;hp=8c49dc23df38964cd53dc3b39b681048747fdb2d;hpb=1521c33d91f45cfaecfda6258f66a4efff4cfc71;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 8c49dc23d..35a7761cb 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -24,22 +24,21 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # common routines for gl, ar, ap, is, ir, oe # -use SL::Projects; - use strict; # any custom scripts for this one if (-f "bin/mozilla/custom_arap.pl") { eval { require "bin/mozilla/custom_arap.pl"; }; } -if (-f "bin/mozilla/$main::form->{login}_arap.pl") { - eval { require "bin/mozilla/$main::form->{login}_arap.pl"; }; +if (-f "bin/mozilla/$::myconfig{login}_arap.pl") { + eval { require "bin/mozilla/$::myconfig{login}_arap.pl"; }; } 1; @@ -48,412 +47,29 @@ require "bin/mozilla/common.pl"; # end of main -sub check_name { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . - 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash |' . - 'purchase_delivery_order_edit | sales_delivery_order_edit'); - - my ($name, %params) = @_; - - $name = $name eq "customer" ? "customer" : "vendor"; - - my ($new_name, $new_id) = split /--/, $form->{$name}; - my $i = 0; - # if we use a selection - if ($form->{"select$name"}) { - if ($form->{"old$name"} ne $form->{$name}) { - - # this is needed for is, ir and oe - $form->{update} = 0; - # for credit calculations - $form->{oldinvtotal} = 0; - $form->{oldtotalpaid} = 0; - $form->{calctax} = 1; - - $form->{"${name}_id"} = $new_id; - - IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); - IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); - - $form->{$name} = $form->{"old$name"} = "$new_name--$new_id"; - - $i = 1; - } - } else { - - # check name, combine name and id - if ($form->{"old$name"} ne qq|$form->{$name}--$form->{"${name}_id"}|) { - - # this is needed for is, ir and oe - $form->{update} = 0; - - # for credit calculations - $form->{oldinvtotal} = 0; - $form->{oldtotalpaid} = 0; - $form->{calctax} = 1; - - # return one name or a list of names in $form->{name_list} - $i = $form->get_name(\%myconfig, $name); - - if ($i > 1) { - if ($params{no_select}) { - # $locale->text('Customer') - # $locale->text('Vendor') - $form->error($locale->text("More than one #1 found matching, please be more specific.", $locale->text(ucfirst $name))); - } else { - &select_name($name); - exit; - } - } - - if ($i == 1) { - - # we got one name - $form->{"${name}_id"} = $form->{name_list}[0]->{id}; - $form->{$name} = $form->{name_list}[0]->{name}; - $form->{"old$name"} = qq|$form->{$name}--$form->{"${name}_id"}|; - - IS->get_customer(\%myconfig, \%$form) if ($name eq 'customer'); - IR->get_vendor(\%myconfig, \%$form) if ($name eq 'vendor'); - - } else { - - # name is not on file - # $locale->text('Customer not on file or locked!') - # $locale->text('Vendor not on file or locked!') - my $msg = ucfirst $name . " not on file or locked!"; - $form->error($locale->text($msg)); - } - } - } - $form->language_payment(\%myconfig); - - $main::lxdebug->leave_sub(); - - return $i; -} - -# $locale->text('Customer not on file!') -# $locale->text('Vendor not on file!') - -sub select_name { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my $locale = $main::locale; - - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . - 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash'); - - my ($table) = @_; - - my @column_index = qw(ndx name address); - - my $label = ucfirst $table; - my %column_data; - $column_data{ndx} = qq| |; - $column_data{name} = - qq|| . $locale->text($label) . qq||; - $column_data{address} = - qq|| . $locale->text('Address') . qq||; - - # list items with radio button on a form - $form->header; - - my $title = $locale->text('Select from one of the names below'); - - print qq| - - -
{script}> - - - - - - - - - - - - -
$title
- - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - my $i = 0; - my $j; - foreach my $ref (@{ $form->{name_list} }) { - my $checked = ($i++) ? "" : "checked"; - - $ref->{name} =~ s/\"/"/g; - - $column_data{ndx} = - qq||; - $column_data{name} = - qq||; - $column_data{address} = qq||; - - $j++; - $j %= 2; - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{id}> - -|; - - } - - print qq| -
$ref->{name}$ref->{address} 
-
- - - -|; - - # delete variables - map { delete $form->{$_} } qw(action name_list header); - - # save all other form variables - foreach my $key (keys %${form}) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| - - - -
- -
- - - -|; - - $main::lxdebug->leave_sub(); -} - -sub name_selected { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . - 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash'); - - # replace the variable with the one checked - - # index for new item - my $i = $form->{ndx}; - - $form->{ $form->{vc} } = $form->{"new_name_$i"}; - $form->{"$form->{vc}_id"} = $form->{"new_id_$i"}; - $form->{"old$form->{vc}"} = - qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - - # delete all the new_ variables - for $i (1 .. $form->{lastndx}) { - map { delete $form->{"new_${_}_$i"} } qw(id name); - } - - map { delete $form->{$_} } qw(ndx lastndx nextsub); - - IS->get_customer(\%myconfig, \%$form) if ($form->{vc} eq 'customer'); - IR->get_vendor(\%myconfig, \%$form) if ($form->{vc} eq 'vendor'); - - &update(1); - - $main::lxdebug->leave_sub(); -} - -sub check_project { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my $locale = $main::locale; - - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . - 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); - - my $nextsub = shift || 'update'; - - for my $i (1 .. $form->{rowcount}) { - my $suffix = $i ? "_$i" : ""; - my $prefix = $i ? "" : "global"; - $form->{"${prefix}project_id${suffix}"} = "" unless $form->{"${prefix}projectnumber$suffix"}; - if ($form->{"${prefix}projectnumber${suffix}"} ne $form->{"old${prefix}projectnumber${suffix}"}) { - if ($form->{"${prefix}projectnumber${suffix}"}) { - - # get new project - $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"}; - my %params = map { $_ => $form->{$_} } qw(projectnumber description active); - my $rows; - if (($rows = Projects->search_projects(%params)) > 1) { - - # check form->{project_list} how many there are - $form->{rownumber} = $i; - &select_project($i ? undef : 1, $nextsub); - exit; - } - - if ($rows == 1) { - $form->{"${prefix}project_id${suffix}"} = $form->{project_list}->[0]->{id}; - $form->{"${prefix}projectnumber${suffix}"} = $form->{project_list}->[0]->{projectnumber}; - $form->{"old${prefix}projectnumber${suffix}"} = $form->{project_list}->[0]->{projectnumber}; - } else { - - # not on file - $form->error($locale->text('Project not on file!')); - } - } else { - $form->{"old${prefix}projectnumber${suffix}"} = ""; - } - } - } - - $main::lxdebug->leave_sub(); -} - sub select_project { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; - my $form = $main::form; - my $locale = $main::locale; - my $cgi = $main::cgi; - - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . - 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); + $::auth->assert('ar_transactions | ap_transactions | vendor_invoice_edit | sales_order_edit | invoice_edit |' . + 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); my ($is_global, $nextsub) = @_; + my $project_list = delete $::form->{project_list}; - my @column_index = qw(ndx projectnumber description); - - my %column_data; - $column_data{ndx} = qq| |; - $column_data{projectnumber} = qq|| . $locale->text('Number') . qq||; - $column_data{description} = - qq|| . $locale->text('Description') . qq||; - - # list items with radio button on a form - $form->header; - - my $title = $locale->text('Select from one of the projects below'); - - print qq| - - -
{script}> - -{rownumber}> - - - - - - - - - - - - -
$title
- - |; - - map { print "\n$column_data{$_}" } @column_index; + map { delete $::form->{$_} } qw(action header update); - print qq| - -|; - - my $i = 0; - my $j; - foreach my $ref (@{ $form->{project_list} }) { - my $checked = ($i++) ? "" : "checked"; - - $ref->{name} =~ s/\"/"/g; - - $column_data{ndx} = - qq||; - $column_data{projectnumber} = - qq||; - $column_data{description} = qq||; - - $j++; - $j %= 2; - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{id}> - -|; - - } - - print qq| -
$ref->{projectnumber}$ref->{description}
-
- - - -|; - - # delete action variable - map { delete $form->{$_} } qw(action project_list header update); - - # save all other form variables - foreach my $key (keys %${form}) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; + my @hiddens; + for my $key (keys %$::form) { + next if $key eq 'login' || $key eq 'password' || '' ne ref $::form->{$key}; + push @hiddens, { key => $key, value => $::form->{$key} }; } + push @hiddens, { key => 'is_global', value => $is_global }, + { key => 'project_selected_nextsub', value => $nextsub }; - print - $cgi->hidden('-name' => 'is_global', '-default' => [$is_global]) - . $cgi->hidden('-name' => 'project_selected_nextsub', '-default' => [$nextsub]) - . qq| - -
- -
- - - -|; + $::form->header; + print $::form->parse_html_template('arap/select_project', { hiddens => \@hiddens, project_list => $project_list }); - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub project_selected { @@ -461,7 +77,7 @@ sub project_selected { my $form = $main::form; - $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . + $main::auth->assert('ar_transactions | ap_transactions | vendor_invoice_edit | sales_order_edit | invoice_edit |' . 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); # replace the variable with the one checked @@ -500,139 +116,16 @@ __END__ =head1 NAME -<<<<<<< HEAD:bin/mozilla/arap.pl -bin/mozilla/arap.pl - helper routines for invoiceing frontend. - -=head1 SYNOPSIS - -nothing yet - -=head1 DESCRIPTION - -nothing yet -======= arap.pl - helper functions or customer/vendor retrieval =head1 SYNOPSIS check_name('vendor') - check_project(); =head1 DESCRIPTION Don't use anyting in this file without extreme care, and even then be prepared for massive headaches. It's a collection of helper routines that wrap the customer/vendor dropdown/textfield duality into something even complexer. ->>>>>>> 88f5a78... check_name erweitert um ein no_select flag. siehe perldoc bin/mozilla/arap.pl:bin/mozilla/arap.pl - -=head1 FUNCTIONS - -=head2 check_name customer|vendor - -<<<<<<< HEAD:bin/mozilla/arap.pl -check_name was originally meant to update the selected customer or vendor. The -way it does that has generted more hate than almost any other part of this -software. - -What it does is: - -=over 4 - -=item - -It checks if a vendor or customer is given. No failsafe, vendor fallback if -$_[0] is something fancy. - -=item - -It assumes, that there is a field named customer or vendor in $form. - -=item - -It assumes, that this field is filled with name--id, and tries to split that. -sql ledger uses that combination to get ids into the select keys. - -=item - -It looks for a field selectcustomer or selectvendor in $form. sql ledger used -to store a copy of the html select in there. (again, don't ask) - -=item - -If this field exists, it looks for a field called oldcustomer or oldvendor, in -which the old name--id string was stored in sql ledger, and compares those. - -=item - -if they don't match, it will set customer_id or vendor_id in $form, load the -entry (which will clobber everything in $form named like a column in customer -oder vendor) and return. - -=item - -If there was no select* entry, it assumes that vclimit was lower than the -number of entries, and that an input field was generated. In that case the -splitting is omitted (since users don't generally include ids in entered names) - -=item - -It looks for a *_id field, and combines it with the given input into a name--id -entry and compares it to the old* entry. (Missing any of these will instantly -break check_namea. - -=item - -If those do not match, $form->get_name is called to get matching results. -get_name only matches by *number and name, not by id, don't try to get it to do -so. - -=item - -The results are stored in $form>{name_list} but a count is returned, and -checked. - -=item - -If only one result was found, *_id, * and old* are copied into $form, the entry -is loaded (like above, clobbering) - -=item - -If there is more than one, a selection dialog is rendered - -=item - -If none is found, an error is generated. - -=back - -=head3 I built a customer/vendor box somewhere and it doesn't work, what's wrong? - -Make sure a select* field is given if and only if you render a select box. The -actual contents are ignored, but recognition fails if not present. - -Make sure old* and *_id fields are set correctly (name--id form for old*). They -are necessary in all steps and branches. - -Since get_customer and get_vendor clobber a lot of fields, make sure what -changes exactly. -======= -This function will take the contents of $form->{vendor} or $form->{customer}, try to guess if there was a selectbox or not, and search for matching customer/vendors. - -This mostly works great, except for the case when there is more than one match. -In that case check_name will display a select form, that will redirect to the -original C. Unfortunately any hidden vars or input fields will be lost -in the process unless saved before in a callback. - -If you still want to use it, you can disable this feature, like this: - - check_name('customer', no_select => 1) - -In that case multiple matches will trigger an error. - -=head1 BUGS - -=head1 AUTHOR ->>>>>>> 88f5a78... check_name erweitert um ein no_select flag. siehe perldoc bin/mozilla/arap.pl:bin/mozilla/arap.pl =cut