Auftrags-Controller: date_tag mit _as_date füttern

diff --git a/templates/webpages/order/tabs/_second_row.html b/templates/webpages/order/tabs/_second_row.html
index 18226ab074ede0dcad22aef94bd7f4cc787a0561..046224fa10d59d6de338149e0deab22e24deee66 100644 (file)
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -14,7 +14,7 @@
     [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %] 
     [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
       <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
     [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]&nbsp;
     [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
       <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;

-      [% L.date_tag("order.orderitems[].reqdate", ITEM.reqdate) %]&nbsp;
+      [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;

     [%- END %]
     <b>[%- 'Subtotal' | $T8 %]</b>&nbsp;
     [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]&nbsp;
     [%- END %]
     <b>[%- 'Subtotal' | $T8 %]</b>&nbsp;
     [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]&nbsp;

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index c67981292cda3b3be5f3045a6b978c20f1e25888..682162e5fc0653af4e709fe9cbc98196d11c7f25 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -150,7 +150,7 @@
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% transdate_txt | $T8 %]</th>
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% transdate_txt | $T8 %]</th>

-            <td>[% L.date_tag('order.transdate', SELF.order.transdate) %]</td>
+            <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %]</td>

           </tr>
 
           [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
           </tr>
 
           [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]


@@ -162,7 +162,7 @@
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>

-            <td>[% L.date_tag('order.reqdate', SELF.order.reqdate) %]</td>
+            <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date) %]</td>

           </tr>
 
           [%- IF SELF.type == "sales_quotation" -%]
           </tr>
 
           [%- IF SELF.type == "sales_quotation" -%]


@@ -172,7 +172,7 @@
           </tr>
           <tr>
             <th width="70%" align="right" nowrap>[% 'Expected billing date' | $T8 %]</th>
           </tr>
           <tr>
             <th width="70%" align="right" nowrap>[% 'Expected billing date' | $T8 %]</th>

-            <td>[%- L.date_tag('order.expected_billing_date', SELF.order.expected_billing_date) %]</td>
+            <td>[%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_sa_date) %]</td>

           </tr>
           [%- END %]
 
           </tr>
           [%- END %]