HTML-Code aufgeräumt, Attribute gequotet, HTML-Sonderzeichen in Werten escapet.
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 24 Jan 2008 14:32:13 +0000 (14:32 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 24 Jan 2008 14:32:13 +0000 (14:32 +0000)
templates/webpages/ct/form_footer_de.html
templates/webpages/ct/form_footer_master.html
templates/webpages/ct/form_header_de.html
templates/webpages/ct/form_header_master.html
templates/webpages/ct/get_delivery_de.html
templates/webpages/ct/get_delivery_master.html

index 0269dfa..88afd0f 100644 (file)
@@ -1,29 +1,33 @@
+[% USE HTML %]
 
-<input name=id type=hidden id=cvid value=[% id %]>
-<input name=business_save type=hidden value="[% selectbusiness %]">
-<input name=title_save type=hidden value="[% title %]">
+<input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
+<input name="business_save" type="hidden" value="[% HTML.escape(selectbusiness) %]">
+<input name="title_save" type="hidden" value="[% HTML.escape(title) %]">
 
-<input type=hidden name=callback value="[% callback %]">
-<input type=hidden name=db id=db value=[% db %]>
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+<input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
 
 <br>
-  <input class=submit type=submit name=action accesskey="s" value="Speichern">
-  <input class=submit type=submit name=action accesskey="s" value="Speichern und schließen">
-  <input class=submit type=submit name=action value=" [% IF is_cumstomer %]Speichern und Debitorenbuchung erfassen[% ELSE %]Speichern und Kreditorenbuchung erfassen[% END %]">
-  <input class=submit type=submit name=action value="Speichern und Rechnung erfassen">
-  <input class=submit type=submit name=action value="Speichern und Auftrag erfassen">
-  <input class=submit type=submit name=action value="[% IF is_customer %]Speichern und Angebot[% ELSE %]Speichern und Lieferantenanfrage[% END %]">
+  <input class="submit" type="submit" name="action" accesskey="s" value="Speichern">
+  <input class="submit" type="submit" name="action" accesskey="s" value="Speichern und schließen">
+  <input class="submit" type="submit" name="action" value=" [% IF is_cumstomer %]Speichern und Debitorenbuchung erfassen[% ELSE %]Speichern und Kreditorenbuchung erfassen[% END %]">
+  <input class="submit" type="submit" name="action" value="Speichern und Rechnung erfassen">
+  <input class="submit" type="submit" name="action" value="Speichern und Auftrag erfassen">
+  <input class="submit" type="submit" name="action" value="[% IF is_customer %]Speichern und Angebot[% ELSE %]Speichern und Lieferantenanfrage[% END %]">
 [%- IF id AND is_orphaned %]
-  <input class=submit type=submit name=action value="Löschen">
+  <input class="submit" type="submit" name="action" value="Löschen">
 [%- END %]
 [%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="Historie">
 [%- END %]
 
   </form>
-<script type="text/javascript">
-//Start Tab Content script for UL with id="maintab" Separate multiple ids each with a comma.
-initializetabcontent("maintab")
-</script>
+
+ <script type="text/javascript">
+  <!--
+      //Start Tab Content script for UL with id="maintab".
+      initializetabcontent("maintab");
+    -->
+ </script>
 </body>
 </html>
index 8277c8c..1b65f89 100644 (file)
@@ -1,29 +1,33 @@
+[% USE HTML %]
 
-<input name=id type=hidden id=cvid value=[% id %]>
-<input name=business_save type=hidden value="[% selectbusiness %]">
-<input name=title_save type=hidden value="[% title %]">
+<input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
+<input name="business_save" type="hidden" value="[% HTML.escape(selectbusiness) %]">
+<input name="title_save" type="hidden" value="[% HTML.escape(title) %]">
 
-<input type=hidden name=callback value="[% callback %]">
-<input type=hidden name=db id=db value=[% db %]>
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+<input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
 
 <br>
-  <input class=submit type=submit name=action accesskey="s" value="<translate>Save</translate>">
-  <input class=submit type=submit name=action accesskey="s" value="<translate>Save and Close</translate>">
-  <input class=submit type=submit name=action value=" [% IF is_cumstomer %]<translate>Save and AR Transaction</translate>[% ELSE %]<translate>Save and AP Transaction</translate>[% END %]">
-  <input class=submit type=submit name=action value="<translate>Save and Invoice</translate>">
-  <input class=submit type=submit name=action value="<translate>Save and Order</translate>">
-  <input class=submit type=submit name=action value="[% IF is_customer %]<translate>Save and Quotation</translate>[% ELSE %]<translate>Save and RFQ</translate>[% END %]">
+  <input class="submit" type="submit" name="action" accesskey="s" value="<translate>Save</translate>">
+  <input class="submit" type="submit" name="action" accesskey="s" value="<translate>Save and Close</translate>">
+  <input class="submit" type="submit" name="action" value=" [% IF is_cumstomer %]<translate>Save and AR Transaction</translate>[% ELSE %]<translate>Save and AP Transaction</translate>[% END %]">
+  <input class="submit" type="submit" name="action" value="<translate>Save and Invoice</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Save and Order</translate>">
+  <input class="submit" type="submit" name="action" value="[% IF is_customer %]<translate>Save and Quotation</translate>[% ELSE %]<translate>Save and RFQ</translate>[% END %]">
 [%- IF id AND is_orphaned %]
-  <input class=submit type=submit name=action value="<translate>Delete</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
 [%- END %]
 [%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="<translate>history</translate>">
 [%- END %]
 
   </form>
-<script type="text/javascript">
-//Start Tab Content script for UL with id="maintab" Separate multiple ids each with a comma.
-initializetabcontent("maintab")
-</script>
+
+ <script type="text/javascript">
+  <!--
+      //Start Tab Content script for UL with id="maintab".
+      initializetabcontent("maintab");
+    -->
+ </script>
 </body>
 </html>
index bfdd6fc..6893fe2 100644 (file)
 [% USE HTML %]<body onLoad="fokus()">
-<table width=100%>
-  <tr>
-    <th class=listtop>[% title %]</th>
-  </tr>
-</table>
-
-
-<form method=post name="ct" action=[% script %] onKeyUp="highlight(event)" onClick="highlight(event)">
-
-
-
-<ul id="maintab" class="shadetabs">
-<li class="selected"><a href="#" rel="billing">Rechnungsadresse</a></li>
-<li><a href="#" rel="shipto">Lieferadresse</a></li>
-<li><a href="#" rel="contacts">Ansprechpartner</a></li>
-<li><a href="#" rel="deliveries">Lieferungen</a></li>
-<li><a href="#" rel="vcnotes">Bemerkungen</a></li>
-[%- IF CUSTOM_VARIABLES.size %]
-<li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
-[%- END %]
-</ul>
-
-<div class="tabcontentstyle">
-
-<div id="billing" class="tabcontent">
-
-      <table width=100%>
-       <tr height="5"></tr>
-       <tr>
-[%- IF is_customer %]
-         <th align=right nowrap>Kundennummer</th>
-         <td><input name="customernumber" size=35 value="[% customernumber %]"></td>
-[% ELSE %]
-         <th align=right nowrap>Lieferantennummer</th>
-         <td><input name="vendornumber" size=35 value="[% vendornumber %]"></td>
-[% END %]
-       </tr>
-        <tr>
-          <th align=right nowrap>Anrede</th>
-          <td>
-            <input id=greeting name=greeting size=30 value="[% greeting %]">&nbsp;
-              [%- INCLUDE generic/multibox.html 
-                    name       = 'selected_company_greeting',
-                    DATA       = MB_COMPANY_GREETINGS,
-                    show_empty = 1,
-                    id_key     = 'id',
-                    label_key  = 'description',
-              -%]
-          </td>
-        </tr>
-       <tr>
-         <th align=right nowrap>Firmenname</th>
-         <td><input name=name size=35 maxlength=75 value="[% name %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Abteilung</th>
-         <td><input name=department_1 size=16 maxlength=75 value="[% department_1 %]">
-         <input name=department_2 size=16 maxlength=75 value="[% department_2 %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Straße</th>
-         <td><input name=street size=35 maxlength=75 value="[% street %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>PLZ/Stadt</th>
-         <td><input name=zipcode size=5 maxlength=10 value="[% zipcode %]">
-          <input name=city size=30 maxlength=75 value="[% city %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Land</th>
-         <td><input name=country size=35 maxlength=75 value="[% country %]"></td>
-       </tr>
-       <tr>
-          <th align=right nowrap>Kontakt</th>
-          <td><input name=contact size=28 maxlength=75 value="[% contact %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Telefon</th>
-         <td><input name=phone size=30 maxlength=30 value="[% phone %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Fax</th>
-         <td><input name=fax size=30 maxlength=30 value="[% fax %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>eMail</th>
-         <td><input name=email size=45 value="[% email %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Homepage</th>
-         <td><input name=homepage size=45 value="[% homepage %]"></td>
-       </tr>
-</table>
-<table>
-       <tr>
-         <th align=right>Kreditlimit</th>
-         <td><input name=creditlimit size=9 value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
-         <input type="hidden" name="terms" value="[% terms %]">
-         <th align=right>Zahlungskonditionen</th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'payment_id',
-                  DATA       = payment_terms,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-         <th align=right>Rabatt</th>
-         <td><input name=discount size=4 value="[% LxERP.format_amount(discount) %]">
-         %</td>
-       </tr>
-       <tr>
-         <th align=right>Steuernummer</th>
-         <td><input name=taxnumber size=20 value="[% taxnumber %]"></td>
-          <th align=right>USt-IdNr.</th>
-         <td><input name="ustid" maxlength="14" size="20" value="[% ustid %]"></td>
-[%- IF is_sustomer %]
-          <th align=right>KNr. beim Kunden</th>
-          <td><input name=c_vendor_id size=10 value="[% c_vendor_id %]"></td>
-[%- ELSE %]
-          <th align=right>Kundennummer</th>
-          <td><input name=v_customer_id size=10 value="[% v_customer_id %]"></td>
-[%- END %]
-       </tr>
-        <tr>
-          <th align=right>Kontonummer</th>
-          <td><input name="account_number" size="10" maxlength="15" value="[% account_number %]"></td>
-          <th align=right>Bankleitzahl</th>
-          <td><input name="bank_code" size="10" maxlength="10" value="[% bank_code %]"></td>
-          <th align=right>Bank</th>
-          <td><input name=bank size=30 value="[% bank %]"></td>
-        </tr>
-       <tr>
-         <th align=right>Kunden-/Lieferantentyp</th>
-         <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'business',
-                  DATA       = all_business,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-         <th align=right>Sprache</th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'language_id',
-                  DATA       = languages,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-
-[%- IF is_customer %]
-          <th align=right>Preisgruppe</th>
-          <td>
-[%- IF is_customer %]
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'klass',
-                  DATA       = all_pricegroup,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'pricegroup',
-           -%]
-[% END %]
-          </td>
-[%- END  %]
-        </tr>
-        <tr>
-          <td align=right>Ungültig</td>
-          <td><input name=obsolete class=checkbox type=checkbox value=1 [% IF obsolete %]checked[% END %]></td>
-       </tr>
-        <tr>
-          <th align=right>Steuersatz</th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'taxzone_id',
-                  DATA       = ALL_TAXZONES,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-[%- IF is_customer %]
-          <th align="right">Verkäufer/in</th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'salesman_id',
-                  DATA       = ALL_SALESMEN,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_sub  = 'salesman_label',
-            -%]
-          </td>
-[%- END %]
-        </tr>
-      </table>
-  <table>
-  <tr>
-    <th align=left nowrap>Bemerkungen</th>
-  </tr>
-  <tr>
-    <td><textarea name=notes rows=3 cols=60 wrap=soft>[% notes %]</textarea></td>
-  </tr>
-
-            </table>
-          </td>
-        </tr>
-</table>
-<br style="clear: left" /></div>
-
-      <div id="shipto" class="tabcontent">
-
-      <table width=100%>
-        <tr>
-          <th align=right>Lieferadresse</th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'shipto_id',
-                  id         = 'shipto_id',
-                  DATA       = SHIPTO,
-                  onChange   = "get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail'])",
-                  id_key     = 'shipto_id',
-                  label_sub  = 'shipto_label',
-                  label_key  = 'shipto_label',
-            -%]
-          </td>
-        </tr>
-       <tr>
-         <th align=right nowrap>Firmenname</th>
-         <td><input id=shiptoname name=shiptoname size=35 maxlength=75 value="[% shiptoname %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Abteilung</th>
-          <td><input id=shiptodepartment_1 name=shiptodepartment_1 size=16 maxlength=75 value="[% shiptodepartment_1 %]">
-         <input id=shiptodepartment_2 name=shiptodepartment_2 size=16 maxlength=75 value="[% shiptodepartment_2 %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Straße</th>
-         <td><input id=shiptostreet name=shiptostreet size=35 maxlength=75 value="[% shiptostreet %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>PLZ/Stadt</th>
-         <td><input id=shiptozipcode name=shiptozipcode size=5 maxlength=75 value="[% shiptozipcode %]">
-          <input id=shiptocity name=shiptocity size=30 maxlength=75 value="[% shiptocity %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Land</th>
-         <td><input id=shiptocountry name=shiptocountry size=35 maxlength=75 value="[% shiptocountry %]"></td>
-       </tr>
-       <tr>
-          <th align=right nowrap>Kontakt</th>
-         <td><input id=shiptocontact name=shiptocontact size=30 maxlength=75 value="[% shiptocontact %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Telefon</th>
-         <td><input id=shiptophone name=shiptophone size=30 maxlength=30 value="[% shiptophone %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>Fax</th>
-         <td><input id=shiptofax name=shiptofax size=30 maxlength=30 value="[% shiptofax %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>eMail</th>
-         <td><input id=shiptoemail name=shiptoemail size=45 value="[% shiptoemail %]"></td>
-       </tr>
-        <tr>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-           <td>&nbsp;</td>
-       </tr>
 
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
+
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="billing">Rechnungsadresse</a></li>
+   <li><a href="#" rel="shipto">Lieferadresse</a></li>
+   <li><a href="#" rel="contacts">Ansprechpartner</a></li>
+   <li><a href="#" rel="deliveries">Lieferungen</a></li>
+   <li><a href="#" rel="vcnotes">Bemerkungen</a></li>
+   [%- IF CUSTOM_VARIABLES.size %]
+   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
+   [%- END %]
+  </ul>
+
+  <div class="tabcontentstyle">
+
+   <div id="billing" class="tabcontent">
+
+    <table width="100%">
+     <tr height="5"></tr>
+     <tr>
+      [%- IF is_customer %]
+      <th align="right" nowrap>Kundennummer</th>
+      <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
+      [%- ELSE %]
+      <th align="right" nowrap>Lieferantennummer</th>
+      <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
+      [%- END %]
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Anrede</th>
+      <td>
+       <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_company_greeting',
+             DATA       = MB_COMPANY_GREETINGS,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Firmenname</th>
+      <td><input name="name" size="35" maxlength="75" value="[% name %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Abteilung</th>
+      <td>
+       <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
+       <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Straße</th>
+      <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>PLZ/Stadt</th>
+      <td>
+       <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
+       <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Land</th>
+      <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Kontakt</th>
+      <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Telefon</th>
+      <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Fax</th>
+      <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>eMail</th>
+      <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Homepage</th>
+      <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
+     </tr>
     </table>
-<br style="clear: left" /></div>
-
-<div id="contacts" class="tabcontent">
-<table>
-    <tr>
-         <td colspan=3>
-               <input type=hidden name=cp_id value=[% cp_id %]>
-                <table>
-                  <tr>
-                    <th align=right>Ansprechpartner</th>
-                    <td>
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'cp_id',
-                            id         = 'cp_id',
-                            DATA       = CONTACTS,
-                            onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
-                            id_key     = 'cp_id',
-                            label_key  = 'cp_name',
-                      -%]
-                    </td>
-                  </tr>
-                <tr>
-                 <th align=left nowrap>Anrede</th>
-                  <td>
-                    <input id=cp_greeting name=cp_greeting size=40 maxlength=75 value="[% cp_greeting %]">&nbsp;
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'selected_cp_greeting',
-                            DATA       = MB_GREETINGS,
-                            show_empty = 1,
-                            id_key     = 'id',
-                            label_key  = 'description',
-                      -%]
-                  </td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Titel</th>
-                  <td>
-                    <input id=cp_title name=cp_title size=40 maxlength=75 value="[% cp_title %]">&nbsp;
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'selected_cp_title',
-                            DATA       = MB_TITLES,
-                            show_empty = 1,
-                            id_key     = 'id',
-                            label_key  = 'description',
-                      -%]
-                  </td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Abteilung</th>
-                  <td><input id=cp_abteilung name=cp_abteilung size=40 value="[% cp_abteilung %]">&nbsp;
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'selected_cp_abteilung',
-                            DATA       = MB_DEPARTMENT,
-                            show_empty = 1,
-                            id_key     = 'id',
-                            label_key  = 'description',
-                      -%]
-                  </td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Vorname</th>
-                  <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% cp_givenname %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>Name</th>
-                  <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% cp_name %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>Telefon 1 </th>
-                  <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% cp_phone1 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Telefon 2</th>
-                  <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% cp_phone2 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Fax</th>
-                  <td><input id=cp_fax name=cp_fax size=40 value="[% cp_fax %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Mobile 1</th>
-                  <td><input id=cp_mobile1 name=cp_mobile1 size=40 value="[% cp_mobile1 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Mobile 2</th>
-                  <td><input id=cp_mobile2 name=cp_mobile2 size=40 value="[% cp_mobile2 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Sat. Tel.</th>
-                  <td><input id=cp_satphone name=cp_satphone size=40 value="[% cp_satphone %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap>Sat. Fax</th>
-                  <td><input id=cp_satfax name=cp_satfax size=40 value="[% cp_satfax %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>Projekt</th>
-                  <td><input id=cp_project name=cp_project size=40 value="[% cp_project %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>eMail</th>
-                  <td><input id=cp_email name=cp_email size=40 value="[% cp_email %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>Privates Tel.</th>
-                  <td><input id=cp_privatphone name=cp_privatphone size=40 value="[% cp_privatphone %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>Private eMail</th>
-                  <td><input id=cp_privatemail name=cp_privatemail size=40 value="[% cp_privatemail %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap>Geburtstag</th>
-                  <td><input id=cp_birthday name=cp_birthday size=40 value="[% cp_birthday %]"></td>
-                </tr>
-                
-          </table>
-        </td>
-        </tr>
-        <tr height="5"></tr>
-          <tr>
-            <th align=right nowrap>Bcc</th>
-            <td><input name=bcc size=35 value="[% bcc %]"></td>
-          </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      
-<br style="clear: left" /></div>
-<div id="deliveries" class="tabcontent">
-  <table>
-    <tr>
-      <th align=right>Lieferadresse</th>
+
+    <table>
+     <tr>
+      <th align="right">Kreditlimit</th>
+      <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
+      <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
+      <th align="right">Zahlungskonditionen</th>
       <td>
-        [%- INCLUDE generic/multibox.html 
-              name       = 'delivery_id',
-              id         = 'delivery_id',
-              DATA       = SHIPTO,
-              onChange   = "get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])",
-              id_key     = 'shipto_id',
-              label_sub  = 'shipto_label',
+       [%- INCLUDE generic/multibox.html
+             name       = 'payment_id',
+             DATA       = payment_terms,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
        -%]
       </td>
-    </tr>
-    <tr>
-      <th align=left nowrap>Von</th>
-      <td><input id=from name=from size=10 maxlength=10 value="[% from %]">
-        <input type="button" name="fromB" id="trigger_from" value="?"></td>
-      <th align=left nowrap>Bis</th>
-      <td><input id=to name=to size=10 maxlength=10 value="[% to %]">
-        <input type="button" name="toB" id="trigger_to" value="?"></td>
-    </tr>       
-    <tr>
-     <td colspan=4>
-      <div id=delivery>
-      </div>
+
+      <th align="right">Rabatt</th>
+      <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
+     </tr>
+
+     <tr>
+      <th align="right">Steuernummer</th>
+      <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
+      <th align="right">USt-IdNr.</th>
+      <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
+      [%- IF is_sustomer %]
+      <th align="right">KNr. beim Kunden</th>
+      <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
+      [%- ELSE %]
+      <th align="right">Kundennummer</th>
+      <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
+      [%- END %]
+     </tr>
+
+     <tr>
+      <th align="right">Kontonummer</th>
+      <td><input name="account_number" size="10" maxlength="15" value="[% HTML.escape(account_number) %]"></td>
+      <th align="right">Bankleitzahl</th>
+      <td><input name="bank_code" size="10" maxlength="10" value="[% HTML.escape(bank_code) %]"></td>
+      <th align="right">Bank</th>
+      <td><input name="bank" size="30" value="[% HTML.escape(bank) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right">Kunden-/Lieferantentyp</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'business',
+             DATA       = all_business,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
       </td>
-    </tr>
-  </table>
-<br style="clear: left" /></div>
-
-<div id="vcnotes" class="tabcontent">
-
- [%- IF NOTES && NOTES.size %]
- <p>
-  <table>
-   <tr>
-    <th class="listheading">Löschen</th>
-    <th class="listheading">Betreff</th>
-    <th class="listheading">Erstellt am</th>
-    <th class="listheading">Erstellt von</th>
-    <th class="listheading">Wiedervorlagedatum</th>
-    <th class="listheading">Wiedervorlage f&uuml;r</th>
-    <th class="listheading">Wiedervorlage erledigt</th>
-   </tr>
-
-   [%- FOREACH row = NOTES %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-    <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
-    <td><a href="ct.pl?action=edit&db=[% HTML.escape(db) %]&id=[% HTML.escape(id) %]&edit_note_id=[% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-    <td>[% HTML.escape(row.created_on) %]</td>
-    <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
-    <td>[% HTML.escape(row.follow_up_date) %]</td>
-    <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-    <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]Ja[% ELSE %]Nein[% END %][% END %]</td>
-   </tr>
-   [%- END %]
-   <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
-  </table>
- </p>
- [%- END %]
-
- <div class="listtop">[% IF NOTE_id %]Notiz bearbeiten[% ELSE %]Notiz erfassen[% END %]</div>
-
- <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
- <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
-
- <p>
-  <table>
-   <tr>
-    <td valign="right">Betreff</td>
-    <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
-   </tr>
-
-   <tr>
-    <td valign="right" align="top">Text</td>
-    <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
-   </tr>
-
-   <tr>
-    <td valign="right">Wiedervorlage am</td>
-    <td>
-     <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
-     <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-     f&uuml;r
-     <select name="FU_created_for_user">
-     [%- FOREACH row = ALL_EMPLOYEES %]
-     <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
-      [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-     </option>
-     [%- END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td></td>
-    <td>
-     <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-     <label for="FU_done">Wiedervorlage erledigt</label>
-    </td>
-   </tr>
-  </table>
- </p>
-
- <br style="clear: left" />
-</div>
-
-<script type="text/javascript">
- <!--
-     Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
-   -->
-</script>
-
-[%- IF CUSTOM_VARIABLES.size %]
-<div id="custom_variables" class="tabcontent">
-
- <p>
-  <table>
-   [%- FOREACH var = CUSTOM_VARIABLES %]
-   <tr>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">[% var.HTML_CODE %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
+      <th align="right">Sprache</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'language_id',
+             DATA       = languages,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+
+      [%- IF is_customer %]
+      <th align="right">Preisgruppe</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'klass',
+             DATA       = all_pricegroup,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'pricegroup',
+       -%]
+      </td>
+      [%- END  %]
+     </tr>
+
+     <tr>
+      <td align="right">Ungültig</td>
+      <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
+     </tr>
+
+     <tr>
+      <th align="right">Steuersatz</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'taxzone_id',
+             DATA       = ALL_TAXZONES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+      [%- IF is_customer %]
+      <th align="right">Verkäufer/in</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'salesman_id',
+             DATA       = ALL_SALESMEN,
+             show_empty = 1,
+             id_key     = 'id',
+             label_sub  = 'salesman_label',
+       -%]
+      </td>
+      [%- END %]
+     </tr>
+    </table>
+
+    <table>
+     <tr>
+      <th align="left" nowrap>Bemerkungen</th>
+     </tr>
+
+     <tr>
+      <td><textarea name="notes" rows="3" cols="60" wrap="soft">[% HTML.escape(notes) %]</textarea></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="shipto" class="tabcontent">
+
+    <table width="100%">
+     <tr>
+      <th align="right">Lieferadresse</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'shipto_id',
+             id         = 'shipto_id',
+             DATA       = SHIPTO,
+             onChange   = "get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail'])",
+             id_key     = 'shipto_id',
+             label_sub  = 'shipto_label',
+             label_key  = 'shipto_label',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Firmenname</th>
+      <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Abteilung</th>
+      <td>
+       <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
+       <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Straße</th>
+      <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>PLZ/Stadt</th>
+      <td>
+       <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
+       <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Land</th>
+      <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Kontakt</th>
+      <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
+     </tr>
 
- <br style="clear: left" />
-</div>
-[%- END %]
+     <tr>
+      <th align="right" nowrap>Telefon</th>
+      <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>Fax</th>
+      <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap>eMail</th>
+      <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
+     </tr>
+
+     <tr>
+      <td>&nbsp;</td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="contacts" class="tabcontent">
+    <table>
+     <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
+     <tr>
+      <th align="right">Ansprechpartner</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'cp_id',
+             id         = 'cp_id',
+             DATA       = CONTACTS,
+             onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
+             id_key     = 'cp_id',
+             label_key  = 'cp_name',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Anrede</th>
+      <td>
+       <input id="cp_greeting" name="cp_greeting" size="40" maxlength="75" value="[% HTML.escape(cp_greeting) %]">&nbsp;
+        [%- INCLUDE generic/multibox.html
+              name       = 'selected_cp_greeting',
+              DATA       = MB_GREETINGS,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Titel</th>
+      <td>
+       <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_title',
+             DATA       = MB_TITLES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Abteilung</th>
+      <td>
+       <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_abteilung',
+             DATA       = MB_DEPARTMENT,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Vorname</th>
+      <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Name</th>
+      <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Telefon 1 </th>
+      <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Telefon 2</th>
+      <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Fax</th>
+      <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Mobile 1</th>
+      <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Mobile 2</th>
+      <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Sat. Tel.</th>
+      <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Sat. Fax</th>
+      <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Projekt</th>
+      <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>eMail</th>
+      <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Privates Tel.</th>
+      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Private eMail</th>
+      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Geburtstag</th>
+      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
+     </tr>
+
+     <tr>
+      <td colspan="2"><hr></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Bcc</th>
+      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="deliveries" class="tabcontent">
+    <table>
+     <tr>
+      <th align="right">Lieferadresse</th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'delivery_id',
+             id         = 'delivery_id',
+             DATA       = SHIPTO,
+             onChange   = "get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])",
+             id_key     = 'shipto_id',
+             label_sub  = 'shipto_label',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap>Von</th>
+      <td>
+       <input id="from" name="from" size="10" maxlength="10" value="[% HTML.escape(from) %]">
+       <input type="button" name="fromB" id="trigger_from" value="?">
+      </td>
+      <th align="left" nowrap>Bis</th>
+      <td>
+       <input id="to" name="to" size="10" maxlength="10" value="[% HTML.escape(to) %]">
+       <input type="button" name="toB" id="trigger_to" value="?">
+      </td>
+     </tr>
+
+     <tr>
+      <td colspan="4">
+       <div id="delivery">
+       </div>
+      </td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="vcnotes" class="tabcontent">
+
+    [%- IF NOTES && NOTES.size %]
+    <p>
+     <table>
+      <tr>
+       <th class="listheading">Löschen</th>
+       <th class="listheading">Betreff</th>
+       <th class="listheading">Erstellt am</th>
+       <th class="listheading">Erstellt von</th>
+       <th class="listheading">Wiedervorlagedatum</th>
+       <th class="listheading">Wiedervorlage f&uuml;r</th>
+       <th class="listheading">Wiedervorlage erledigt</th>
+      </tr>
+
+      [%- FOREACH row = NOTES %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+       <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
+       <td><a href="ct.pl?action=edit&db=[% HTML.url(db) %]&id=[% HTML.url(id) %]&edit_note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
+       <td>[% HTML.escape(row.created_on) %]</td>
+       <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
+       <td>[% HTML.escape(row.follow_up_date) %]</td>
+       <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
+       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]Ja[% ELSE %]Nein[% END %][% END %]</td>
+      </tr>
+      [%- END %]
+
+      <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
+
+     </table>
+    </p>
+    [%- END %]
+
+    <div class="listtop">[% IF NOTE_id %]Notiz bearbeiten[% ELSE %]Notiz erfassen[% END %]</div>
+
+    <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
+    <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
+
+    <p>
+     <table>
+      <tr>
+       <td valign="right">Betreff</td>
+       <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
+      </tr>
+
+      <tr>
+       <td valign="right" align="top">Text</td>
+       <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
+      </tr>
+
+      <tr>
+       <td valign="right">Wiedervorlage am</td>
+       <td>
+        <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
+        <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
+        f&uuml;r
+        <select name="FU_created_for_user">
+         [%- FOREACH row = ALL_EMPLOYEES %]
+         <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
+          [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
+         </option>
+         [%- END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <td>&nbsp;</td>
+       <td>
+        <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
+        <label for="FU_done">Wiedervorlage erledigt</label>
+       </td>
+      </tr>
+     </table>
+    </p>
+
+    <br style="clear: left" />
+   </div>
+
+   [%- IF CUSTOM_VARIABLES.size %]
+   <div id="custom_variables" class="tabcontent">
+
+    <p>
+     <table>
+      [%- FOREACH var = CUSTOM_VARIABLES %]
+      <tr>
+       <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>
+  </div>
 
-<script type="text/javascript"><!--
-  Calendar.setup({ inputField : "fromB", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
-  Calendar.setup({ inputField : "toB", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
-//--></script>
+  <script type="text/javascript">
+   <!--
+       Calendar.setup({ inputField : "fromB",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
+       Calendar.setup({ inputField : "toB",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
+       Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
+       //-->
+  </script>
index 2cb6726..5a190b3 100644 (file)
 [% USE HTML %]<body onLoad="fokus()">
-<table width=100%>
-  <tr>
-    <th class=listtop>[% title %]</th>
-  </tr>
-</table>
-
-
-<form method=post name="ct" action=[% script %] onKeyUp="highlight(event)" onClick="highlight(event)">
-
-
-
-<ul id="maintab" class="shadetabs">
-<li class="selected"><a href="#" rel="billing"><translate>Billing Address</translate></a></li>
-<li><a href="#" rel="shipto"><translate>Shipping Address</translate></a></li>
-<li><a href="#" rel="contacts">Ansprechpartner</a></li>
-<li><a href="#" rel="deliveries"><translate>Lieferungen</translate></a></li>
-<li><a href="#" rel="vcnotes"><translate>Notes</translate></a></li>
-[%- IF CUSTOM_VARIABLES.size %]
-<li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
-[%- END %]
-</ul>
-
-<div class="tabcontentstyle">
-
-<div id="billing" class="tabcontent">
-
-      <table width=100%>
-       <tr height="5"></tr>
-       <tr>
-[%- IF is_customer %]
-         <th align=right nowrap><translate>Customer Number</translate></th>
-         <td><input name="customernumber" size=35 value="[% customernumber %]"></td>
-[% ELSE %]
-         <th align=right nowrap><translate>Vendor Number</translate></th>
-         <td><input name="vendornumber" size=35 value="[% vendornumber %]"></td>
-[% END %]
-       </tr>
-        <tr>
-          <th align=right nowrap><translate>Greeting</translate></th>
-          <td>
-            <input id=greeting name=greeting size=30 value="[% greeting %]">&nbsp;
-              [%- INCLUDE generic/multibox.html 
-                    name       = 'selected_company_greeting',
-                    DATA       = MB_COMPANY_GREETINGS,
-                    show_empty = 1,
-                    id_key     = 'id',
-                    label_key  = 'description',
-              -%]
-          </td>
-        </tr>
-       <tr>
-         <th align=right nowrap><translate>Company Name</translate></th>
-         <td><input name=name size=35 maxlength=75 value="[% name %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Abteilung</translate></th>
-         <td><input name=department_1 size=16 maxlength=75 value="[% department_1 %]">
-         <input name=department_2 size=16 maxlength=75 value="[% department_2 %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Street</translate></th>
-         <td><input name=street size=35 maxlength=75 value="[% street %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
-         <td><input name=zipcode size=5 maxlength=10 value="[% zipcode %]">
-          <input name=city size=30 maxlength=75 value="[% city %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Country</translate></th>
-         <td><input name=country size=35 maxlength=75 value="[% country %]"></td>
-       </tr>
-       <tr>
-          <th align=right nowrap><translate>Contact</translate></th>
-          <td><input name=contact size=28 maxlength=75 value="[% contact %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Phone</translate></th>
-         <td><input name=phone size=30 maxlength=30 value="[% phone %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Fax</translate></th>
-         <td><input name=fax size=30 maxlength=30 value="[% fax %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>E-mail</translate></th>
-         <td><input name=email size=45 value="[% email %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Homepage</translate></th>
-         <td><input name=homepage size=45 value="[% homepage %]"></td>
-       </tr>
-</table>
-<table>
-       <tr>
-         <th align=right><translate>Credit Limit</translate></th>
-         <td><input name=creditlimit size=9 value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
-         <input type="hidden" name="terms" value="[% terms %]">
-         <th align=right><translate>Payment Terms</translate></th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'payment_id',
-                  DATA       = payment_terms,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-         <th align=right><translate>Discount</translate></th>
-         <td><input name=discount size=4 value="[% LxERP.format_amount(discount) %]">
-         %</td>
-       </tr>
-       <tr>
-         <th align=right><translate>Tax Number / SSN</translate></th>
-         <td><input name=taxnumber size=20 value="[% taxnumber %]"></td>
-          <th align=right><translate>USt-IdNr.</translate></th>
-         <td><input name="ustid" maxlength="14" size="20" value="[% ustid %]"></td>
-[%- IF is_sustomer %]
-          <th align=right><translate>KNr. beim Kunden</translate></th>
-          <td><input name=c_vendor_id size=10 value="[% c_vendor_id %]"></td>
-[%- ELSE %]
-          <th align=right><translate>Kundennummer</translate></th>
-          <td><input name=v_customer_id size=10 value="[% v_customer_id %]"></td>
-[%- END %]
-       </tr>
-        <tr>
-          <th align=right><translate>Account Number</translate></th>
-          <td><input name="account_number" size="10" maxlength="15" value="[% account_number %]"></td>
-          <th align=right><translate>Bank Code Number</translate></th>
-          <td><input name="bank_code" size="10" maxlength="10" value="[% bank_code %]"></td>
-          <th align=right><translate>Bank</translate></th>
-          <td><input name=bank size=30 value="[% bank %]"></td>
-        </tr>
-       <tr>
-         <th align=right><translate>Type of Business</translate></th>
-         <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'business',
-                  DATA       = all_business,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-         <th align=right><translate>Language</translate></th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'language_id',
-                  DATA       = languages,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-
-[%- IF is_customer %]
-          <th align=right><translate>Preisklasse</translate></th>
-          <td>
-[%- IF is_customer %]
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'klass',
-                  DATA       = all_pricegroup,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'pricegroup',
-           -%]
-[% END %]
-          </td>
-[%- END  %]
-        </tr>
-        <tr>
-          <td align=right><translate>Obsolete</translate></td>
-          <td><input name=obsolete class=checkbox type=checkbox value=1 [% IF obsolete %]checked[% END %]></td>
-       </tr>
-        <tr>
-          <th align=right><translate>Steuersatz</translate></th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'taxzone_id',
-                  DATA       = ALL_TAXZONES,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_key  = 'description',
-            -%]
-          </td>
-[%- IF is_customer %]
-          <th align="right"><translate>Salesman</translate></th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'salesman_id',
-                  DATA       = ALL_SALESMEN,
-                  show_empty = 1,
-                  id_key     = 'id',
-                  label_sub  = 'salesman_label',
-            -%]
-          </td>
-[%- END %]
-        </tr>
-      </table>
-  <table>
-  <tr>
-    <th align=left nowrap><translate>Notes</translate></th>
-  </tr>
-  <tr>
-    <td><textarea name=notes rows=3 cols=60 wrap=soft>[% notes %]</textarea></td>
-  </tr>
-
-            </table>
-          </td>
-        </tr>
-</table>
-<br style="clear: left" /></div>
-
-      <div id="shipto" class="tabcontent">
-
-      <table width=100%>
-        <tr>
-          <th align=right><translate>Shipping Address</translate></th>
-          <td>
-            [%- INCLUDE generic/multibox.html 
-                  name       = 'shipto_id',
-                  id         = 'shipto_id',
-                  DATA       = SHIPTO,
-                  onChange   = "get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail'])",
-                  id_key     = 'shipto_id',
-                  label_sub  = 'shipto_label',
-                  label_key  = 'shipto_label',
-            -%]
-          </td>
-        </tr>
-       <tr>
-         <th align=right nowrap><translate>Company Name</translate></th>
-         <td><input id=shiptoname name=shiptoname size=35 maxlength=75 value="[% shiptoname %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Abteilung</translate></th>
-          <td><input id=shiptodepartment_1 name=shiptodepartment_1 size=16 maxlength=75 value="[% shiptodepartment_1 %]">
-         <input id=shiptodepartment_2 name=shiptodepartment_2 size=16 maxlength=75 value="[% shiptodepartment_2 %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Street</translate></th>
-         <td><input id=shiptostreet name=shiptostreet size=35 maxlength=75 value="[% shiptostreet %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
-         <td><input id=shiptozipcode name=shiptozipcode size=5 maxlength=75 value="[% shiptozipcode %]">
-          <input id=shiptocity name=shiptocity size=30 maxlength=75 value="[% shiptocity %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Country</translate></th>
-         <td><input id=shiptocountry name=shiptocountry size=35 maxlength=75 value="[% shiptocountry %]"></td>
-       </tr>
-       <tr>
-          <th align=right nowrap><translate>Contact</translate></th>
-         <td><input id=shiptocontact name=shiptocontact size=30 maxlength=75 value="[% shiptocontact %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Phone</translate></th>
-         <td><input id=shiptophone name=shiptophone size=30 maxlength=30 value="[% shiptophone %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>Fax</translate></th>
-         <td><input id=shiptofax name=shiptofax size=30 maxlength=30 value="[% shiptofax %]"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap><translate>E-mail</translate></th>
-         <td><input id=shiptoemail name=shiptoemail size=45 value="[% shiptoemail %]"></td>
-       </tr>
-        <tr>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-           <td>&nbsp;</td>
-       </tr>
 
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
+
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="billing"><translate>Billing Address</translate></a></li>
+   <li><a href="#" rel="shipto"><translate>Shipping Address</translate></a></li>
+   <li><a href="#" rel="contacts">Ansprechpartner</a></li>
+   <li><a href="#" rel="deliveries"><translate>Lieferungen</translate></a></li>
+   <li><a href="#" rel="vcnotes"><translate>Notes</translate></a></li>
+   [%- IF CUSTOM_VARIABLES.size %]
+   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
+   [%- END %]
+  </ul>
+
+  <div class="tabcontentstyle">
+
+   <div id="billing" class="tabcontent">
+
+    <table width="100%">
+     <tr height="5"></tr>
+     <tr>
+      [%- IF is_customer %]
+      <th align="right" nowrap><translate>Customer Number</translate></th>
+      <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
+      [%- ELSE %]
+      <th align="right" nowrap><translate>Vendor Number</translate></th>
+      <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
+      [%- END %]
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Greeting</translate></th>
+      <td>
+       <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_company_greeting',
+             DATA       = MB_COMPANY_GREETINGS,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Company Name</translate></th>
+      <td><input name="name" size="35" maxlength="75" value="[% name %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Department</translate></th>
+      <td>
+       <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
+       <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Street</translate></th>
+      <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
+      <td>
+       <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
+       <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Country</translate></th>
+      <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Contact</translate></th>
+      <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Phone</translate></th>
+      <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Fax</translate></th>
+      <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>E-mail</translate></th>
+      <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Homepage</translate></th>
+      <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
+     </tr>
     </table>
-<br style="clear: left" /></div>
-
-<div id="contacts" class="tabcontent">
-<table>
-    <tr>
-         <td colspan=3>
-               <input type=hidden name=cp_id value=[% cp_id %]>
-                <table>
-                  <tr>
-                    <th align=right><translate>Ansprechpartner</translate></th>
-                    <td>
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'cp_id',
-                            id         = 'cp_id',
-                            DATA       = CONTACTS,
-                            onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
-                            id_key     = 'cp_id',
-                            label_key  = 'cp_name',
-                      -%]
-                    </td>
-                  </tr>
-                <tr>
-                 <th align=left nowrap><translate>Greeting</translate></th>
-                  <td>
-                    <input id=cp_greeting name=cp_greeting size=40 maxlength=75 value="[% cp_greeting %]">&nbsp;
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'selected_cp_greeting',
-                            DATA       = MB_GREETINGS,
-                            show_empty = 1,
-                            id_key     = 'id',
-                            label_key  = 'description',
-                      -%]
-                  </td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Title</translate></th>
-                  <td>
-                    <input id=cp_title name=cp_title size=40 maxlength=75 value="[% cp_title %]">&nbsp;
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'selected_cp_title',
-                            DATA       = MB_TITLES,
-                            show_empty = 1,
-                            id_key     = 'id',
-                            label_key  = 'description',
-                      -%]
-                  </td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Department</translate></th>
-                  <td><input id=cp_abteilung name=cp_abteilung size=40 value="[% cp_abteilung %]">&nbsp;
-                      [%- INCLUDE generic/multibox.html 
-                            name       = 'selected_cp_abteilung',
-                            DATA       = MB_DEPARTMENT,
-                            show_empty = 1,
-                            id_key     = 'id',
-                            label_key  = 'description',
-                      -%]
-                  </td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Given Name</translate></th>
-                  <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% cp_givenname %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>Name</translate></th>
-                  <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% cp_name %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>Phone1</translate></th>
-                  <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% cp_phone1 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Phone2</translate></th>
-                  <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% cp_phone2 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Fax</translate></th>
-                  <td><input id=cp_fax name=cp_fax size=40 value="[% cp_fax %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Mobile1</translate></th>
-                  <td><input id=cp_mobile1 name=cp_mobile1 size=40 value="[% cp_mobile1 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Mobile2</translate></th>
-                  <td><input id=cp_mobile2 name=cp_mobile2 size=40 value="[% cp_mobile2 %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Sat. Phone</translate></th>
-                  <td><input id=cp_satphone name=cp_satphone size=40 value="[% cp_satphone %]"></td>
-                </tr>
-                <tr>
-                  <th align=left nowrap><translate>Sat. Fax</translate></th>
-                  <td><input id=cp_satfax name=cp_satfax size=40 value="[% cp_satfax %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>Project</translate></th>
-                  <td><input id=cp_project name=cp_project size=40 value="[% cp_project %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>E-mail</translate></th>
-                  <td><input id=cp_email name=cp_email size=40 value="[% cp_email %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>Private Phone</translate></th>
-                  <td><input id=cp_privatphone name=cp_privatphone size=40 value="[% cp_privatphone %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>Private E-mail</translate></th>
-                  <td><input id=cp_privatemail name=cp_privatemail size=40 value="[% cp_privatemail %]"></td>
-                </tr>
-                <tr>
-                 <th align=left nowrap><translate>Birthday</translate></th>
-                  <td><input id=cp_birthday name=cp_birthday size=40 value="[% cp_birthday %]"></td>
-                </tr>
-                
-          </table>
-        </td>
-        </tr>
-        <tr height="5"></tr>
-          <tr>
-            <th align=right nowrap><translate>Bcc</translate></th>
-            <td><input name=bcc size=35 value="[% bcc %]"></td>
-          </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      
-<br style="clear: left" /></div>
-<div id="deliveries" class="tabcontent">
-  <table>
-    <tr>
-      <th align=right><translate>Shipping Address</translate></th>
+
+    <table>
+     <tr>
+      <th align="right"><translate>Credit Limit</translate></th>
+      <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
+      <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
+      <th align="right"><translate>Payment Terms</translate></th>
       <td>
-        [%- INCLUDE generic/multibox.html 
-              name       = 'delivery_id',
-              id         = 'delivery_id',
-              DATA       = SHIPTO,
-              onChange   = "get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])",
-              id_key     = 'shipto_id',
-              label_sub  = 'shipto_label',
+       [%- INCLUDE generic/multibox.html
+             name       = 'payment_id',
+             DATA       = payment_terms,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
        -%]
       </td>
-    </tr>
-    <tr>
-      <th align=left nowrap><translate>From</translate></th>
-      <td><input id=from name=from size=10 maxlength=10 value="[% from %]">
-        <input type="button" name="fromB" id="trigger_from" value="?"></td>
-      <th align=left nowrap><translate>To (time)</translate></th>
-      <td><input id=to name=to size=10 maxlength=10 value="[% to %]">
-        <input type="button" name="toB" id="trigger_to" value="?"></td>
-    </tr>       
-    <tr>
-     <td colspan=4>
-      <div id=delivery>
-      </div>
+
+      <th align="right"><translate>Discount</translate></th>
+      <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
+     </tr>
+
+     <tr>
+      <th align="right"><translate>Tax Number / SSN</translate></th>
+      <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
+      <th align="right"><translate>USt-IdNr.</translate></th>
+      <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
+      [%- IF is_sustomer %]
+      <th align="right"><translate>KNr. beim Kunden</translate></th>
+      <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
+      [%- ELSE %]
+      <th align="right"><translate>Kundennummer</translate></th>
+      <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
+      [%- END %]
+     </tr>
+
+     <tr>
+      <th align="right"><translate>Account Number</translate></th>
+      <td><input name="account_number" size="10" maxlength="15" value="[% HTML.escape(account_number) %]"></td>
+      <th align="right"><translate>Bank Code Number</translate></th>
+      <td><input name="bank_code" size="10" maxlength="10" value="[% HTML.escape(bank_code) %]"></td>
+      <th align="right"><translate>Bank</translate></th>
+      <td><input name="bank" size="30" value="[% HTML.escape(bank) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right"><translate>Type of Business</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'business',
+             DATA       = all_business,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
       </td>
-    </tr>
-  </table>
-<br style="clear: left" /></div>
-
-<div id="vcnotes" class="tabcontent">
-
- [%- IF NOTES && NOTES.size %]
- <p>
-  <table>
-   <tr>
-    <th class="listheading"><translate>Delete</translate></th>
-    <th class="listheading"><translate>Subject</translate></th>
-    <th class="listheading"><translate>Created on</translate></th>
-    <th class="listheading"><translate>Created by</translate></th>
-    <th class="listheading"><translate>Follow-Up Date</translate></th>
-    <th class="listheading"><translate>Follow-Up for</translate></th>
-    <th class="listheading"><translate>Follow-Up done</translate></th>
-   </tr>
-
-   [%- FOREACH row = NOTES %]
-   <tr class="listrow[% loop.count % 2 %]">
-    <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
-    <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
-    <td><a href="ct.pl?action=edit&db=[% HTML.escape(db) %]&id=[% HTML.escape(id) %]&edit_note_id=[% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
-    <td>[% HTML.escape(row.created_on) %]</td>
-    <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
-    <td>[% HTML.escape(row.follow_up_date) %]</td>
-    <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-    <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]<translate>Yes</translate>[% ELSE %]<translate>No</translate>[% END %][% END %]</td>
-   </tr>
-   [%- END %]
-   <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
-  </table>
- </p>
- [%- END %]
-
- <div class="listtop">[% IF NOTE_id %]<translate>Edit note</translate>[% ELSE %]<translate>Add note</translate>[% END %]</div>
-
- <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
- <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
-
- <p>
-  <table>
-   <tr>
-    <td valign="right"><translate>Subject</translate></td>
-    <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
-   </tr>
-
-   <tr>
-    <td valign="right" align="top"><translate>Body</translate></td>
-    <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
-   </tr>
-
-   <tr>
-    <td valign="right"><translate>Follow-Up On</translate></td>
-    <td>
-     <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
-     <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-     <translate>for</translate>
-     <select name="FU_created_for_user">
-     [%- FOREACH row = ALL_EMPLOYEES %]
-     <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
-      [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-     </option>
-     [%- END %]
-     </select>
-    </td>
-   </tr>
-
-   <tr>
-    <td></td>
-    <td>
-     <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-     <label for="FU_done"><translate>Follow-Up done</translate></label>
-    </td>
-   </tr>
-  </table>
- </p>
-
- <br style="clear: left" />
-</div>
-
-<script type="text/javascript">
- <!--
-     Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
-   -->
-</script>
-
-[%- IF CUSTOM_VARIABLES.size %]
-<div id="custom_variables" class="tabcontent">
-
- <p>
-  <table>
-   [%- FOREACH var = CUSTOM_VARIABLES %]
-   <tr>
-    <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
-    <td valign="top">[% var.HTML_CODE %]</td>
-   </tr>
-   [%- END %]
-  </table>
- </p>
+      <th align="right"><translate>Language</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'language_id',
+             DATA       = languages,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+
+      [%- IF is_customer %]
+      <th align="right"><translate>Preisklasse</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'klass',
+             DATA       = all_pricegroup,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'pricegroup',
+       -%]
+      </td>
+      [%- END  %]
+     </tr>
+
+     <tr>
+      <td align="right"><translate>Obsolete</translate></td>
+      <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
+     </tr>
+
+     <tr>
+      <th align="right"><translate>Steuersatz</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'taxzone_id',
+             DATA       = ALL_TAXZONES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+      [%- IF is_customer %]
+      <th align="right"><translate>Salesman</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'salesman_id',
+             DATA       = ALL_SALESMEN,
+             show_empty = 1,
+             id_key     = 'id',
+             label_sub  = 'salesman_label',
+       -%]
+      </td>
+      [%- END %]
+     </tr>
+    </table>
+
+    <table>
+     <tr>
+      <th align="left" nowrap><translate>Notes</translate></th>
+     </tr>
+
+     <tr>
+      <td><textarea name="notes" rows="3" cols="60" wrap="soft">[% HTML.escape(notes) %]</textarea></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="shipto" class="tabcontent">
+
+    <table width="100%">
+     <tr>
+      <th align="right"><translate>Shipping Address</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'shipto_id',
+             id         = 'shipto_id',
+             DATA       = SHIPTO,
+             onChange   = "get_shipto(['shipto_id__' + this.value], ['shiptoname','shiptodepartment_1', 'shiptodepartment_2','shiptostreet','shiptozipcode','shiptocity','shiptocountry','shiptocontact','shiptophone','shiptofax','shiptoemail'])",
+             id_key     = 'shipto_id',
+             label_sub  = 'shipto_label',
+             label_key  = 'shipto_label',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Company Name</translate></th>
+      <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Abteilung</translate></th>
+      <td>
+       <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
+       <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Street</translate></th>
+      <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
+      <td>
+       <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
+       <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
+      </td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Country</translate></th>
+      <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Contact</translate></th>
+      <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
+     </tr>
 
- <br style="clear: left" />
-</div>
-[%- END %]
+     <tr>
+      <th align="right" nowrap><translate>Phone</translate></th>
+      <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>Fax</translate></th>
+      <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="right" nowrap><translate>E-mail</translate></th>
+      <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
+     </tr>
+
+     <tr>
+      <td>&nbsp;</td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="contacts" class="tabcontent">
+    <table>
+     <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
+     <tr>
+      <th align="right"><translate>Ansprechpartner</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'cp_id',
+             id         = 'cp_id',
+             DATA       = CONTACTS,
+             onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
+             id_key     = 'cp_id',
+             label_key  = 'cp_name',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Greeting</translate></th>
+      <td>
+       <input id="cp_greeting" name="cp_greeting" size="40" maxlength="75" value="[% HTML.escape(cp_greeting) %]">&nbsp;
+        [%- INCLUDE generic/multibox.html
+              name       = 'selected_cp_greeting',
+              DATA       = MB_GREETINGS,
+              show_empty = 1,
+              id_key     = 'id',
+              label_key  = 'description',
+        -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Title</translate></th>
+      <td>
+       <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_title',
+             DATA       = MB_TITLES,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Department</translate></th>
+      <td>
+       <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
+       [%- INCLUDE generic/multibox.html
+             name       = 'selected_cp_abteilung',
+             DATA       = MB_DEPARTMENT,
+             show_empty = 1,
+             id_key     = 'id',
+             label_key  = 'description',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Given Name</translate></th>
+      <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Name</translate></th>
+      <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Phone1</translate></th>
+      <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Phone2</translate></th>
+      <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Fax</translate></th>
+      <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Mobile1</translate></th>
+      <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Mobile2</translate></th>
+      <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Sat. Phone</translate></th>
+      <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Sat. Fax</translate></th>
+      <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Project</translate></th>
+      <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>E-mail</translate></th>
+      <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Private Phone</translate></th>
+      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Private E-mail</translate></th>
+      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Birthday</translate></th>
+      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
+     </tr>
+
+     <tr>
+      <td colspan="2"><hr></td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>Bcc</translate></th>
+      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="deliveries" class="tabcontent">
+    <table>
+     <tr>
+      <th align="right"><translate>Shipping Address</translate></th>
+      <td>
+       [%- INCLUDE generic/multibox.html
+             name       = 'delivery_id',
+             id         = 'delivery_id',
+             DATA       = SHIPTO,
+             onChange   = "get_delivery(['shipto_id__' + this.value, 'from__' + from.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])",
+             id_key     = 'shipto_id',
+             label_sub  = 'shipto_label',
+       -%]
+      </td>
+     </tr>
+
+     <tr>
+      <th align="left" nowrap><translate>From</translate></th>
+      <td>
+       <input id="from" name="from" size="10" maxlength="10" value="[% HTML.escape(from) %]">
+       <input type="button" name="fromB" id="trigger_from" value="?">
+      </td>
+      <th align="left" nowrap><translate>To (time)</translate></th>
+      <td>
+       <input id="to" name="to" size="10" maxlength="10" value="[% HTML.escape(to) %]">
+       <input type="button" name="toB" id="trigger_to" value="?">
+      </td>
+     </tr>
+
+     <tr>
+      <td colspan="4">
+       <div id="delivery">
+       </div>
+      </td>
+     </tr>
+    </table>
+
+    <br style="clear: left" />
+   </div>
+
+   <div id="vcnotes" class="tabcontent">
+
+    [%- IF NOTES && NOTES.size %]
+    <p>
+     <table>
+      <tr>
+       <th class="listheading"><translate>Delete</translate></th>
+       <th class="listheading"><translate>Subject</translate></th>
+       <th class="listheading"><translate>Created on</translate></th>
+       <th class="listheading"><translate>Created by</translate></th>
+       <th class="listheading"><translate>Follow-Up Date</translate></th>
+       <th class="listheading"><translate>Follow-Up for</translate></th>
+       <th class="listheading"><translate>Follow-Up done</translate></th>
+      </tr>
+
+      [%- FOREACH row = NOTES %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <input type="hidden" name="NOTE_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+       <td>[% UNLESS NOTE_id && (NOTE_id == row.id) %]<input type="checkbox" name="NOTE_delete_[% loop.count %]" value="1">[% END %]</td>
+       <td><a href="ct.pl?action=edit&db=[% HTML.url(db) %]&id=[% HTML.url(id) %]&edit_note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
+       <td>[% HTML.escape(row.created_on) %]</td>
+       <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
+       <td>[% HTML.escape(row.follow_up_date) %]</td>
+       <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
+       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]<translate>Yes</translate>[% ELSE %]<translate>No</translate>[% END %][% END %]</td>
+      </tr>
+      [%- END %]
+
+      <input type="hidden" name="NOTES_rowcount" value="[% NOTES.size %]">
+
+     </table>
+    </p>
+    [%- END %]
+
+    <div class="listtop">[% IF NOTE_id %]<translate>Edit note</translate>[% ELSE %]<translate>Add note</translate>[% END %]</div>
+
+    <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
+    <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
+
+    <p>
+     <table>
+      <tr>
+       <td valign="right"><translate>Subject</translate></td>
+       <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
+      </tr>
+
+      <tr>
+       <td valign="right" align="top"><translate>Body</translate></td>
+       <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
+      </tr>
+
+      <tr>
+       <td valign="right"><translate>Follow-Up On</translate></td>
+       <td>
+        <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
+        <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
+        <translate>for</translate>
+        <select name="FU_created_for_user">
+         [%- FOREACH row = ALL_EMPLOYEES %]
+         <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
+          [%- IF row.name %][%- HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
+         </option>
+         [%- END %]
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <td>&nbsp;</td>
+       <td>
+        <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
+        <label for="FU_done"><translate>Follow-Up done</translate></label>
+       </td>
+      </tr>
+     </table>
+    </p>
+
+    <br style="clear: left" />
+   </div>
+
+   [%- IF CUSTOM_VARIABLES.size %]
+   <div id="custom_variables" class="tabcontent">
+
+    <p>
+     <table>
+      [%- FOREACH var = CUSTOM_VARIABLES %]
+      <tr>
+       <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>
+  </div>
 
-<script type="text/javascript"><!--
-  Calendar.setup({ inputField : "fromB", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
-  Calendar.setup({ inputField : "toB", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
-//--></script>
+  <script type="text/javascript">
+   <!--
+       Calendar.setup({ inputField : "fromB",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_from" });
+       Calendar.setup({ inputField : "toB",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_to" });
+       Calendar.setup({ inputField : "FU_date", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BR", button : "FU_date_trigger" });
+       //-->
+  </script>
index 9f723f7..833d4bf 100644 (file)
@@ -1,28 +1,27 @@
 [% USE LxERP %]
-<table width=100%>
+<table width="100%">
   <tr>
     <td>
-      <table width=100%>
-        <tr class=listheading>
-          <th class=listheading>Lieferadresse</th>
-          <th class=listheading>Rechnung</th>
-          <th class=listheading>Auftrag</th>
-          <th class=listheading>Rechnungsdatum</th>
-          <th class=listheading>Beschreibung</th>
-          <th class=listheading>Menge</th>
-          <th class=listheading>Einheit</th>
-          <th class=listheading>Verkaufspreis</th>
+      <table width="100%">
+        <tr class="listheading">
+          <th class="listheading">Lieferadresse</th>
+          <th class="listheading">Rechnung</th>
+          <th class="listheading">Auftrag</th>
+          <th class="listheading">Rechnungsdatum</th>
+          <th class="listheading">Beschreibung</th>
+          <th class="listheading">Menge</th>
+          <th class="listheading">Einheit</th>
+          <th class="listheading">Verkaufspreis</th>
         </tr>
 [%- FOREACH row = DELIVERY %]
-        <tr class=listrow[% loop.count % 2 %]>
-          
-          <td>[% row.shiptoname UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% row.invnumber   %]&nbsp;</td>
-          <td>[% row.ordnumber   %]&nbsp;</td>
-          <td>[% row.transdate   %]&nbsp;</td>
-          <td>[% row.description %]&nbsp;</td>
-          <td>[% row.qty         %]&nbsp;</td>
-          <td>[% row.unit        %]&nbsp;</td>
+        <tr class="listrow[% loop.count % 2 %]">
+          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
+          <td>[% HTML.escape(row.invnumber)   %]&nbsp;</td>
+          <td>[% HTML.escape(row.ordnumber)   %]&nbsp;</td>
+          <td>[% HTML.escape(row.transdate)   %]&nbsp;</td>
+          <td>[% HTML.escape(row.description) %]&nbsp;</td>
+          <td>[% HTML.escape(row.qty)         %]&nbsp;</td>
+          <td>[% HTML.escape(row.unit)        %]&nbsp;</td>
           <td>[% LxERP.format_amount(row.sellprice, 2) %]&nbsp;</td>
         </tr>
 [%- END %]
index 772b83b..42dd804 100644 (file)
@@ -1,28 +1,27 @@
 [% USE LxERP %]
-<table width=100%>
+<table width="100%">
   <tr>
     <td>
-      <table width=100%>
-        <tr class=listheading>
-          <th class=listheading><translate>Shipping Address</translate></th>
-          <th class=listheading><translate>Invoice</translate></th>
-          <th class=listheading><translate>Order</translate></th>
-          <th class=listheading><translate>Invdate</translate></th>
-          <th class=listheading><translate>Description</translate></th>
-          <th class=listheading><translate>Qty</translate></th>
-          <th class=listheading><translate>Unit</translate></th>
-          <th class=listheading><translate>Sell Price</translate></th>
+      <table width="100%">
+        <tr class="listheading">
+          <th class="listheading"><translate>Shipping Address</translate></th>
+          <th class="listheading"><translate>Invoice</translate></th>
+          <th class="listheading"><translate>Order</translate></th>
+          <th class="listheading"><translate>Invdate</translate></th>
+          <th class="listheading"><translate>Description</translate></th>
+          <th class="listheading"><translate>Qty</translate></th>
+          <th class="listheading"><translate>Unit</translate></th>
+          <th class="listheading"><translate>Sell Price</translate></th>
         </tr>
 [%- FOREACH row = DELIVERY %]
-        <tr class=listrow[% loop.count % 2 %]>
-          
-          <td>[% row.shiptoname UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% row.invnumber   %]&nbsp;</td>
-          <td>[% row.ordnumber   %]&nbsp;</td>
-          <td>[% row.transdate   %]&nbsp;</td>
-          <td>[% row.description %]&nbsp;</td>
-          <td>[% row.qty         %]&nbsp;</td>
-          <td>[% row.unit        %]&nbsp;</td>
+        <tr class="listrow[% loop.count % 2 %]">
+          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
+          <td>[% HTML.escape(row.invnumber)   %]&nbsp;</td>
+          <td>[% HTML.escape(row.ordnumber)   %]&nbsp;</td>
+          <td>[% HTML.escape(row.transdate)   %]&nbsp;</td>
+          <td>[% HTML.escape(row.description) %]&nbsp;</td>
+          <td>[% HTML.escape(row.qty)         %]&nbsp;</td>
+          <td>[% HTML.escape(row.unit)        %]&nbsp;</td>
           <td>[% LxERP.format_amount(row.sellprice, 2) %]&nbsp;</td>
         </tr>
 [%- END %]