X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Farap.pl;h=03dd6e895d51b8e491358233763c89a12d94d298;hb=6fda7b5dfcbcb7c039d11aa708b9f79cfe51a71f;hp=073b51c72f2db2f3ce7311cd821899f8ce0236ac;hpb=cfc6a60d53597f6a879b28af37f84b4b5fa4cc6b;p=kivitendo-erp.git
diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index 073b51c72..03dd6e895 100644
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -30,22 +30,38 @@
# 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;
@@ -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,14 +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;
}
@@ -117,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|
|;
@@ -133,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|
@@ -148,17 +181,18 @@ sub select_name {
+
{id}>
@@ -201,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|;
}
@@ -219,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"};
@@ -247,32 +288,21 @@ 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}) {
+ for my $i (1 .. $form->{rowcount}) {
my $suffix = $i ? "_$i" : "";
my $prefix = $i ? "" : "global";
$form->{"${prefix}project_id${suffix}"} = "" unless $form->{"${prefix}projectnumber$suffix"};
@@ -281,21 +311,20 @@ sub check_project {
# get new project
$form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"};
- if (($rows = PE->projects(\%myconfig, $form)) > 1) {
+ 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);
- exit;
+ &select_project($i ? undef : 1, $nextsub);
+ ::end_of_request();
}
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};
+ $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
@@ -307,16 +336,24 @@ sub check_project {
}
}
- $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) = @_;
+ 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|
| . $locale->text('Number') . qq|
|;
$column_data{description} =
@@ -325,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|
@@ -342,7 +379,7 @@ sub select_project {
-
|;
+
|;
map { print "\n$column_data{$_}" } @column_index;
@@ -351,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;
@@ -395,14 +433,16 @@ sub select_project {
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|
{"is_global"} ? "" : "_$form->{rownumber}";
@@ -438,21 +483,156 @@ sub project_selected {
map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description);
}
- map { delete $form->{$_} } qw(ndx lastndx nextsub is_global);
+ 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
+
+<<<<<<< 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