PriceRule: Purchase/Sales nicht mehr mitschleifen

diff --git a/locale/de/all b/locale/de/all
index ad3234cb63a23fdd747248e6b3fb9b6d9cc8194b..0209437ff6dafd8bd22db56c8da379aaf4a4b7d9 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1929,7 +1929,6 @@ $self->{texts} = {
   'Projects'                    => 'Projekte',
   'Projecttransactions'         => 'Projektbuchungen',
   'Prozentual/Absolut'          => 'Prozentual/Absolut',
   'Projects'                    => 'Projekte',
   'Projecttransactions'         => 'Projektbuchungen',
   'Prozentual/Absolut'          => 'Prozentual/Absolut',

-  'Purchase'                    => '',

   'Purchase Delivery Orders'    => 'Einkaufslieferscheine',
   'Purchase Delivery Orders deleteable' => 'Einkaufslieferscheine löschbar',
   'Purchase Invoice'            => 'Einkaufsrechnung',
   'Purchase Delivery Orders'    => 'Einkaufslieferscheine',
   'Purchase Delivery Orders deleteable' => 'Einkaufslieferscheine löschbar',
   'Purchase Invoice'            => 'Einkaufsrechnung',


@@ -2096,7 +2095,6 @@ $self->{texts} = {
   'Saldo neu'                   => 'Saldo neu',
   'Saldo per'                   => 'Saldo per',
   'Sale Prices'                 => 'Verkaufspreise',
   'Saldo neu'                   => 'Saldo neu',
   'Saldo per'                   => 'Saldo per',
   'Sale Prices'                 => 'Verkaufspreise',

-  'Sales'                       => '',

   'Sales Delivery Orders'       => 'Verkaufslieferscheine',
   'Sales Delivery Orders deleteable' => 'Verkaufslieferscheine löschbar',
   'Sales Invoice'               => 'Rechnung',
   'Sales Delivery Orders'       => 'Verkaufslieferscheine',
   'Sales Delivery Orders deleteable' => 'Verkaufslieferscheine löschbar',
   'Sales Invoice'               => 'Rechnung',

diff --git a/templates/webpages/price_rule/form.html b/templates/webpages/price_rule/form.html
index 0d6dbab32072b40f08e1d7962577b0750ace447c..752851f7165f5a40f07e5bad90c709aa2159870f 100644 (file)
--- a/templates/webpages/price_rule/form.html
+++ b/templates/webpages/price_rule/form.html
@@ -15,12 +15,6 @@
     <th align="right">[% 'Name' | $T8 %]</th>
     <td>[% L.input_tag("price_rule.name", SELF.price_rule.name, size=60, class='initial_focus') %]</td>
    </tr>
     <th align="right">[% 'Name' | $T8 %]</th>
     <td>[% L.input_tag("price_rule.name", SELF.price_rule.name, size=60, class='initial_focus') %]</td>
    </tr>

-[%- IF 0 %]
-   <tr>
-    <th align="right">[% 'Type' | $T8 %]</th>
-    <td>[% L.select_tag("price_rule.type", [ [ 'sales', LxERP.t8('Sales')], [ 'purchase', LxERP.t8('Purchase') ] ], default=SELF.price_rule.type) %]</td>
-   </tr>
-[%- END %]

    <tr>
     <th align="right">[% 'Priority' | $T8 %]</th>
     <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>
     <th align="right">[% 'Priority' | $T8 %]</th>
     <td>[% L.select_tag('price_rule.priority', [ [3, LxERP.t8('Normal') ], [ 4, LxERP.t8('Override') ] ], default=SELF.price_rule.priority, style='width: 300px') %]</td>