From 4bcc6d5246fe26db457d9ae916963154fb89cda9 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 1 Oct 2015 13:33:17 +0200 Subject: [PATCH] =?utf8?q?Verkaufsrechnungen:=20aktuellen=20Mahnstatus=20a?= =?utf8?q?nzeigen;=20Texte=20leichter=20verst=C3=A4ndlich?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Zusätzlich zur höchsten Stufe aktuell noch offenen Rechnungen und dem gesamten offenen Betrag angemahnter Rechnungen des Kunden wird nun auch explizit angezeigt, wenn die aktuelle Rechnung selber angemahnt wurde. Diese Warnung wird nicht nur fett, sondern sogar rot dargestellt. --- SL/IS.pm | 2 ++ bin/mozilla/is.pl | 2 +- css/kivitendo/main.css | 7 +++++++ css/lx-office-erp/main.css | 7 +++++++ locale/de/all | 4 ++++ templates/webpages/is/form_header.html | 18 ++++++++++++++---- 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/SL/IS.pm b/SL/IS.pm index 5550ddae9..88c015d48 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -1895,9 +1895,11 @@ sub retrieve_invoice { a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type, a.transaction_description, a.donumber, a.invnumber_for_credit_note, a.marge_total, a.marge_percent, a.direct_debit, a.delivery_term_id, + dc.dunning_description, e.name AS employee FROM ar a LEFT JOIN employee e ON (e.id = a.employee_id) + LEFT JOIN dunning_config dc ON (a.dunning_config_id = dc.id) WHERE a.id = ?|; $ref = selectfirst_hashref_query($form, $dbh, $query, $id); map { $form->{$_} = $ref->{$_} } keys %{ $ref }; diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 4b3177105..41d7e3157 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -380,7 +380,7 @@ sub form_header { $TMPL_VAR{HIDDENS} = [qw( id action type media format queued printed emailed title vc discount title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id - max_dunning_level dunning_amount + max_dunning_level dunning_amount dunning_description shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index b14c25fdc..9c5ea64c5 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -466,3 +466,10 @@ div.cpc_block span.cpc_block_second_row { span.toggle_selected { font-weight: bold; } +.dunned_invoice { + font-weight: bold; + color: #f00; +} +.customer_dunning_level { + font-weight: bold; +} diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index fe993c233..da2835ca1 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -477,3 +477,10 @@ div.cpc_block span.cpc_block_second_row { span.toggle_selected { font-weight: bold; } +.dunned_invoice { + font-weight: bold; + color: #f00; +} +.customer_dunning_level { + font-weight: bold; +} diff --git a/locale/de/all b/locale/de/all index d2b46558f..2a05468f5 100755 --- a/locale/de/all +++ b/locale/de/all @@ -735,6 +735,7 @@ $self->{texts} = { 'Customer saved!' => 'Kunde gespeichert!', 'Customer type' => 'Kundentyp', 'Customer variables' => 'Kundenvariablen', + 'Customer\'s current maximum dunning level: #1' => 'Aktuell höchste Mahnstufe des Kunden: #1', 'Customer/Vendor' => 'Kunde/Lieferant', 'Customer/Vendor (database ID)' => 'Kunde/Lieferant (Datenbank-ID)', 'Customer/Vendor Name' => 'Kunde/Lieferant', @@ -951,6 +952,7 @@ $self->{texts} = { 'Due Date missing!' => 'Fälligkeitsdatum fehlt!', 'Due to security concerns these files have to be deleted or moved after the migration before you can continue using kivitendo.' => 'Aus Sicherheitsgründen müssen diese Dateien nach erfolgter Migration gelöscht oder verschoben werden, bevor kivitendo weiter genutzt werden kann.', 'Duedate +Days' => 'Fällikeitsdatum +Tage', + 'Dunned open amount: #1' => 'Angemahnter, offener Betrag: #1', 'Dunning' => 'Mahnung', 'Dunning Amount' => 'gemahnter Betrag', 'Dunning Date' => 'Mahndatum', @@ -964,6 +966,7 @@ $self->{texts} = { 'Dunning Process started for selected invoices!' => 'Mahnprozess für selektierte Rechnungen gestartet', 'Dunning number' => 'Mahnungsnummer', 'Dunning overview' => 'Mahnungsübersicht', + 'Dunning status' => 'Mahnstatus', 'Dunnings' => 'Mahnungen', 'Duplicate in CSV file' => 'Duplikat in CSV-Datei', 'Duplicate in database' => 'Duplikat in Datenbank', @@ -2937,6 +2940,7 @@ $self->{texts} = { 'This group is valid for the following clients' => 'Diese Gruppe ist für die folgenden Mandanten gültig', 'This has been changed in this version, therefore please change the "old" bins to some real warehouse bins.' => 'Das wurde in dieser Version umgestellt, bitte ändern Sie die Freitext-Lagerplätze auf vorhandene Lagerplätze.', 'This has been changed in this version.' => 'Ab dieser Version ist dies nicht mehr so.', + 'This invoice\'s dunning level: #1' => 'Mahnstufe dieser Rechnung: #1', 'This is a very critical problem.' => 'Dieses Problem ist sehr schwerwiegend.', 'This is the client to be selected by default on the login screen.' => 'Dies ist derjenige Mandant, der im Loginbildschirm standardmäßig ausgewählt sein wird.', 'This is the default bin for parts' => 'Standard-Lagerplatz für Stammdaten/Waren', diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html index ca11fb1dc..7b6712d45 100644 --- a/templates/webpages/is/form_header.html +++ b/templates/webpages/is/form_header.html @@ -90,11 +90,21 @@ [% LxERP.format_amount(creditremaining,0 ,'0') %] -[%- IF max_dunning_level %] +[%- IF max_dunning_level || dunning_description %] - [% 'Max. Dunning Level' | $T8 %]: - - [% max_dunning_level %]; [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount,2) %] + [% LxERP.t8("Dunning status") %] + + [% IF dunning_description %] + [% LxERP.t8("This invoice's dunning level: #1", dunning_description) %] + [% IF max_dunning_level %]
[% END %] + [% END %] + [% IF max_dunning_level %] + + [% LxERP.t8("Customer's current maximum dunning level: #1", max_dunning_level) %] +
+ [% LxERP.t8("Dunned open amount: #1", LxERP.format_amount(dunning_amount, 2)) %] + + [% END %] [%- END %] -- 2.20.1