From: Moritz Bunkus Date: Thu, 24 Jan 2008 14:32:13 +0000 (+0000) Subject: HTML-Code aufgeräumt, Attribute gequotet, HTML-Sonderzeichen in Werten escapet. X-Git-Tag: release-2.6.0beta1~293 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f704c1f4362b5e891bd1827ef8466dd2714d43da;p=kivitendo-erp.git HTML-Code aufgeräumt, Attribute gequotet, HTML-Sonderzeichen in Werten escapet. --- diff --git a/templates/webpages/ct/form_footer_de.html b/templates/webpages/ct/form_footer_de.html index 0269dfad0..88afd0fc7 100644 --- a/templates/webpages/ct/form_footer_de.html +++ b/templates/webpages/ct/form_footer_de.html @@ -1,29 +1,33 @@ +[% USE HTML %] - - - + + + - - + +
- - - - - - + + + + + + [%- IF id AND is_orphaned %] - + [%- END %] [%- IF id %] - + [%- END %] - + + diff --git a/templates/webpages/ct/form_footer_master.html b/templates/webpages/ct/form_footer_master.html index 8277c8c8f..1b65f89d6 100644 --- a/templates/webpages/ct/form_footer_master.html +++ b/templates/webpages/ct/form_footer_master.html @@ -1,29 +1,33 @@ +[% USE HTML %] - - - + + + - - + +
- - - - - - + + + + + + [%- IF id AND is_orphaned %] - + [%- END %] [%- IF id %] - + [%- END %] - + + diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html index bfdd6fced..6893fe2cb 100644 --- a/templates/webpages/ct/form_header_de.html +++ b/templates/webpages/ct/form_header_de.html @@ -1,548 +1,596 @@ [% USE HTML %] - - - - -
[% title %]
- - -
- - - - - -
- -
- - - - -[%- IF is_customer %] - - -[% ELSE %] - - -[% END %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KundennummerLieferantennummer
Anrede -   - [%- INCLUDE generic/multibox.html - name = 'selected_company_greeting', - DATA = MB_COMPANY_GREETINGS, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Firmenname
Abteilung -
Straße
PLZ/Stadt -
Land
Kontakt
Telefon
Fax
eMail
Homepage
- - - - - - - - - - - - - - - -[%- IF is_sustomer %] - - -[%- ELSE %] - - -[%- END %] - - - - - - - - - - - - - - - -[%- IF is_customer %] - - -[%- END %] - - - - - - - - -[%- IF is_customer %] - - -[%- END %] - -
KreditlimitZahlungskonditionen - [%- INCLUDE generic/multibox.html - name = 'payment_id', - DATA = payment_terms, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Rabatt - %
SteuernummerUSt-IdNr.KNr. beim KundenKundennummer
KontonummerBankleitzahlBank
Kunden-/Lieferantentyp - [%- INCLUDE generic/multibox.html - name = 'business', - DATA = all_business, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Sprache - [%- INCLUDE generic/multibox.html - name = 'language_id', - DATA = languages, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Preisgruppe -[%- IF is_customer %] - [%- INCLUDE generic/multibox.html - name = 'klass', - DATA = all_pricegroup, - show_empty = 1, - id_key = 'id', - label_key = 'pricegroup', - -%] -[% END %] -
Ungültig
Steuersatz - [%- INCLUDE generic/multibox.html - name = 'taxzone_id', - DATA = ALL_TAXZONES, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Verkäufer/in - [%- INCLUDE generic/multibox.html - name = 'salesman_id', - DATA = ALL_SALESMEN, - show_empty = 1, - id_key = 'id', - label_sub = 'salesman_label', - -%] -
- - - - - - - - -
Bemerkungen
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
[% title %]
+ + + + + +
+ +
+ +
Lieferadresse - [%- 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', - -%] -
Firmenname
Abteilung -
Straße
PLZ/Stadt -
Land
Kontakt
Telefon
Fax
eMail
 
 
+ + + [%- IF is_customer %] + + + [%- ELSE %] + + + [%- END %] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KundennummerLieferantennummer
Anrede +   + [%- INCLUDE generic/multibox.html + name = 'selected_company_greeting', + DATA = MB_COMPANY_GREETINGS, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Firmenname
Abteilung + + +
Straße
PLZ/Stadt + + +
Land
Kontakt
Telefon
Fax
eMail
Homepage
-
- -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Ansprechpartner - [%- 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', - -%] -
Anrede -   - [%- INCLUDE generic/multibox.html - name = 'selected_cp_greeting', - DATA = MB_GREETINGS, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Titel -   - [%- INCLUDE generic/multibox.html - name = 'selected_cp_title', - DATA = MB_TITLES, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Abteilung  - [%- INCLUDE generic/multibox.html - name = 'selected_cp_abteilung', - DATA = MB_DEPARTMENT, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Vorname
Name
Telefon 1
Telefon 2
Fax
Mobile 1
Mobile 2
Sat. Tel.
Sat. Fax
Projekt
eMail
Privates Tel.
Private eMail
Geburtstag
-
Bcc
- - - - - -
-
- - - + +
Lieferadresse
+ + + + + - - - - - - - - - + + + + + + + + + [%- IF is_sustomer %] + + + [%- ELSE %] + + + [%- END %] + + + + + + + + + + + + + + - -
KreditlimitZahlungskonditionen - [%- 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', -%]
Von - Bis -
-
-
+ +
Rabatt %
SteuernummerUSt-IdNr.KNr. beim KundenKundennummer
KontonummerBankleitzahlBank
Kunden-/Lieferantentyp + [%- INCLUDE generic/multibox.html + name = 'business', + DATA = all_business, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%]
-
- -
- - [%- IF NOTES && NOTES.size %] -

- - - - - - - - - - - - [%- FOREACH row = NOTES %] - - - - - - - - - - - [%- END %] - -
LöschenBetreffErstellt amErstellt vonWiedervorlagedatumWiedervorlage fürWiedervorlage erledigt
[% UNLESS NOTE_id && (NOTE_id == row.id) %][% END %][% HTML.escape(row.subject) %][% HTML.escape(row.created_on) %][% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %][% HTML.escape(row.follow_up_date) %][% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %][% IF row.follow_up_date %][% IF row.follow_up_done %]Ja[% ELSE %]Nein[% END %][% END %]
-

- [%- END %] - -
[% IF NOTE_id %]Notiz bearbeiten[% ELSE %]Notiz erfassen[% END %]
- - - - -

- - - - - - - - - - - - - - - - - - - - -
Betreff
Text
Wiedervorlage am - - - für - -
- - -
-

- -
-
- - - -[%- IF CUSTOM_VARIABLES.size %] -
- -

- - [%- FOREACH var = CUSTOM_VARIABLES %] - - - - - [%- END %] -
[% HTML.escape(var.description) %][% var.HTML_CODE %]
-

+ Sprache + + [%- INCLUDE generic/multibox.html + name = 'language_id', + DATA = languages, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] + + + [%- IF is_customer %] + Preisgruppe + + [%- INCLUDE generic/multibox.html + name = 'klass', + DATA = all_pricegroup, + show_empty = 1, + id_key = 'id', + label_key = 'pricegroup', + -%] + + [%- END %] + + + + Ungültig + + + + + Steuersatz + + [%- INCLUDE generic/multibox.html + name = 'taxzone_id', + DATA = ALL_TAXZONES, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] + + [%- IF is_customer %] + Verkäufer/in + + [%- INCLUDE generic/multibox.html + name = 'salesman_id', + DATA = ALL_SALESMEN, + show_empty = 1, + id_key = 'id', + label_sub = 'salesman_label', + -%] + + [%- END %] + + + + + + + + + + + +
Bemerkungen
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- -[%- END %] + + + + + + + + + + + + + + + + + + + + + +
Lieferadresse + [%- 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', + -%] +
Firmenname
Abteilung + + +
Straße
PLZ/Stadt + + +
Land
Kontakt
Telefon
Fax
eMail
 
 
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Ansprechpartner + [%- 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', + -%] +
Anrede +   + [%- INCLUDE generic/multibox.html + name = 'selected_cp_greeting', + DATA = MB_GREETINGS, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Titel +   + [%- INCLUDE generic/multibox.html + name = 'selected_cp_title', + DATA = MB_TITLES, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Abteilung +   + [%- INCLUDE generic/multibox.html + name = 'selected_cp_abteilung', + DATA = MB_DEPARTMENT, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Vorname
Name
Telefon 1
Telefon 2
Fax
Mobile 1
Mobile 2
Sat. Tel.
Sat. Fax
Projekt
eMail
Privates Tel.
Private eMail
Geburtstag

Bcc
+ +
+
+ +
+ + + + + + + + + + + + + + + + +
Lieferadresse + [%- 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', + -%] +
Von + + + Bis + + +
+
+
+
+ +
+
+ +
+ + [%- IF NOTES && NOTES.size %] +

+ + + + + + + + + + + + [%- FOREACH row = NOTES %] + + + + + + + + + + + [%- END %] + + + +
LöschenBetreffErstellt amErstellt vonWiedervorlagedatumWiedervorlage fürWiedervorlage erledigt
[% UNLESS NOTE_id && (NOTE_id == row.id) %][% END %][% HTML.escape(row.subject) %][% HTML.escape(row.created_on) %][% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %][% HTML.escape(row.follow_up_date) %][% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %][% IF row.follow_up_date %][% IF row.follow_up_done %]Ja[% ELSE %]Nein[% END %][% END %]
+

+ [%- END %] + +
[% IF NOTE_id %]Notiz bearbeiten[% ELSE %]Notiz erfassen[% END %]
+ + + + +

+ + + + + + + + + + + + + + + + + + + + +
Betreff
Text
Wiedervorlage am + + + für + +
  + + +
+

+ +
+
+ + [%- IF CUSTOM_VARIABLES.size %] +
+ +

+ + [%- FOREACH var = CUSTOM_VARIABLES %] + + + + + [%- END %] +
[% HTML.escape(var.description) %][% var.HTML_CODE %]
+

+ +
+
+ [%- END %] -
+ - + diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html index 2cb672692..5a190b3b4 100644 --- a/templates/webpages/ct/form_header_master.html +++ b/templates/webpages/ct/form_header_master.html @@ -1,548 +1,596 @@ [% USE HTML %] - - - - -
[% title %]
- - - - - - - - -
- -
- - - - -[%- IF is_customer %] - - -[% ELSE %] - - -[% END %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Customer NumberVendor Number
Greeting -   - [%- INCLUDE generic/multibox.html - name = 'selected_company_greeting', - DATA = MB_COMPANY_GREETINGS, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Company Name
Abteilung -
Street
Zipcode/City -
Country
Contact
Phone
Fax
E-mail
Homepage
- - - - - - - - - - - - - - - -[%- IF is_sustomer %] - - -[%- ELSE %] - - -[%- END %] - - - - - - - - - - - - - - - -[%- IF is_customer %] - - -[%- END %] - - - - - - - - -[%- IF is_customer %] - - -[%- END %] - -
Credit LimitPayment Terms - [%- INCLUDE generic/multibox.html - name = 'payment_id', - DATA = payment_terms, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Discount - %
Tax Number / SSNUSt-IdNr.KNr. beim KundenKundennummer
Account NumberBank Code NumberBank
Type of Business - [%- INCLUDE generic/multibox.html - name = 'business', - DATA = all_business, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Language - [%- INCLUDE generic/multibox.html - name = 'language_id', - DATA = languages, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Preisklasse -[%- IF is_customer %] - [%- INCLUDE generic/multibox.html - name = 'klass', - DATA = all_pricegroup, - show_empty = 1, - id_key = 'id', - label_key = 'pricegroup', - -%] -[% END %] -
Obsolete
Steuersatz - [%- INCLUDE generic/multibox.html - name = 'taxzone_id', - DATA = ALL_TAXZONES, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] - Salesman - [%- INCLUDE generic/multibox.html - name = 'salesman_id', - DATA = ALL_SALESMEN, - show_empty = 1, - id_key = 'id', - label_sub = 'salesman_label', - -%] -
- - - - - - - - -
Notes
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
[% title %]
+ + + + + +
+ +
+ +
Shipping Address - [%- 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', - -%] -
Company Name
Abteilung -
Street
Zipcode/City -
Country
Contact
Phone
Fax
E-mail
 
 
+ + + [%- IF is_customer %] + + + [%- ELSE %] + + + [%- END %] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Customer NumberVendor Number
Greeting +   + [%- INCLUDE generic/multibox.html + name = 'selected_company_greeting', + DATA = MB_COMPANY_GREETINGS, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Company Name
Department + + +
Street
Zipcode/City + + +
Country
Contact
Phone
Fax
E-mail
Homepage
-
- -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Ansprechpartner - [%- 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', - -%] -
Greeting -   - [%- INCLUDE generic/multibox.html - name = 'selected_cp_greeting', - DATA = MB_GREETINGS, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Title -   - [%- INCLUDE generic/multibox.html - name = 'selected_cp_title', - DATA = MB_TITLES, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Department  - [%- INCLUDE generic/multibox.html - name = 'selected_cp_abteilung', - DATA = MB_DEPARTMENT, - show_empty = 1, - id_key = 'id', - label_key = 'description', - -%] -
Given Name
Name
Phone1
Phone2
Fax
Mobile1
Mobile2
Sat. Phone
Sat. Fax
Project
E-mail
Private Phone
Private E-mail
Birthday
-
Bcc
- - - - - -
-
- - - + +
Shipping Address
+ + + + + - - - - - - - - - + + + + + + + + + [%- IF is_sustomer %] + + + [%- ELSE %] + + + [%- END %] + + + + + + + + + + + + + + - -
Credit LimitPayment Terms - [%- 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', -%]
From - To (time) -
-
-
+ +
Discount %
Tax Number / SSNUSt-IdNr.KNr. beim KundenKundennummer
Account NumberBank Code NumberBank
Type of Business + [%- INCLUDE generic/multibox.html + name = 'business', + DATA = all_business, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%]
-
- -
- - [%- IF NOTES && NOTES.size %] -

- - - - - - - - - - - - [%- FOREACH row = NOTES %] - - - - - - - - - - - [%- END %] - -
DeleteSubjectCreated onCreated byFollow-Up DateFollow-Up forFollow-Up done
[% UNLESS NOTE_id && (NOTE_id == row.id) %][% END %][% HTML.escape(row.subject) %][% HTML.escape(row.created_on) %][% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %][% HTML.escape(row.follow_up_date) %][% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %][% IF row.follow_up_date %][% IF row.follow_up_done %]Yes[% ELSE %]No[% END %][% END %]
-

- [%- END %] - -
[% IF NOTE_id %]Edit note[% ELSE %]Add note[% END %]
- - - - -

- - - - - - - - - - - - - - - - - - - - -
Subject
Body
Follow-Up On - - - for - -
- - -
-

- -
-
- - - -[%- IF CUSTOM_VARIABLES.size %] -
- -

- - [%- FOREACH var = CUSTOM_VARIABLES %] - - - - - [%- END %] -
[% HTML.escape(var.description) %][% var.HTML_CODE %]
-

+ Language + + [%- INCLUDE generic/multibox.html + name = 'language_id', + DATA = languages, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] + + + [%- IF is_customer %] + Preisklasse + + [%- INCLUDE generic/multibox.html + name = 'klass', + DATA = all_pricegroup, + show_empty = 1, + id_key = 'id', + label_key = 'pricegroup', + -%] + + [%- END %] + + + + Obsolete + + + + + Steuersatz + + [%- INCLUDE generic/multibox.html + name = 'taxzone_id', + DATA = ALL_TAXZONES, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] + + [%- IF is_customer %] + Salesman + + [%- INCLUDE generic/multibox.html + name = 'salesman_id', + DATA = ALL_SALESMEN, + show_empty = 1, + id_key = 'id', + label_sub = 'salesman_label', + -%] + + [%- END %] + + + + + + + + + + + +
Notes
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- -[%- END %] + + + + + + + + + + + + + + + + + + + + + +
Shipping Address + [%- 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', + -%] +
Company Name
Abteilung + + +
Street
Zipcode/City + + +
Country
Contact
Phone
Fax
E-mail
 
 
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Ansprechpartner + [%- 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', + -%] +
Greeting +   + [%- INCLUDE generic/multibox.html + name = 'selected_cp_greeting', + DATA = MB_GREETINGS, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Title +   + [%- INCLUDE generic/multibox.html + name = 'selected_cp_title', + DATA = MB_TITLES, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Department +   + [%- INCLUDE generic/multibox.html + name = 'selected_cp_abteilung', + DATA = MB_DEPARTMENT, + show_empty = 1, + id_key = 'id', + label_key = 'description', + -%] +
Given Name
Name
Phone1
Phone2
Fax
Mobile1
Mobile2
Sat. Phone
Sat. Fax
Project
E-mail
Private Phone
Private E-mail
Birthday

Bcc
+ +
+
+ +
+ + + + + + + + + + + + + + + + +
Shipping Address + [%- 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', + -%] +
From + + + To (time) + + +
+
+
+
+ +
+
+ +
+ + [%- IF NOTES && NOTES.size %] +

+ + + + + + + + + + + + [%- FOREACH row = NOTES %] + + + + + + + + + + + [%- END %] + + + +
DeleteSubjectCreated onCreated byFollow-Up DateFollow-Up forFollow-Up done
[% UNLESS NOTE_id && (NOTE_id == row.id) %][% END %][% HTML.escape(row.subject) %][% HTML.escape(row.created_on) %][% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %][% HTML.escape(row.follow_up_date) %][% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %][% IF row.follow_up_date %][% IF row.follow_up_done %]Yes[% ELSE %]No[% END %][% END %]
+

+ [%- END %] + +
[% IF NOTE_id %]Edit note[% ELSE %]Add note[% END %]
+ + + + +

+ + + + + + + + + + + + + + + + + + + + +
Subject
Body
Follow-Up On + + + for + +
  + + +
+

+ +
+
+ + [%- IF CUSTOM_VARIABLES.size %] +
+ +

+ + [%- FOREACH var = CUSTOM_VARIABLES %] + + + + + [%- END %] +
[% HTML.escape(var.description) %][% var.HTML_CODE %]
+

+ +
+
+ [%- END %] -
+ - + diff --git a/templates/webpages/ct/get_delivery_de.html b/templates/webpages/ct/get_delivery_de.html index 9f723f7f4..833d4bf4a 100644 --- a/templates/webpages/ct/get_delivery_de.html +++ b/templates/webpages/ct/get_delivery_de.html @@ -1,28 +1,27 @@ [% USE LxERP %] - +
- - - - - - - - - - +
LieferadresseRechnungAuftragRechnungsdatumBeschreibungMengeEinheitVerkaufspreis
+ + + + + + + + + [%- FOREACH row = DELIVERY %] - - - - - - - - - + + + + + + + + [%- END %] diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html index 772b83ba4..42dd80406 100644 --- a/templates/webpages/ct/get_delivery_master.html +++ b/templates/webpages/ct/get_delivery_master.html @@ -1,28 +1,27 @@ [% USE LxERP %] -
LieferadresseRechnungAuftragRechnungsdatumBeschreibungMengeEinheitVerkaufspreis
[% row.shiptoname UNLESS loop.prev.shiptoname == row.shiptoname %] [% row.invnumber %] [% row.ordnumber %] [% row.transdate %] [% row.description %] [% row.qty %] [% row.unit %] 
[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %] [% HTML.escape(row.invnumber) %] [% HTML.escape(row.ordnumber) %] [% HTML.escape(row.transdate) %] [% HTML.escape(row.description) %] [% HTML.escape(row.qty) %] [% HTML.escape(row.unit) %]  [% LxERP.format_amount(row.sellprice, 2) %] 
+
- - - - - - - - - - +
Shipping AddressInvoiceOrderInvdateDescriptionQtyUnitSell Price
+ + + + + + + + + [%- FOREACH row = DELIVERY %] - - - - - - - - - + + + + + + + + [%- END %]
Shipping AddressInvoiceOrderInvdateDescriptionQtyUnitSell Price
[% row.shiptoname UNLESS loop.prev.shiptoname == row.shiptoname %] [% row.invnumber %] [% row.ordnumber %] [% row.transdate %] [% row.description %] [% row.qty %] [% row.unit %] 
[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %] [% HTML.escape(row.invnumber) %] [% HTML.escape(row.ordnumber) %] [% HTML.escape(row.transdate) %] [% HTML.escape(row.description) %] [% HTML.escape(row.qty) %] [% HTML.escape(row.unit) %]  [% LxERP.format_amount(row.sellprice, 2) %]