X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Fbin%2Fmozilla%2Fca.pl;h=9ee602e743c9011dfdc81f4ed996b7c62ad6962a;hp=ed3100573117bb26e12f76dada5c3db1918fd90a;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643 diff --git a/sql-ledger/bin/mozilla/ca.pl b/sql-ledger/bin/mozilla/ca.pl index ed3100573..9ee602e74 100644 --- a/sql-ledger/bin/mozilla/ca.pl +++ b/sql-ledger/bin/mozilla/ca.pl @@ -6,6 +6,7 @@ # Email: dsimader@sql-ledger.org # Web: http://www.sql-ledger.org # +# Contributors: # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +27,6 @@ # #====================================================================== - use SL::CA; 1; @@ -67,11 +67,11 @@ sub chart_of_accounts { @column_index = qw(accno gifi_accno description debit credit); - $column_header{accno} = qq||.$locale->text('Account').qq|\n|; - $column_header{gifi_accno} = qq||.$locale->text('GIFI').qq|\n|; - $column_header{description} = qq||.$locale->text('Description').qq|\n|; - $column_header{debit} = qq||.$locale->text('Debit').qq|\n|; - $column_header{credit} = qq||.$locale->text('Credit').qq|\n|; + $column_header{accno} = qq||.$locale->text('Account').qq|\n|; + $column_header{gifi_accno} = qq||.$locale->text('GIFI').qq|\n|; + $column_header{description} = qq||.$locale->text('Description').qq|\n|; + $column_header{debit} = qq||.$locale->text('Debit').qq|\n|; + $column_header{credit} = qq||.$locale->text('Credit').qq|\n|; $form->{title} = $locale->text('Chart of Accounts'); @@ -83,8 +83,8 @@ sub chart_of_accounts { print qq| - - +
$form->{title}
+ |; @@ -100,12 +100,12 @@ sub chart_of_accounts { $description = $form->escape($ca->{description}); $gifi_description = $form->escape($ca->{gifi_description}); - $href = qq|$form->{script}?path=$form->{path}&action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description&gifi_accno=$ca->{gifi_accno}&gifi_description=$gifi_description|; + $href = qq|$form->{script}?path=$form->{path}&action=list&accno=$ca->{accno}&login=$form->{login}&sessionid=$form->{sessionid}&description=$description&gifi_accno=$ca->{gifi_accno}&gifi_description=$gifi_description|; if ($ca->{charttype} eq "H") { print qq||; map { $column_data{$_} = ""; } qw(accno description); - $column_data{gifi_accno} = ""; + $column_data{gifi_accno} = ""; } else { $i++; $i %= 2; print qq||; @@ -129,8 +129,8 @@ sub chart_of_accounts { map { $column_data{$_} = ""; } qw(accno gifi_accno description); - $column_data{debit} = ""; - $column_data{credit} = ""; + $column_data{debit} = ""; + $column_data{credit} = ""; print ""; @@ -158,10 +158,46 @@ sub list { } else { $form->{title} .= " - ".$locale->text('Account')." $form->{accno}"; } - + + # get departments + $form->all_departments(\%myconfig); + if (@{ $form->{all_departments} }) { + $form->{selectdepartment} = " + + + +| if $form->{selectdepartment}; + + # accounting years + $form->{selectaccountingyear} = " + + + +|; + + $form->header; - map { $form->{$_} =~ s/"/"/g; } qw(description gifi_description); + map { $form->{$_} = $form->quote($form->{$_}) } qw(description gifi_description); print qq| @@ -177,17 +213,19 @@ sub list {
$form->{title}
$ca->{$_}$ca->{gifi_accno} $ca->{gifi_accno} 
 ".$form->format_amount(\%myconfig, $totaldebit, 2, 0)."".$form->format_amount(\%myconfig, $totalcredit, 2, 0)."".$form->format_amount(\%myconfig, $totaldebit, 2, 0)."".$form->format_amount(\%myconfig, $totalcredit, 2, 0)."
|.$locale->text('Department').qq|
|.$locale->text('Period').qq| + + + |.$locale->text('Current').qq| + |.$locale->text('Month').qq| + |.$locale->text('Quarter').qq| + |.$locale->text('Year').qq| +
- +
$form->{title}
$form->{title}
+ $department - + + $selectfrom |; $column_header{reference} = qq||; $column_header{description} = qq||; + $column_header{cleared} = qq||; $column_header{debit} = qq||; $column_header{credit} = qq||; $column_header{balance} = qq||; @column_index = $form->sort_columns(qw(transdate reference description debit credit)); + + if ($form->{link} =~ /_paid/) { + @column_index = $form->sort_columns(qw(transdate reference description cleared debit credit)); + } if ($form->{accounttype} eq 'gifi') { map { $form->{$_} = $form->{"gifi_$_"} } qw(accno description); @@ -246,8 +300,16 @@ sub list_transactions { $form->{title} = ($form->{accounttype} eq 'gifi') ? $locale->text('GIFI') : $locale->text('Account'); $form->{title} .= " $form->{accno} - $form->{description}"; - - + + if ($form->{department}) { + ($department) = split /--/, $form->{department}; + $options = $locale->text('Department')." : $department
"; + } + if ($form->{projectnumber}) { + ($projectnumber) = split /--/, $form->{projectnumber}; + $options .= $locale->text('Project Number')." : $projectnumber
"; + } + if ($form->{fromdate} || $form->{todate}) { if ($form->{fromdate}) { $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); @@ -261,6 +323,7 @@ sub list_transactions { $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig),1); } + $options .= $form->{period}; $form->header; @@ -269,11 +332,11 @@ sub list_transactions {
|.$locale->text('From').qq| |.$locale->text('to').qq||.$locale->text('To').qq|
|.$locale->text('Include in Report').qq| @@ -201,7 +239,7 @@ sub list { {login}> {path}> -{password}> +{sessionid}>
@@ -216,25 +254,41 @@ sub list { sub list_transactions { CA->all_transactions(\%myconfig, \%$form); - + $description = $form->escape($form->{description}); $gifi_description = $form->escape($form->{gifi_description}); + $department = $form->escape($form->{department}); + $projectnumber = $form->escape($form->{projectnumber}); + $title = $form->escape($form->{title}); # construct href - $href = "$form->{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}"; + $href = "$form->{script}?path=$form->{path}&direction=$form->{direction}&oldsort=$form->{oldsort}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&title=$title"; + $form->sort_order(); + + $description = $form->escape($form->{description},1); + $gifi_description = $form->escape($form->{gifi_description},1); + $department = $form->escape($form->{department},1); + $projectnumber = $form->escape($form->{projectnumber},1); + $title = $form->escape($form->{title},1); + # construct callback - $callback = "rp.pl?path=$form->{path}&action=generate_trial_balance&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&accounttype=$form->{accounttype}"; + $callback = "$form->{script}?path=$form->{path}&direction=$form->{direction}&oldsort=$form->{oldsort}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&title=$title"; # figure out which column comes first $column_header{transdate} = qq|		|.$locale->text('Date').qq||.$locale->text('Reference').qq||.$locale->text('Description').qq||.$locale->text('R').qq||.$locale->text('Debit').qq||.$locale->text('Credit').qq||.$locale->text('Balance').qq|
- + - + "; @@ -337,7 +400,9 @@ print qq| $column_data{transdate} = qq||; $column_data{reference} = qq||; - $column_data{description} = qq||; + $column_data{description} = qq||; + + $column_data{cleared} = ($ca->{cleared}) ? qq|| : qq||; $i++; $i %= 2; print qq| @@ -360,9 +425,9 @@ print qq| map { $column_data{$_} = "" } @column_index; - $column_data{debit} = ""; - $column_data{credit} = ""; - $column_data{balance} = ""; + $column_data{debit} = ""; + $column_data{credit} = ""; + $column_data{balance} = ""; print qq| @@ -391,8 +456,8 @@ sub ca_subtotal { map { $column_data{$_} = "" } @column_index; - $column_data{debit} = ""; - $column_data{credit} = ""; + $column_data{debit} = ""; + $column_data{credit} = ""; $subtotaldebit = 0; $subtotalcredit = 0;
$form->{title}$form->{title}
$form->{period}$options
@@ -320,7 +383,7 @@ print qq| } # construct link to source - $href = "{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; + $href = "{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ca->{reference}"; $column_data{debit} = "".$form->format_amount(\%myconfig, $ca->{debit}, 2, " ")."$ca->{transdate}$href$ca->{description}$ca->{description} *  ".$form->format_amount(\%myconfig, $totaldebit, 2, " ")."".$form->format_amount(\%myconfig, $totalcredit, 2, " ")."".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)."".$form->format_amount(\%myconfig, $totaldebit, 2, " ")."".$form->format_amount(\%myconfig, $totalcredit, 2, " ")."".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)."
 ".$form->format_amount(\%myconfig, $subtotaldebit, 2, " ") . "".$form->format_amount(\%myconfig, $subtotalcredit, 2, " ") . "".$form->format_amount(\%myconfig, $subtotaldebit, 2, " ") . "".$form->format_amount(\%myconfig, $subtotalcredit, 2, " ") . "