From: Thomas Heck Date: Tue, 4 Dec 2012 15:31:25 +0000 (+0100) Subject: Suchmaske für Verkaufsberichte an das "Kivitendo"-Design angepasst. X-Git-Tag: release-3.1.0beta1~784^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=dd5e7c23a2ca4dc84f2c945b5dd8ea5c55087374;p=kivitendo-erp.git Suchmaske für Verkaufsberichte an das "Kivitendo"-Design angepasst. --- diff --git a/templates/webpages/vk/search_invoice.html b/templates/webpages/vk/search_invoice.html index 95a4b6141..ef9f46dd2 100644 --- a/templates/webpages/vk/search_invoice.html +++ b/templates/webpages/vk/search_invoice.html @@ -1,304 +1,340 @@ [%- USE T8 %] [%- USE L %] -
- - - - - -
[% title %]
- - - + + + + + + + + + -
- - - - - - - - - - - -
[% 'Configuration' | $T8 %] - - - - - - - - - - - - - - - - - - - - - - - -
[% 'Main sorting' | $T8 %] - - [% 'Heading' | $T8 %] [% 'Subtotal' | $T8 %]
[% 'Secondary sorting' | $T8 %] - - [% 'Heading' | $T8 %] [% 'Subtotal' | $T8 %]
[% 'Item mode' | $T8 %] ([%'Show items from invoices individually' | $T8 %])
- [% 'Total sum' | $T8 %] - [% 'Decimalplaces' | $T8 %]:
-
[% 'Filter' | $T8 %] - - - - - - + + + + +
[% title %]
+ + +

[% 'Filter' | $T8 %]:
+ - + + + - - - - - - + + + - - - + - + + + + + + + + + + - - - - - - - - - - + + + - - - - - - + + + + + + - + + + + + - - - - - - - + + + - - + + + + + + - + + - [% CUSTOM_VARIABLES_FILTER_CODE_CT %] + [% CUSTOM_VARIABLES_FILTER_CODE_CT %] + + - + + - [% CUSTOM_VARIABLES_FILTER_CODE_IC %] - -
[% 'Customer' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'customer', - default = oldcustomer, - style = 'width: 250px', - DATA = ALL_VC, - id_sub = 'vc_keys', - label_key = 'name', - select = vc_select, - limit = vclimit, - show_empty = 1, - allow_textbox = 1, - -%] + + [%- INCLUDE 'generic/multibox.html' + name = 'customer', + default = oldcustomer, + style = 'width: 250px', + DATA = ALL_VC, + id_sub = 'vc_keys', + label_key = 'name', + select = vc_select, + limit = vclimit, + show_empty = 1, + allow_textbox = 1, + -%] + [% 'Customer Number' | $T8 %] +
[% 'Customer Number' | $T8 %]
[% 'Department' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'department', - style = 'width: 250px', - DATA = ALL_DEPARTMENTS, - id_key = 'id', - label_key = 'description', - show_empty = 1, - allow_textbox = 0, - -%] + + [%- INCLUDE 'generic/multibox.html' + name = 'department', + style = 'width: 250px', + DATA = ALL_DEPARTMENTS, + id_key = 'id', + label_key = 'description', + show_empty = 1, + allow_textbox = 0, + -%]
[% 'Project Number' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'project_id', - style = "width: 250px", - DATA = ALL_PROJECTS, - id_key = 'id', - label_key = 'projectnumber', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] + + [%- INCLUDE 'generic/multibox.html' + name = 'project_id', + style = "width: 250px", + DATA = ALL_PROJECTS, + id_key = 'id', + label_key = 'projectnumber', + limit = vclimit, + show_empty = 1, + allow_textbox = 0, + -%] +
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %] +
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %]
[% 'Group' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'partsgroup_id', - style = 'width: 250px', - DATA = ALL_PARTSGROUPS, - id_key = 'id', - label_key = 'partsgroup', - show_empty = 1, - allow_textbox = 0, - -%] + [%- INCLUDE 'generic/multibox.html' + name = 'partsgroup_id', + style = 'width: 250px', + DATA = ALL_PARTSGROUPS, + id_key = 'id', + label_key = 'partsgroup', + show_empty = 1, + allow_textbox = 0, + -%]
[% 'Country' | $T8 %]
[% 'Country' | $T8 %]
[% 'Employee' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'employee_id', - style = 'width: 250px', - DATA = ALL_EMPLOYEES, - id_key = 'id', - label_sub = 'employee_labels', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - default = ' ', - -%] + [%- INCLUDE 'generic/multibox.html' + name = 'employee_id', + style = 'width: 250px', + DATA = ALL_EMPLOYEES, + id_key = 'id', + label_sub = 'employee_labels', + limit = vclimit, + show_empty = 1, + allow_textbox = 0, + default = ' ', + -%]
[% 'Salesman' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'salesman_id', + style = 'width: 250px', + DATA = ALL_SALESMEN, + id_key = 'id', + label_sub = 'salesman_labels', + limit = vclimit, + show_empty = 1, + allow_textbox = 0, + -%] +
[% 'Salesman' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'salesman_id', - style = 'width: 250px', - DATA = ALL_SALESMEN, - id_key = 'id', - label_sub = 'salesman_labels', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] -
[% 'Customer type' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'business_id', - style = "width: 250px", - DATA = ALL_BUSINESS_TYPES, - id_key = 'id', - label_key = 'description', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] + + [%- INCLUDE 'generic/multibox.html' + name = 'business_id', + style = "width: 250px", + DATA = ALL_BUSINESS_TYPES, + id_key = 'id', + label_key = 'description', + limit = vclimit, + show_empty = 1, + allow_textbox = 0, + -%]
[% 'Invoice Date' | $T8 %] [% 'From' | $T8 %] [% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] - [% L.date_tag('transdateto') %] - [% 'Bis' | $T8 %] + [% L.date_tag('transdateto') %] +

[% 'Filter for customer variables' | $T8 %]:
+ [% 'Filter for customer variables' | $T8 %] +

[% 'Filter for item variables' | $T8 %]:
+ [% 'Filter for item variables' | $T8 %] +
- -
[% 'Include in Report' | $T8 %] - - + [% CUSTOM_VARIABLES_FILTER_CODE_IC %] + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - [% CUSTOM_VARIABLES_INCLUSION_CODE_CT %] - - + + + + - [% CUSTOM_VARIABLES_INCLUSION_CODE_IC %] -
- [% 'Cumulated or averaged values' | $T8 %] ([% 'invoice mode or item mode' | $T8 %]): -
+
+
[% 'Include in Report' | $T8 %] + - - - - + + + + + + + - - - - + + + + + - - - - + + + + + - + - - + - - - - + + - - - - + + - - - - + + + + + + + + + - + + + + + + + + + + + + [% CUSTOM_VARIABLES_INCLUSION_CODE_CT %] + + + + + [% CUSTOM_VARIABLES_INCLUSION_CODE_IC %] + +
[% 'Sales price total' | $T8 %][% 'Purchase price total' | $T8 %][% 'Margetotal' | $T8 %] ([% 'Single values in item mode, cumulated values in invoice mode' | $T8 %]) + + [% 'Cumulated or averaged values' | $T8 %] ([% 'invoice mode or item mode' | $T8 %]): +
[% 'Sales price total' | $T8 %][% 'Purchase price total' | $T8 %][% 'Margetotal' | $T8 %] ([% 'Single values in item mode, cumulated values in invoice mode' | $T8 %])
[% 'Sales price' | $T8 %][% 'Purchase price' | $T8 %][% 'Margepercent' | $T8 %]([% 'averaged values, in invoice mode only useful when filtered by a part' | $T8 %])[% 'Sales price' | $T8 %][% 'Purchase price' | $T8 %][% 'Margepercent' | $T8 %]([% 'averaged values, in invoice mode only useful when filtered by a part' | $T8 %])
[% 'Quantity' | $T8 %][% 'Discount' | $T8 %]([% 'averaged values, in invoice mode only useful when filtered by a part' | $T8 %])[% 'Quantity' | $T8 %][% 'Discount' | $T8 %]([% 'averaged values, in invoice mode only useful when filtered by a part' | $T8 %])
[% 'Weight' | $T8 %][% 'Weight' | $T8 %]
 
- [% 'Item values' | $T8 %] ([% 'Only shown in item mode' | $T8 %]) -
[% 'Description' | $T8 %][% 'Part Number' | $T8 %][% 'Invnumber' | $T8 %][% 'Invdate' | $T8 %] 
[% 'Base unit' | $T8 %][% 'Group' | $T8 %][% 'Salesperson' | $T8 %][% 'Employee' | $T8 %] + [% 'Item values' | $T8 %] ([% 'Only shown in item mode' | $T8 %]) +
[% 'Customer Number' | $T8 %][% 'Customer Name' | $T8 %][% 'Country' | $T8 %][% 'Customer type' | $T8 %][% 'Description' | $T8 %][% 'Part Number' | $T8 %][% 'Invnumber' | $T8 %][% 'Invdate' | $T8 %]
[% 'Base unit' | $T8 %][% 'Group' | $T8 %][% 'Salesperson' | $T8 %][% 'Employee' | $T8 %]
 
[% 'Customer Number' | $T8 %][% 'Customer Name' | $T8 %][% 'Country' | $T8 %][% 'Customer type' | $T8 %]
+ [% 'Customer variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %]) +
+ [% 'Item variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %]) +
+
+
+
- [% 'Customer variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %]) - [% 'Main sorting' | $T8 %] + + [% 'Heading' | $T8 %] [% 'Subtotal' | $T8 %]
 
- [% 'Item variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %]) - [% 'Secondary sorting' | $T8 %] + + [% 'Heading' | $T8 %] [% 'Subtotal' | $T8 %]
-
-
[% 'Item mode' | $T8 %] ([%'Show items from invoices individually' | $T8 %])
[% 'Total sum' | $T8 %][% 'Decimalplaces' | $T8 %]:
- -
- - - +
+ +
+ + + +

+ + + +