From 90003b2cc3ac57e135c1cdec9cbc8425952ecd43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Wed, 1 Oct 2014 11:06:57 +0200 Subject: [PATCH] =?utf8?q?Erinnerung=20f=C3=BCr=20Transport-=20oder=20Vers?= =?utf8?q?andkostenartikel=20bei=20Angebot=20/=20Auftrag=20implementiert?= =?utf8?q?=20Erweiterung:=20Mandantenkonfiguration=20um=20einen=20Standard?= =?utf8?q?artikel=20der=20auf=20Vorhandensein=20=C3=BCberpr=C3=BCft=20wird?= =?utf8?q?=20(oe).=20Falls=20nicht=20wird=20eine=20entsprechende=20Warnung?= =?utf8?q?=20ausgegeben.=20Verbesserungsm=C3=B6glichkei=201:=20Artikelnumm?= =?utf8?q?er=20per=20partpicker=20ausw=C3=A4hlen=20Verbesserungsm=C3=B6gli?= =?utf8?q?chkei=202:=20Erinnerung=20anolog=20zu=20Vorgangsbezeichnung=20ve?= =?utf8?q?rgeben=20implementieren?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/DB/MetaSetup/Default.pm | 1 + bin/mozilla/oe.pl | 19 +++++++++++++++++++ locale/de/all | 6 +++++- .../defaults_transport_cost_reminder.pl | 19 +++++++++++++++++++ .../webpages/client_config/_features.html | 6 ++++++ templates/webpages/oe/form_footer.html | 11 +++++++++-- 6 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 sql/Pg-upgrade2/defaults_transport_cost_reminder.pl diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm index 6f9ea2b37..8ddda026c 100644 --- a/SL/DB/MetaSetup/Default.pm +++ b/SL/DB/MetaSetup/Default.pm @@ -94,6 +94,7 @@ __PACKAGE__->meta->columns( transfer_default_ignore_onhand => { type => 'boolean', default => 'false' }, transfer_default_services => { type => 'boolean', default => 'true' }, transfer_default_use_master_default_bin => { type => 'boolean', default => 'false' }, + transport_cost_reminder_article_number => { type => 'text' }, vendornumber => { type => 'text' }, version => { type => 'varchar', length => 8 }, vertreter => { type => 'boolean', default => 'false' }, diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 3f33c7f75..1d3213884 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -564,9 +564,11 @@ sub form_footer { $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); + my $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number; print $form->parse_html_template("oe/form_footer", { %TMPL_VAR, webdav => $::instance_conf->get_webdav, + tpca_reminder => $tpca_reminder, print_options => print_options(inline => 1), label_edit => $locale->text("Edit the $form->{type}"), label_workflow => $locale->text("Workflow $form->{type}"), @@ -2078,6 +2080,23 @@ sub _oe_remove_delivered_or_billed_rows { _remove_billed_or_delivered_rows(quantities => \%handled_base_qtys); } +# iterate all positions and match articlenumber +sub check_transport_cost_reminder_article_number { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + + check_oe_access(); + + my $transport_article = $::instance_conf->get_transport_cost_reminder_article_number; + for my $i (1 .. $form->{rowcount}) { + return undef if $form->{"partnumber_${i}"} eq $transport_article; + } + + return $transport_article; + + $main::lxdebug->leave_sub(); +} sub dispatcher { foreach my $action (qw(delete delivery_order e_mail invoice print purchase_order purchase_order quotation request_for_quotation sales_order sales_order save save_and_close save_as_new ship_to update)) { diff --git a/locale/de/all b/locale/de/all index 733048ced..1ea961338 100755 --- a/locale/de/all +++ b/locale/de/all @@ -334,6 +334,7 @@ $self->{texts} = { 'Bcc' => 'Bcc', 'Bcc E-mail' => 'BCC (E-Mail)', 'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => 'Da die Benutzerfreundlichkeit durch doppelte Artikelnummern erheblich verschlechtert wird (zum Beispiel, wenn man einen Artikel für eine Rechnung sucht), sollten Artikelnummern eindeutig vergeben sein.', + 'Before saving a sales order, this article will be checked and a warning is generated.' => 'Vor dem Speichern eines Angebots oder Auftrags wird überprüft, ob die hier definierte Artikelnnumer vorhanden ist (Versandkosten01, etc.) und eine entsprechende Hinweiswarnung angezeigt', 'Belegnummer' => 'Buchungsnummer', 'Beratername' => 'Beratername', 'Beraternummer' => 'Beraternummer', @@ -756,6 +757,7 @@ $self->{texts} = { 'Default output medium' => 'Standardausgabekanal', 'Default printer' => 'Standarddrucker', 'Default template format' => 'Standardvorlagenformat', + 'Default transport article number' => 'Standard Versand / Transport-Erinnerungs-Artikel', 'Default unit' => 'Standardeinheit', 'Default value' => 'Standardwert', 'Delete' => 'Löschen', @@ -1474,6 +1476,7 @@ $self->{texts} = { 'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.', 'Missing parameter for WebDAV file copy' => 'Fehlender Parameter für WebDAV Datei kopieren', 'Missing taxkeys in invoices with taxes.' => 'Fehlende Steuerschlüssel in Rechnungen mit Steuern', + 'Missing transport cost: #1 Are you sure?' => 'Fehlender Transportkosten-Artikel #1 Trotzdem speichern?', 'Mitarbeiter' => 'Mitarbeiter', 'Mixed (requires column "type")' => 'Gemischt (erfordert Spalte "type")', 'Mobile' => 'Mobiltelefon', @@ -2069,7 +2072,7 @@ $self->{texts} = { 'Save and Order' => 'Speichern und Auftrag erfassen', 'Save and Quotation' => 'Speichern und Angebot', 'Save and RFQ' => 'Speichern und Lieferantenanfrage', - 'Save and close' => 'Speichern und schließen', + 'Save and close' => 'Speichern und schließen', 'Save and execute' => 'Speichern und ausführen', 'Save and keep open' => 'Speichern und geöffnet lassen', 'Save as new' => 'als neu speichern', @@ -2708,6 +2711,7 @@ $self->{texts} = { 'Transfer successful' => 'Lagervorgang erfolgreich', 'Translation' => 'Übersetzung', 'Translations' => 'Übersetzungen', + 'Transport and service costs reminder' => 'Transport- und Versandkosten-Erinnerung', 'Trial Balance' => 'Summen- und Saldenliste', 'Trial balance between %s and %s' => 'Summen- und Saldenlisten vom %s bis zum %s', 'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.', diff --git a/sql/Pg-upgrade2/defaults_transport_cost_reminder.pl b/sql/Pg-upgrade2/defaults_transport_cost_reminder.pl new file mode 100644 index 000000000..9a2173b6c --- /dev/null +++ b/sql/Pg-upgrade2/defaults_transport_cost_reminder.pl @@ -0,0 +1,19 @@ +# @tag: defaults_transport_cost_reminder +# @description: Artikelname der beim Auftrag auf Vorhandensein überprüft wird (Versandkostenerinnerung). +# @depends: release_3_1_0 +package SL::DBUpgrade2::defaults_transport_cost_reminder; + +use utf8; + +use parent qw(SL::DBUpgrade2::Base); +use strict; + +sub run { + my ($self) = @_; + + # this query will fail if column already exist (new database) + $self->db_query(qq|ALTER TABLE defaults ADD COLUMN transport_cost_reminder_article_number text|); + return 1; +} + +1; diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html index 416eb815f..bc817b0be 100644 --- a/templates/webpages/client_config/_features.html +++ b/templates/webpages/client_config/_features.html @@ -108,5 +108,11 @@ [% LxERP.t8('When converting a requirement spec into a quotation or an oder each section gets converted into a line position in the new record. This is the article used by default for this conversion.') %] + [% LxERP.t8('Transport and service costs reminder') %] + + [% LxERP.t8('Default transport article number') %] + [% L.input_tag('defaults.transport_cost_reminder_article_number', SELF.defaults.transport_cost_reminder_article_number, style=style) %] + [% LxERP.t8('Before saving a sales order, this article will be checked and a warning is generated.') %] + diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html index 9dd893e8d..8a8dd0845 100644 --- a/templates/webpages/oe/form_footer.html +++ b/templates/webpages/oe/form_footer.html @@ -140,8 +140,15 @@ - - + +[% IF not tpca_reminder %] + + +[% ELSE %] + [% IF warn_save_active_periodic_invoice %] [% warn_save_active_periodic_invoice=1 %] [% END %] + [% L.submit_tag('action_save', LxERP.t8('Save'), confirm=LxERP.t8('Missing transport cost: #1 Are you sure?', tpca_reminder), 'data-require-transaction-description'=INSTANCE_CONF.get_require_transaction_description_ps, 'data-warn-save-active-periodic-invoice'=warn_save_active_periodic_invoice) %] + [% L.submit_tag('action_save_and_close', LxERP.t8('Save and close'), confirm=LxERP.t8('Missing transport cost: #1 Are you sure?', tpca_reminder), 'data-require-transaction-description'=INSTANCE_CONF.get_require_transaction_description_ps, 'data-warn-save-active-periodic-invoice'=warn_save_active_periodic_invoice) %] +[% END %] [%- IF id %] -- 2.20.1