From: Moritz Bunkus Date: Tue, 2 Sep 2014 07:35:59 +0000 (+0200) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.2.0beta~325 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/22cf5fb67293f9bde99b9f0a48f982e3d396d3bd?hp=25fb47b11a819cd96d3d170de4c0e2539da554b5 Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm index 0246768d8..c94f1bac3 100644 --- a/SL/Controller/CsvImport/Base.pm +++ b/SL/Controller/CsvImport/Base.pm @@ -2,6 +2,7 @@ package SL::Controller::CsvImport::Base; use strict; +use English qw(-no_match_vars); use List::MoreUtils qw(pairwise any); use SL::Helper::Csv; @@ -461,9 +462,9 @@ sub save_objects { my $ret; if (!eval { $ret = $object->save(cascade => !!$self->save_with_cascade()); 1 }) { - push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $@); + push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $EVAL_ERROR); } elsif ( !$ret ) { - push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $entry->{object}->db->error); + push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $object->db->error); } else { $self->_save_history($object); $self->controller->num_imported($self->controller->num_imported + 1); diff --git a/SL/IC.pm b/SL/IC.pm index 810e226fa..f6ceaceb1 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -243,7 +243,7 @@ sub save { map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) } qw(rop weight listprice sellprice gv lastcost); - my $makemodel = (($form->{make_1}) || ($form->{model_1})) ? 1 : 0; + my $makemodel = ($form->{make_1} || $form->{model_1} || ($form->{makemodel_rows} > 1)) ? 1 : 0; $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0; @@ -1552,9 +1552,9 @@ sub retrieve_accounts { LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id LEFT JOIN chart c2 ON tc.income_accno_id = c2.id LEFT JOIN chart c3 ON tc.expense_accno_id = c3.id - WHERE - tc.taxzone_id = '$form->{taxzone_id}' - and + WHERE + tc.taxzone_id = '$form->{taxzone_id}' + and p.id IN ($in) SQL diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index f3f194528..4a5a4cd0d 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -1879,9 +1879,11 @@ sub _render_custom_variables_inputs { } } + my $hide_non_editable = 1; + my $show = 0; my $description = ''; - if (($cvar->{flag_editable} && $cvar->{valid}) && !$partsgroup_filtered) { + if (( ($cvar->{flag_editable} || !$hide_non_editable) && $cvar->{valid}) && !$partsgroup_filtered) { $num_visible_cvars++; $description = $cvar->{description} . ' '; $show = 1; @@ -1894,7 +1896,7 @@ sub _render_custom_variables_inputs { description => $description, cvar => 1, render_options => { - hide_non_editable => 1, + hide_non_editable => $hide_non_editable, var => $cvar, name_prefix => 'ic_', name_postfix => "_$params{row}", diff --git a/locale/de/special_chars b/locale/de/special_chars index c349536e8..3095e9112 100644 --- a/locale/de/special_chars +++ b/locale/de/special_chars @@ -22,7 +22,7 @@ order=< > \n \n=
[Template/LaTeX] -order=\\ & \n \r " $ % _ # ^ { } < > £ ± ² ³ ° § ® © \xad \xa0 ➔ → ← +order=\\ & \n \r " $ % _ # ^ { } < > £ ± ² ³ ° § ® © \xad \xa0 ➔ → ← | \\=\\textbackslash\s = "='' @@ -52,6 +52,7 @@ _=\\_ →=$\\rightarrow$ ←=$\\leftarrow$ \xa0=~ +|=\\textbar [Template/OpenDocument] order=& < > " ' \x80 \n \r diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html index f0fecb6f3..f8db6ba82 100644 --- a/templates/webpages/oe/sales_order.html +++ b/templates/webpages/oe/sales_order.html @@ -36,16 +36,20 @@ + + [%# render all row2 entries except cvars %] [%- FOREACH row2 = row.ROW2 %] [%- IF !row2.cvar %] [% row2.value %] [%- END %] [%- END %] + [%# process editable cvars %] [%- FOREACH row2 = row.ROW2 %] - [%- IF row2.cvar && row2.render_options.valid && !row2.render_options.partsgroup_filtered %] + [%- SET show = ((row2.render_options.var.flag_editable || !row2.render_options.hide_non_editable ) && row2.render_options.valid && !row2.render_options.partsgroup_filtered) %] + [%- IF row2.cvar && show %] [%- IF row2.line_break %] [%- END %] @@ -60,6 +64,14 @@
+ [%# process non editable cvars extra to not disturb the table layout (this will be hidden inputs) %] + [%- FOREACH row2 = row.ROW2 %] + [%- SET hide = (!row2.render_options.var.flag_editable && row2.render_options.hide_non_editable) %] + [%- IF row2.cvar && hide %] + [% PROCESS cvar_inputs cvar = row2.render_options %] + [%- END %] + [%- END %] + [%- END %] diff --git a/templates/webpages/ustva/ustva.html b/templates/webpages/ustva/ustva.html index 17e87be78..27a4331fe 100644 --- a/templates/webpages/ustva/ustva.html +++ b/templates/webpages/ustva/ustva.html @@ -265,7 +265,7 @@ Vorsteuerabzug.
Umsätze nach § 4 Nr. 8 bis 20 UStG [%pos_ustva_53%] - Lieferungen sicherungsbereigneter Gegenstände und + Lieferungen sicherungsübereigneter Gegenstände und Umsätze, die unter das GrEStG fallen. 73 [%pos_ustva_73%] @@ -326,7 +326,7 @@ Vorsteuerabzug.
Umsätze nach § 4 Nr. 8 bis 20 UStG Vorsteuerbeträge, die nach allgemeinen - Durchschnittsästzen berechnet sind + Durchschnittsätzen berechnet sind 63 [%pos_ustva_63%] @@ -369,7 +369,7 @@ Vorsteuerabzug.
Umsätze nach § 4 Nr. 8 bis 20 UStG Anrechnung (Abzug) der festgesetzten Sondervorauszahlung für Dauerfristverlängerung (nur in der letzten Voranmeldung des - Besteuerungszeitraums, ausfüllen) + Besteuerungszeitraums ausfüllen) 39 [%pos_ustva_39%]