X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fgl.pl;h=cad79b7c6fcc2a3f576fe8f80d15281bb37a4d6f;hb=1ac7b3f25a266f5d58cdac7652bed37344c6e3b2;hp=fb0de34e94e94bc2a96e789b74129e53b69de362;hpb=efb9a24f2252104ab4af5c25334119d7c5c70a8c;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index fb0de34e9..cad79b7c6 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -24,7 +24,8 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Genereal Ledger
@@ -40,11 +41,12 @@ use List::Util qw(sum);
use SL::FU;
use SL::GL;
use SL::IS;
-use SL::PE;
use SL::ReportGenerator;
+use SL::DBUtils qw(selectrow_query selectall_hashref_query);
+use SL::Webdav;
+use SL::Locale::String qw(t8);
require "bin/mozilla/common.pl";
-require "bin/mozilla/drafts.pl";
require "bin/mozilla/reportgenerator.pl";
# this is for our long dates
@@ -78,13 +80,11 @@ require "bin/mozilla/reportgenerator.pl";
sub add {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
- return $main::lxdebug->leave_sub() if (load_draft_maybe());
-
$form->{title} = "Add";
$form->{callback} = "gl.pl?action=add" unless $form->{callback};
@@ -99,16 +99,7 @@ sub add {
$form->{credit} = 0;
$form->{tax} = 0;
- # departments
- $form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} || [] }) {
- $form->{selectdepartment} = "\n";
-
- map {
- $form->{selectdepartment} .=
- " $_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} || [] });
- }
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
$form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
@@ -120,7 +111,7 @@ sub add {
sub prepare_transaction {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -129,16 +120,7 @@ sub prepare_transaction {
$form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
- # departments
- $form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} || [] }) {
- $form->{selectdepartment} = " \n";
-
- map {
- $form->{selectdepartment} .=
- " $_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} || [] });
- }
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
my $i = 1;
my $tax = 0;
@@ -167,7 +149,7 @@ sub prepare_transaction {
$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = $ref->{id}."--0.00000";
$form->{"project_id_$i"} = $ref->{project_id};
$i++;
}
@@ -191,7 +173,7 @@ sub prepare_transaction {
sub edit {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -202,6 +184,18 @@ sub edit {
$form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+ if ($form->{reference} && $::instance_conf->get_webdav) {
+ my $webdav = SL::Webdav->new(
+ type => 'general_ledger',
+ number => $form->{reference},
+ );
+ my $webdav_path = $webdav->webdav_path;
+ my @all_objects = $webdav->get_all_objects;
+ @{ $form->{WEBDAV} } = map { { name => $_->filename,
+ type => t8('File'),
+ link => File::Spec->catfile($_->full_filedescriptor),
+ } } @all_objects;
+ }
form_header();
display_rows();
form_footer();
@@ -212,17 +206,16 @@ sub edit {
sub search {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger');
+ $::auth->assert('general_ledger | gl_transactions');
- $::form->all_departments(\%::myconfig);
$::form->get_lists(
projects => { key => "ALL_PROJECTS", all => 1 },
);
- $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
+ $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
$::form->header;
print $::form->parse_html_template('gl/search', {
- department_label => sub { ("$_[0]{description}--$_[0]{id}")x2 },
employee_label => sub { "$_[0]{id}--$_[0]{name}" },
});
@@ -251,7 +244,7 @@ sub create_subtotal_row {
sub generate_report {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('general_ledger | gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -304,11 +297,8 @@ sub generate_report {
);
# add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
- my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto employee_id datesort category l_subtotal);
+ my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal);
push @hidden_variables, map { "l_${_}" } @columns;
- foreach ( @hidden_variables ) {
- print URL "$_\n";
- };
my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
@@ -325,15 +315,12 @@ sub generate_report {
push @date_options, $locale->text('Bis'), $locale->date(\%myconfig, $form->{dateto}, 1) if ($form->{dateto});
push @options, join(' ', @date_options) if (scalar @date_options);
- if ($form->{department}) {
- my ($department) = split /--/, $form->{department};
- push @options, $locale->text('Department') . " : $department";
+ if ($form->{department_id}) {
+ my $department = SL::DB::Manager::Department->find_by( id => $form->{department_id} );
+ push @options, $locale->text('Department') . " : " . $department->description;
}
-
my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
- print URL $callback;
- close URL;
$form->{l_credit_accno} = 'Y';
$form->{l_debit_accno} = 'Y';
@@ -517,10 +504,16 @@ sub generate_report {
$main::lxdebug->leave_sub();
}
+sub show_draft {
+ $::form->{transdate} = DateTime->today_local->to_kivitendo if !$::form->{transdate};
+ $::form->{gldate} = $::form->{transdate} if !$::form->{gldate};
+ update();
+}
+
sub update {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -535,6 +528,10 @@ sub update {
my $creditcount = 0;
my ($debitcredit, $amount);
+ my $dbh = SL::DB->client->dbh;
+ my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
+ my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
+
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@ -573,10 +570,10 @@ sub update {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00";
}
if (!$debitcredit && $debittax) {
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00";
}
$amount =
($form->{"debit_$i"} == 0)
@@ -584,24 +581,20 @@ sub update {
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00";
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
$credittax = 1;
}
- if ($form->{taxincluded}) {
- $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
- } else {
- $form->{"tax_$i"} = $amount * $rate;
- }
- } else {
- $form->{"tax_$i"} = 0;
- }
+ };
+ my ($tmpnetamount,$tmpdiff);
+ ($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2);
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
$count++;
@@ -628,7 +621,7 @@ sub display_form {
my ($init) = @_;
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -651,7 +644,7 @@ sub display_rows {
my ($init) = @_;
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -673,8 +666,8 @@ sub display_rows {
my %charts = ();
my $taxchart_init;
foreach my $item (@{ $form->{ALL_CHARTS} }) {
- if ($item->{charttype} eq 'H'){ #falls ÃÅberschrift
- next; #ÃÅberspringen (Bug 1150)
+ if ($item->{charttype} eq 'H'){ # skip headings
+ next;
}
my $key = $item->{accno} . "--" . $item->{tax_id};
$taxchart_init = $item->{tax_id} unless (@chart_values);
@@ -855,7 +848,7 @@ sub _get_radieren {
sub form_header {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger');
+ $::auth->assert('gl_transactions');
my ($init) = @_;
@@ -864,9 +857,12 @@ sub form_header {
$::form->get_lists("projects" => { "key" => "ALL_PROJECTS",
"all" => 0,
"old_id" => \@old_project_ids },
+
"charts" => { "key" => "ALL_CHARTS",
"transdate" => $::form->{transdate} });
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+
GL->get_chart_balances('charts' => $::form->{ALL_CHARTS});
my $title = $::form->{title};
@@ -877,10 +873,6 @@ sub form_header {
map { $::form->{$_} =~ s/\"/"/g }
qw(chart taxchart);
- $::form->{selectdepartment} =~ s/ selected//;
- $::form->{selectdepartment} =~
- s/option>\Q$::form->{department}\E/option selected>$::form->{department}/;
-
if ($init) {
$::request->{layout}->focus("#reference");
$::form->{taxincluded} = "1";
@@ -903,12 +895,12 @@ sub form_header {
sub form_footer {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger');
+ $::auth->assert('gl_transactions');
my ($follow_ups, $follow_ups_due);
if ($::form->{id}) {
- $follow_ups = FU->follow_ups('trans_id' => $::form->{id});
+ $follow_ups = FU->follow_ups('trans_id' => $::form->{id}, 'not_done' => 1);
$follow_ups_due = sum map { $_->{due} * 1 } @{ $follow_ups || [] };
}
@@ -967,8 +959,9 @@ sub yes {
if (GL->delete_transaction(\%myconfig, \%$form)){
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ $form->{snumbers} = qq|gltransaction_| . $form->{id};
$form->{addition} = "DELETED";
+ $form->{what_done} = "gl_transaction";
$form->save_history;
}
# /saving the history
@@ -1003,9 +996,9 @@ sub post_transaction {
my $debitcredit;
my %split_safety = ();
- my $dbh = $form->dbconnect_noauto(\%myconfig);
+ my $dbh = SL::DB->client->dbh;
my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
- $dbh->disconnect;
+ my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@ -1061,22 +1054,22 @@ sub post_transaction {
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
$credittax = 1;
}
- if ($form->{taxincluded}) {
- $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
- if ($debitcredit) {
- $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
- } else {
- $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
- }
+
+ my ($tmpnetamount,$tmpdiff);
+ ($tmpnetamount,$form->{"tax_$i"},$tmpdiff) = $form->calculate_tax($amount,$rate,$form->{taxincluded} *= 1,2);
+ if ($debitcredit) {
+ $form->{"debit_$i"} = $tmpnetamount;
} else {
- $form->{"tax_$i"} = $amount * $rate;
+ $form->{"credit_$i"} = $tmpnetamount;
}
+
} else {
$form->{"tax_$i"} = 0;
}
@@ -1140,9 +1133,9 @@ sub post_transaction {
undef($form->{callback});
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "SAVED";
- $form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id};
+ $form->{snumbers} = qq|gltransaction_| . $form->{id};
+ $form->{addition} = "POSTED";
+ $form->{what_done} = "gl transaction";
$form->save_history;
}
# /saving the history
@@ -1153,12 +1146,12 @@ sub post_transaction {
sub post {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my $locale = $main::locale;
- if ($::myconfig{mandatory_departments} && !$form->{department}) {
+ if ($::myconfig{mandatory_departments} && !$form->{department_id}) {
$form->{saved_message} = $::locale->text('You have to specify a department.');
update();
exit;
@@ -1168,10 +1161,13 @@ sub post {
$form->{storno} = 0;
post_transaction();
+ if ($::instance_conf->get_webdav) {
+ SL::Webdav->new(type => 'general_ledger',
+ number => $form->{reference},
+ )->webdav_path;
+ }
- remove_draft() if $form->{remove_draft};
-
- $form->{callback} = build_std_url("action=add&DONT_LOAD_DRAFT=1", "show_details");
+ $form->{callback} = build_std_url("action=add", "show_details");
$form->redirect($form->{callback});
$main::lxdebug->leave_sub();
@@ -1180,7 +1176,7 @@ sub post {
sub post_as_new {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
@@ -1193,7 +1189,7 @@ sub post_as_new {
sub storno {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -1209,8 +1205,9 @@ sub storno {
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
- $form->{snumbers} = "ordnumber_$form->{ordnumber}";
+ $form->{snumbers} = qq|gltransaction_| . $form->{id};
$form->{addition} = "STORNO";
+ $form->{what_done} = "gl_transaction";
$form->save_history;
}
# /saving the history