From: Moritz Bunkus Date: Wed, 23 Jan 2008 16:57:03 +0000 (+0000) Subject: HTML-Attribute anständig quoten. Kosmetik. X-Git-Tag: release-2.6.0beta1~295 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a8cccc0a8878dcb2a76f0e444248739f6a529321;p=kivitendo-erp.git HTML-Attribute anständig quoten. Kosmetik. --- diff --git a/templates/webpages/oe/orders_footer_de.html b/templates/webpages/oe/orders_footer_de.html index 73a423e8e..9785de14c 100644 --- a/templates/webpages/oe/orders_footer_de.html +++ b/templates/webpages/oe/orders_footer_de.html @@ -2,98 +2,101 @@ [%- USE LxERP %] - - - +

- - - - - - - +

Bemerkungen	interne Bemerkungen
[% notes %]

+ + + [%- IF is_sales %] [%- END %] - - +

+ + + + + + + - + - + [%- IF id && num_follow_ups %] [%- END %]

Bemerkungen	interne Bemerkungen
[% notes %]	[% intnotes %]
Zahlungskonditionen	- [%- INCLUDE 'generic/multibox.html' - name = 'payment_id', - style = 'width: 250px', - DATA = ALL_PAYMENTS, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'payment_id', + style = 'width: 250px', + DATA = ALL_PAYMENTS, + id_key = 'id', label_key = 'description', show_empty = 1 -%]
[% LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.', num_follow_ups, num_due_follow_ups) %]

- + - + - - + +

Ertrag	Ertrag	[% LxERP.format_amount(marge_total, 2) %]
Ertrag prozentual	Ertrag prozentual	[% LxERP.format_amount(marge_percent, 2) %]	%

[%- IF taxaccounts %] - Steuer im Preis inbegriffen

+ Steuer im Preis inbegriffen

[%- END %] - - [% subtotal %] - [% tax %] - - - - -

Summe	[% LxERP.format_amount(invtotal, 2) %]

+ [% subtotal %] + [% tax %] + + + + +

Summe	[% LxERP.format_amount(invtotal, 2) %]

- - + + -

[%- IF webdav %] - Dokumente im Webdav-Repository + Dokumente im Webdav-Repository - + + - + [%- END %] @@ -105,52 +108,52 @@

+ - - + + - [%- FOREACH file = WEBDAV %] + [%- FOREACH file="WEBDAV" %] - - + + [%- END %]

Dateiname	Webdavlink	Dateiname	Webdavlink
[% file.name %]	[% file.type %]	[% HTML.escape(file.name) %]	[% HTML.escape(file.type) %]

[% label_edit %]
- - - - - - + + + + + + [%- IF id %]
[% label_workflow %]
- - + + [%- IF is_sales_quo %] - + [%- END %] [%- IF is_req_quo %] - + [%- END %] [%- IF is_sales_ord || is_pur_ord %] [%- END %] - +
[% heading %] als neue Vorlage verwenden für
[%- IF is_sales_ord %] - - + + [%- ELSE %] [%- IF is_pur_ord %] - - + + [%- ELSE %] - + [%- END %] [%- END %] [%- END %] - - - + + + diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html index 4efc868d7..e866ff88f 100644 --- a/templates/webpages/oe/orders_footer_master.html +++ b/templates/webpages/oe/orders_footer_master.html @@ -2,98 +2,101 @@ [%- USE LxERP %] - - - +

- - - - - - - +

Notes	Internal Notes
[% notes %]

+ + + [%- IF is_sales %] [%- END %] - - +

+ + + + + + + - + - + [%- IF id && num_follow_ups %] [%- END %]

Notes	Internal Notes
[% notes %]	[% intnotes %]
Payment Terms	- [%- INCLUDE 'generic/multibox.html' - name = 'payment_id', - style = 'width: 250px', - DATA = ALL_PAYMENTS, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'payment_id', + style = 'width: 250px', + DATA = ALL_PAYMENTS, + id_key = 'id', label_key = 'description', show_empty = 1 -%]
[% LxERP.format_string('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]

- + - + - - + +

Ertrag	Ertrag	[% LxERP.format_amount(marge_total, 2) %]
Ertrag prozentual	Ertrag prozentual	[% LxERP.format_amount(marge_percent, 2) %]	%

[%- IF taxaccounts %] - Tax Included

+ Tax Included

[%- END %] - - [% subtotal %] - [% tax %] - - - - -

Total	[% LxERP.format_amount(invtotal, 2) %]

+ [% subtotal %] + [% tax %] + + + + +

Total	[% LxERP.format_amount(invtotal, 2) %]

- - + + -

[%- IF webdav %] - Dokumente im Webdav-Repository + Dokumente im Webdav-Repository - + + - + [%- END %] @@ -105,52 +108,52 @@

+ - - + + - [%- FOREACH file = WEBDAV %] + [%- FOREACH file="WEBDAV" %] - - + + [%- END %]

Dateiname	Webdavlink	Dateiname	Webdavlink
[% file.name %]	[% file.type %]	[% HTML.escape(file.name) %]	[% HTML.escape(file.type) %]

[% label_edit %]
- - - - - - + + + + + + [%- IF id %]
[% label_workflow %]
- - + + [%- IF is_sales_quo %] - + [%- END %] [%- IF is_req_quo %] - + [%- END %] [%- IF is_sales_ord || is_pur_ord %] [%- END %] - +
[% heading %] als neue Vorlage verwenden für
[%- IF is_sales_ord %] - - + + [%- ELSE %] [%- IF is_pur_ord %] - - + + [%- ELSE %] - + [%- END %] [%- END %] [%- END %] - - - + + + diff --git a/templates/webpages/oe/orders_header_de.html b/templates/webpages/oe/orders_header_de.html index c2409f2f3..209d4fa1f 100644 --- a/templates/webpages/oe/orders_header_de.html +++ b/templates/webpages/oe/orders_header_de.html @@ -2,7 +2,7 @@ [%- USE LxERP %] -

+ @@ -12,7 +12,7 @@ [%- FOREACH row = HIDDENS %] - + [%- END %] @@ -20,55 +20,54 @@ - - - - +

[% title %]

+ +

[% HTML.escape(title) %]

- -

- + + -

+ [%- IF ALL_CONTACTS.size %] [%- END %] -[%- IF ALL_SHIPTO %] +[%- IF ALL_SHIPTO.size %] [%- IF selectdepartment %] - [%- END %] @@ -124,29 +123,29 @@ [%- END %] [%- IF show_exchangerate %] - + [%- END %] [%- IF is_sales %] - - + + [%- END %] - - + + - - + + @@ -154,38 +153,38 @@ [%- IF show_delivery_customer %] - - + [%- END %]

[% IF vc == 'customer' %]Kunde[% ELSE %]Lieferant[% END %]

- [%- INCLUDE 'generic/multibox.html' + [%- INCLUDE 'generic/multibox.html' name = vc, - style = 'width: 250px', + style = 'width: 250px', DATA = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS, id_sub = 'vc_keys', label_key = 'name', select = vc_select, limit = vclimit, onChange = "document.getElementById('update_button').click();" -%] - +

Ansprechpartner

- [%- INCLUDE 'generic/multibox.html' - name = 'cp_id', - style = 'width: 250px', - DATA = ALL_CONTACTS, - id_key = 'cp_id', + [%- INCLUDE 'generic/multibox.html' + name = 'cp_id', + style = 'width: 250px', + DATA = ALL_CONTACTS, + id_key = 'cp_id', label_sub = 'contact_labels', show_empty = 1 -%]

Lieferadresse

- [%- INCLUDE 'generic/multibox.html' - name = 'shipto_id', - style = 'width: 250px', - DATA = ALL_SHIPTO, - id_key = 'shipto_id', + [%- INCLUDE 'generic/multibox.html' + name = 'shipto_id', + style = 'width: 250px', + DATA = ALL_SHIPTO, + id_key = 'shipto_id', label_sub = 'shipto_labels', show_empty = 1, onChange = "document.getElementById('update_button').click();" -%] @@ -99,19 +98,19 @@

Steuersatz

- [%- INCLUDE 'generic/multibox.html' - name = 'taxzone_id', - style = 'width: 250px', - DATA = ALL_TAXZONES, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'taxzone_id', + style = 'width: 250px', + DATA = ALL_TAXZONES, + id_key = 'id', label_key = 'description' -%]

Abteilung

- +

Wechselkurs

[%- IF forex %] [% LxERP.format_amount(exchangerate, 0) %] [%- ELSE %] - + [%- END %]

Motiv

Versandort

Transportmittel

Vorgangsbezeichnung

- - + - - +

+				-		+
+				-		+

[% openclosed %] @@ -193,33 +192,33 @@ [%- END %] [%- IF is_order %] - - + + [%- END %] - - + + [%- IF is_order %] - - + + [%- END %] - -

Bearbeiter

- [%- INCLUDE 'generic/multibox.html' - name = 'employee_id', - DATA = ALL_EMPLOYEES, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'employee_id', + DATA = ALL_EMPLOYEES, + id_key = 'id', label_sub = 'sales_employee_labels' -%]

Verkäufer/in

- [%- INCLUDE 'generic/multibox.html' - name = 'salesman_id', - default = salesman_id ? salesman_id : employee_id, - DATA = ALL_SALESMEN, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'salesman_id', + default = salesman_id ? salesman_id : employee_id, + DATA = ALL_SALESMEN, + id_key = 'id', label_sub = 'sales_employee_labels' -%]

Auftragsnummer

[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]

Bestellnummer des Kunden

[%- IF is_order %] Auftragsdatum [%- ELSE %] @@ -229,7 +228,7 @@ [% button1 %]

[%- IF is_sales_quo %] gültig bis [%- ELSE %] @@ -241,10 +240,10 @@

Projektnummer

- [%- INCLUDE 'generic/multibox.html' - name = 'globalproject_id', - DATA = ALL_PROJECTS, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'globalproject_id', + DATA = ALL_PROJECTS, + id_key = 'id', label_key = 'projectnumber', show_empty = 1, onChange = "document.getElementById('update_button').click();" -%] diff --git a/templates/webpages/oe/orders_header_master.html b/templates/webpages/oe/orders_header_master.html index d7b4a30c9..f5df7d648 100644 --- a/templates/webpages/oe/orders_header_master.html +++ b/templates/webpages/oe/orders_header_master.html @@ -2,7 +2,7 @@ [%- USE LxERP %] - + @@ -12,7 +12,7 @@ [%- FOREACH row = HIDDENS %] - + [%- END %] @@ -20,55 +20,54 @@ - - - - +

[% title %]

+ +

[% HTML.escape(title) %]

- -

- + + -

[% IF vc == 'customer' %]Customer[% ELSE %]Vendor[% END %]

Contact Person

Shipping Address

Steuersatz

Department

- +

Exchangerate

[%- IF forex %] [% LxERP.format_amount(exchangerate, 0) %] [%- ELSE %] - + [%- END %]

Motiv

Shipping Point

Ship via

Transaction description

- - + - - +

+				-		+
+				-		+

[% openclosed %] @@ -193,33 +192,33 @@ [%- END %] [%- IF is_order %] - - + + [%- END %] - - + + [%- IF is_order %] - - + + [%- END %] - -

+	[%- IF is_order %] Order Date [%- ELSE %] @@ -229,7 +228,7 @@ [% button1 %]
Employee	- [%- INCLUDE 'generic/multibox.html' - name = 'employee_id', - DATA = ALL_EMPLOYEES, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'employee_id', + DATA = ALL_EMPLOYEES, + id_key = 'id', label_sub = 'sales_employee_labels' -%]
Salesman	- [%- INCLUDE 'generic/multibox.html' - name = 'salesman_id', - default = salesman_id ? salesman_id : employee_id, - DATA = ALL_SALESMEN, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'salesman_id', + default = salesman_id ? salesman_id : employee_id, + DATA = ALL_SALESMEN, + id_key = 'id', label_sub = 'sales_employee_labels' -%]
Order Number		Order Number
[% IF is_req_quo %]RFQ Number[% ELSE %]Quotation Number[% END %]		[% IF is_req_quo %]RFQ Number[% ELSE %]Quotation Number[% END %]
Customer Order Number		Customer Order Number
+	[%- IF is_sales_quo %] Valid until [%- ELSE %] @@ -241,10 +240,10 @@
Project Number	- [%- INCLUDE 'generic/multibox.html' - name = 'globalproject_id', - DATA = ALL_PROJECTS, - id_key = 'id', + [%- INCLUDE 'generic/multibox.html' + name = 'globalproject_id', + DATA = ALL_PROJECTS, + id_key = 'id', label_key = 'projectnumber', show_empty = 1, onChange = "document.getElementById('update_button').click();" -%]