From: Jan Büren Date: Wed, 11 Mar 2015 14:57:19 +0000 (+0100) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.2.1~29 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/9ad7c056342885c959c0bbe966531ee40934d2df?hp=090b94e9c005d1f442f4e9a648c0fe5c2ce08f10 Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- diff --git a/letter.pl b/letter.pl new file mode 120000 index 000000000..385000d1b --- /dev/null +++ b/letter.pl @@ -0,0 +1 @@ +am.pl \ No newline at end of file diff --git a/templates/webpages/letter/edit.html b/templates/webpages/letter/edit.html new file mode 100644 index 000000000..fa6a8a0a8 --- /dev/null +++ b/templates/webpages/letter/edit.html @@ -0,0 +1,200 @@ +[%- USE HTML %] +[%- USE T8 %] +[%- USE L %] + + +
[% title %]
+ +
+ + + + + + + + +

+ + [%- IF SAVED_MESSAGE %] + + + + + [%- END %] + + + + + + + + + + + + + + + + +
[% SAVED_MESSAGE %]
+ + + + + + + + + + + + + +
[% 'Customer' | $T8 %]: + [%- INCLUDE 'generic/multibox.html' + name = 'letter.customer', + style = 'width:60%', + DATA = ALL_CUSTOMERS, + id_sub = 'vc_keys', + label_key = 'name', + select = vc_select, + limit = myconfig_vclimit, + allow_textbox = 1, + force_textbox = limit_exceeded_all_customer + onChange = "document.getElementById('update_button').click();" -%] +[%- IF letter.customer_id %] + +[%- END %] + + +[%- UNLESS myconfig_vclimit < ALL_CUSTOMERS.size %] + +[%- END %] +
[% 'Contact Person' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'letter.cp_id', + style = 'width:100%', + DATA = ALL_CONTACTS, + id_key = 'cp_id', + label_sub = 'ct_labels', + show_empty = 1 -%] +
[% 'Your Reference' | $T8 %]:
+ + 		+ + + + + + + + + + + +
[% 'Letternumber' | $T8 %]:
[% 'Date' | $T8 %]:[% L.date_tag('letter.date', date, readonly=readonly) %]
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
[% 'Subject' | $T8 %]
[% 'Greeting' | $T8 %]
[% 'Body' | $T8 %]
[% 'Internal Notes' | $T8 %]
+ + + + + + +
+ + + + + + + + +
[% 'Employee' | $T8 %]
+ [%- INCLUDE 'generic/multibox.html' + name = 'letter.employee_id', + default = letter.employee_id, + style = 'width:70%;font-weight:bold', + DATA = ALL_EMPLOYEES, + id_key = 'id', + label_key = 'name', + limit = vclimit, + show_empty = 1, + allow_textbox = 0, + force_textbox = limit_exceeded_ALL_EMPLOYEES + onChange = "document.getElementById('update_button').click();" -%] +
+ 		+ + + + + + + +
[% 'Salesman' | $T8 %]
+ [%- INCLUDE 'generic/multibox.html' + name = 'letter.salesman_id', + default = letter.salesman_id, + style = 'width:70%;font-weight:bold', + DATA = ALL_SALESMEN, + id_key = 'id', + label_key = 'name', + limit = vclimit, + show_empty = 1, + allow_textbox = 0, + force_textbox = limit_exceeded_ALL_SALESMAN + onChange = "document.getElementById('update_button').click();" -%] +
+ 		+
+
+ +
+ [% print_options %] +
+

+ + + + + + + + +
+ + + + + diff --git a/templates/webpages/letter/load_drafts.html b/templates/webpages/letter/load_drafts.html new file mode 100644 index 000000000..78c04cd80 --- /dev/null +++ b/templates/webpages/letter/load_drafts.html @@ -0,0 +1,41 @@ +[%- USE T8 %] +[%- USE HTML %] +

[% 'Load letter draft' | $T8 %]

+ +
+ + + + + + + + + + + + + + +
+ [% 'The following drafts have been saved and can be loaded.' | $T8 %] +
+ + + + + + + + + [% FOREACH row = LETTER_DRAFTS %] + + + + + + + [% END %] +
 [% 'Date' | $T8 %][% 'Subject' | $T8 %][% 'Customer' | $T8 %]
[% HTML.escape(row.date) %][% HTML.escape(row.subject) %][% HTML.escape(row.customer) %]
+
+
diff --git a/templates/webpages/letter/report_bottom.html b/templates/webpages/letter/report_bottom.html new file mode 100644 index 000000000..da543dfd7 --- /dev/null +++ b/templates/webpages/letter/report_bottom.html @@ -0,0 +1,7 @@ +[% USE HTML%] +[%- USE T8 %] + + [%- FOREACH item = HIDDEN %] + + [%- END %] + diff --git a/templates/webpages/letter/report_top.html b/templates/webpages/letter/report_top.html new file mode 100644 index 000000000..548c4ed04 --- /dev/null +++ b/templates/webpages/letter/report_top.html @@ -0,0 +1,10 @@ +[%- IF OPTIONS.size %] +

+ [%- FOREACH option = OPTIONS %] + [%- option %][% UNLESS loop.last %]
[% END %] + [%- END %] +

+[%- END %] + +
+ diff --git a/templates/webpages/letter/search.html b/templates/webpages/letter/search.html new file mode 100644 index 000000000..e8ce72f11 --- /dev/null +++ b/templates/webpages/letter/search.html @@ -0,0 +1,92 @@ +[% USE HTML %] +[% USE T8 %] + + + + +
[% title %]
+ + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% 'Letternumber' | $T8 %] +
[% 'Customer' | $T8 %] + [%- INCLUDE 'generic/multibox.html' + name = 'customer', + style = 'width:250px', + DATA = ALL_CUSTOMERS, + id_key = 'id', + label_key = 'name', + select = vc_select, + limit = myconfig_vclimit, + allow_textbox = 1, + show_empty = 1, + force_textbox = limit_exceeded_all_customer + onChange = "document.getElementById('update_button').click();" -%] +[%- IF myconfig_vclimit > ALL_CUSTOMERS.size %] + +[%- END %] +
[% 'Contact' | $T8 %]
[% 'Subject' | $T8 %]
[% 'Body' | $T8 %]
[% 'From' | $T8 %] + + + [% 'To (time)' | $T8 %] + + +
+

+ +

+ +

+
+ + +