package GL;
+use List::Util qw(first);
+
use Data::Dumper;
use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
+use SL::DB::Chart;
use SL::Util qw(trim);
use SL::DB;
# insert acc_trans transactions
for $i (1 .. $form->{rowcount}) {
- # extract accno
- my ($accno) = split(/--/, $form->{"accno_$i"});
($form->{"tax_id_$i"}) = split(/--/, $form->{"taxchart_$i"});
if ($form->{"tax_id_$i"} ne "") {
$query = qq|SELECT taxkey, rate FROM tax WHERE id = ?|;
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
source, memo, project_id, taxkey, ob_transaction, cb_transaction, tax_id, chart_link)
- VALUES (?, (SELECT id FROM chart WHERE accno = ?),
- ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE accno = ?))|;
- @values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}),
- $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}), $accno);
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE id = ?))|;
+ @values = (conv_i($form->{id}), $form->{"accno_id_$i"}, $amount, conv_date($form->{transdate}),
+ $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}), $form->{"accno_id_$i"});
do_query($form, $dbh, $query, @values);
}
$query =
qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo, a.source,
a.transdate, a.cleared, a.project_id, p.projectnumber,
- a.taxkey, t.rate AS taxrate, t.id,
+ a.taxkey, t.rate AS taxrate, t.id, a.chart_id,
(SELECT c1.accno
FROM chart c1, tax t1
WHERE (t1.id = t.id) AND (c1.id = t.chart_id)) AS taxaccno,
}
sub get_chart_balances {
- $main::lxdebug->enter_sub();
-
- my $self = shift;
- my %params = @_;
-
- Common::check_params(\%params, qw(charts));
+ my ($self, @chart_ids) = @_;
- my $myconfig = \%main::myconfig;
- my $form = $main::form;
-
- my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
-
- my @ids = map { $_->{id} } @{ $params{charts} };
-
- if (!@ids) {
- $main::lxdebug->leave_sub();
- return;
- }
+ return () unless @chart_ids;
+ my $placeholders = join ', ', ('?') x scalar(@chart_ids);
my $query = qq|SELECT chart_id, SUM(amount) AS sum
FROM acc_trans
- WHERE chart_id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)
+ WHERE chart_id IN (${placeholders})
GROUP BY chart_id|;
- my %balances = selectall_as_map($form, $dbh, $query, 'chart_id', 'sum', @ids);
+ my %balances = selectall_as_map($::form, $::form->get_standard_dbh(\%::myconfig), $query, 'chart_id', 'sum', @chart_ids);
- foreach my $chart (@{ $params{charts} }) {
- $chart->{balance} = $balances{ $chart->{id} } || 0;
- }
-
- $main::lxdebug->leave_sub();
+ return %balances;
}
-sub get_tax_dropdown {
- my ($self, $accno) = @_;
-
- my $myconfig = \%main::myconfig;
- my $form = $main::form;
+sub get_active_taxes_for_chart {
+ my ($self, $chart_id, $transdate) = @_;
- my $dbh = $form->get_standard_dbh($myconfig);
+ my $chart = SL::DB::Chart->new(id => $chart_id)->load;
+ my $active_taxkey = $chart->get_active_taxkey($transdate);
+ my $taxes = SL::DB::Manager::Tax->get_all(
+ where => [ chart_categories => { like => '%' . $chart->category . '%' }],
+ sort_by => 'taxkey, rate',
+ );
- my $query = qq|SELECT category FROM chart WHERE accno = ?|;
- my ($category) = selectrow_query($form, $dbh, $query, $accno);
-
- $query = qq|SELECT * FROM tax WHERE chart_categories like '%$category%' order by taxkey, rate|;
-
- my $sth = prepare_execute_query($form, $dbh, $query);
-
- my @tax_accounts = ();
- while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
- push(@tax_accounts, $ref);
- }
+ my $default_tax = first { $active_taxkey->tax_id == $_->id } @{ $taxes };
+ $default_tax->{is_default} = 1 if $default_tax;
- return @tax_accounts;
+ return @{ $taxes };
}
1;
$form->{"project_id_$j"} = $ref->{project_id};
} else {
- $form->{"accno_$i"} = "$ref->{accno}--$ref->{tax_id}";
+ $form->{"accno_id_$i"} = $ref->{chart_id};
for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
if ($ref->{amount} < 0) {
$form->{totaldebit} -= $ref->{amount};
my %myconfig = %main::myconfig;
my $cgi = $::request->{cgi};
+ my %balances = GL->get_chart_balances(map { $_->{id} } @{ $form->{ALL_CHARTS} });
+
$form->{debit_1} = 0 if !$form->{"debit_1"};
$form->{totaldebit} = 0;
$form->{totalcredit} = 0;
$project_labels{$item->{"id"}} = $item->{"projectnumber"};
}
- my %chart_labels = ();
- my @chart_values = ();
- my %charts = ();
- my $taxchart_init;
- foreach my $item (@{ $form->{ALL_CHARTS} }) {
- if ($item->{charttype} eq 'H'){ # skip headings
- next;
- }
- my $key = $item->{accno} . "--" . $item->{tax_id};
- $taxchart_init = $item->{tax_id} unless (@chart_values);
- push(@chart_values, $key);
- $chart_labels{$key} = $item->{accno} . "--" . $item->{description};
- $charts{$item->{accno}} = $item;
- }
+ my %charts_by_id = map { ($_->{id} => $_) } @{ $::form->{ALL_CHARTS} };
+ my $default_chart = $::form->{ALL_CHARTS}[0];
+ my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
my ($source, $memo, $source_hidden, $memo_hidden);
for my $i (1 .. $form->{rowcount}) {
<input type="hidden" name="memo_$i" value="$form->{"memo_$i"}" size="16">|;
}
- my $selected_accno_full;
- my ($accno_row) = split(/--/, $form->{"accno_$i"});
- my $item = $charts{$accno_row};
- $selected_accno_full = "$item->{accno}--$item->{tax_id}";
-
- my $selected_taxchart = $form->{"taxchart_$i"};
- my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full);
- my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_accno_$i"});
-
my %taxchart_labels = ();
my @taxchart_values = ();
- my %taxcharts = ();
- my $filter_accno;
- $filter_accno = $::form->{ALL_CHARTS}[0]->{accno};
- $filter_accno = $selected_accno if (!$init and $i < $form->{rowcount});
- foreach my $item ( GL->get_tax_dropdown($filter_accno) ) {
- my $key = $item->{id} . "--" . $item->{rate};
- $taxchart_init = $key if ($taxchart_init == $item->{id});
- push(@taxchart_values, $key);
- $taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %';
- $taxcharts{$item->{id}} = $item;
- }
- if ($previous_accno &&
- ($previous_accno eq $selected_accno) &&
- ($previous_tax_id ne $selected_tax_id)) {
- my $item = $taxcharts{$selected_tax_id};
- $selected_taxchart = "$item->{id}--$item->{rate}";
+ my $accno_id = $::form->{"accno_id_$i"};
+ my $chart = $charts_by_id{$accno_id} // $default_chart;
+ $accno_id = $chart->{id};
+ my $chart_has_changed = $::form->{"previous_accno_id_$i"} && ($accno_id != $::form->{"previous_accno_id_$i"});
+ my ($first_taxchart, $default_taxchart, $taxchart_to_use);
+
+ foreach my $item ( GL->get_active_taxes_for_chart($accno_id, $transdate) ) {
+ my $key = $item->id . "--" . $item->rate;
+ $first_taxchart //= $item;
+ $default_taxchart = $item if $item->{is_default};
+ $taxchart_to_use = $item if $key eq $form->{"taxchart_$i"};
+
+ push(@taxchart_values, $key);
+ $taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
}
- $selected_accno = '' if ($init);
- $selected_taxchart ||= $taxchart_init;
+ $taxchart_to_use = $default_taxchart // $first_taxchart if $chart_has_changed || !$taxchart_to_use;
+ my $selected_taxchart = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
my $accno = qq|<td>| .
- NTI($cgi->popup_menu('-name' => "accno_$i",
- '-id' => "accno_$i",
- '-onChange' => "updateTaxes($i);",
- '-style' => 'width:200px',
- '-values' => \@chart_values,
- '-labels' => \%chart_labels,
- '-default' => $selected_accno_full))
- . $cgi->hidden('-name' => "previous_accno_$i",
- '-default' => $selected_accno_full)
+ $::request->presenter->chart_picker("accno_id_$i", $accno_id, style => "width: 300px") .
+ $::request->presenter->hidden_tag("previous_accno_id_$i", $accno_id)
. qq|</td>|;
my $tax_ddbox = qq|<td>| .
NTI($cgi->popup_menu('-name' => "taxchart_$i",
<input type="hidden" name="project_id_$i" value="$form->{"project_id_$i"}">|;
my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : '';
+ my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR');
print qq|<tr valign=top>
$accno
- <td id="chart_balance_$i" align="right"> </td>
+ <td id="chart_balance_$i" align="right">${balance}</td>
$fx_transaction
<td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
<td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>
my ($init) = @_;
+ $::request->layout->add_javascripts("autocomplete_chart.js", "kivi.GL.js");
+
my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
$::form->get_lists("projects" => { "key" => "ALL_PROJECTS",
$::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
- GL->get_chart_balances('charts' => $::form->{ALL_CHARTS});
-
my $title = $::form->{title};
$::form->{title} = $::locale->text("$title General Ledger Transaction");
# $locale->text('Add General Ledger Transaction')
$::request->{layout}->focus("#reference");
$::form->{taxincluded} = "1";
} else {
- $::request->{layout}->focus("#accno_$::form->{rowcount}");
+ $::request->{layout}->focus("#accno_id_$::form->{rowcount}_name");
}
$::form->{previous_id} ||= "--";
}
sub get_tax_dropdown {
- $main::lxdebug->enter_sub();
+ my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
+ my @tax_accounts = GL->get_active_taxes_for_chart($::form->{accno_id}, $transdate);
+ my $html = $::form->parse_html_template("gl/update_tax_accounts", { TAX_ACCOUNTS => \@tax_accounts });
- my $form = $main::form;
- my @tax_accounts = GL->get_tax_dropdown($form->{accno});
-
- foreach my $item (@tax_accounts) {
- $item->{taxdescription} = $::locale->{iconv_utf8}->convert($item->{taxdescription});
- $item->{taxdescription} .= ' ' . $form->round_amount($item->{rate} * 100);
- }
-
- $form->{TAX_ACCOUNTS} = [ @tax_accounts ];
-
- print $form->ajax_response_header, $form->parse_html_template("gl/update_tax_accounts");
+ print $::form->ajax_response_header, $html;
+}
- $main::lxdebug->leave_sub();
+sub get_chart_balance {
+ my %balances = GL->get_chart_balances($::form->{accno_id});
+ my $balance = $::form->format_amount(\%::myconfig, $balances{ $::form->{accno_id} }, 2, 'DRCR');
+ print $::form->ajax_response_header, $balance;
}
1;
--- /dev/null
+namespace('kivi.GL', function(ns) {
+ "use strict";
+
+ this.show_chart_balance = function(obj) {
+ var row = $(obj).attr('name').replace(/.*_/, '');
+
+ $.ajax({
+ url: 'gl.pl?action=get_chart_balance',
+ data: { accno_id: $(obj).val() },
+ dataType: 'html',
+ success: function (new_html) {
+ $('#chart_balance_' + row).html(new_html);
+ }
+ });
+ };
+
+ this.update_taxes = function(obj) {
+ var row = $(obj).attr('name').replace(/.*_/, '');
+
+ $.ajax({
+ url: 'gl.pl?action=get_tax_dropdown',
+ data: { accno_id: $(obj).val(),
+ transdate: $('#transdate').val() },
+ dataType: 'html',
+ success: function (new_html) {
+ $("#taxchart_" + row).html(new_html);
+ }
+ });
+ };
+});
</form>
+<script type="text/javascript">
+ <!--
+$(document).ready(function() {
+ [%- SET row=0 %]
+ [%- WHILE row < rowcount %]
+ [%- SET row=row + 1 %]
+ $('#accno_id_[% row %]').on('set_item:ChartPicker', function(e, item) {
+ kivi.GL.show_chart_balance(this);
+ kivi.GL.update_taxes(this);
+ });
+ [%- END %]
+});
+-->
+</script>
<script type="text/javascript">
<!--
-function updateTaxes(row)
-{
- var accno = document.getElementById('accno_' + row);
- var taxkey = accno.options[accno.selectedIndex].value;
- var reg = /^(.*?)--(\d*)$/;
- var found = reg.exec(taxkey);
- var account = found[1];
- var default_tax_id = found[2];
-
- $.ajax({
- url: 'gl.pl?action=get_tax_dropdown',
- data: { accno: account,
- selected_tax_id: default_tax_id},
- dataType: 'html',
- success: function (new_html) {
- $("#taxchart_" + row).html(new_html);
- },
- });
-};
-
function copy_debit_to_credit() {
var txt = document.getElementsByName('debit_1')[0].value;
document.getElementsByName('credit_2')[0].value = txt;
[%- END %]
</tr>
-
-[%- PROCESS 'gl/form_header_chart_balances_js.html' %]
+++ /dev/null
-[% USE HTML %]
-[% USE JavaScript %]
-[% USE LxERP %]
-
-<script type="text/javascript">
- <!--
-var chart_balances = new Array();
-
-[% FOREACH chart = ALL_CHARTS %]
-chart_balances[[% loop.count - 1 %]] = '[% JavaScript.escape(LxERP.format_amount(chart.balance, 2, 0, 'DRCR')) %]';
-[%- END %]
-
-function show_chart_balance(obj) {
- var row = $(obj).attr('name').replace(/.*_/, '');
- var idx = $('#accno_' + row).prop('selectedIndex');
- $('#chart_balance_' + row).html(chart_balances[idx]);
-}
-
-$(document).ready(function() {
- [%- SET row=0 %]
- [%- WHILE row < rowcount %]
- [%- SET row=row + 1 %]
- $('#accno_[% row %]').change(function() { show_chart_balance(this); });
- show_chart_balance($('#accno_[% row %]'));
- [%- END %]
-});
--->
-</script>
-[% USE L %]
+[% USE L %][%- USE LxERP -%]
[% FOR row = TAX_ACCOUNTS %]
-<option value='[% row.id %]--[% row.rate %]'[% IF row.id == selected_tax_id%] selected[% END %]>[% row.taxdescription %] %</option>
+<option value='[% row.id %]--[% row.rate %]'[% IF row.is_default %] selected[% END %]>[% row.taxdescription %] [% LxERP.round_amount(row.rate * 100) %] %</option>
[% END %]
projects / kivitendo-erp.git / commitdiff