c.accno, c.description AS chartdescription, c.charttype, c.category AS chartcategory, c.link AS chartlink,
COALESCE(gl.reference, COALESCE(ap.invnumber, ar.invnumber)) AS reference,
COALESCE(ap.invoice, COALESCE(ar.invoice, FALSE)) AS invoice,
c.accno, c.description AS chartdescription, c.charttype, c.category AS chartcategory, c.link AS chartlink,
COALESCE(gl.reference, COALESCE(ap.invnumber, ar.invnumber)) AS reference,
COALESCE(ap.invoice, COALESCE(ar.invoice, FALSE)) AS invoice,
- $entry->{actual_tax} = $form->round_amount(abs($entry->{tax_entry} ? $entry->{tax_entry}->{amount} : 0), 2);
- $entry->{expected_tax} = $form->round_amount(abs($entry->{expected_tax}), 2);
- $entry->{taxkey_error} = ( $entry->{taxkey} && !$entry->{tax_entry})
- || (!$entry->{taxkey} && $entry->{tax_entry})
- || (abs($entry->{expected_tax} - $entry->{actual_tax}) >= 0.02);
- $entry->{tax_entry_oid} = $entry->{tax_entry}->{oid};
+ $entry->{actual_tax} = $form->round_amount(abs($entry->{tax_entry} ? $entry->{tax_entry}->{amount} : 0), 2);
+ $entry->{expected_tax} = $form->round_amount(abs($entry->{expected_tax}), 2);
+ $entry->{taxkey_error} = ( $entry->{taxkey} && !$entry->{tax_entry})
+ || (!$entry->{taxkey} && $entry->{tax_entry})
+ || (abs($entry->{expected_tax} - $entry->{actual_tax}) >= 0.02);
+ $entry->{tax_entry_acc_trans_id} = $entry->{tax_entry}->{acc_trans_id};
delete $entry->{tax_entry};
$entry->{display_amount} = $form->round_amount(abs($entry->{amount}) * $storno_mult, 2);
delete $entry->{tax_entry};
$entry->{display_amount} = $form->round_amount(abs($entry->{amount}) * $storno_mult, 2);
# $solution->{rows}->[$i]->{taxdescription} .= ' ' . $form->format_amount(\%myconfig, $tax_entry->{taxrate} * 100) . ' %';
# push @{ $solution->{changes} }, {
# $solution->{rows}->[$i]->{taxdescription} .= ' ' . $form->format_amount(\%myconfig, $tax_entry->{taxrate} * 100) . ' %';
# push @{ $solution->{changes} }, {
my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
my $query = qq|SELECT 'ap' AS module,
my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
my $query = qq|SELECT 'ap' AS module,
- at.oid, at.trans_id, at.chart_id, at.amount, at.taxkey, at.transdate,
+ at.acc_trans_id, at.trans_id, at.chart_id, at.amount, at.taxkey, at.transdate,
- at.oid, at.trans_id, at.chart_id, at.amount, at.taxkey, at.transdate,
+ at.acc_trans_id, at.trans_id, at.chart_id, at.amount, at.taxkey, at.transdate,
c.link
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id IN (SELECT id FROM ar WHERE NOT invoice))
AND (taxkey IN (8, 9, 18, 19))
c.link
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id IN (SELECT id FROM ar WHERE NOT invoice))
AND (taxkey IN (8, 9, 18, 19))
- push @corrections, ({ 'oid' => $non_tax->{oid},
- 'taxkey' => $taxkey_replacements{$non_tax->{taxkey}},
+ push @corrections, ({ 'acc_trans_id' => $non_tax->{acc_trans_id},
+ 'taxkey' => $taxkey_replacements{$non_tax->{taxkey}},
- 'oid' => $tax->{oid},
- 'taxkey' => $taxkey_replacements{$non_tax->{taxkey}},
- 'chart_id' => $all_taxes{taxkeys}->{ $taxkey_replacements{$non_tax->{taxkey}} }->{taxchart_id},
+ 'acc_trans_id' => $tax->{acc_trans_id},
+ 'taxkey' => $taxkey_replacements{$non_tax->{taxkey}},
+ 'chart_id' => $all_taxes{taxkeys}->{ $taxkey_replacements{$non_tax->{taxkey}} }->{taxchart_id},
my $h_taxkey_chart_id = prepare_query($form, $dbh, $q_taxkey_chart_id);
foreach my $entry (@corrections) {
if ($entry->{chart_id}) {
my $h_taxkey_chart_id = prepare_query($form, $dbh, $q_taxkey_chart_id);
foreach my $entry (@corrections) {
if ($entry->{chart_id}) {
- do_statement($form, $h_taxkey_chart_id, $q_taxkey_chart_id, $entry->{taxkey}, $entry->{chart_id}, $entry->{oid});
+ do_statement($form, $h_taxkey_chart_id, $q_taxkey_chart_id, $entry->{taxkey}, $entry->{chart_id}, $entry->{acc_trans_id});
- do_statement($form, $h_taxkey_only, $q_taxkey_only, $entry->{taxkey}, $entry->{oid});
+ do_statement($form, $h_taxkey_only, $q_taxkey_only, $entry->{taxkey}, $entry->{acc_trans_id});
- foreach my $oid (@corrections) {
- do_statement($form, $sth, $query, $oid);
+ foreach my $acc_trans_id (@corrections) {
+ do_statement($form, $sth, $query, $acc_trans_id);
my $h_transdate = prepare_query($form, $dbh, $q_transdate);
foreach my $fix (@{ $params{fixes} }) {
my $h_transdate = prepare_query($form, $dbh, $q_transdate);
foreach my $fix (@{ $params{fixes} }) {
- do_statement($form, $h_taxkey_only, $q_taxkey_only, conv_i($fix->{taxkey}), conv_i($fix->{oid}));
+ do_statement($form, $h_taxkey_only, $q_taxkey_only, conv_i($fix->{taxkey}), conv_i($fix->{acc_trans_id}));
- do_statement($form, $h_transdate, $q_transdate, conv_i($fix->{tax_entry_oid}));
+ do_statement($form, $h_transdate, $q_transdate, conv_i($fix->{tax_entry_acc_trans_id}));
my ($transdate) = $h_transdate->fetchrow_array();
my %all_taxes = $self->{taxkeys}->get_full_tax_info('transdate' => $transdate);
my ($transdate) = $h_transdate->fetchrow_array();
my %all_taxes = $self->{taxkeys}->get_full_tax_info('transdate' => $transdate);
- do_statement($form, $h_taxkey_chart, $q_taxkey_chart, conv_i($fix->{taxkey}), conv_i($tax_info->{taxchart_id}), conv_i($fix->{tax_entry_oid}));
+ do_statement($form, $h_taxkey_chart, $q_taxkey_chart, conv_i($fix->{taxkey}), conv_i($tax_info->{taxchart_id}), conv_i($fix->{tax_entry_acc_trans_id}));