Merge branch 'test' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / shop_order / show.html

diff --git a/templates/webpages/shop_order/show.html b/templates/webpages/shop_order/show.html
index e9c22e5..da045f1 100644 (file)
--- a/templates/webpages/shop_order/show.html
+++ b/templates/webpages/shop_order/show.html
@@ -118,6 +118,7 @@
           <tr><td><b>[% 'Shop Ordernotes' | $T8 %]</b></td><td>[% HTML.escape(IMPORT.shop_customer_comment) %]</td></tr>
           <tr><td><b>[% 'Shop Orderamount' | $T8 %]</b></td><td>[% HTML.escape(IMPORT.amount_as_number) %]</td></tr>
           <tr><td><b>[% 'Shipping costs' | $T8 %]</b></td><td>[% HTML.escape(IMPORT.shipping_costs_as_number) %]</td></tr>
+          <tr><td><b>[% 'Payment description' | $T8 %]</b></td><td>[% HTML.escape(IMPORT.payment_description) %]</td></tr>
         </table>
       </td>
       <td style="padding-left: 20px; vertical-align: top;">
@@ -131,7 +132,7 @@
             <div style="height: 125px; overflow:auto;">
               <table>
                 <tr class="listheading">
-                  <th colspan="7">Customer Proposals</td>
+                  <th colspan="7">[% 'Customer Proposals' | $T8 %]</td>
                 </tr>
                 [% FOREACH prop = PROPOSALS %][% IF prop.order_lock %][% SET orderlock_class = 'style="background:rgba(232, 32, 23, 0.2);"' %][% ELSE %][% SET orderlock_class = '' %][% END %]
                 <tr class="listrow" [% orderlock_class %]>
@@ -176,22 +177,21 @@
   <div style="height: 250px; overflow:auto; margin:15px;">
     <table width="99%">
       <tr class="listheading">
-        <th>[% 'Position' | $T8 %]</th>
-        <th>[% 'Partnumber' | $T8 %]</th>
-        <th>[% 'Part Description' | $T8 %]</th>
-        <th>[% 'Qty' | $T8 %]</th>
-        <th>[% 'Price' | $T8 %]</th>
-        <th>[% 'Extended' | $T8 %]</th>
+        <th>[% 'Position'          | $T8 %]</th>
+        <th>[% 'Partnumber'        | $T8 %]</th>
+        <th>[% 'Partdescriptipion' | $T8 %]</th>
+        <th>[% 'Qty'               | $T8 %]</th>
+        <th>[% 'Price'             | $T8 %]</th>
+        <th>[% 'Extended'          | $T8 %]</th>
       </tr>
-      [% FOREACH pos = IMPORT.shop_order_items %]
       <tr class="listrow">
-        <td>[% count() %]</td>
-        <td>[% HTML.escape(pos.partnumber) %]</td>
-        <td>[% HTML.escape(pos.description) %]</td>
-        <td>[% pos.quantity_as_number%]</td>
-        <td>[% pos.price_as_number%]</td>
-        [% SET extended = pos.price * pos.quantity %]
-        <td>[% LxERP.format_amount(extended,2) %]</td>
+      [% FOREACH pos = IMPORT.shop_order_items %]
+        <td>[% loop.count                                      %]</td>
+        <td>[% HTML.escape(pos.partnumber)                     %]</td>
+        <td>[% HTML.escape(pos.description)                    %]</td>
+        <td>[% pos.quantity_as_number                          %]</td>
+        <td>[% pos.price_as_number                             %]</td>
+        <td>[% LxERP.format_amount(pos.price * pos.quantity,2) %]</td>
       </tr>
       [% END %]
     </table>
@@ -205,4 +205,3 @@ $("input[type=radio]").change(function(){
       $('#transfer').css("display", 'block');
 });
 </script>
-[% # L.dump(IMPORT) %]