X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/517ed14d9733e94411274bd2b9fb59cef9e632ff..4e8e33e9c0a98f10551a4ae18597dc724e621a13:/SL/IR.pm diff --git a/SL/IR.pm b/SL/IR.pm index 402454d17..1ed136c6d 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -1071,7 +1071,7 @@ sub retrieve_invoice { # get tax rates and description my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno}; $query = - qq|SELECT c.accno, t.taxdescription, t.rate, + qq|SELECT c.accno, t.taxdescription, t.rate, t.id as tax_id, c.accno as taxnumber -- taxnumber is same as accno, but still accessed as taxnumber in code FROM tax t LEFT JOIN chart c ON (c.id = t.chart_id) @@ -1098,6 +1098,7 @@ sub retrieve_invoice { $form->{"$ptr->{accno}_rate"} = $ptr->{rate}; $form->{"$ptr->{accno}_description"} = $ptr->{taxdescription}; $form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber}; + $form->{"$ptr->{accno}_tax_id"} = $ptr->{tax_id}; $form->{taxaccounts} .= "$ptr->{accno} "; } @@ -1341,7 +1342,7 @@ sub retrieve_item { # get tax rates and description my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno}; $query = - qq|SELECT c.accno, t.taxdescription, t.rate, c.accno as taxnumber + qq|SELECT c.accno, t.taxdescription, t.rate, c.accno as taxnumber, t.id as tax_id FROM tax t LEFT JOIN chart c on (c.id = t.chart_id) WHERE t.id IN @@ -1372,6 +1373,7 @@ sub retrieve_item { $form->{"$ptr->{accno}_rate"} = $ptr->{rate}; $form->{"$ptr->{accno}_description"} = $ptr->{taxdescription}; $form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber}; + $form->{"$ptr->{accno}_tax_id"} = $ptr->{tax_id}; $form->{taxaccounts} .= "$ptr->{accno} "; }