X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fic%2Fform_footer_master.html;h=ed08335c9183a382b8486479aee2f4cf30d2f908;hb=705655d4a388cbea644c1992350707f145fc4b22;hp=d041971b07cd068928af34b68f81c59200f86373;hpb=4f82ce002979fbe9a59d5e69a53e3697b7df20c1;p=kivitendo-erp.git

diff --git a/templates/webpages/ic/form_footer_master.html b/templates/webpages/ic/form_footer_master.html
index d041971b0..ed08335c9 100644
--- a/templates/webpages/ic/form_footer_master.html
+++ b/templates/webpages/ic/form_footer_master.html
@@ -1,17 +1,18 @@
 [%- USE HTML %]
 [%- USE LxERP %]
   [%- IF item == 'assembly' %]
-  <tr>
+  <!-- Wieder zurueck in die ic.pl, entweder alle Einzelteile auslagern oder gar keine -->
+  <!-- tr>
     <td>
-      <table width="100%">
+      <table border="0" width="100%">
         <tr>
-          <th colspan="2" align="right"><translate>Total</translate></th>
-          <th align="right">[% LxERP.format_amount(assemblytotal, 2) %]</th>
+          <th colspan="2" align=right><translate>Total</translate>&nbsp;</th>
+          <th align=right><translate>Purchase Price</translate>:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  <translate>Sell Price</translate>: [% LxERP.format_amount(assemblytotal, 2) %]</th>
         </tr>
       </table>
     </td>
   </tr>
-  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]">
+  <input type="hidden" name="assembly_rows" value="[% HTML.escape(assembly_rows) %]" -->
   [%- END %]
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
@@ -21,9 +22,34 @@
   <tr>
     <td><hr size="3" noshade></td>
   </tr>
-</table>
+ </table>
+
+ <br style="clear: left" />
+</div>
+
+[%- IF CUSTOM_VARIABLES.size %]
+<div id="custom_variables" class="tabcontent">
+
+ <p><translate>Unchecked custom variables will not appear in orders and invoices.</translate></p>
+
+ <p>
+  <table>
+   [%- FOREACH var = CUSTOM_VARIABLES %]
+   <tr>
+    <td align="right" valign="top">[% var.VALID_BOX %]</td>
+    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
+    <td valign="top">[% var.HTML_CODE %]</td>
+   </tr>
+   [%- END %]
+  </table>
+ </p>
+
+ <br style="clear: left" />
+</div>
+[%- END %]
+
+</div>
 
-<br>
 <input class="submit" type="submit" name="action" value="<translate>Update</translate>">
 <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
 <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
@@ -35,7 +61,7 @@
 
     [%- IF orphaned %]
       [%- UNLESS previousform %]
-        [%- IF item == 'assembly' %] {
+        [%- IF item == 'assembly' %]
           [%- UNLESS onhand %]
 <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
           [%- END %]
@@ -53,6 +79,14 @@
 </form>
 
 <script type="text/javascript" src="js/wz_tooltip.js"></script>
+<script type="text/javascript">
+<!--
+    var maintab = new ddtabcontent("maintab");
+    maintab.setpersist(true);
+    maintab.setselectedClassTarget("link"); //"link" or "linkparent"
+    maintab.init();
+  -->
+</script>
 
 </body>
 </html>