From 26a7b7af2734e081e1c32c2248c8ee35c67a4225 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Wed, 2 Dec 2015 16:20:01 +0100 Subject: [PATCH] =?utf8?q?Auftrags-Controller:=20Preis=20und=20Rabatt=20im?= =?utf8?q?mer=20rechtsb=C3=BCndig.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../webpages/order/tabs/_item_input.html | 6 +++--- .../order/tabs/_multi_items_result.html | 6 +++--- templates/webpages/order/tabs/_row.html | 20 ++++++++----------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/templates/webpages/order/tabs/_item_input.html b/templates/webpages/order/tabs/_item_input.html index aacaa4be4..4e92e159e 100644 --- a/templates/webpages/order/tabs/_item_input.html +++ b/templates/webpages/order/tabs/_item_input.html @@ -17,11 +17,11 @@ [% L.part_picker('add_item.parts_id', '', fat_set_item=1, style='width: 300px', class="add_item_input") %] [% L.input_tag('add_item.description', '', class="add_item_input") %] - [% L.input_tag('add_item.qty_as_number', '', size = 5, style='text-align:right', class="add_item_input") %] + [% L.input_tag('add_item.qty_as_number', '', size = 5, class="add_item_input numeric") %] [% L.hidden_tag('add_item.unit', '', class="add_item_input") %] - [% L.input_tag('add_item.sellprice_as_number', '', size = 10, style='text-align:right', class="add_item_input") %] - [% L.input_tag('add_item.discount_as_percent', '', size = 5, style='text-align:right', class="add_item_input") %] + [% L.input_tag('add_item.sellprice_as_number', '', size = 10, class="add_item_input numeric") %] + [% L.input_tag('add_item.discount_as_percent', '', size = 5, class="add_item_input numeric") %] [% L.button_tag('add_item()', LxERP.t8('Add part')) %] diff --git a/templates/webpages/order/tabs/_multi_items_result.html b/templates/webpages/order/tabs/_multi_items_result.html index 248fe8f3c..11313a91e 100644 --- a/templates/webpages/order/tabs/_multi_items_result.html +++ b/templates/webpages/order/tabs/_multi_items_result.html @@ -3,7 +3,7 @@ + @@ -13,8 +13,8 @@ diff --git a/templates/webpages/order/tabs/_row.html b/templates/webpages/order/tabs/_row.html index fd3f30a5e..9ca6bbbf8 100644 --- a/templates/webpages/order/tabs/_row.html +++ b/templates/webpages/order/tabs/_row.html @@ -31,15 +31,13 @@ [%- L.input_tag("order.orderitems[].qty_as_number", ITEM.qty_as_number, size = 5, - style='text-align:right', - class="recalc reformat_number") %] + class="recalc reformat_number numeric") %]
[% 'for all' | $T8 %] - [% L.input_tag("multi_items.all_qty", '', size = 5, style='text-align:right') %][% L.input_tag("multi_items.all_qty", '', size = 5, class='numeric') %]
[% L.hidden_tag("add_multi_items[+].parts_id", item.id) %] - [% L.input_tag("add_multi_items[].qty_as_number", '', size = 5, style='text-align:right', - class = 'multi_items_qty', onclick = 'set_qty_to_one(this)') %] + [% L.input_tag("add_multi_items[].qty_as_number", '', size = 5, + class = 'multi_items_qty numeric', onclick = 'set_qty_to_one(this)') %] [% HTML.escape(item.unit) %] [% HTML.escape(item.partnumber) %] [%- L.input_tag("order.orderitems[].price_factor", ITEM.price_factor, size = 5, - style='text-align:right', - class="recalc") %] + class="recalc numeric") %] [%- L.select_tag("order.orderitems[].unit", @@ -57,16 +55,15 @@ [%- L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %] [%- SET EDIT_PRICE = (AUTH.assert('edit_prices', 1) && ITEM.active_price_source.source == '') %] -
+
[%- L.input_tag("order.orderitems[].sellprice_as_number", ITEM.sellprice_as_number, size = 10, - style='text-align:right', disabled=(EDIT_PRICE? '' : 1), - class="recalc reformat_number") %] + class="recalc reformat_number numeric") %]
- [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", style='text-align:right') %] + [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", class="numeric") %] [%- L.hidden_tag("order.orderitems[].sellprice_as_number", ITEM.sellprice_as_number, disabled=(EDIT_PRICE? 1 : '')) %] @@ -75,16 +72,15 @@
[%- L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %] [%- SET EDIT_DISCOUNT = (AUTH.assert('edit_prices', 1) && ITEM.active_discount_source.source == '') %] -
+
[%- L.input_tag("order.orderitems[].discount_as_percent", ITEM.discount_as_percent, size = 5, - style='text-align:right', disabled=(EDIT_DISCOUNT? '' : 1), - class="recalc reformat_number") %] + class="recalc reformat_number numeric") %]
- [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", style='text-align:right') %] + [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", class="numeric") %] [%- L.hidden_tag("order.orderitems[].discount_as_percent", ITEM.discount_as_percent, disabled=(EDIT_DISCOUNT? 1 : '')) %] -- 2.20.1