From 968c9d8f19707313ef55e58b3955209b9b841da8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Fri, 25 Mar 2022 06:14:15 +0100 Subject: [PATCH] =?utf8?q?Verkn=C3=BCpfte=20Belege=20auch=20f=C3=BCr=20Dia?= =?utf8?q?logbuchungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/RecordLinks.pm | 1 + SL/DB/GLTransaction.pm | 1 + SL/DB/Helper/LinkedRecords.pm | 3 ++- doc/changelog | 1 + templates/webpages/gl/form_header.html | 3 +++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SL/Controller/RecordLinks.pm b/SL/Controller/RecordLinks.pm index c5d30c72f..49661cbe0 100644 --- a/SL/Controller/RecordLinks.pm +++ b/SL/Controller/RecordLinks.pm @@ -55,6 +55,7 @@ my @link_type_specifics = ( { title => t8('AR Transaction'), type => 'ar_transaction', model => 'Invoice', number => 'invnumber', }, { title => t8('AP Transaction'), type => 'ap_transaction', model => 'PurchaseInvoice', number => 'invnumber', }, { title => t8('Dunning'), type => 'dunning', model => 'Dunning', number => 'dunning_id', }, + { title => t8('GL Transaction'), type => 'gl_transaction', model => 'GLTransaction', number => 'reference', }, ); my @link_types = map { +{ %link_type_defaults, %{ $_ } } } @link_type_specifics; diff --git a/SL/DB/GLTransaction.pm b/SL/DB/GLTransaction.pm index a235bd9db..1dbf2c813 100644 --- a/SL/DB/GLTransaction.pm +++ b/SL/DB/GLTransaction.pm @@ -2,6 +2,7 @@ package SL::DB::GLTransaction; use strict; +use SL::DB::Helper::LinkedRecords; use SL::DB::MetaSetup::GLTransaction; use SL::Locale::String qw(t8); use List::Util qw(sum); diff --git a/SL/DB/Helper/LinkedRecords.pm b/SL/DB/Helper/LinkedRecords.pm index adc3dac8a..4614e5a8d 100644 --- a/SL/DB/Helper/LinkedRecords.pm +++ b/SL/DB/Helper/LinkedRecords.pm @@ -315,6 +315,7 @@ sub sort_linked_records { 'SL::DB::ShopOrder' => sub { $_[0]->shop_ordernumber }, 'SL::DB::EmailJournal' => sub { $_[0]->id }, 'SL::DB::Dunning' => sub { $_[0]->dunning_id }, + 'SL::DB::GLTransaction' => sub { $_[0]->reference }, UNKNOWN => '9999999999999999', ); my $number_xtor = sub { @@ -342,7 +343,7 @@ sub sort_linked_records { purchase_order => 130, purchase_delivery_order => 140, 'SL::DB::PurchaseInvoice' => 150, - 'SL::DB::PurchaseInvoice' => 150, + 'SL::DB::GLTransaction' => 170, 'SL::DB::Letter' => 200, 'SL::DB::ShopOrder' => 250, 'SL::DB::EmailJournal' => 300, diff --git a/doc/changelog b/doc/changelog index 38c83a5a2..c7f525e7f 100644 --- a/doc/changelog +++ b/doc/changelog @@ -23,6 +23,7 @@ Kleinere neue Features und Detailverbesserungen: bei Kunden, Lieferanten und Ansprechpersonen durchsucht. - Skontoautomatik bei Kontoauszug verbuchen generiert automatisch die Steuerkorrektur pro Steuersatz des Belegs als verknüpfte Dialogbuchung +- Verknüpfte Belege auch für Dialogbuchungen (neuer Reiter) 2022-03-02 - Release 3.6.0 diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html index 00631c3ed..8dd130a7d 100644 --- a/templates/webpages/gl/form_header.html +++ b/templates/webpages/gl/form_header.html @@ -42,6 +42,9 @@
  • [% 'Documents' | $T8 %]
  • [% 'Attachments' | $T8 %]
  • [%- END %] + [%- IF AUTH.assert('record_links', 1) %] +
  • [% 'Linked Records' | $T8 %]
  • + [%- END %] [%- END %] -- 2.20.1