Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / webpages / oe / price_sources_dialog.html

diff --git a/templates/webpages/oe/price_sources_dialog.html b/templates/webpages/oe/price_sources_dialog.html
index 263cfd6..7cfd7f8 100644 (file)
--- a/templates/webpages/oe/price_sources_dialog.html
+++ b/templates/webpages/oe/price_sources_dialog.html
@@ -29,13 +29,13 @@
     <tr class='listrow'>
 [%- IF price_source.record_item.active_price_source != price.source %]
      <td>[% L.button_tag('kivi.io.update_price_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ LxERP.format_amount(price.price, -2) _ '\')', LxERP.t8('Select')) %]</td>
-[%- ELSIF price_source.record_item.sellprice != price.price %]
+[%- ELSIF price_source.record_item.sellprice * 1 != price.price * 1 %]
      <td>[% L.button_tag('kivi.io.update_price_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ LxERP.format_amount(price.price, -2) _ '\')', LxERP.t8('Update Price')) %]</td>
 [%- ELSE %]
     <td><b>[% 'Selected' | $T8 %]</b></td>
 [% END %]
      <td>[% price.source_description | html %]</td>
-     <td>[% price.price_as_number %]</td>
+     <td class="numeric">[% price.price_as_number %]</td>
 [% IF price.source == best_price.source %]
      <td align='center'>&#x2022;</td>
 [% ELSE %]
@@ -71,7 +71,7 @@
     <tr class='listrow'>
 [%- IF price_source.record_item.active_discount_source != price.source %]
      <td>[% L.button_tag('kivi.io.update_discount_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ price.discount_as_percent _ '\')', LxERP.t8('Select')) %]</td>
-[%- ELSIF price_source.record_item.discount != price.discount * 100 %]
+[%- ELSIF price_source.record_item.discount * 1 != price.discount * 100 %]
      <td>[% L.button_tag('kivi.io.update_discount_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ price.discount_as_percent  _ '\')', LxERP.t8('Update Discount')) %]</td>
 [%- ELSE %]
     <td><b>[% 'Selected' | $T8 %]</b></td>