Merge branch 'master' into 202408-bankconfig

Author: jbueren

SL/AM.pm

@@ -565,6 +565,10 @@ sub layout_style {
   SL::Helper::UserPreferences::DisplayPreferences->new()->get_layout_style();
 }
 
+sub part_picker_search_all_as_list_default {
+  SL::Helper::UserPreferences::PartPickerSearch->new()->get_all_as_list_default();
+}
+
 sub save_preferences {
   $main::lxdebug->enter_sub();
 
@@ -611,6 +615,9 @@ sub save_preferences {
   if (exists $form->{layout_style}) {
     SL::Helper::UserPreferences::DisplayPreferences->new()->store_layout_style($form->{layout_style})
   }
+  if (exists $form->{part_picker_search_all_as_list_default}) {
+    SL::Helper::UserPreferences::PartPickerSearch->new()->store_all_as_list_default($form->{part_picker_search_all_as_list_default})
+  }
 
   $main::lxdebug->leave_sub();
 

SL/AR.pm

@@ -626,7 +626,7 @@ sub ar_transactions {
   }
   if ($form->{"project_id"}) {
     $where .=
-      qq|AND ((a.globalproject_id = ?) OR EXISTS | .
+      qq| AND ((a.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
       qq|   WHERE i.project_id = ? AND i.trans_id = a.id) | .
       qq| OR EXISTS | .

SL/Controller/BankImport.pm

@@ -170,16 +170,18 @@ sub make_transaction_idx {
   my ($transaction) = @_;
 
   if (ref($transaction) eq 'SL::DB::BankTransaction') {
-    $transaction = { map { ($_ => $transaction->$_) } qw(local_bank_account_id transdate valutadate amount purpose) };
+    $transaction = { map { ($_ => $transaction->$_) } qw(local_bank_account_id remote_account_number transdate valutadate amount purpose end_to_end_id) };
   }
 
+  my @other_fields =  $transaction->{end_to_end_id} && $::instance_conf->get_check_bt_duplicates_endtoend
+                   ? qw(end_to_end_id remote_account_number) : qw(purpose);
   return normalize_text(join '/',
                         map { $_ // '' }
                         ($transaction->{local_bank_account_id},
                          $transaction->{transdate}->ymd,
                          $transaction->{valutadate}->ymd,
                          (apply { s{0+$}{} } $transaction->{amount} * 1),
-                         $transaction->{purpose}));
+                         map { $transaction->{$_} } @other_fields));
 }
 
 sub init_bank_accounts {

SL/Controller/BankTransaction.pm

@@ -969,7 +969,7 @@ sub prepare_report {
   $report->{title} = t8('Bank transactions');
   $self->{report}  = $report;
 
-  my @columns      = qw(ids local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose local_account_number local_bank_code id);
+  my @columns      = qw(ids local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose end_to_end_id local_account_number local_bank_code id);
   my @sortable     = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount                                  purpose local_account_number local_bank_code);
 
   my %column_defs  = (
@@ -1007,6 +1007,7 @@ sub prepare_report {
     local_account_number  => { sub   => sub { $_[0]->local_bank_account->account_number } },
     local_bank_code       => { sub   => sub { $_[0]->local_bank_account->bank_code } },
     local_bank_name       => { sub   => sub { $_[0]->local_bank_account->name } },
+    end_to_end_id         => { sub   => sub { $_[0]->end_to_end_id }, text => $::locale->text('End to end ID') },
     id                    => {},
   );
 

SL/Controller/CsvImport/BankTransaction.pm

@@ -50,13 +50,15 @@ sub check_objects {
     $self->check_currency($entry, take_default => 1);
     $self->join_purposes($entry);
     $self->join_remote_names($entry);
+    $self->extract_end_to_end_id($entry);
     $self->check_existing($entry) unless @{ $entry->{errors} };
   } continue {
     $i++;
   }
 
   $self->add_info_columns({ header => $::locale->text('Bank account'), method => 'local_bank_name' });
   $self->add_raw_data_columns("currency", "currency_id") if grep { /^currency(?:_id)?$/ } @{ $self->csv->header };
+  $self->add_info_columns({ header => $::locale->text('End to end ID'), method => 'end_to_end_id' });
 }
 
 sub check_existing {
@@ -76,7 +78,16 @@ sub check_existing {
     # * amount
     # * local_bank_account_id (case flatrate bank charges for two accounts in one bank: same purpose, transdate, remote_account_number(empty), amount. Just different local_bank_account_id)
     my $num;
-    if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, purpose => $object->purpose, amount => $object->amount, local_bank_account_id => $object->local_bank_account_id] ) ) {
+
+    my @conditions;
+
+    if ($object->end_to_end_id && $::instance_conf->get_check_bt_duplicates_endtoend) {
+      push @conditions, ( end_to_end_id => $object->end_to_end_id );
+    } else {
+      push @conditions, ( purpose => $object->purpose );
+    }
+
+    if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, amount => $object->amount, local_bank_account_id => $object->local_bank_account_id, @conditions] ) ) {
       push(@{$entry->{errors}}, $::locale->text('Skipping due to existing bank transaction in database'));
     };
   } else {
@@ -203,6 +214,19 @@ sub join_remote_names {
   $object->remote_name($remote_name);
 }
 
+sub extract_end_to_end_id {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  return if $object->purpose !~ m{\b(?:end\W?to\W?end:|eref\+) *([^ ]+)}i;
+
+  my $id = $1;
+
+  $object->end_to_end_id($id) if $id !~ m{notprovided}i;
+  $entry->{info_data}->{end_to_end_id} = $object->end_to_end_id;
+}
+
 sub check_auth {
   $::auth->assert('config') if ! $::auth->assert('bank_transaction',1);
 }

SL/Controller/CsvImport/Base.pm

@@ -534,6 +534,33 @@ sub save_objects {
   return unless $data->[0];
   return unless $data->[0]{object};
 
+  # If we store into tables which get numbers from the TransNumberGenerator
+  # we have to lock all tables referenced by the storage table (or by
+  # tables stored alongside with the storage table) that are handled by
+  # the TransNumberGenerator, too.
+  # Otherwise we can run into a deadlock if someone saves a document via
+  # the user interface. The exact behavoir depends on timing.
+  # E.g. we are importing orders and a user want to
+  # book an invoice:
+  # web: locks ar (via before-save hook and TNG (or SL::TransNumber))
+  # importer: locks oe (via before-save hook and TNG) (*)
+  # importer: locks defaults (via before-save hook and TNG)
+  # web: wants to lock defaults (via before-save hook and TNG (or SL::TransNumber)) -> is waiting
+  # importer: wants to save oe and wants to lock referenced tables (here ar) -> is waiting
+  # --> deadlock
+  #
+  # (*) if the importer locks ar here, too, everything is fine, because it will wait here
+  # before locking the defaults table.
+  #
+  # List of referenced tables:
+  # (Locking is done in the transaction below)
+  my %referenced_tables_by_type = (
+    orders          => [qw(ar customer vendor)],
+    delivery_orders => [qw(customer vendor)   ],
+    ar_transactions => [qw(customer)          ],
+    ap_transactions => [qw(vendor)            ],
+  );
+
   $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%;
 
   my $last_index = $#$data;
@@ -542,6 +569,11 @@ sub save_objects {
   for my $chunk (0 .. $last_index / $chunk_size) {
     $self->controller->track_progress(progress => ($chunk_size * $chunk)/scalar(@$data) * 100); # scale from 45..95%;
     SL::DB->client->with_transaction(sub {
+
+      foreach my $refs (@{ $referenced_tables_by_type{$self->controller->{type}} || [] }) {
+        SL::DB->client->dbh->do("LOCK " . $refs) || die SL::DB->client->dbh->errstr;
+      }
+
       foreach my $entry_index ($chunk_size * $chunk .. min( $last_index, $chunk_size * ($chunk + 1) - 1 )) {
         my $entry = $data->[$entry_index];
 

SL/Controller/CustomDataExport.pm

@@ -104,6 +104,7 @@ sub action_export {
 
 sub check_auth {
   my ($self) = @_;
+  $::auth->assert('custom_data_report');
   $::auth->assert($self->query->access_right) if $self->query->access_right;
 }