From: Niclas Zimmermann Date: Tue, 26 Feb 2013 15:30:04 +0000 (+0100) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~602 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/88bb5aaaa09976ba6310116828121d28afe8ffc8?hp=e7c657561c3070bd5228f084835f7aa0e792d33d Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- diff --git a/SL/BackgroundJob/SelfTest/Transactions.pm b/SL/BackgroundJob/SelfTest/Transactions.pm index 881298d98..a7fe76364 100644 --- a/SL/BackgroundJob/SelfTest/Transactions.pm +++ b/SL/BackgroundJob/SelfTest/Transactions.pm @@ -309,7 +309,7 @@ sub check_stornos_ohne_partner { LEFT JOIN vendor v on (v.id = ap.vendor_id) WHERE storno_id is null AND storno is true AND ap.id not in (SELECT storno_id FROM ap WHERE storno_id is not null AND storno is true); |; - + my $stornos_ohne_partner = selectall_hashref_query($::form, $self->dbh, $query); $self->tester->ok(@$stornos_ohne_partner == 0, 'Es sollte keine Stornos ohne Partner geben'); diff --git a/SL/CT.pm b/SL/CT.pm index dd9d627b8..97f57c72c 100644 --- a/SL/CT.pm +++ b/SL/CT.pm @@ -635,16 +635,16 @@ sub search { "salesman" => "e.name" ); + $form->{sort} ||= "name"; my $sortorder; if ( $join_records ) { # in UNION case order by hash key, e.g. salesman - # the UNION created an implicit select around the result - $sortorder = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name"; + # the UNION created an implicit select around the result + $sortorder = $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name"; } else { # in not UNION case order by hash value, e.g. e.name - $sortorder = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $allowed_sort_columns{$form->{sort}} : "ct.name"; - }; - $form->{sort} = $sortorder; + $sortorder = $allowed_sort_columns{$form->{sort}} ? $allowed_sort_columns{$form->{sort}} : "ct.name"; + } my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; if ($sortorder !~ /(business|id)/ && !$join_records) { @@ -713,7 +713,7 @@ sub search { qq| WHERE cv.id = a.vendor_id)|; } $form->{l_invnumber} = $form->{l_ordnumber} = $form->{l_quonumber} = ""; - }; + } if ($form->{obsolete} eq "Y") { $where .= qq| AND obsolete|; @@ -812,7 +812,7 @@ sub search { } $query .= qq| ORDER BY $sortorder|; - + $form->{CT} = selectall_hashref_query($form, $dbh, $query, @values); $main::lxdebug->leave_sub(); diff --git a/SL/Common.pm b/SL/Common.pm index 726c4c8e2..159609d30 100644 --- a/SL/Common.pm +++ b/SL/Common.pm @@ -441,6 +441,9 @@ sub get_vc_details { $query = qq|SELECT * FROM contacts WHERE (cp_cv_id = ?)|; $form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $vc_id); + # Only show default pricegroup for customer, not vendor, which is why this is outside the main query + ($form->{pricegroup}) = selectrow_query($form, $dbh, qq|SELECT pricegroup FROM pricegroup WHERE id = ?|, $form->{klass}); + $dbh->disconnect(); $main::lxdebug->leave_sub(); diff --git a/SL/DATEV.pm b/SL/DATEV.pm index 875588859..b748d30d2 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -465,11 +465,11 @@ sub _get_transactions { next; } - # determine at which array position the reference value (called absumsatz) is + # determine at which array position the reference value (called absumsatz) is # and which amount it has for my $j (0 .. (scalar(@{$trans}) - 1)) { - + # Three cases: # 1: gl transaction (Dialogbuchung), invoice is false, no double split booking allowed diff --git a/SL/GL.pm b/SL/GL.pm index fb7b534e5..10d6ee120 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -284,7 +284,7 @@ sub all_transactions { push(@arvalues, '%' . $form->{description} . '%'); push(@apvalues, '%' . $form->{description} . '%'); } - + if ($form->{employee} =~ /--/) { ($form->{employee_id},$form->{employee_name}) = split(/--/,$form->{employee}); #if ($form->{employee_id}) { @@ -370,7 +370,7 @@ sub all_transactions { 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', }, 'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', }, ); - + # sortdir = sort direction (ascending or descending) my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; my $sortkey = $sort_columns{$form->{sort}} ? $form->{sort} : $form->{datesort}; # default used to be transdate diff --git a/SL/VK.pm b/SL/VK.pm index c056aac65..c373a1956 100644 --- a/SL/VK.pm +++ b/SL/VK.pm @@ -52,7 +52,7 @@ sub invoice_transactions { my $query = qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.id,ar.transdate,p.partnumber,pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as description,i.lastcost,i.sellprice,i.fxsellprice,i.marge_total,i.marge_percent,i.unit,b.description as business,e.name as employee,e2.name as salesman, to_char(ar.transdate,'Month') as month, to_char(ar.transdate, 'YYYYMM') as nummonth, p.unit as parts_unit, p.weight | . - qq|FROM invoice i | . + qq|FROM invoice i | . qq|JOIN ar on (i.trans_id = ar.id) | . qq|JOIN parts p on (i.parts_id = p.id) | . qq|LEFT JOIN partsgroup pg on (p.partsgroup_id = pg.id) | . @@ -157,7 +157,7 @@ sub invoice_transactions { push(@values, $form->{"project_id"}, $form->{"project_id"}); } if ($form->{business_id}) { - $where .= qq| AND ct.business_id = ? |; + $where .= qq| AND ct.business_id = ? |; push(@values, $form->{"business_id"}); } @@ -179,7 +179,7 @@ sub invoice_transactions { $where .= qq| AND ($cvar_where_ic)|; push @values, @cvar_values_ic; } - + $query .= " WHERE $where ORDER BY $sortorder "; # LIMIT 5000"; my @result = selectall_hashref_query($form, $dbh, $query, @values); diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index c127b24c9..8a30094fa 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -209,7 +209,7 @@ sub list_names { my @hidden_variables = ( qw( db status obsolete name contact email cp_name addr_street addr_zipcode - addr_city business_id + addr_city addr_country business_id ), "$form->{db}number", map({ "cvar_$_->{name}" } @searchable_custom_variables), map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)), diff --git a/templates/webpages/common/show_vc_details.html b/templates/webpages/common/show_vc_details.html index be6406bce..e0555d33c 100644 --- a/templates/webpages/common/show_vc_details.html +++ b/templates/webpages/common/show_vc_details.html @@ -105,6 +105,13 @@ [% HTML.escape(discount) %]% + [% IF is_customer %] + + [% 'Pricegroup' | $T8 %] + [% HTML.escape(pricegroup) %] + + [% END %] + [% 'Payment Terms' | $T8 %] [% HTML.escape(payment_terms) %]