use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
use SL::DB::Chart;
+use SL::DB::Draft;
use SL::Util qw(trim);
use SL::DB;
$query =
qq|UPDATE gl SET
reference = ?, description = ?, notes = ?,
- transdate = ?, department_id = ?, taxincluded = ?,
+ transdate = ?, deliverydate = ?, tax_point = ?, department_id = ?, taxincluded = ?,
storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?
WHERE id = ?|;
@values = ($form->{reference}, $form->{description}, $form->{notes},
- conv_date($form->{transdate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f',
+ conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f',
$form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
conv_i($form->{id}));
do_query($form, $dbh, $query, @values);
do_query($form, $dbh, qq|UPDATE gl SET storno = 't' WHERE id = ?|, conv_i($form->{storno_id}));
}
+ if ($form->{draft_id}) {
+ SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]);
+ }
+
# safety check datev export
if ($::instance_conf->get_datev_check_on_gl_transaction) {
- my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
- $transdate ||= DateTime->today;
+ # create datev object
my $datev = SL::DATEV->new(
- exporttype => DATEV_ET_BUCHUNGEN,
- format => DATEV_FORMAT_KNE,
dbh => $dbh,
trans_id => $form->{id},
);
- $datev->export;
+ $datev->generate_datev_data;
if ($datev->errors) {
die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
push(@apvalues, $project_id, $project_id);
}
- my ($project_columns, $project_join);
+ my ($project_columns, $project_join);
+ my ($arap_globalproject_columns, $arap_globalproject_join);
+ my ($gl_globalproject_columns);
if ($form->{"l_projectnumbers"}) {
- $project_columns = qq|, ac.project_id, pr.projectnumber|;
- $project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|;
+ $project_columns = qq|, ac.project_id, pr.projectnumber|;
+ $project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|;
+ $arap_globalproject_columns = qq|, a.globalproject_id, globalpr.projectnumber AS globalprojectnumber|;
+ $arap_globalproject_join = qq|LEFT JOIN project globalpr ON (a.globalproject_id = globalpr.id)|;
+ $gl_globalproject_columns = qq|, NULL AS globalproject_id, '' AS globalprojectnumber|;
}
if ($form->{accno}) {
'reference' => [ qw(lower_reference id) ],
'description' => [ qw(lower_description id) ],
'accno' => [ qw(accno transdate id) ],
+ 'department' => [ qw(department transdate id) ],
);
my %lowered_columns = (
'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', },
ac.acc_trans_id, g.id, 'gl' AS type, FALSE AS invoice, g.reference, ac.taxkey, c.link,
g.description, ac.transdate, ac.gldate, ac.source, ac.trans_id,
ac.amount, c.accno, g.notes, t.chart_id,
+ d.description AS department,
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
- $project_columns
+ $project_columns $gl_globalproject_columns
$columns_for_sorting{gl}
FROM gl g
- LEFT JOIN employee e ON (g.employee_id = e.id),
+ LEFT JOIN employee e ON (g.employee_id = e.id)
+ LEFT JOIN department d ON (g.department_id = d.id),
acc_trans ac $project_join, chart c
LEFT JOIN tax t ON (t.chart_id = c.id)
WHERE $glwhere
SELECT ac.acc_trans_id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id,
ac.amount, c.accno, a.notes, t.chart_id,
+ d.description AS department,
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
- $project_columns
+ $project_columns $arap_globalproject_columns
$columns_for_sorting{arap}
FROM ar a
- LEFT JOIN employee e ON (a.employee_id = e.id),
+ LEFT JOIN employee e ON (a.employee_id = e.id)
+ LEFT JOIN department d ON (a.department_id = d.id)
+ $arap_globalproject_join,
acc_trans ac $project_join, customer ct, chart c
LEFT JOIN tax t ON (t.chart_id=c.id)
WHERE $arwhere
SELECT ac.acc_trans_id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id,
ac.amount, c.accno, a.notes, t.chart_id,
+ d.description AS department,
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
- $project_columns
+ $project_columns $arap_globalproject_columns
$columns_for_sorting{arap}
FROM ap a
- LEFT JOIN employee e ON (a.employee_id = e.id),
+ LEFT JOIN employee e ON (a.employee_id = e.id)
+ LEFT JOIN department d ON (a.department_id = d.id)
+ $arap_globalproject_join,
acc_trans ac $project_join, vendor ct, chart c
LEFT JOIN tax t ON (t.chart_id=c.id)
WHERE $apwhere
}
$ref->{"projectnumbers"} = {};
- $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"});
+ $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"});
+ $ref->{"projectnumbers"}->{$ref->{"globalprojectnumber"}} = 1 if ($ref->{"globalprojectnumber"});
$balance = $ref->{amount};
$balance =
(int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
- $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"});
+ $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"});
+ $ref->{"projectnumbers"}->{$ref2->{"globalprojectnumber"}} = 1 if ($ref2->{"globalprojectnumber"});
if ($ref2->{chart_id} > 0) { # all tax accounts, following lines
if ($ref2->{amount} < 0) {
if ($form->{id}) {
$query =
- qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id,
+ qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, g.tax_point,
+ g.storno, g.storno_id,
g.department_id, d.description AS department,
e.name AS employee, g.taxincluded, g.gldate,
g.ob_transaction, g.cb_transaction
}
sub get_active_taxes_for_chart {
- my ($self, $chart_id, $transdate) = @_;
+ my ($self, $chart_id, $transdate, $tax_id) = @_;
my $chart = SL::DB::Chart->new(id => $chart_id)->load;
my $active_taxkey = $chart->get_active_taxkey($transdate);
+
+ my $where = [ chart_categories => { like => '%' . $chart->category . '%' } ];
+
+ if ( defined $tax_id && $tax_id >= 0 ) {
+ $where = [ or => [ chart_categories => { like => '%' . $chart->category . '%' },
+ id => $tax_id
+ ]
+ ];
+ }
+
my $taxes = SL::DB::Manager::Tax->get_all(
- where => [ chart_categories => { like => '%' . $chart->category . '%' }],
+ where => $where,
sort_by => 'taxkey, rate',
);
}
1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::GL - some useful GL functions
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<get_active_taxes_for_chart> $transdate $tax_id
+
+Returns a list of valid taxes for a certain chart.
+
+If the optional param transdate exists one entry in the returning list
+may get the attribute C<is_default> for this specific tax-dependent date.
+The possible entries are filtered by the charttype of the tax, i.e. only taxes
+whose chart_categories match the category of the chart will be shown.
+
+In the case of existing records, e.g. when opening an old ar record, due to
+changes in the configurations the desired tax might not be available in the
+dropdown anymore. If we are loading an old record and know its tax_id (from
+acc_trans), we can pass $tax_id as the third parameter and be sure that the
+original tax always appears in the dropdown.
+
+The functions returns an array which may be used for building dropdowns in ar/ap/gl code.
+
+=back
+
+=head1 TODO
+
+Nothing here yet.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+G. Richardson E<lt>grichardson@kivitec.deE<gt>
+
+=cut
projects / kivitendo-erp.git / blobdiff