X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Forders_footer_master.html;h=92ac4b5f958f0faf9a93e07a9ed9af351c0c85c1;hb=0642b9ee91c5a0d94af1f8f10e62ac23261b9368;hp=997396dfc9109281b387f027bdbcf495b1b532ff;hpb=270df90017196116ff80fc2b917bb23aca5ca994;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html
index 997396dfc..92ac4b5f9 100644
--- a/templates/webpages/oe/orders_footer_master.html
+++ b/templates/webpages/oe/orders_footer_master.html
@@ -16,28 +16,42 @@
 	      </tr>
               <tr>
                 <th align="right"><translate>Payment Terms</translate></th>
-                <td>[% payments %]</td>
+                <td>
+                      [%- INCLUDE 'generic/multibox.html' 
+                           name       = 'payment_id', 
+                           style      = 'width: 250px', 
+                           DATA       = ALL_PAYMENTS, 
+                           id_key     = 'id', 
+                           label_key  = 'description',
+                           show_empty = 1 -%]
+                </td>
 	    </tr>
+      [%- IF id && num_follow_ups %]
+      <tr>
+       <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
+      </tr>
+      [%- END %]
       </table>
 	  </td>
+[%- IF is_sales %]
           <td>
             <table>
 
-[%- IF is_sales %]
             <tr>
               <th  align=left><translate>Ertrag</translate></th>
-              <td>[% LxERP.format_amount(marge_total, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
             </tr>
             <tr>
               <th  align=left><translate>Ertrag prozentual</translate></th>
-              <td>[% LxERP.format_amount(marge_percent, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>
             </tr>
-[%- END %]
 
             <input type=hidden name="marge_total" value="[% marge_total %]">
             <input type=hidden name="marge_percent" value="[% marge_percent %]">
             </table>
           </td>
+[%- END %]
 	  <td align=right>
 [%- IF taxaccounts %]
             <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b><translate>Tax Included</translate></b><br><br>
@@ -99,6 +113,7 @@
 <input class=submit type=submit name=action value="<translate>Save and Close</translate>">
 
 [%- IF id %]
+  <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
   <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
 
   <br>[% label_workflow %]<br>
@@ -133,9 +148,6 @@
 <input type=hidden name=rowcount value="[% HTML.escape(rowcount) %]">
 <input type=hidden name=callback value="[% callback %]">
 
-<input type=hidden name=login value="[% HTML.escape(login) %]">
-<input type=hidden name=password value="[% HTML.escape(password) %]">
-
 </form>
 
 </body>