X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=a3284ed9265f1541d84fa29733a98324068f4804;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=a4d1000390a4e1c956e88f2b2c5ba6e89e167e3e;hpb=a8c6f09f1c148a46cfda8b773db7109c69ab1649;p=kivitendo-erp.git diff --git a/SL/AR.pm b/SL/AR.pm index a4d100039..a3284ed92 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -171,7 +171,7 @@ sub post_transaction { # insert detail records in acc_trans $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|; - @values = (conv_i($form->{id}), conv_i($form->{AR_amounts}{"amount_$i"}), conv_i($form->{"amount_$i"}), conv_date($form->{transdate}), $project_id, + @values = (conv_i($form->{id}), $form->{AR_amounts}{"amount_$i"}, conv_i($form->{"amount_$i"}), conv_date($form->{transdate}), $project_id, conv_i($form->{"taxkey_$i"})); do_query($form, $dbh, $query, @values); @@ -179,7 +179,7 @@ sub post_transaction { # insert detail records in acc_trans $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|; - @values = (conv_i($form->{id}), conv_i($form->{AR_amounts}{"tax_$i"}), conv_i($form->{"tax_$i"}), conv_date($form->{transdate}), $project_id, + @values = (conv_i($form->{id}), $form->{AR_amounts}{"tax_$i"}, conv_i($form->{"tax_$i"}), conv_date($form->{transdate}), $project_id, conv_i($form->{"taxkey_$i"})); do_query($form, $dbh, $query, @values); } @@ -417,7 +417,7 @@ sub ar_transactions { qq| a.marge_total, a.marge_percent, | . qq| a.transaction_description, | . qq| pr.projectnumber AS globalprojectnumber, | . - qq| c.name, c.customernumber, c.country, c.ustid, | . + qq| c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | . qq| e.name AS employee, | . qq| e2.name AS salesman, | . qq| tz.description AS taxzone, | . @@ -436,6 +436,7 @@ sub ar_transactions { qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| . qq|LEFT JOIN tax_zones tz ON (tz.id = c.taxzone_id)| . qq|LEFT JOIN payment_terms pt ON (pt.id = c.payment_id)| . + qq|LEFT JOIN business b ON (b.id = c.business_id)| . qq|LEFT JOIN department d ON (d.id = a.department_id)|; my $where = "1 = 1";