PriceRule: Priorität auf 2 Werte einschränken

diff --git a/SL/Controller/PriceRule.pm b/SL/Controller/PriceRule.pm
index a90f68e2206e1693a747f78f28b99ba7e13fa27c..013445570616e3e6f05eb58ff2bbe30e5ac78aa0 100644 (file)
--- a/SL/Controller/PriceRule.pm
+++ b/SL/Controller/PriceRule.pm
@@ -148,7 +148,7 @@ sub prepare_report {
 
   my %column_defs = (
     name          => { obj_link => sub { $self->url_for(action => 'edit', 'price_rule.id' => $_[0]->id, callback => $callback) } },
 
   my %column_defs = (
     name          => { obj_link => sub { $self->url_for(action => 'edit', 'price_rule.id' => $_[0]->id, callback => $callback) } },

-    priority      => { sub  => sub { $_[0]->priority } },
+    priority      => { sub  => sub { $_[0]->priority_as_text } },

     price         => { sub  => sub { $_[0]->price_as_number } },
     discount      => { sub  => sub { $_[0]->discount_as_number } },
     obsolete      => { sub  => sub { $_[0]->obsolete_as_bool_yn } },
     price         => { sub  => sub { $_[0]->price_as_number } },
     discount      => { sub  => sub { $_[0]->discount_as_number } },
     obsolete      => { sub  => sub { $_[0]->obsolete_as_bool_yn } },

diff --git a/SL/DB/PriceRule.pm b/SL/DB/PriceRule.pm
index 7dfd197037f7d38688c8177f52c75cd0f0d7ec06..5c2552ddbdaa3f024e8c18a90665365f2a48f592 100644 (file)
--- a/SL/DB/PriceRule.pm
+++ b/SL/DB/PriceRule.pm
@@ -119,5 +119,12 @@ sub in_use {
   || SL::DB::Manager::InvoiceItem->get_all_count(query => [ active_price_source => $price_source_spec ]);
 }
 
   || SL::DB::Manager::InvoiceItem->get_all_count(query => [ active_price_source => $price_source_spec ]);
 }
 

+sub priority_as_text {
+  my ($self) = @_;
+
+  return t8('Override') if $self->priority == 4;
+  t8('Normal');
+}
+

 
 1;
 
 1;

diff --git a/locale/de/all b/locale/de/all
index c3a493bfb3413ff771642587990e296f924f4752..7bd7c8592316cb33089cc179b37aba2ede11575c 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1618,6 +1618,7 @@ $self->{texts} = {
   'None'                        => 'Kein',
   'None (PriceSource Discount)' => 'Freier Rabatt',
   'None (PriceSource)'          => 'Freier Preis',
   'None'                        => 'Kein',
   'None (PriceSource Discount)' => 'Freier Rabatt',
   'None (PriceSource)'          => 'Freier Preis',

+  'Normal'                      => 'Normal',

   'Normal users cannot log in.' => 'Normale Benutzer können sich nicht anmelden.',
   'Normalize Customer / Vendor names' => 'Normalisierung Kunden- / Lieferantennamen',
   'Normalize part description and part notes' => 'Normalisierung Artikelbeschreibung und Artikellangtext (Bemerkung)',
   'Normal users cannot log in.' => 'Normale Benutzer können sich nicht anmelden.',
   'Normalize Customer / Vendor names' => 'Normalisierung Kunden- / Lieferantennamen',
   'Normalize part description and part notes' => 'Normalisierung Artikelbeschreibung und Artikellangtext (Bemerkung)',


@@ -1710,6 +1711,7 @@ $self->{texts} = {
   'Output Number Format'        => 'Zahlenformat (Ausgabe)',
   'Outputformat'                => 'Ausgabeformat',
   'Overdue sales quotations and requests for quotations' => 'Überfällige Angebote und Preisanfragen',
   'Output Number Format'        => 'Zahlenformat (Ausgabe)',
   'Outputformat'                => 'Ausgabeformat',
   'Overdue sales quotations and requests for quotations' => 'Überfällige Angebote und Preisanfragen',

+  'Override'                    => 'Override',

   'Override invoice language'   => 'Diese Sprache verwenden',
   'Owner of account'            => 'Kontoinhaber',
   'PAYMENT POSTED'              => 'Rechnung gebucht',
   'Override invoice language'   => 'Diese Sprache verwenden',
   'Owner of account'            => 'Kontoinhaber',
   'PAYMENT POSTED'              => 'Rechnung gebucht',

diff --git a/templates/webpages/price_rule/_filter.html b/templates/webpages/price_rule/_filter.html
index 6cc7cfbbbb996b122ebe11d4fba1daff894c2813..ff0e2e5366afb227bfd552ce15f04f385b8d55bc 100644 (file)
--- a/templates/webpages/price_rule/_filter.html
+++ b/templates/webpages/price_rule/_filter.html
@@ -24,8 +24,12 @@
    <td>[% L.input_tag('filter.discount:number', filter.discount_number, size=20) %]</td>
   </tr>
   <tr>
    <td>[% L.input_tag('filter.discount:number', filter.discount_number, size=20) %]</td>
   </tr>
   <tr>

-   <th align="right">[% 'Discount' | $T8 %]</th>
-   <td>[% L.select_tag('filter.obsolete', [ [ '', LxERP.t8('Both') ], [ 0, LxERP.t8('Valid') ], [ 1 , LxERP.t8('Obsolete')]], default=filter.obsolete, title_key='description', style='width: 300px') %]</td>
+   <th align="right">[% 'Priority' | $T8 %]</th>
+   <td>[% L.select_tag('filter.priority', [ [ '', LxERP.t8('All') ], [ 3, LxERP.t8('Normal') ], [ 4 , LxERP.t8('Override')]], default=filter.priority, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Obsolete' | $T8 %]</th>
+   <td>[% L.select_tag('filter.obsolete', [ [ '', LxERP.t8('Both') ], [ 0, LxERP.t8('Valid') ], [ 1 , LxERP.t8('Obsolete')]], default=filter.obsolete, style='width: 300px') %]</td>

   </tr>
  </table>
 
   </tr>
  </table>
 


@@ -36,7 +40,7 @@
 [% L.hidden_tag('page', FORM.page) %]
 [% L.input_tag('action_list', LxERP.t8('Continue'), type = 'submit', class='submit')%]
 
 [% L.hidden_tag('page', FORM.page) %]
 [% L.input_tag('action_list', LxERP.t8('Continue'), type = 'submit', class='submit')%]
 

-<a href='#' onClick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);'>[% 'Reset' | $T8 %]</a>
+<a href='#' onClick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);$("#filter_table select").val("")'>[% 'Reset' | $T8 %]</a>

 
 </div>
 
 
 </div>
 

diff --git a/templates/webpages/price_rule/form.html b/templates/webpages/price_rule/form.html
index 8f55e79fd2f0fd729b9542d703bb7255bbedeb23..30c0e6060e31a3575addd6d27bd0ef010cc58409 100644 (file)
--- a/templates/webpages/price_rule/form.html
+++ b/templates/webpages/price_rule/form.html
@@ -23,7 +23,7 @@
 [%- END %]
    <tr>
     <th align="right">[% 'Priority' | $T8 %]</th>
 [%- END %]
    <tr>
     <th align="right">[% 'Priority' | $T8 %]</th>

-    <td>[% L.select_tag('price_rule.priority', [1,2,3,4,5], default=SELF.price_rule.priority, style='width: 300px') %]</td>
+    <td>[% L.select_tag('price_rule.priority', [ [3, LxERP.t8('Normal') ], [ 4, LxERP.t8('Override') ] ], default=SELF.price_rule.priority, style='width: 300px') %]</td>

    </tr>
 
    <tr>
    </tr>
 
    <tr>