#
#======================================================================
+use POSIX qw(strftime);
+use List::Util qw(sum first max);
+use List::UtilsBy qw(sort_by);
+
use SL::AR;
+use SL::FU;
use SL::IS;
use SL::PE;
-use Data::Dumper;
+use SL::DB::Default;
+use SL::DB::Invoice;
+use SL::ReportGenerator;
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
-require "bin/mozilla/drafts.pl";
-
-1;
+require "bin/mozilla/reportgenerator.pl";
-# end of main
+use strict;
+#use warnings;
# this is for our long dates
# $locale->text('January')
# $locale->text('Dec')
sub add {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- return $lxdebug->leave_sub() if (load_draft_maybe());
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
# saving the history
if(!exists $form->{addition} && ($form->{id} ne "")) {
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = "ADDED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "ADDED";
+ $form->save_history;
}
- # /saving the history
-
+ # /saving the history
+
$form->{title} = "Add";
- $form->{callback} =
- "$form->{script}?action=add&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
+ $form->{callback} = "ar.pl?action=add" unless $form->{callback};
AR->get_transdate(\%myconfig, $form);
$form->{initial_transdate} = $form->{transdate};
- &create_links;
+ create_links(dont_save => 1);
$form->{transdate} = $form->{initial_transdate};
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub edit {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+
# show history button
$form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
#/show hhistory button
$form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$form->{title} = "Edit";
- &create_links;
+ create_links();
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub display_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
&form_header;
&form_footer;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
+}
+
+sub _retrieve_invoice_object {
+ return undef if !$::form->{id};
+ return $::form->{invoice_obj} if $::form->{invoice_obj} && $::form->{invoice_obj}->id == $::form->{id};
+ return SL::DB::Invoice->new(id => $::form->{id})->load;
}
sub create_links {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my %params = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
$form->create_links("AR", \%myconfig, "customer");
- $duedate = $form->{duedate};
+ $form->{invoice_obj} = _retrieve_invoice_object();
+
+ my %saved;
+ if (!$params{dont_save}) {
+ %saved = map { ($_ => $form->{$_}) } qw(direct_debit id taxincluded);
+ $saved{duedate} = $form->{duedate} if $form->{duedate};
+ $saved{currency} = $form->{currency} if $form->{currency};
+ }
- $taxincluded = $form->{taxincluded};
- my $id = $form->{id};
IS->get_customer(\%myconfig, \%$form);
- $form->{taxincluded} = $taxincluded;
- $form->{id} = $id;
- $form->{duedate} = $duedate if $duedate;
+ $form->{$_} = $saved{$_} for keys %saved;
$form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
$form->{rowcount} = 1;
- # notes
- $form->{notes} = $form->{intnotes} unless $form->{notes};
-
# currencies
- @curr = split(/:/, $form->{currencies});
- chomp $curr[0];
- $form->{defaultcurrency} = $curr[0];
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
+ $form->{selectcurrency} = "";
+ map { $form->{selectcurrency} .= "<option>$_\n" } $form->get_all_currencies(\%myconfig);
# customers
- if (@{ $form->{all_customer} }) {
+ if (@{ $form->{all_customer} || [] }) {
$form->{customer} = "$form->{customer}--$form->{customer_id}";
map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" }
(@{ $form->{all_customer} });
}
# departments
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
$form->{department} = "$form->{department}--$form->{department_id}";
map {
$form->{selectdepartment} .=
"<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
+ } (@{ $form->{all_departments} || [] });
}
$form->{employee} = "$form->{employee}--$form->{employee_id}";
# sales staff
- if (@{ $form->{all_employees} }) {
+ if (@{ $form->{all_employees} || [] }) {
$form->{selectemployee} = "";
map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
- (@{ $form->{all_employees} });
+ (@{ $form->{all_employees} || [] });
}
# build the popup menus
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_header {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $title = $form->{title};
- $form->{title} = $locale->text("$title Accounts Receivables Transaction");
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $::request->{cgi};
- $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
+ $form->{invoice_obj} = _retrieve_invoice_object();
+ my ($title, $readonly, $exchangerate, $rows);
+ my ($notes, $department, $customer, $employee, $amount, $project);
+ my ($ARselected);
+
+
+ $title = $form->{title};
# $locale->text('Add Accounts Receivables Transaction')
# $locale->text('Edit Accounts Receivables Transaction')
+ $form->{title} = $locale->text("$title Accounts Receivables Transaction");
+
$form->{javascript} = qq|<script type="text/javascript">
<!--
function setTaxkey(accno, row) {
# show history button js
$form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
#/show history button js
- $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$readonly = ($form->{id}) ? "readonly" : "";
- $form->{radier} =
- ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+ $form->{radier} = ($::instance_conf->get_ar_changeable == 2)
+ ? ($form->current_date(\%myconfig) eq $form->{gldate})
+ : ($::instance_conf->get_ar_changeable == 1);
$readonly = ($form->{radier}) ? "" : $readonly;
# set option selected
- foreach $item (qw(customer currency department employee)) {
+ foreach my $item (qw(customer currency department employee)) {
$form->{"select$item"} =~ s/ selected//;
- $form->{"select$item"} =~
- s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+ $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
- # format amounts
- $form->{exchangerate} =
- $form->format_amount(\%myconfig, $form->{exchangerate});
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
- $form->{creditlimit} =
- $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
- $form->{creditremaining} =
- $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
+ # format exchangerate
+ $form->{exchangerate} = $form->{exchangerate} ? $form->format_amount(\%myconfig, $form->{exchangerate}) : '';
- $exchangerate = qq|
-<input type=hidden name=forex value=$form->{forex}>
-|;
- if ($form->{currency} ne $form->{defaultcurrency}) {
- if ($form->{forex}) {
- $exchangerate .= qq|
- <th align=right>| . $locale->text('Exchangerate') . qq|</th>
- <td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
-|;
- } else {
- $exchangerate .= qq|
- <th align=right>| . $locale->text('Exchangerate') . qq|</th>
- <td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
-|;
- }
- }
+ $rows = max 2, $form->numtextrows($form->{notes}, 50);
- $taxincluded = qq|
- <tr>
- <td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
- <th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
- </tr>
-|;
+ my @old_project_ids = grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{rowcount};
- if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
- $rows = 2;
- }
- $notes =
- qq|<textarea name=notes rows=$rows cols=50 wrap=soft>$form->{notes}</textarea>|;
-
- $department = qq|
- <tr>
- <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select>
- <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
- </td>
- </tr>
-| if $form->{selectdepartment};
-
- $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
-
- $customer =
- ($form->{selectcustomer})
- ? qq|<select name="customer"
-onchange="document.getElementById('update_button').click();">$form->{
-selectcustomer}</select>|
- : qq|<input name=customer value="$form->{customer}" size=35>|;
-
- $employee = qq|
- <input type=hidden name=employee value="$form->{employee}">
-|;
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids },
+ "charts" => { "key" => "ALL_CHARTS",
+ "transdate" => $form->{transdate} },
+ "taxcharts" => { "key" => "ALL_TAXCHARTS",
+ "module" => "AR" },);
- if ($form->{selectemployee}) {
- $employee = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
- <td colspan=2><select name=employee>$form->{selectemployee}</select></td>
- <input type=hidden name=selectemployee value="$form->{selectemployee}">
- </tr>
-|;
- }
+ $_->{link_split} = { map { $_ => 1 } split/:/, $_->{link} } for @{ $form->{ALL_CHARTS} };
- my @old_project_ids = ();
- map({ push(@old_project_ids, $form->{"project_id_$_"})
- if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
-
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 0,
- "old_id" => \@old_project_ids },
- "charts" => { "key" => "ALL_CHARTS",
- "transdate" => $form->{transdate} },
- "taxcharts" => "ALL_TAXCHARTS");
-
- map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
- @{ $form->{ALL_CHARTS} });
-
- my %project_labels = ();
- my @project_values = ("");
- foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
- push(@project_values, $item->{"id"});
- $project_labels{$item->{"id"}} = $item->{"projectnumber"};
- }
+ my %project_labels = map { $_->{id} => $_->{projectnumber} } @{ $form->{"ALL_PROJECTS"} };
- my (%AR_amount_labels, @AR_amount_values);
- my (%AR_labels, @AR_values);
- my (%AR_paid_labels, @AR_paid_values);
+ my (@AR_amount_values);
+ my (@AR_values);
+ my (@AR_paid_values);
+ my %chart_labels;
my %charts;
my $taxchart_init;
foreach my $item (@{ $form->{ALL_CHARTS} }) {
- if (grep({ $_ eq "AR_amount" } @{ $item->{link_split} })) {
+ if ($item->{link_split}{AR_amount}) {
$taxchart_init = $item->{tax_id} if ($taxchart_init eq "");
my $key = "$item->{accno}--$item->{tax_id}";
push(@AR_amount_values, $key);
- $AR_amount_labels{$key} =
- "$item->{accno}--$item->{description}";
-
- } elsif (grep({ $_ eq "AR" } @{ $item->{link_split} })) {
+ } elsif ($item->{link_split}{AR}) {
push(@AR_values, $item->{accno});
- $AR_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
-
- } elsif (grep({ $_ eq "AR_paid" } @{ $item->{link_split} })) {
+ } elsif ($item->{link_split}{AR_paid}) {
push(@AR_paid_values, $item->{accno});
- $AR_paid_labels{$item->{accno}} =
- "$item->{accno}--$item->{description}";
}
+ # weirdness for AR_amount
+ $chart_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
+ $chart_labels{"$item->{accno}--$item->{tax_id}"} = "$item->{accno}--$item->{description}";
+
$charts{$item->{accno}} = $item;
}
my $key = "$item->{id}--$item->{rate}";
$taxchart_init = $key if ($taxchart_init eq $item->{id});
push(@taxchart_values, $key);
- $taxchart_labels{$key} =
- "$item->{taxdescription} " . ($item->{rate} * 100) . ' %';
+ $taxchart_labels{$key} = "$item->{taxdescription} " . ($item->{rate} * 100) . ' %';
$taxcharts{$item->{id}} = $item;
}
- $form->{fokus} = "arledger.customer";
-
- # use JavaScript Calendar or not
- $form->{jsscript} = 1;
- $jsscript = "";
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>
- <td><input type=button name=transdate id="trigger1" value=|
- . $locale->text('button') . qq|></td>
- |;
- $button2 = qq|
- <td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>
- <td><input type=button name=duedate id="trigger2" value=|
- . $locale->text('button') . qq|></td></td>
- |;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1",
- "duedate", "BL", "trigger2");
- } else {
-
- # without JavaScript Calendar
- $button1 =
- qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>|;
- $button2 =
- qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>|;
- }
+ my $follow_up_vc = $form->{customer};
+ $follow_up_vc =~ s/--.*?//;
+ my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
$form->{javascript} .=
- qq|<script type="text/javascript" src="js/common.js"></script>| .
- qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
-
- $form->header;
- $onload = qq|focus()|;
- $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
- $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
- print qq|
-<body onLoad="$onload">
-
-<form method=post name="arledger" action=$form->{script}>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=sort value=$form->{sort}>
-<input type=hidden name=closedto value=$form->{closedto}>
-<input type=hidden name=locked value=$form->{locked}>
-<input type=hidden name=title value="$title">
-
-| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
-
-<table width=100%>
- <tr class=listtop>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr valign=top>
- <td>
- <table width=100%>
- <tr valign=top>
- <td>
- <table>
- <tr>
- <th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
- <td colspan=3>$customer <input type="button" value="?" onclick="show_vc_details('customer')"></td>
- <input type=hidden name=selectcustomer value="$form->{selectcustomer}">
- <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
- <input type=hidden name=customer_id value="$form->{customer_id}">
- <input type=hidden name=terms value=$form->{terms}>
- </tr>
- <tr>
- <td></td>
- <td colspan=3>
- <table width=100%>
- <tr>
- <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
- <td>$form->{creditlimit}</td>
- <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
- <td class="plus$n">$form->{creditremaining}</td>
- <input type=hidden name=creditlimit value=$form->{creditlimit}>
- <input type=hidden name=creditremaining value=$form->{creditremaining}>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Currency') . qq|</th>
- <td><select name=currency>$form->{selectcurrency}</select></td>
- <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
- <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
- <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
- <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
- $exchangerate
- </tr>
- $department
- $taxincluded
- </table>
- </td>
- <td align=right>
- <table>
- $employee
- <tr>
- <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
- <td><input name=invnumber size=11 value="$form->{invnumber}"></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
- <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
- $button1
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
- $button2
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
-$jsscript
- <input type=hidden name=rowcount value=$form->{rowcount}>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>
- <th class=listheading style="width:15%">|
- . $locale->text('Account') . qq|</th>
- <th class=listheading style="width:10%">|
- . $locale->text('Amount') . qq|</th>
- <th class=listheading style="width:10%">|
- . $locale->text('Tax') . qq|</th>
- <th class=listheading style="width:5%">|
- . $locale->text('Korrektur') . qq|</th>
- <th class=listheading style="width:10%">|
- . $locale->text('Taxkey') . qq|</th>
- <th class=listheading style="width:10%">|
- . $locale->text('Project') . qq|</th>
- </tr>
-|;
-
- $amount = $locale->text('Amount');
- $project = $locale->text('Project');
+ qq|<script type="text/javascript" src="js/show_vc_details.js"></script>| .
+ qq|<script type="text/javascript" src="js/follow_up.js"></script>| .
+ qq|<script type="text/javascript" src="js/kivi.Draft.js"></script>|;
- for $i (1 .. $form->{rowcount}) {
+# $amount = $locale->text('Amount');
+# $project = $locale->text('Project');
- # format amounts
- $form->{"amount_$i"} =
- $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
- $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
+ my @transactions;
+ for my $i (1 .. $form->{rowcount}) {
+ my $transaction = {
+ amount => $form->{"amount_$i"},
+ tax => $form->{"tax_$i"},
+ project_id => ($i==$form->{rowcount}) ? $form->{globalproject_id} : $form->{"project_id_$i"},
+ };
my $selected_accno_full;
my ($accno_row) = split(/--/, $form->{"AR_amount_$i"});
$selected_taxchart = "$item->{id}--$item->{rate}";
}
- $selected_taxchart = $taxchart_init unless ($form->{"taxchart_$i"});
+ if (!$form->{"taxchart_$i"}) {
+ if ($form->{"AR_amount_$i"} =~ m/.--./) {
+ $selected_taxchart = join '--', map { ($_->{id}, $_->{rate}) } first { $_->{id} == $item->{tax_id} } @{ $form->{ALL_TAXCHARTS} };
+ } else {
+ $selected_taxchart = $taxchart_init;
+ }
+ }
- $selectAR_amount =
+ $transaction->{selectAR_amount} =
NTI($cgi->popup_menu('-name' => "AR_amount_$i",
'-id' => "AR_amount_$i",
'-style' => 'width:400px',
'-onChange' => "setTaxkey(this, $i)",
'-values' => \@AR_amount_values,
- '-labels' => \%AR_amount_labels,
+ '-labels' => \%chart_labels,
'-default' => $selected_accno_full))
. $cgi->hidden('-name' => "previous_AR_amount_$i",
'-default' => $selected_accno_full);
- $tax = qq|<td>| .
+ $transaction->{taxchart} =
NTI($cgi->popup_menu('-name' => "taxchart_$i",
'-id' => "taxchart_$i",
'-style' => 'width:200px',
'-values' => \@taxchart_values,
'-labels' => \%taxchart_labels,
- '-default' => $selected_taxchart))
- . qq|</td>|;
-
- $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
-
- my $projectnumber =
- NTI($cgi->popup_menu('-name' => "project_id_$i",
- '-values' => \@project_values,
- '-labels' => \%project_labels,
- '-default' => $form->{"project_id_$i"} ));
-
- print qq|
- <tr>
- <td>$selectAR_amount</td>
- <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
- <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
- <td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td>
- $tax
- <td>$projectnumber</td>
- </tr>
-|;
- $amount = "";
- $project = "";
+ '-default' => $selected_taxchart));
+
+ push @transactions, $transaction;
}
$form->{invtotal_unformatted} = $form->{invtotal};
- $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
$ARselected =
NTI($cgi->popup_menu('-name' => "ARselected", '-id' => "ARselected",
'-style' => 'width:400px',
- '-values' => \@AR_values, '-labels' => \%AR_labels,
+ '-values' => \@AR_values, '-labels' => \%chart_labels,
'-default' => $form->{ARselected}));
- print qq|
- <tr>
- <td colspan=6>
- <hr noshade>
- </td>
- </tr>
- <tr>
- <td>${ARselected}</td>
- <th align=left>$form->{invtotal}</th>
-
- <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
- <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
-
- <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
-
- <td colspan=4></td>
-
-
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr>
- <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
- <td align=left>$notes</td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>
- <th colspan=7 class=listheading>|
- . $locale->text('Incoming Payments') . qq|</th>
- </tr>
-|;
-
- if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AR_paid paid_project_id);
- } else {
- @column_index = qw(datepaid source memo paid exchangerate AR_paid paid_project_id);
- }
-
- $column_data{datepaid} = "<th>" . $locale->text('Date') . "</th>";
- $column_data{paid} = "<th>" . $locale->text('Amount') . "</th>";
- $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
- $column_data{AR_paid} = "<th>" . $locale->text('Account') . "</th>";
- $column_data{source} = "<th>" . $locale->text('Source') . "</th>";
- $column_data{memo} = "<th>" . $locale->text('Memo') . "</th>";
- $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
-
- print "
- <tr>
-";
- map { print "$column_data{$_}\n" } @column_index;
- print "
- </tr>
-";
-
- my @triggers = ();
- my $totalpaid = 0;
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
- for $i (1 .. $form->{paidaccounts}) {
- print "
- <tr>
-";
- $selectAR_paid =
+ my $now = $form->current_date(\%myconfig);
+
+ my @payments;
+ for my $i (1 .. $form->{paidaccounts}) {
+ my $payment = {
+ paid => $form->{"paid_$i"},
+ exchangerate => $form->{"exchangerate_$i"} || '',
+ gldate => $form->{"gldate_$i"},
+ acc_trans_id => $form->{"acc_trans_id_$i"},
+ source => $form->{"source_$i"},
+ memo => $form->{"memo_$i"},
+ AR_paid => $form->{"AR_paid_$i"},
+ forex => $form->{"forex_$i"},
+ datepaid => $form->{"datepaid_$i"},
+ paid_project_id => $form->{"paid_project_id_$i"},
+ gldate => $form->{"gldate_$i"},
+ };
+
+ # default account for current assets (i.e. 1801 - SKR04) if no account is selected
+ $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+
+ $payment->{selectAR_paid} =
NTI($cgi->popup_menu('-name' => "AR_paid_$i",
'-id' => "AR_paid_$i",
'-values' => \@AR_paid_values,
- '-labels' => \%AR_paid_labels,
- '-default' => $form->{"AR_paid_$i"}));
+ '-labels' => \%chart_labels,
+ '-default' => $payment->{AR_paid} || $form->{accno_arap}));
- $totalpaid += $form->{"paid_$i"};
- # format amounts
- if ($form->{"paid_$i"}) {
- $form->{"paid_$i"} =
- $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
- }
- $form->{"exchangerate_$i"} =
- $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-
- $exchangerate = qq| |;
- if ($form->{currency} ne $form->{defaultcurrency}) {
- if ($form->{"forex_$i"}) {
- $exchangerate =
- qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
- } else {
- $exchangerate =
- qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
- }
- }
- $exchangerate .= qq|
-<input type=hidden name="forex_$i" value=$form->{"forex_$i"}>
-|;
+ $payment->{changeable} =
+ SL::DB::Default->get->payments_changeable == 0 ? !$payment->{acc_trans_id} # never
+ : SL::DB::Default->get->payments_changeable == 2 ? $payment->{gldate} eq '' || $payment->{gldate} eq $now
+ : 1;
+
+ #deaktivieren von gebuchten Zahlungen ausserhalb der BĂĽcherkontrolle, vorher prĂĽfen ob heute eingegeben
+ if ($form->date_closed($payment->{"gldate_$i"})) {
+ $payment->{changeable} = 0;
+ }
- $column_data{paid} =
- qq|<td align=center><input name="paid_$i" size=11 value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
- $column_data{AR_paid} =
- qq|<td align=center>${selectAR_paid}</td>|;
- $column_data{exchangerate} = qq|<td align=center>$exchangerate</td>|;
- $column_data{datepaid} =
- qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
- <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
- $column_data{source} =
- qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
- $column_data{memo} =
- qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
-
- $column_data{paid_project_id} =
- qq|<td>|
- . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
- '-values' => \@project_values,
- '-labels' => \%project_labels,
- '-default' => $form->{"paid_project_id_$i"} ))
- . qq|</td>|;
-
- map { print qq|$column_data{$_}\n| } @column_index;
-
- print "
- </tr>
-";
- push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
+ push @payments, $payment;
}
- my $paid_missing = $form->{invtotal_unformatted} - $totalpaid;
+ my @empty = grep { $_->{paid} eq '' } @payments;
+ @payments = (
+ (sort_by { DateTime->from_kivitendo($_->{datepaid}) } grep { $_->{paid} ne '' } @payments),
+ @empty,
+ );
- print qq|
- <tr>
- <td></td>
- <td></td>
- <td align="center">| . $locale->text('Total') . qq|</td>
- <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td align="center">| . $locale->text('Missing amount') . qq|</td>
- <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
- </tr>
-| . $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
- qq|
-<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
-
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-|;
+ $form->{totalpaid} = sum map { $_->{paid} } @payments;
- $lxdebug->leave_sub();
+ $form->header;
+ print $::form->parse_html_template('ar/form_header', {
+ paid_missing => $::form->{invtotal} - $::form->{totalpaid},
+ show_exch => ($::form->{defaultcurrency} && ($::form->{currency} ne $::form->{defaultcurrency})),
+ payments => \@payments,
+ transactions => \@transactions,
+ project_labels => \%project_labels,
+ rows => $rows,
+ ARselected => $ARselected,
+ title_str => $title,
+ follow_up_trans_info => $follow_up_trans_info,
+ today => DateTime->today,
+ });
+
+ $main::lxdebug->leave_sub();
}
sub form_footer {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- print qq|
+ $main::auth->assert('general_ledger');
-<input name=gldate type=hidden value="| . Q($form->{gldate}) . qq|">
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $::request->{cgi};
-<input name=callback type=hidden value="$form->{callback}">
+ if ( $form->{id} ) {
+ my $follow_ups = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1);
+ if ( @{ $follow_ups} ) {
+ $form->{follow_up_length} = scalar(@{$follow_ups});
+ $form->{follow_up_due_length} = sum(map({ $_->{due} * 1 } @{ $follow_ups }));
+ }
+ }
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-|
-. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
-. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
-. qq|
+ my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-<br>
-|;
+ $form->{is_closed} = $transdate <= $closedto;
- if (!$form->{id} && $form->{draft_id}) {
- print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft',
- '-value' => 1, '-checked' => $form->{remove_draft},
- '-label' => '')) .
- qq| <label for="remove_draft">| .
- $locale->text("Remove draft when posting") .
- qq|</label><br>|);
- }
+ # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
+ $form->{show_storno_button} =
+ $form->{id} &&
+ !IS->has_storno(\%myconfig, $form, 'ar') &&
+ !IS->is_storno(\%myconfig, $form, 'ar') &&
+ ($form->{totalpaid} == 0 || $form->{totalpaid} eq "");
- $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ $form->{show_mark_as_paid_button} = $form->{id} && $::instance_conf->get_ar_show_mark_as_paid();
- # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
- print qq|<input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|">|
- if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && !$form->{paid_1});
-
- print qq|<input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">\n|;
- if ($form->{id}) {
- if ($form->{radier}) {
- print qq|
- <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|">
- <input class=submit type=submit name=action value="| . $locale->text('Delete') . qq|"> |;
- }
- if ($transdate > $closedto) {
- print qq|
- <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|"> |;
- }
- print qq|
- <input class=submit type=submit name=action value="| . $locale->text('Post Payment') . qq|"> |;
+ print $::form->parse_html_template('ar/form_footer');
- } else {
- if ($transdate > $closedto) {
- print qq|<input class=submit type=submit name=action value="| . $locale->text('Post') . qq|"> | .
- NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
- }
- }
+ $main::lxdebug->leave_sub();
+}
- if ($form->{menubar}) {
- require "bin/mozilla/menu.pl";
- &menubar;
- }
- # button for saving history
- if($form->{id} ne "") {
- print qq|<input type=button class=submit onclick=set_history_window($form->{id}); name=history id=history value=| . $locale->text('history') . qq|>|;
- }
- # /button for saving history
- print "
-</form>
+sub mark_as_paid {
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
-</body>
-</html>
-";
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- $lxdebug->leave_sub();
+ &mark_as_paid_common(\%myconfig,"ar");
+
+ $main::lxdebug->leave_sub();
}
sub update {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
my $display = shift;
+ my ($totaltax, $exchangerate);
+
$form->{invtotal} = 0;
+ delete @{ $form }{ grep { m/^tax_\d+$/ } keys %{ $form } };
+
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
- @flds = qw(amount AR_amount projectnumber oldprojectnumber project_id);
- $count = 0;
- @a = ();
+ my @flds = qw(amount AR_amount projectnumber oldprojectnumber project_id);
+ my $count = 0;
+ my @a = ();
- for $i (1 .. $form->{rowcount}) {
- $form->{"amount_$i"} =
- $form->parse_amount(\%myconfig, $form->{"amount_$i"});
- $form->{"tax_$i"} = $form->parse_amount(\%myconfig, $form->{"tax_$i"});
+ for my $i (1 .. $form->{rowcount}) {
+ $form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
if ($form->{"amount_$i"}) {
push @a, {};
- $j = $#a;
- if (!$form->{"korrektur_$i"}) {
- ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
- if ($form->{taxincluded}) {
- $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
- } else {
- $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
- }
- } else {
- $form->{"tax_$i"} = 0;
- }
- }
- $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
+ my $j = $#a;
+ my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+
+ my $tmpnetamount;
+ ($tmpnetamount,$form->{"tax_$i"}) = $form->calculate_tax($form->{"amount_$i"},$rate,$form->{taxincluded},2);
$totaltax += $form->{"tax_$i"};
map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
$form->{rowcount} = $count + 1;
map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
- $form->{exchangerate} = $exchangerate
- if (
- $form->{forex} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{transdate}, 'buy'
- )));
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
$form->{invdate} = $form->{transdate};
- $save_AR = $form->{AR};
- &check_name(customer);
- $form->{AR} = $save_AR;
+
+ my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 customer_id notes);
+
+ &check_name("customer");
+
+ $form->{AR} = $saved_variables{AR};
+ if ($saved_variables{AR_amount_1} =~ m/.--./) {
+ map { $form->{$_} = $saved_variables{$_} } qw(AR_amount_1 taxchart_1);
+ } else {
+ delete $form->{taxchart_1};
+ }
$form->{invtotal} =
($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
} qw(paid exchangerate);
- $totalpaid += $form->{"paid_$i"};
+ $form->{totalpaid} += $form->{"paid_$i"};
- $form->{"exchangerate_$i"} = $exchangerate
- if (
- $form->{"forex_$i"} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy'
- )));
+ $form->{"forex_$i"} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+ $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
}
}
$form->{creditremaining} -=
- ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} -
+ ($form->{invtotal} - $form->{totalpaid} + $form->{oldtotalpaid} -
$form->{oldinvtotal});
$form->{oldinvtotal} = $form->{invtotal};
- $form->{oldtotalpaid} = $totalpaid;
+ $form->{oldtotalpaid} = $form->{totalpaid};
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
+#
+# ToDO: fix $closedto and $invdate
+#
sub post_payment {
- $lxdebug->enter_sub();
- for $i (1 .. $form->{paidaccounts}) {
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $form->mtime_ischanged('ar');
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+ my $invdate = $form->datetonum($form->{transdate}, \%myconfig);
+
+ for my $i (1 .. $form->{paidaccounts}) {
+
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
- $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+ my $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($form->{"datepaid_$i"}, \%myconfig));
+
+ #Zusätzlich noch das Buchungsdatum in die Bücherkontrolle einbeziehen
+ # (Dient zur PrĂĽfung ob ZE oder ZA geprĂĽft werden soll)
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid_$i"}) && !$form->date_closed($form->{"gldate_$i"}, \%myconfig));
- if ($form->{currency} ne $form->{defaultcurrency}) {
- $form->{"exchangerate_$i"} = $form->{exchangerate}
- if ($invdate == $datepaid);
- $form->isblank("exchangerate_$i",
- $locale->text('Exchangerate for payment missing!'));
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
+# $form->{"exchangerate_$i"} = $form->{exchangerate} if ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
}
}
}
($form->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
- $form->redirect($locale->text('Payment posted!'))
- if (AR->post_payment(\%myconfig, \%$form));
+ if (AR->post_payment(\%myconfig, \%$form)) {
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{what_done} = 'invoice';
+ $form->{addition} = "PAYMENT POSTED";
+ $form->save_history;
+ $form->redirect($locale->text('Payment posted!'))
+ } else {
$form->error($locale->text('Cannot post payment!'));
+ };
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _post {
+ $main::auth->assert('general_ledger');
- $lxdebug->leave_sub();
+ my $form = $main::form;
+
+ # inline post
+ post(1);
}
sub post {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ my ($inline) = @_;
+
+ $form->mtime_ischanged('ar');
+
+ my ($datepaid);
# check if there is an invoice number, invoice and due date
$form->isblank("transdate", $locale->text('Invoice Date missing!'));
$form->isblank("duedate", $locale->text('Due Date missing!'));
$form->isblank("customer", $locale->text('Customer missing!'));
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
- $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $form->error($locale->text('Cannot post transaction for a closed period!')) if ($transdate <= $closedto);
+ if ($myconfig{mandatory_departments} && !$form->{department}) {
+ $form->{saved_message} = $::locale->text('You have to specify a department.');
+ update();
+ exit;
+ }
+
+ my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $form->error($locale->text('Zero amount posting!'))
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($transdate, \%myconfig));
+
+ $form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
+
+ $form->error($locale->text('Zero amount posting!'))
unless grep $_*1, map $form->parse_amount(\%myconfig, $form->{"amount_$_"}), 1..$form->{rowcount};
$form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
- if ($form->{currency} ne $form->{defaultcurrency});
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency}));
delete($form->{AR});
- for $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{paidaccounts}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($form->{"datepaid_$i"}, \%myconfig));
+
+ #Zusätzlich noch das Buchungsdatum in die Bücherkontrolle einbeziehen
+ # (Dient zur PrĂĽfung ob ZE oder ZA geprĂĽft werden soll)
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid_$i"}) && !$form->date_closed($form->{"gldate_$i"}, \%myconfig));
- if ($form->{currency} ne $form->{defaultcurrency}) {
+ if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
$form->{"exchangerate_$i"} = $form->{exchangerate} if ($transdate == $datepaid);
$form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
}
}
# if oldcustomer ne customer redo form
- ($customer) = split /--/, $form->{customer};
+ my ($customer) = split /--/, $form->{customer};
if ($form->{oldcustomer} ne "$customer--$form->{customer_id}") {
- &update;
- exit;
+ update();
+ $::dispatcher->end_request;
}
$form->{AR}{receivables} = $form->{ARselected};
+ $form->{storno} = 0;
$form->{id} = 0 if $form->{postasnew};
- if (AR->post_transaction(\%myconfig, \%$form)) {
- # saving the history
- if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = "invnumber_$form->{invnumber}";
- $form->{addition} = "POSTED";
- $form->save_history($form->dbconnect(\%myconfig));
- }
- # /saving the history
- remove_draft() if $form->{remove_draft};
- $form->redirect($locale->text('Transaction posted!'));
+ $form->error($locale->text('Cannot post transaction!')) unless AR->post_transaction(\%myconfig, \%$form);
+
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{snumbers} = "invnumber_$form->{invnumber}";
+ $form->{what_done} = "invoice";
+ $form->{addition} = "POSTED";
+ $form->save_history;
}
- $form->error($locale->text('Cannot post transaction!'));
+ # /saving the history
+
+ $form->redirect($locale->text('Transaction posted!')) unless $inline;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post_as_new {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
$form->{postasnew} = 1;
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = "POSTED AS NEW";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{what_done} = "invoice";
+ $form->{addition} = "POSTED AS NEW";
+ $form->save_history;
}
- # /saving the history
+ # /saving the history
&post;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-sub use_as_template {
- $lxdebug->enter_sub();
+sub use_as_new {
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
$form->{paidaccounts} = 1;
$form->{rowcount}--;
$form->{invdate} = $form->current_date(\%myconfig);
&update;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub delete {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->{title} = $locale->text('Confirm!');
delete $form->{header};
print qq|
-<body>
-
<form method=post action=$form->{script}>
|;
- foreach $key (keys %$form) {
+ foreach my $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
}
<input name=action class=submit type=submit value="|
. $locale->text('Yes') . qq|">
</form>
-
-</body>
-</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub yes {
- $lxdebug->enter_sub();
- if (AR->delete_transaction(\%myconfig, \%$form, $spool)) {
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ if (AR->delete_transaction(\%myconfig, \%$form)) {
# saving the history
if(!exists $form->{addition}) {
- $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{what_done} = "invoice";
+ $form->{addition} = "DELETED";
+ $form->save_history;
}
- # /saving the history
+ # /saving the history
$form->redirect($locale->text('Transaction deleted!'));
}
$form->error($locale->text('Cannot delete transaction!'));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub search {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('invoice_edit');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $::request->{cgi};
# setup customer selection
$form->all_vc(\%myconfig, "customer", "AR");
- if (@{ $form->{all_customer} }) {
- map { $customer .= "<option>$_->{name}--$_->{id}\n" }
- @{ $form->{all_customer} };
- $customer = qq|<select name=customer><option>\n$customer</select>|;
- } else {
- $customer = qq|<input name=customer size=35>|;
- }
+ $form->{title} = $locale->text('AR Transactions');
- # departments
- if (@{ $form->{all_departments} }) {
- $form->{selectdepartment} = "<option>\n";
+ # Auch in RechnungsĂĽbersicht nach Kundentyp filtern - jan
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 },
+ "departments" => "ALL_DEPARTMENTS",
+ "customers" => "ALL_VC",
+ "business_types" => "ALL_BUSINESS_TYPES");
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+ $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
- map {
- $form->{selectdepartment} .=
- "<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
- }
+ $form->{CT_CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT');
+ ($form->{CT_CUSTOM_VARIABLES_FILTER_CODE},
+ $form->{CT_CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CT_CUSTOM_VARIABLES},
+ 'include_prefix' => 'l_',
+ 'include_value' => 'Y');
- $department = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- </tr>
-| if $form->{selectdepartment};
+ # constants and subs for template
+ $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
- $form->{title} = $locale->text('AR Transactions');
-
- $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
-
- # use JavaScript Calendar or not
- $form->{jsscript} = 1;
- $jsscript = "";
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
- <input type=button name=transdatefrom id="trigger1" value=|
- . $locale->text('button') . qq|></td>
- |;
- $button2 = qq|
- <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
- <input type=button name=transdateto name=transdateto id="trigger2" value=|
- . $locale->text('button') . qq|></td>
- |;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger1",
- "transdateto", "BL", "trigger2");
- } else {
+ $form->header;
+ print $form->parse_html_template('ar/search', { %myconfig });
- # without JavaScript Calendar
- $button1 = qq|
- <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
- $button2 = qq|
- <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
- }
+ $main::lxdebug->leave_sub();
+}
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 1 });
+sub create_subtotal_row {
+ $main::lxdebug->enter_sub();
- my %labels = ();
- my @values = ("");
- foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
- push(@values, $item->{"id"});
- $labels{$item->{"id"}} = $item->{"projectnumber"};
- }
- my $projectnumber =
- NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
- '-labels' => \%labels));
+ my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
- $form->{fokus} = "search.customer";
- $form->header;
- $onload = qq|focus()|;
- $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
- $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
- print qq|
-<body onLoad="$onload">
-
-<form method=post name="search" action=$form->{script}>
-
-<table width=100%>
- <tr><th class=listtop>$form->{title}</th></tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align=right>| . $locale->text('Customer') . qq|</th>
- <td colspan=3>$customer</td>
- </tr>
- $department
- <tr>
- <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
- <td colspan=3><input name=invnumber size=20></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
- <td colspan=3><input name=ordnumber size=20></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Transaction description') . qq|</th>
- <td colspan=3><input name=transaction_description size=40></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
- <td colspan=3><input name=notes size=40></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text("Project Number") . qq|</th>
- <td colspan="3">$projectnumber</td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('From') . qq|</th>
- $button1
- <th align=right>| . $locale->text('Bis') . qq|</th>
- $button2
- </tr>
- <input type=hidden name=sort value=transdate>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
- <td>
- <table width=100%>
- <tr>
- <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>| . $locale->text('Open') . qq|</td>
- <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Closed') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('ID') . qq|</td>
- <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>| . $locale->text('Invoice Number') . qq|</td>
- <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Order Number') . qq|</td>
- <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>| . $locale->text('Invoice Date') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>| . $locale->text('Customer') . qq|</td>
- <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Amount') . qq|</td>
- <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Tax') . qq|</td>
- <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>| . $locale->text('Total') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Date Paid') . qq|</td>
- <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
- <td nowrap>| . $locale->text('Paid') . qq|</td>
- <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Due Date') . qq|</td>
- <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Amount Due') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Notes') . qq|</td>
- <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Salesperson') . qq|</td>
- <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Shipping Point') . qq|</td>
- <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Ship via') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Subtotal') . qq|</td>
- <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Project Number') . qq|</td>
- <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
- <td nowrap>| . $locale->text('Transaction description') . qq|</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-<input type=hidden name=nextsub value=$form->{nextsub}>
-
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br>
-<input class=submit type=submit name=action value="|
- . $locale->text('Continue') . qq|">
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
-</form>
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
-</body>
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
-$jsscript
+ $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
-</html>
-|;
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
+
+ return $row;
}
sub ar_transactions {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('invoice_edit');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ my ($callback, $href, @columns);
- $form->{customer} = $form->unescape($form->{customer});
($form->{customer}, $form->{customer_id}) = split(/--/, $form->{customer});
+ report_generator_set_default_sort('transdate', 1);
+
AR->ar_transactions(\%myconfig, \%$form);
- $callback =
- "$form->{script}?action=ar_transactions&login=$form->{login}&password=$form->{password}";
- $href = $callback;
+ $form->{title} = $locale->text('AR Transactions');
+
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+ @columns =
+ qw(ids transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid
+ datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
+ marge_total marge_percent globalprojectnumber customernumber country ustid taxzone
+ payment_terms charts customertype direct_debit dunning_description department);
+
+ my $ct_cvar_configs = CVar->get_configs('module' => 'CT');
+ my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
+ my @ct_searchable_custom_variables = grep { $_->{searchable} } @{ $ct_cvar_configs };
+
+ my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @ct_includeable_custom_variables;
+ push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
+
+ my @hidden_variables = map { "l_${_}" } @columns;
+ push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto duedatefrom duedateto
+ employee_id salesman_id business_id parts_partnumber parts_description department_id);
+ push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
+
+ $href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
+
+ my %column_defs = (
+ 'ids' => { raw_header_data => $::request->presenter->checkbox_tag("", id => "check_all", checkall => "[data-checkall=1]"), align => 'center' },
+ 'transdate' => { 'text' => $locale->text('Date'), },
+ 'id' => { 'text' => $locale->text('ID'), },
+ 'type' => { 'text' => $locale->text('Type'), },
+ 'invnumber' => { 'text' => $locale->text('Invoice'), },
+ 'ordnumber' => { 'text' => $locale->text('Order'), },
+ 'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), },
+ 'name' => { 'text' => $locale->text('Customer'), },
+ 'netamount' => { 'text' => $locale->text('Amount'), },
+ 'tax' => { 'text' => $locale->text('Tax'), },
+ 'amount' => { 'text' => $locale->text('Total'), },
+ 'paid' => { 'text' => $locale->text('Paid'), },
+ 'datepaid' => { 'text' => $locale->text('Date Paid'), },
+ 'due' => { 'text' => $locale->text('Amount Due'), },
+ 'duedate' => { 'text' => $locale->text('Due Date'), },
+ 'transaction_description' => { 'text' => $locale->text('Transaction description'), },
+ 'notes' => { 'text' => $locale->text('Notes'), },
+ 'salesman' => { 'text' => $locale->text('Salesperson'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
+ 'shippingpoint' => { 'text' => $locale->text('Shipping Point'), },
+ 'shipvia' => { 'text' => $locale->text('Ship via'), },
+ 'globalprojectnumber' => { 'text' => $locale->text('Document Project Number'), },
+ 'marge_total' => { 'text' => $locale->text('Ertrag'), },
+ 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), },
+ 'customernumber' => { 'text' => $locale->text('Customer Number'), },
+ 'country' => { 'text' => $locale->text('Country'), },
+ 'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
+ 'taxzone' => { 'text' => $locale->text('Steuersatz'), },
+ 'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
+ 'charts' => { 'text' => $locale->text('Buchungskonto'), },
+ 'customertype' => { 'text' => $locale->text('Customer type'), },
+ 'direct_debit' => { 'text' => $locale->text('direct debit'), },
+ 'department' => { 'text' => $locale->text('Department'), },
+ dunning_description => { 'text' => $locale->text('Dunning level'), },
+ %column_defs_cvars,
+ );
+
+ foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit)) {
+ my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
+ }
+ my %column_alignment = map { $_ => 'right' } qw(netamount tax amount paid due);
+
+ $form->{"l_type"} = "Y";
+ map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+
+ $column_defs{ids}->{visible} = 'HTML';
+
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
+
+ $report->set_export_options('ar_transactions', @hidden_variables, qw(sort sortdir));
+
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
+
+ CVar->add_custom_variables_to_report('module' => 'CT',
+ 'trans_id_field' => 'customer_id',
+ 'configs' => $ct_cvar_configs,
+ 'column_defs' => \%column_defs,
+ 'data' => $form->{AR});
+
+ my @options;
if ($form->{customer}) {
- $callback .= "&customer=" . $form->escape($form->{customer}, 1);
- $href .= "&customer=" . $form->escape($form->{customer});
- $option = $locale->text('Customer') . " : $form->{customer}";
+ push @options, $locale->text('Customer') . " : $form->{customer}";
+ }
+ if ($form->{cp_name}) {
+ push @options, $locale->text('Contact Person') . " : $form->{cp_name}";
}
+
+ # $form->{department} seems to never be filled, and showing the department_id
+ # at the top of the report doesn't make much sense.
+ # So determine the department name from the id whenever we have a filter for
+ # department
if ($form->{department}) {
- $callback .= "&department=" . $form->escape($form->{department}, 1);
- $href .= "&department=" . $form->escape($form->{department});
- ($department) = split /--/, $form->{department};
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Department') . " : $department";
+ my ($department) = split /--/, $form->{department};
+ push @options, $locale->text('Department') . " : $department";
+ }
+ if ($form->{department_id}) {
+ # push @options, $locale->text('Department Id') . " : $form->{department_id}";
+ unless ($form->{department}) {
+ require SL::DB::Department;
+ my $department = SL::DB::Manager::Department->find_by(id => $::form->{department_id});
+ push @options, $locale->text('Department') . " : " . $department->description if $department;
+ }
}
if ($form->{invnumber}) {
- $callback .= "&invnumber=" . $form->escape($form->{invnumber}, 1);
- $href .= "&invnumber=" . $form->escape($form->{invnumber});
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Invoice Number') . " : $form->{invnumber}";
+ push @options, $locale->text('Invoice Number') . " : $form->{invnumber}";
}
if ($form->{ordnumber}) {
- $callback .= "&ordnumber=" . $form->escape($form->{ordnumber}, 1);
- $href .= "&ordnumber=" . $form->escape($form->{ordnumber});
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Order Number') . " : $form->{ordnumber}";
+ push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
+ }
+ if ($form->{cusordnumber}) {
+ push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}";
}
if ($form->{notes}) {
- $callback .= "¬es=" . $form->escape($form->{notes}, 1);
- $href .= "¬es=" . $form->escape($form->{notes});
- $option .= "\n<br>" if $option;
- $option .= $locale->text('Notes') . " : $form->{notes}";
+ push @options, $locale->text('Notes') . " : $form->{notes}";
}
if ($form->{transaction_description}) {
- $callback .= "&transaction_description=" . $form->escape($form->{transaction_description}, 1);
- $href .= "&transaction_description=" . $form->escape($form->{transaction_description});
- $option .= "\n<br>" if $option;
- $option .= $locale->text('Transaction description') . " : $form->{transaction_description}";
+ push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
+ }
+ if ($form->{parts_partnumber}) {
+ push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}";
+ }
+ if ($form->{parts_description}) {
+ push @options, $locale->text('Part Description') . " : $form->{parts_description}";
}
-
if ($form->{transdatefrom}) {
- $callback .= "&transdatefrom=$form->{transdatefrom}";
- $href .= "&transdatefrom=$form->{transdatefrom}";
- $option .= "\n<br>" if ($option);
- $option .=
- $locale->text('From') . " "
- . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
- $callback .= "&transdateto=$form->{transdateto}";
- $href .= "&transdateto=$form->{transdateto}";
- $option .= "\n<br>" if ($option);
- $option .=
- $locale->text('Bis') . " "
- . $locale->date(\%myconfig, $form->{transdateto}, 1);
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ($form->{open}) {
- $callback .= "&open=$form->{open}";
- $href .= "&open=$form->{open}";
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Open');
- }
- if ($form->{closed}) {
- $callback .= "&closed=$form->{closed}";
- $href .= "&closed=$form->{closed}";
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Closed');
+ push @options, $locale->text('Open');
}
- if ($form->{globalproject_id}) {
- $callback .= "&globalproject_id=" . E($form->{globalproject_id});
- $href .= "&globalproject_id=" . E($form->{globalproject_id});
+ if ($form->{employee_id}) {
+ my $employee = SL::DB::Employee->new(id => $form->{employee_id})->load;
+ push @options, $locale->text('Employee') . ' : ' . $employee->name;
}
-
- @columns =
- qw(transdate id type invnumber ordnumber name netamount tax amount paid
- datepaid due duedate transaction_description notes employee shippingpoint shipvia
- globalprojectnumber);
-
- $form->{"l_type"} = "Y";
-
- foreach $item (@columns) {
- if ($form->{"l_$item"} eq "Y") {
- push @column_index, $item;
-
- # add column to href and callback
- $callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
- }
+ if ($form->{salesman_id}) {
+ my $salesman = SL::DB::Employee->new(id => $form->{salesman_id})->load;
+ push @options, $locale->text('Salesman') . ' : ' . $salesman->name;
}
-
- if ($form->{l_subtotal} eq 'Y') {
- $callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
+ if ($form->{closed}) {
+ push @options, $locale->text('Closed');
}
- $column_header{id} =
- "<th><a class=listheading href=$href&sort=id>"
- . $locale->text('ID')
- . "</a></th>";
- $column_header{transdate} =
- "<th><a class=listheading href=$href&sort=transdate>"
- . $locale->text('Date')
- . "</a></th>";
- $column_header{duedate} =
- "<th><a class=listheading href=$href&sort=duedate>"
- . $locale->text('Due Date')
- . "</a></th>";
- $column_header{type} =
- "<th class=\"listheading\">" . $locale->text('Type') . "</th>";
- $column_header{invnumber} =
- "<th><a class=listheading href=$href&sort=invnumber>"
- . $locale->text('Invoice')
- . "</a></th>";
- $column_header{ordnumber} =
- "<th><a class=listheading href=$href&sort=ordnumber>"
- . $locale->text('Order')
- . "</a></th>";
- $column_header{name} =
- "<th><a class=listheading href=$href&sort=name>"
- . $locale->text('Customer')
- . "</a></th>";
- $column_header{netamount} =
- "<th class=listheading>" . $locale->text('Amount') . "</th>";
- $column_header{tax} =
- "<th class=listheading>" . $locale->text('Tax') . "</th>";
- $column_header{amount} =
- "<th class=listheading>" . $locale->text('Total') . "</th>";
- $column_header{paid} =
- "<th class=listheading>" . $locale->text('Paid') . "</th>";
- $column_header{datepaid} =
- "<th><a class=listheading href=$href&sort=datepaid>"
- . $locale->text('Date Paid')
- . "</a></th>";
- $column_header{due} =
- "<th class=listheading>" . $locale->text('Amount Due') . "</th>";
- $column_header{notes} =
- "<th class=listheading>" . $locale->text('Notes') . "</th>";
- $column_header{employee} =
- "<th><a class=listheading href=$href&sort=employee>"
- . $locale->text('Salesperson') . "</th>";
-
- $column_header{shippingpoint} =
- "<th><a class=listheading href=$href&sort=shippingpoint>"
- . $locale->text('Shipping Point')
- . "</a></th>";
- $column_header{shipvia} =
- "<th><a class=listheading href=$href&sort=shipvia>"
- . $locale->text('Ship via')
- . "</a></th>";
- $column_header{globalprojectnumber} =
- qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
- $column_header{transaction_description} =
- "<th class=listheading>" . $locale->text('Transaction description') . "</th>";
-
- $form->{title} = $locale->text('AR Transactions');
-
- $form->header;
+ $form->{ALL_PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;
- print qq|
-<body>
-
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>$option</td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>
-|;
-
- map { print "\n$column_header{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'raw_top_info_text' => $form->parse_html_template('ar/ar_transactions_header'),
+ 'raw_bottom_info_text' => $form->parse_html_template('ar/ar_transactions_bottom'),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
+ );
+ $report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
# add sort and escape callback, this one we use for the add sub
- $form->{callback} = $callback .= "&sort=$form->{sort}";
+ $form->{callback} = $href .= "&sort=$form->{sort}";
# escape callback for href
- $callback = $form->escape($callback);
-
- if (@{ $form->{AR} }) {
- $sameitem = $form->{AR}->[0]->{ $form->{sort} };
- }
-
- # sums and tax on reports by Antonio Gallardo
- #
- foreach $ar (@{ $form->{AR} }) {
+ $callback = $form->escape($href);
- if ($form->{l_subtotal} eq 'Y') {
- if ($sameitem ne $ar->{ $form->{sort} }) {
- &ar_subtotal;
- }
- }
-
- $column_data{netamount} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ar->{netamount}, 2, " ")
- . "</td>";
- $column_data{tax} = "<td align=right>"
- . $form->format_amount(\%myconfig, $ar->{amount} - $ar->{netamount},
- 2, " ")
- . "</td>";
- $column_data{amount} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ar->{amount}, 2, " ") . "</td>";
- $column_data{paid} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ar->{paid}, 2, " ") . "</td>";
- $column_data{due} = "<td align=right>"
- . $form->format_amount(\%myconfig, $ar->{amount} - $ar->{paid},
- 2, " ")
- . "</td>";
-
- $subtotalnetamount += $ar->{netamount};
- $subtotalamount += $ar->{amount};
- $subtotalpaid += $ar->{paid};
- $subtotaldue += $ar->{amount} - $ar->{paid};
-
- $totalnetamount += $ar->{netamount};
- $totalamount += $ar->{amount};
- $totalpaid += $ar->{paid};
- $totaldue += ($ar->{amount} - $ar->{paid});
-
- $column_data{transdate} = "<td>$ar->{transdate} </td>";
- $column_data{id} = "<td>$ar->{id}</td>";
- $column_data{datepaid} = "<td>$ar->{datepaid} </td>";
- $column_data{duedate} = "<td>$ar->{duedate} </td>";
-
- $module = ($ar->{invoice}) ? "is.pl" : $form->{script};
-
- $column_data{invnumber} =
- "<td><a href=$module?action=edit&id=$ar->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
-
- my $is_storno = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
- my $has_storno = $ar->{storno} && !$is_storno;
-
- $column_data{type} = "<td>" .
- ($has_storno ? $locale->text("Invoice with Storno (abbreviation)") :
- $is_storno ? $locale->text("Storno (one letter abbreviation)") :
- $ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") :
- $ar->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
- $locale->text("AR Transaction (abbreviation)"))
- . "</td>";
- $column_data{ordnumber} = "<td>$ar->{ordnumber} </td>";
- $column_data{name} = "<td>$ar->{name}</td>";
- $ar->{notes} =~ s/\r\n/<br>/g;
- $column_data{notes} = "<td>$ar->{notes} </td>";
- $column_data{shippingpoint} = "<td>$ar->{shippingpoint} </td>";
- $column_data{shipvia} = "<td>$ar->{shipvia} </td>";
- $column_data{employee} = "<td>$ar->{employee} </td>";
- $column_data{globalprojectnumber} =
- "<td>" . H($ar->{globalprojectnumber}) . "</td>";
- $column_data{transaction_description} =
- "<td>" . H($ar->{transaction_description}) . "</td>";
-
- $i++;
- $i %= 2;
- print "
- <tr class=listrow$i>
-";
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
+ my @subtotal_columns = qw(netamount amount paid due marge_total marge_percent);
- }
+ my %totals = map { $_ => 0 } @subtotal_columns;
+ my %subtotals = map { $_ => 0 } @subtotal_columns;
- if ($form->{l_subtotal} eq 'Y') {
- &ar_subtotal;
- }
+ my $idx = 0;
- # print totals
- print qq|
- <tr class=listtotal>
-|;
+ foreach my $ar (@{ $form->{AR} }) {
+ $ar->{tax} = $ar->{amount} - $ar->{netamount};
+ $ar->{due} = $ar->{amount} - $ar->{paid};
- map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{netamount} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totalnetamount, 2, " ") . "</th>";
- $column_data{tax} = "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totalamount - $totalnetamount,
- 2, " ")
- . "</th>";
- $column_data{amount} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totalamount, 2, " ") . "</th>";
- $column_data{paid} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totalpaid, 2, " ") . "</th>";
- $column_data{due} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totaldue, 2, " ") . "</th>";
-
- map { print "\n$column_data{$_}" } @column_index;
+ map { $subtotals{$_} += $ar->{$_};
+ $totals{$_} += $ar->{$_} } @subtotal_columns;
- print qq|
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-<br>
-<form method=post action=$form->{script}>
+ $subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0;
+ $totals{marge_percent} = $totals{netamount} ? ($totals{marge_total} * 100 / $totals{netamount} ) : 0;
-<input name=callback type=hidden value="$form->{callback}">
+ my $is_storno = $ar->{storno} && $ar->{storno_id};
+ my $has_storno = $ar->{storno} && !$ar->{storno_id};
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+ $ar->{type} =
+ $has_storno ? $locale->text("Invoice with Storno (abbreviation)") :
+ $is_storno ? $locale->text("Storno (one letter abbreviation)") :
+ $ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") :
+ $ar->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
+ $locale->text("AR Transaction (abbreviation)");
-<input class=submit type=submit name=action value="|
- . $locale->text('AR Transaction') . qq|">
-<input class=submit type=submit name=action value="|
- . $locale->text('Sales Invoice') . qq|">
+ map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
-</form>
+ $ar->{direct_debit} = $ar->{direct_debit} ? $::locale->text('yes') : $::locale->text('no');
-</body>
-</html>
-|;
+ my $row = { };
- $lxdebug->leave_sub();
-}
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $ar->{$column},
+ 'align' => $column_alignment{$column},
+ };
+ }
-sub ar_subtotal {
- $lxdebug->enter_sub();
+ $row->{invnumber}->{link} = build_std_url("script=" . ($ar->{invoice} ? 'is.pl' : 'ar.pl'), 'action=edit')
+ . "&id=" . E($ar->{id}) . "&callback=${callback}";
- map { $column_data{$_} = "<td> </td>" } @column_index;
+ $row->{ids} = {
+ raw_data => $::request->presenter->checkbox_tag("id[]", value => $ar->{id}, "data-checkall" => 1),
+ valign => 'center',
+ align => 'center',
+ };
- $column_data{tax} = "<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount,
- 2, " ")
- . "</th>";
- $column_data{amount} =
- "<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotalamount, 2, " ") . "</th>";
- $column_data{paid} =
- "<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotalpaid, 2, " ") . "</th>";
- $column_data{due} =
- "<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotaldue, 2, " ") . "</th>";
+ my $row_set = [ $row ];
- $subtotalnetamount = 0;
- $subtotalamount = 0;
- $subtotalpaid = 0;
- $subtotaldue = 0;
+ if (($form->{l_subtotal} eq 'Y')
+ && (($idx == (scalar @{ $form->{AR} } - 1))
+ || ($ar->{ $form->{sort} } ne $form->{AR}->[$idx + 1]->{ $form->{sort} }))) {
+ push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
+ }
- $sameitem = $ar->{ $form->{sort} };
+ $report->add_data($row_set);
- print "<tr class=listsubtotal>";
+ $idx++;
+ }
- map { print "\n$column_data{$_}" } @column_index;
+ $report->add_separator();
+ $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
- print "
-</tr>
-";
+ $report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-
sub storno {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ # don't cancel cancelled transactions
if (IS->has_storno(\%myconfig, $form, 'ar')) {
$form->{title} = $locale->text("Cancel Accounts Receivables Transaction");
$form->error($locale->text("Transaction has already been cancelled!"));
}
- # negate amount/taxes
- for my $i (1 .. $form->{rowcount}) {
- $form->{"amount_$i"} *= -1;
- $form->{"tax_$i"} *= -1;
- }
-
- # format things
- for my $i (1 .. $form->{rowcount}) {
- for (qw(amount tax)) {
- $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) if $form->{"${_}_$i"};
- }
- }
-
- $form->{storno} = 1;
- $form->{storno_id} = $form->{id};
- $form->{id} = 0;
-
- $form->{invnumber} = "Storno-" . $form->{invnumber};
-
- post();
+ AR->storno($form, \%myconfig, $form->{id});
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = "ordnumber_$form->{ordnumber}";
- $form->{addition} = "STORNO";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{addition} = "STORNO";
+ $form->{what_done} = "invoice";
+ $form->save_history;
}
- # /saving the history
+ # /saving the history
- $lxdebug->leave_sub();
+ $form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
+
+ $main::lxdebug->leave_sub();
}
+
+1;