From c9860c6f7dcb7dd0ec6c42735028e89e6a5c0a0b Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 11 Jul 2008 08:28:08 +0000 Subject: [PATCH] TODO-Liste: Preisanfragen und Angebote richtig anzeigen. --- SL/OE.pm | 3 +++ bin/mozilla/oe.pl | 2 +- locale/de/all | 4 +-- templates/webpages/am/config_de.html | 2 +- templates/webpages/am/config_master.html | 2 +- .../webpages/oe/report_for_todo_list_de.html | 25 +++++++++++++++---- .../oe/report_for_todo_list_master.html | 25 +++++++++++++++---- 7 files changed, 48 insertions(+), 15 deletions(-) diff --git a/SL/OE.pm b/SL/OE.pm index 7f2583366..5c6cec658 100644 --- a/SL/OE.pm +++ b/SL/OE.pm @@ -201,10 +201,13 @@ sub transactions_for_todo_list { $query = qq|SELECT oe.id, oe.transdate, oe.reqdate, oe.quonumber, oe.transaction_description, oe.amount, + CASE WHEN (COALESCE(0, oe.customer_id) = 0) THEN 'vendor' ELSE 'customer' END AS vc, c.name AS customer, + v.name AS vendor, e.name AS employee FROM oe LEFT JOIN customer c ON (oe.customer_id = c.id) + LEFT JOIN vendor v ON (oe.vendor_id = v.id) LEFT JOIN employee e ON (oe.employee_id = e.id) WHERE (COALESCE(quotation, FALSE) = TRUE) AND (COALESCE(closed, FALSE) = FALSE) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 73216f824..f7f6ab7f1 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1964,7 +1964,7 @@ sub report_for_todo_list { my $content; if (@{ $quotations }) { - my $edit_url = build_std_url('script=oe.pl', 'action=edit', 'type=sales_quotation', 'vc=customer'); + my $edit_url = build_std_url('script=oe.pl', 'action=edit'); $content = $form->parse_html_template('oe/report_for_todo_list', { 'QUOTATIONS' => $quotations, 'edit_url' => $edit_url }); diff --git a/locale/de/all b/locale/de/all index c763e4177..ffc76be2f 100644 --- a/locale/de/all +++ b/locale/de/all @@ -994,7 +994,7 @@ $self->{texts} = { 'Out of balance!' => 'Summen stimmen nicht berein!', 'Output Number Format' => 'Zahlenformat (Ausgabe)', 'Outputformat' => 'Ausgabeformat', - 'Overdue sales quotations' => 'Überfällige Angebote', + 'Overdue sales quotations and requests for quotations' => 'Überfällige Angebote und Preisanfragen', 'Own Product' => 'eigenes Produkt', 'PAYMENT POSTED' => 'Rechung gebucht', 'PDF' => 'PDF', @@ -1266,7 +1266,7 @@ $self->{texts} = { 'Show details' => 'Details anzeigen', 'Show follow ups...' => 'Zeige Wiedervorlagen...', 'Show old dunnings' => 'Alte Mahnungen anzeigen', - 'Show overdue sales quotations...' => 'Zeige überfällige Angebote...', + 'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...', 'Show your TODO list after loggin in' => 'Aufgabenliste nach dem Anmelden anzeigen', 'Signature' => 'Unterschrift', 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => 'Da Lagerplätze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.', diff --git a/templates/webpages/am/config_de.html b/templates/webpages/am/config_de.html index 167f0b972..e82549b36 100644 --- a/templates/webpages/am/config_de.html +++ b/templates/webpages/am/config_de.html @@ -228,7 +228,7 @@ [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %] - Zeige überfällige Angebote... + Überfällige Angebote und Preisanfragen anzeigen... diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html index 7e0e9f31e..090f436d0 100644 --- a/templates/webpages/am/config_master.html +++ b/templates/webpages/am/config_master.html @@ -228,7 +228,7 @@ [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %] - Show overdue sales quotations... + Show overdue sales quotations and requests for quotations... diff --git a/templates/webpages/oe/report_for_todo_list_de.html b/templates/webpages/oe/report_for_todo_list_de.html index 21840f7f1..6ecfbcd11 100644 --- a/templates/webpages/oe/report_for_todo_list_de.html +++ b/templates/webpages/oe/report_for_todo_list_de.html @@ -1,14 +1,14 @@ [% USE HTML %][% USE LxERP %] -
Überfällige Angebote
+
Überfällige Angebote und Preisanfragen

- - + + @@ -18,8 +18,23 @@ - - + + diff --git a/templates/webpages/oe/report_for_todo_list_master.html b/templates/webpages/oe/report_for_todo_list_master.html index 67d6075dd..aba808ba3 100644 --- a/templates/webpages/oe/report_for_todo_list_master.html +++ b/templates/webpages/oe/report_for_todo_list_master.html @@ -1,14 +1,14 @@ [% USE HTML %][% USE LxERP %] -
Overdue sales quotations
+
Overdue sales quotations and requests for quotations

Datum gültig bisAuftragKundeAngebot / PreisanfrageKunde / Lieferant Vorgangsbezeichnung Betrag Bearbeiter
[% HTML.escape(row.transdate) %] [% HTML.escape(row.reqdate) %][% HTML.escape(row.quonumber) %][% HTML.escape(row.customer) %] + + [% IF row.vc == 'customer' %] + Angebot + [% ELSE %] + Preisanfrage + [% END %] + [% HTML.escape(row.quonumber) %] + + + [% IF row.vc == 'customer' %] + [% HTML.escape(row.customer) %] + [% ELSE %] + [% HTML.escape(row.vendor) %] + [% END %] + [% HTML.escape(row.transaction_description) %] [% HTML.escape(LxERP.format_amount(row.amount, 2)) %] [% HTML.escape(row.employee) %]
- - + + @@ -18,8 +18,23 @@ - - + + -- 2.20.1
Date Valid untilOrderCustomerSales quotation / Request quotationCustomer / Vendor Transaction description Amount Employee
[% HTML.escape(row.transdate) %] [% HTML.escape(row.reqdate) %][% HTML.escape(row.quonumber) %][% HTML.escape(row.customer) %] + + [% IF row.vc == 'customer' %] + Sales quotation + [% ELSE %] + Request quotation + [% END %] + [% HTML.escape(row.quonumber) %] + + + [% IF row.vc == 'customer' %] + [% HTML.escape(row.customer) %] + [% ELSE %] + [% HTML.escape(row.vendor) %] + [% END %] + [% HTML.escape(row.transaction_description) %] [% HTML.escape(LxERP.format_amount(row.amount, 2)) %] [% HTML.escape(row.employee) %]