From: Sven Schöling Date: Mon, 12 Jul 2010 14:13:05 +0000 (+0200) Subject: Merge branch 'template_locales' X-Git-Tag: release-2.6.2beta1~331 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2d3f862b7af94f31860dd264eef7c1bc7de7eae2;p=kivitendo-erp.git Merge branch 'template_locales' Conflicts: templates/webpages/admin/edit_user_master.html templates/webpages/admin/list_users_de.html templates/webpages/is/form_header_master.html --- 2d3f862b7af94f31860dd264eef7c1bc7de7eae2 diff --cc locale/de/all index 06485f9d6,5ba5cd31c..e61de8cd0 --- a/locale/de/all +++ b/locale/de/all @@@ -1021,9 -1019,8 +1022,9 @@@ $self->{texts} = 'National Expenses' => 'Aufwand Inland', 'National Revenues' => 'Erlöse Inland', 'Netto Terms' => 'Zahlungsziel netto', - 'New Buchungsgruppe [% loop.count %]' => 'Neue Buchungsgruppe [% loop.count %]', + 'New Buchungsgruppe #1' => 'Neue Buchungsgruppe #1', 'New Templates' => 'neue Vorlagen', + 'New Win/Tab' => 'Neues Fenster', 'New assembly' => 'Neues Erzeugnis', 'New bank account' => 'Neues Bankkonto', 'New contact' => 'Neuer Ansprechpartner', @@@ -1875,9 -1870,9 +1875,10 @@@ 'You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.' => 'Sie müssen neue Buchungsgruppen für alle Kombinationen aus Inventar-, Erlös- und Aufwandskonto, die bereits benutzt wurden.', 'You have to enter a company name in your user preferences (see the "Program" menu, "Preferences").' => 'Sie müssen einen Firmennamen in Ihren Benutzereinstellungen angeben (siehe "Programm"-Menü, "Benuztereinstellungen).', 'You have to fill in at least an account number, the bank code, the IBAN and the BIC.' => 'Sie müssen zumindest die Kontonummer, die Bankleitzahl, die IBAN und den BIC angeben.', + 'You have to specify a department.' => 'Sie müssen eine Abteilung wählen.', 'You have to specify an execution date for each antry.' => 'Sie müssen für jeden zu buchenden Eintrag ein Ausführungsdatum angeben.', 'You must chose a user.' => 'Sie müssen einen Benutzer auswählen.', + 'You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umständen nicht umkehrbar ist.', 'You will now be forwarded to the administration panel.' => 'Sie werden nun zum Administrationsbereich weitergeleitet.', 'You\'re not editing a file.' => 'Sie bearbeiten momentan keine Datei.', 'You\'ve already chosen the following limitations:' => 'Sie haben bereits die folgenden Einschränkungen vorgenommen:', diff --cc templates/webpages/admin/edit_user.html index 000000000,81eb1ea5e..b30278050 mode 000000,100644..100644 --- a/templates/webpages/admin/edit_user.html +++ b/templates/webpages/admin/edit_user.html @@@ -1,0 -1,282 +1,289 @@@ + [%- USE T8 %] + [% USE HTML %] + + + + + +
+ +
[% title %]
+ + + + + + + + + + + + + + + + + [% IF edit %] + + + + + + + + + + + + + + [% END %] + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Login' | $T8 %] + [%- IF edit %] + [% HTML.escape(myc_login) %] + [%- ELSE %] + + [%- END %] +
[% 'Password' | $T8 %][% IF CAN_CHANGE_PASSWORD %][% ELSE %]********[% END %]
[% 'Name' | $T8 %]
[% 'E-mail' | $T8 %]
[% 'Signature' | $T8 %]
[% 'Phone' | $T8 %]
[% 'Fax' | $T8 %]
[% 'Company' | $T8 %]
[% 'Address' | $T8 %]
[% 'Tax number' | $T8 %]
[% 'Ust-IDNr' | $T8 %]
[% 'DUNS-Nr' | $T8 %]
+ 		+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++ ++ ++ ++ + + +
[% 'Date Format' | $T8 %] + +
[% 'Number Format' | $T8 %] + +
[% 'Dropdown Limit' | $T8 %]
[% 'Language' | $T8 %] + +
[% 'Stylesheet' | $T8 %] + +
[% 'Printer' | $T8 %]
[% 'Use Templates' | $T8 %] + +
[% 'New Templates' | $T8 %]
[% 'Setup Templates' | $T8 %] + +
[% 'Setup Menu' | $T8 %] + +
[% 'Mandatory Departments' | $T8 %] ++ [% 'No' | $T8 %] ++ [% 'Yes' | $T8 %] ++
+
[% 'Database' | $T8 %]
+ + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Driver' | $T8 %]PostgreSQL[% 'Host' | $T8 %]
[% 'Dataset' | $T8 %][% 'Port' | $T8 %]
[% 'User' | $T8 %][% 'Password' | $T8 %]
+
[% 'Group membership' | $T8 %]
[% 'The user is a member in the following group(s):' | $T8 %]
[% FOREACH row = GROUPS %][% HTML.escape(row.name) %] + [% UNLESS loop.last %] | [% END %][% END %]
+ + + + + + + [% IF edit %] + [% FOREACH row = GROUPS %] + + [% END %] + + + + + + [% END %] + +
+ + + + + diff --cc templates/webpages/is/form_header.html index 000000000,059541339..919f37b66 mode 000000,100644..100644 --- a/templates/webpages/is/form_header.html +++ b/templates/webpages/is/form_header.html @@@ -1,0 -1,315 +1,315 @@@ + [%- USE T8 %] + [%- USE HTML %] + [%- USE LxERP %] + [%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %] + + + + + + + + +
+ -

[% saved_message %]

- + [%- FOREACH key = HIDDENS %] + + [%- END %] + + + + + + + +

[% title %]

+ ++

[% saved_message %]

++ + + + + + +
+ + + + + + + + + + [%- IF ALL_CONTACTS.size %] + + + + + [%- END %] + [%- IF ALL_SHIPTO.size %] + + + + + [%- END %] + + + + + [%- IF max_dunning_level %] + + + + + [%- END %] + [%- IF business %] + + + + + [%- END %] + + + + + + + + + [%- IF id %] + + [%- END %] + + [%- IF all_departments %] + + + + + [%- END %] + [%- IF currencies %] + + + + + [%- END %] + + + [%- IF show_exchangerate %] + + + + + [%- END %] + + + + + + + + + + + + +
[% 'Customer' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'customer', + style = 'width: 250px', + DATA = ALL_CUSTOMERS, + id_sub = 'vc_keys', + label_key = 'name', + select = vc_select, + limit = vclimit, + allow_textbox = 1, + onChange = "document.getElementById('update_button').click();" -%] + +
[% 'Contact Person' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'cp_id', + style = 'width: 250px', + DATA = ALL_CONTACTS, + id_key = 'cp_id', + label_sub = 'contact_labels', + show_empty = 1 -%] +
[% 'Shipping Address' | $T8 %] + [%- 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();" -%] +
[% 'Credit Limit' | $T8 %] + [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %] + [% LxERP.format_amount(creditremaining,0 ,'0') %] +
[% 'Max. Dunning Level' | $T8 %]: + [% max_dunning_level %]; [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount,2) %] +
[% 'Customer type' | $T8 %][% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %
[% 'Record in' | $T8 %]
[% 'Steuersatz' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'taxzone_id' + stype = '250px' + DATA = ALL_TAXZONES + id_key = 'id' + readonly = (id ? 1 : 0) + label_key = 'description' -%] +
[% 'Department' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'department_id', + style = 'width: 250px', + DATA = all_departments, + id_key = 'id', + label_sub = 'department_labels', + show_empty = 1 -%] +
[% 'Currency' | $T8 %][% currencies %]
[% 'Exchangerate' | $T8 %] + [%- IF forex %] + [% LxERP.format_amount(exchangerate, 2) %] + [%- ELSE %] + + [%- END %] +
[% 'Shipping Point' | $T8 %]
[% 'Ship via' | $T8 %]
[% 'Transaction description' | $T8 %]
+ 		+ + + + + + [%- IF ALL_SALESMEN.size %] + + + + + [%- END %] + + [%- IF is_type_credit_note %] + + + + + + + + + [%- ELSE %] + + + + + + + + + + + + + + + + + + + + + [%- END %] + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Employee' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'employee_id', + DATA = ALL_EMPLOYEES, + id_key = 'id', + label_sub = 'sales_employee_labels' -%] +
[% 'Salesman' | $T8 %] + [%- 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' -%] +
[% 'Credit Note Number' | $T8 %]
[% 'Credit Note Date' | $T8 %] + + +
[% 'Invoice Number' | $T8 %]
[% 'Invoice Date' | $T8 %] + + +
[% 'Due Date' | $T8 %] + + +
[% 'Delivery Order Number' | $T8 %]
[% 'Delivery Date' | $T8 %] + + +
[% 'Order Number' | $T8 %]
[% 'Order Date' | $T8 %] +
[% 'Quotation Number' | $T8 %]
[% 'Quotation Date' | $T8 %] +
[% 'Customer Order Number' | $T8 %]
[% 'Project Number' | $T8 %] + [%- 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();" -%] +
+
+ + + + + + + + + + + +