X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Farap.pl;h=fa2dd42399a5bf03c94aecbe3bdbde8b6108b628;hb=b02735f55360e5a4e02dca40458b48cf057ecd7b;hp=e7e2378a9e80eb4158d554fc4ccdc3461dd88676;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index e7e2378a9..fa2dd4239 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -30,32 +30,47 @@ # common routines for gl, ar, ap, is, ir, oe # +use SL::Projects; + +use strict; + # any custom scripts for this one -if (-f "$form->{path}/custom_arap.pl") { - eval { require "$form->{path}/custom_arap.pl"; }; +if (-f "bin/mozilla/custom_arap.pl") { + eval { require "bin/mozilla/custom_arap.pl"; }; } -if (-f "$form->{path}/$form->{login}_arap.pl") { - eval { require "$form->{path}/$form->{login}_arap.pl"; }; +if (-f "bin/mozilla/$main::form->{login}_arap.pl") { + eval { require "bin/mozilla/$main::form->{login}_arap.pl"; }; } 1; +require "bin/mozilla/common.pl"; + # end of main sub check_name { - $lxdebug->enter_sub(); + $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) = @_; - my ($name) = @_; + $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; @@ -76,6 +91,7 @@ sub check_name { 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; @@ -83,9 +99,17 @@ sub check_name { $form->{calctax} = 1; # return one name or a list of names in $form->{name_list} - if (($i = $form->get_name(\%myconfig, $name)) > 1) { - &select_name($name); - exit; + $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); + ::end_of_request(); + } } if ($i == 1) { @@ -101,13 +125,16 @@ sub check_name { } else { # name is not on file - $msg = ucfirst $name . " not on file or locked!"; + # $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); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); return $i; } @@ -116,13 +143,20 @@ sub check_name { # $locale->text('Vendor not on file!') sub select_name { - $lxdebug->enter_sub(); + $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) = @_; - @column_index = qw(ndx name address); + my @column_index = qw(ndx name address); - $label = ucfirst $table; + my $label = ucfirst $table; + my %column_data; $column_data{ndx} = qq| |; $column_data{name} = qq|| . $locale->text($label) . qq||; @@ -132,7 +166,7 @@ sub select_name { # list items with radio button on a form $form->header; - $title = $locale->text('Select from one of the names below'); + my $title = $locale->text('Select from one of the names below'); print qq| @@ -147,17 +181,18 @@ sub select_name { - |; + |; map { print "\n$column_data{$_}" } @column_index; print qq| - + |; my $i = 0; - foreach $ref (@{ $form->{name_list} }) { - $checked = ($i++) ? "" : "checked"; + my $j; + foreach my $ref (@{ $form->{name_list} }) { + my $checked = ($i++) ? "" : "checked"; $ref->{name} =~ s/\"/"/g; @@ -170,12 +205,12 @@ sub select_name { $j++; $j %= 2; print qq| - |; + |; map { print "\n$column_data{$_}" } @column_index; print qq| - + {id}> @@ -200,7 +235,8 @@ sub select_name { map { delete $form->{$_} } qw(action name_list header); # save all other form variables - foreach $key (keys %${form}) { + foreach my $key (keys %${form}) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); $form->{$key} =~ s/\"/"/g; print qq|\n|; } @@ -218,16 +254,22 @@ sub select_name { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub name_selected { - $lxdebug->enter_sub(); + $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 - $i = $form->{ndx}; + my $i = $form->{ndx}; $form->{ $form->{vc} } = $form->{"new_name_$i"}; $form->{"$form->{vc}_id"} = $form->{"new_id_$i"}; @@ -236,7 +278,7 @@ sub name_selected { # delete all the new_ variables for $i (1 .. $form->{lastndx}) { - map { delete $form->{"new_${_}_$i"} } (id, name); + map { delete $form->{"new_${_}_$i"} } qw(id name); } map { delete $form->{$_} } qw(ndx lastndx nextsub); @@ -246,71 +288,72 @@ sub name_selected { &update(1); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub add_transaction { - $lxdebug->enter_sub(); - - my ($module) = @_; - - delete $form->{script}; - $form->{action} = "add"; - $form->{type} = "invoice" if $module =~ /(is|ir)/; - - $form->{callback} = $form->escape($form->{callback}, 1); - map { $argv .= "$_=$form->{$_}&" } keys %$form; - - $form->{callback} = "$module.pl?$argv"; +sub check_project { + $main::lxdebug->enter_sub(); - $form->redirect; + my $form = $main::form; + my $locale = $main::locale; - $lxdebug->leave_sub(); -} + $main::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' . + 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash | report'); -sub check_project { - $lxdebug->enter_sub(); + my $nextsub = shift || 'update'; - for $i (1 .. $form->{rowcount}) { - $form->{"project_id_$i"} = "" unless $form->{"projectnumber_$i"}; - if ($form->{"projectnumber_$i"} ne $form->{"oldprojectnumber_$i"}) { - if ($form->{"projectnumber_$i"}) { + 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->{"projectnumber_$i"}; - if (($rows = PE->projects(\%myconfig, $form)) > 1) { + $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; - exit; + &select_project($i ? undef : 1, $nextsub); + ::end_of_request(); } if ($rows == 1) { - $form->{"project_id_$i"} = $form->{project_list}->[0]->{id}; - $form->{"projectnumber_$i"} = - $form->{project_list}->[0]->{projectnumber}; - $form->{"oldprojectnumber_$i"} = - $form->{project_list}->[0]->{projectnumber}; + $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->{"oldprojectnumber_$i"} = ""; + $form->{"old${prefix}projectnumber${suffix}"} = ""; } } } - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub select_project { - $lxdebug->enter_sub(); + $main::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'); + + my ($is_global, $nextsub) = @_; - @column_index = qw(ndx projectnumber description); + my @column_index = qw(ndx projectnumber description); + my %column_data; $column_data{ndx} = qq||; $column_data{projectnumber} = qq||; $column_data{description} = @@ -319,7 +362,7 @@ sub select_project { # list items with radio button on a form $form->header; - $title = $locale->text('Select from one of the projects below'); + my $title = $locale->text('Select from one of the projects below'); print qq| @@ -336,7 +379,7 @@ sub select_project {
 | . $locale->text('Number') . qq|
- |; + |; map { print "\n$column_data{$_}" } @column_index; @@ -345,8 +388,9 @@ sub select_project { |; my $i = 0; - foreach $ref (@{ $form->{project_list} }) { - $checked = ($i++) ? "" : "checked"; + my $j; + foreach my $ref (@{ $form->{project_list} }) { + my $checked = ($i++) ? "" : "checked"; $ref->{name} =~ s/\"/"/g; @@ -386,16 +430,19 @@ sub select_project { |; # delete action variable - map { delete $form->{$_} } qw(action project_list header); + map { delete $form->{$_} } qw(action project_list header update); # save all other form variables - foreach $key (keys %${form}) { + 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| - + print + $cgi->hidden('-name' => 'is_global', '-default' => [$is_global]) + . $cgi->hidden('-name' => 'project_selected_nextsub', '-default' => [$nextsub]) + . qq|
{rownumber}"} = + my $prefix = $form->{"is_global"} ? "global" : ""; + my $suffix = $form->{"is_global"} ? "" : "_$form->{rownumber}"; + + $form->{"${prefix}projectnumber${suffix}"} = $form->{"new_projectnumber_$i"}; - $form->{"oldprojectnumber_$form->{rownumber}"} = + $form->{"old${prefix}projectnumber${suffix}"} = $form->{"new_projectnumber_$i"}; - $form->{"project_id_$form->{rownumber}"} = $form->{"new_id_$i"}; + $form->{"${prefix}project_id${suffix}"} = $form->{"new_id_$i"}; # delete all the new_ variables for $i (1 .. $form->{lastndx}) { map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description); } - map { delete $form->{$_} } qw(ndx lastndx nextsub); + my $nextsub = $form->{project_selected_nextsub} || 'update'; - if ($form->{update}) { - &{ $form->{update} }; - } else { - &update; - } + map { delete $form->{$_} } qw(ndx lastndx nextsub is_global project_selected_nextsub); + + call_sub($nextsub); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } } -sub gl_transaction { &add } -sub ar_transaction { &add_transaction(ar) } -sub ap_transaction { &add_transaction(ap) } -sub sales_invoice { &add_transaction(is) } -sub vendor_invoice { &add_transaction(ir) } +sub continue { call_sub($main::form->{"nextsub"}); } + +1; + +__END__ + +=head1 NAME + +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. + +=head1 FUNCTIONS + +=head2 check_name customer|vendor + +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. + +=head3 select- version works fine, but things go awry when I use a textbox, any idea? + +If there is more than one match, 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. + +Otherwise you'll have to care to include a complete state in callback. +=cut