@@ -260,7 +261,7 @@ sub name_selected {
my $form = $main::form;
my %myconfig = %main::myconfig;
- $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 | sales_delivery_order_edit | ' .
'request_quotation_edit | sales_quotation_edit | purchase_order_edit | cash');
# replace the variable with the one checked
@@ -268,6 +269,9 @@ sub name_selected {
# index for new item
my $i = $form->{ndx};
+ _reset_salesman_id();
+ delete @{ $form }{qw(payment_id)};
+
$form->{ $form->{vc} } = $form->{"new_name_$i"};
$form->{"$form->{vc}_id"} = $form->{"new_id_$i"};
$form->{"old$form->{vc}"} =
@@ -288,58 +292,18 @@ sub name_selected {
$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);
- ::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};
- } else {
-
- # not on file
- $form->error($locale->text('Project not on file!'));
- }
- } else {
- $form->{"old${prefix}projectnumber${suffix}"} = "";
- }
- }
- }
-
- $main::lxdebug->leave_sub();
+# Reset the $::form field 'salesman_id' to the ID of the currently
+# logged in user. Useful when changing to a customer/vendor that has
+# no salesman listed in their master data.
+sub _reset_salesman_id {
+ my $current_employee = SL::DB::Manager::Employee->current;
+ $::form->{salesman_id} = $current_employee->id if $current_employee && exists $::form->{salesman_id};
}
sub select_project {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ $::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) = @_;
@@ -366,7 +330,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
@@ -410,7 +374,6 @@ arap.pl - helper functions or customer/vendor retrieval
=head1 SYNOPSIS
check_name('vendor')
- check_project();
=head1 DESCRIPTION
|