From: Jan Büren Date: Wed, 18 Jan 2012 15:10:55 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-2.7.0beta1~32^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/6e15c0a98d4f7cb34f6e95b56923ebff659e4825?hp=a179a61b49d7fb7a59efc9fe04eaff160e95026a Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index d8d223ecb..bc3808820 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -17,6 +17,11 @@ sub _tag_id { } } +my %_valueless_attributes = map { $_ => 1 } qw( + checked compact declare defer disabled ismap multiple noresize noshade nowrap + readonly selected +); + sub _H { my $string = shift; return $::locale->quote_special_chars('HTML', $string); @@ -62,9 +67,9 @@ sub attributes { my @result = (); while (my ($name, $value) = each %options) { next unless $name; - next if $name eq 'disabled' && !$value; + next if $_valueless_attributes{$name} && !$value; $value = '' if !defined($value); - push @result, _H($name) . '="' . _H($value) . '"'; + push @result, $_valueless_attributes{$name} ? _H($name) : _H($name) . '="' . _H($value) . '"'; } return @result ? ' ' . join(' ', @result) : ''; @@ -277,7 +282,8 @@ sub date_tag { s/y+/\%Y/gi; } $::myconfig{"dateformat"}; - my $cal_align = delete $params{cal_align} || 'BR'; + my $cal_align = delete $params{cal_align} || 'BR'; + my $onchange = delete $params{onchange}; my $str_value = blessed $value ? $value->to_lxoffice : $value; $self->input_tag($name, $str_value, @@ -285,6 +291,9 @@ sub date_tag { size => 11, title => _H($::myconfig{dateformat}), onBlur => 'check_right_date_format(this)', + ($onchange ? ( + onChange => $onchange, + ) : ()), %params, ) . ((!$params{no_cal}) ? $self->html_tag('img', undef, diff --git a/scripts/find-use.pl b/scripts/find-use.pl index f65143ee6..902422110 100755 --- a/scripts/find-use.pl +++ b/scripts/find-use.pl @@ -5,6 +5,7 @@ use File::Find; use Module::CoreList; use SL::InstallationCheck; use Term::ANSIColor; +use Getopt::Long; my (%uselines, %modules, %supplied, %requires); @@ -37,6 +38,10 @@ my (%uselines, %modules, %supplied, %requires); } ); +GetOptions( + 'files-with-match|l' => \ my $l, +); + find(sub { return unless /(\.p[lm]|console)$/; @@ -118,8 +123,12 @@ while ($changed) { } } -print sprintf "%8s : %s (%s)", color_text($modules{$_}->{status}), $_, join(' ', @{ $modules{$_}->{files} || [] }) - for sort { +do { + print sprintf "%8s : %s", color_text($modules{$_}->{status}), $_; + if ($l) { + print " $_" for @{ $modules{$_}->{files} || [] }; + } +} for sort { $modules{$a}->{status} cmp $modules{$b}->{status} || $a cmp $b } keys %modules; diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html index 4a64d0db4..771cede74 100644 --- a/templates/webpages/is/_payments.html +++ b/templates/webpages/is/_payments.html @@ -33,9 +33,12 @@ [% SET paid = 'paid_' _ i %] [% SET AR_paid = 'AR_paid_' _ i %] [% SET selectAR_paid_ref = 'selectAR_paid_' _ i %] - - - + + + + + + @@ -99,11 +102,15 @@ [% IF $changeable %] + + + + [% END %] [% END # foreach %] @@ -120,12 +127,15 @@ [%- 'Missing amount' | $T8 %] [% LxERP.format_amount(paid_missing, 2) | html %] - + + + + diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html index 6314c21cd..3a86b2ab8 100644 --- a/templates/webpages/is/form_footer.html +++ b/templates/webpages/is/form_footer.html @@ -14,10 +14,10 @@ - + - + [%- INCLUDE 'generic/multibox.html' @@ -46,14 +46,18 @@ - + - + - -
[% 'Ertrag' | $T8 %][% LxERP.format_amount(marge_total, 2, 0) %] + [% LxERP.format_amount(marge_total, 2, 0) %] + +
[% 'Ertrag prozentual' | $T8 %][% LxERP.format_amount(marge_percent, 2, 0) %] % + [% LxERP.format_amount(marge_percent, 2, 0) %] % + +
@@ -163,7 +167,7 @@ [% END %] - + diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html index ca2b5364d..c322a777e 100644 --- a/templates/webpages/is/form_header.html +++ b/templates/webpages/is/form_header.html @@ -21,7 +21,7 @@ -

[% title %]

+

[% title %]

[% saved_message %]

@@ -45,11 +45,11 @@ allow_textbox = 1, onChange = "document.getElementById('update_button').click();" -%] - + [%- IF ALL_CONTACTS.size %] @@ -90,17 +90,19 @@ [%- END %] [% 'Record in' | $T8 %] - - + + + + [% 'Steuersatz' | $T8 %] - [% L.select_tag('taxzone_id', L.options_for_select(ALL_TAXZONES, default=taxzone_id, title='description'), readonly=(id ? 1 : 0), style='width: 250px', onchange="document.getElementById('update_button').click();") %] - + [% L.select_tag('taxzone_id', L.options_for_select(ALL_TAXZONES, default=taxzone_id, title='description'), disabled=(id ? 1 : 0), style='width: 250px', onchange="document.getElementById('update_button').click();") %] [%- IF id %] [%- END %] + [%- IF all_departments %] @@ -116,8 +118,12 @@ [% currencies %] [%- END %] - - + + + + + + [%- IF show_exchangerate %] [% 'Exchangerate' | $T8 %] @@ -172,7 +178,7 @@ [% 'Credit Note Date' | $T8 %] - [% L.date_tag('invdate', invdate, onBlur='check_right_date_format(this)', cal_align='BL', onChange='set_duedate()') %] + [% L.date_tag('invdate', invdate, cal_align='BL', onchange='set_duedate()') %] [%- ELSE %] @@ -181,11 +187,11 @@ [% 'Invoice Date' | $T8 %] - [% L.date_tag('invdate', invdate, onBlur='check_right_date_format(this)', cal_align='BL', onChange='set_duedate()') %] + [% L.date_tag('invdate', invdate, cal_align='BL', onchange='set_duedate()') %] [% 'Due Date' | $T8 %] - [% L.date_tag('duedate', duedate, onBlur='check_right_date_format(this)', cal_align='BL') %] + [% L.date_tag('duedate', duedate, cal_align='BL') %] [% 'Delivery Order Number' | $T8 %] @@ -193,7 +199,7 @@ [% 'Delivery Date' | $T8 %] - [% L.date_tag('deliverydate', deliverydate, onBlur='check_right_date_format(this)', cal_align='BL') %] + [% L.date_tag('deliverydate', deliverydate, cal_align='BL') %] [%- END %] @@ -203,7 +209,7 @@ [% 'Order Date' | $T8 %] - [% L.date_tag('orddate', orddate, onBlur='check_right_date_format(this)', cal_align='BL') %] + [% L.date_tag('orddate', orddate, cal_align='BL') %] [% 'Quotation Number' | $T8 %] @@ -211,7 +217,7 @@ [% 'Quotation Date' | $T8 %] - [% L.date_tag('quodate', quodate, onBlur='check_right_date_format(this)', cal_align='BL') %] + [% L.date_tag('quodate', quodate, cal_align='BL') %] [% 'Customer Order Number' | $T8 %] @@ -226,13 +232,13 @@ - - - - + + + + @@ -266,5 +272,4 @@ } //--> - - + diff --git a/templates/webpages/webdav/_list.html b/templates/webpages/webdav/_list.html index 3432fc614..5e86becb9 100644 --- a/templates/webpages/webdav/_list.html +++ b/templates/webpages/webdav/_list.html @@ -6,6 +6,8 @@ + + [% END %]
Dokumente im Webdav-Repository
@@ -18,5 +20,6 @@ [%- END %]
Dateiname
+