use SL::IO;
use SL::MoreCommon;
use SL::DB::Default;
+use SL::TransNumber;
use strict;
$form->{AR_amounts}{receivables} = $form->{ARselected};
$form->{AR}{receivables} = $form->{ARselected};
- # parsing
- for $i (1 .. $form->{rowcount}) {
- $form->{"amount_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"}) * $form->{exchangerate}, 2);
- $form->{amount} += $form->{"amount_$i"};
- $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"});
- }
-
- # this is for ar
- $form->{tax} = 0;
- $form->{netamount} = 0;
- $form->{total_tax} = 0;
-
- # taxincluded doesn't make sense if there is no amount
- $form->{taxincluded} = 0 unless $form->{amount};
-
- for $i (1 .. $form->{rowcount}) {
- ($form->{"tax_id_$i"}) = split /--/, $form->{"taxchart_$i"};
+ $form->{tax} = 0; # is this still needed?
- $query = qq|SELECT c.accno, t.taxkey, t.rate FROM tax t LEFT JOIN chart c ON (c.id = t.chart_id) WHERE t.id = ? ORDER BY c.accno|;
- ($form->{AR_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) = selectrow_query($form, $dbh, $query, $form->{"tax_id_$i"});
-
- if ($form->{taxincluded} *= 1) {
- $tax = $form->{"korrektur_$i"}
- ? $form->{"tax_$i"}
- : $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1)); # should be same as taxrate * amount / (taxrate + 1)
- $form->{"amount_$i"} = $form->round_amount($form->{"amount_$i"} - $tax, 2);
- $form->{"tax_$i"} = $form->round_amount($tax, 2);
- } else {
- $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"} unless $form->{"korrektur_$i"};
- $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
- }
- $form->{netamount} += $form->{"amount_$i"};
- $form->{total_tax} += $form->{"tax_$i"};
- }
+ # main calculation of rowcount loop inside Form method, amount_$i and tax_$i get formatted
+ $form->{taxincluded} = 0 unless $form->{taxincluded};
+ ($form->{netamount},$form->{total_tax},$form->{amount}) = $form->calculate_arap('sell', $form->{taxincluded}, $form->{exchangerate});
# adjust paidaccounts if there is no date in the last row
# this does not apply to stornos, where the paid field is set manually
$form->{datepaid} = $form->{"datepaid_$i"};
}
- $form->{amount} = $form->{netamount} + $form->{total_tax};
}
$form->{paid} = $form->round_amount($form->{paid} * ($form->{exchangerate} || 1), 2);
} else {
$query = qq|SELECT nextval('glid')|;
($form->{id}) = selectrow_query($form, $dbh, $query);
- $query = qq|INSERT INTO ar (id, invnumber, employee_id, currency_id) VALUES (?, 'dummy', ?, (SELECT id FROM currencies WHERE name=?))|;
- do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{currency});
- $form->{invnumber} = $form->update_defaults($myconfig, "invnumber", $dbh) unless $form->{invnumber};
+ $query = qq|INSERT INTO ar (id, invnumber, employee_id, currency_id, taxzone_id) VALUES (?, 'dummy', ?, (SELECT id FROM currencies WHERE name=?), (SELECT taxzone_id FROM customer WHERE id = ?))|;
+ do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{currency}, $form->{customer_id});
+ if (!$form->{invnumber}) {
+ my $trans_number = SL::TransNumber->new(type => 'invoice', dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
+ $form->{invnumber} = $trans_number->create_unique;
+ }
}
}
dbh => $dbh,
from => $transdate,
to => $transdate,
+ trans_id => $form->{id},
);
$datev->export;
my @values;
my $query =
- qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.transdate, | .
+ qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | .
qq| a.duedate, a.netamount, a.amount, a.paid, | .
qq| a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
qq| a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
) AS charts } .
qq|FROM ar a | .
qq|JOIN customer c ON (a.customer_id = c.id) | .
+ qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
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 tax_zones tz ON (tz.id = a.taxzone_id)| .
+ qq|LEFT JOIN payment_terms pt ON (pt.id = a.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";
+
+ unless ( $::auth->assert('show_ar_transactions', 1) ) {
+ $where .= " AND NOT invoice = 'f' "; # remove ar transactions from Sales -> Reports -> Invoices
+ };
+
if ($form->{customernumber}) {
$where .= " AND c.customernumber = ?";
push(@values, $form->{customernumber});
$where .= " AND c.name ILIKE ?";
push(@values, $form->like($form->{customer}));
}
+ if ($form->{"cp_name"}) {
+ $where .= " AND (cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
+ push(@values, ('%' . $form->{"cp_name"} . '%')x2);
+ }
if ($form->{business_id}) {
my $business_id = $form->{business_id};
$where .= " AND c.business_id = ?";
$where .= " AND d.description ILIKE ?";
push(@values, $department);
}
- foreach my $column (qw(invnumber ordnumber notes transaction_description)) {
+ foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description)) {
if ($form->{$column}) {
$where .= " AND a.$column ILIKE ?";
push(@values, $form->like($form->{$column}));
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
my $sortorder = join(', ', map { "$_ $sortdir" } @a);
- if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description))) {
+ if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description))) {
$sortorder = $form->{sort} . " $sortdir";
}
my ($self, $form, $for_post_payments) = @_;
my ($exchangerate, $akey, $j, $k, $index, $taxamount, $totaltax, $taxrate, $diff, $totalwithholding, $withholdingrate,
- $totalamount, $taxincluded, $tax);
+ $totalamount, $tax);
# forex
$form->{forex} = $form->{exchangerate};
}
}
- $form->{taxincluded} = $taxincluded if ($form->{id});
$form->{paidaccounts} = 1 if not defined $form->{paidaccounts};
if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
1;
-
projects / kivitendo-erp.git / blobdiff