date error in mapping

[mfinanz.git] / templates / webpages / order / form.html

diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index 82bc2f15d0039fba078381f215c247b1566b34bc..597aae883133ac0f61476e2064c7e7e98006d734 100644 (file)
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -2,6 +2,10 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]

+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]

 <h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
 
 <div id="print_options" style="display:none">
 <h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
 
 <div id="print_options" style="display:none">


@@ -21,13 +25,26 @@
   [% L.hidden_tag('callback',             FORM.callback) %]
   [% L.hidden_tag('type',                 FORM.type) %]
   [% L.hidden_tag('id',                   SELF.order.id) %]
   [% L.hidden_tag('callback',             FORM.callback) %]
   [% L.hidden_tag('type',                 FORM.type) %]
   [% L.hidden_tag('id',                   SELF.order.id) %]

-  [% L.hidden_tag('converted_from_oe_id', SELF.converted_from_oe_id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.order.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.order.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]

 
   [%- INCLUDE 'common/flash.html' %]
 
   <div class="tabwidget" id="order_tabs">
     <ul>
       <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
 
   [%- INCLUDE 'common/flash.html' %]
 
   <div class="tabwidget" id="order_tabs">
     <ul>
       <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>

+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]

 [%- IF INSTANCE_CONF.get_webdav %]
       <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
 [%- IF INSTANCE_CONF.get_webdav %]
       <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]


@@ -62,5 +79,4 @@
     </div>
 
   </div>
     </div>
 
   </div>

-

 </form>
 </form>