diff options
Diffstat (limited to 'sql-ledger/bin/mozilla/cp.pl')
-rw-r--r-- | sql-ledger/bin/mozilla/cp.pl | 430 |
1 files changed, 313 insertions, 117 deletions
diff --git a/sql-ledger/bin/mozilla/cp.pl b/sql-ledger/bin/mozilla/cp.pl index 911b70105..8aefa0ccd 100644 --- a/sql-ledger/bin/mozilla/cp.pl +++ b/sql-ledger/bin/mozilla/cp.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 @@ -27,6 +28,7 @@ use SL::CP; +use SL::OP; use SL::IS; use SL::IR; @@ -38,30 +40,64 @@ require "$form->{path}/arap.pl"; sub payment { + $form->{callback} = "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&all_vc=$form->{all_vc}&type=$form->{type}"; + + $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP"; + $form->{arap} = lc $form->{ARAP}; + # setup customer/vendor selection for open invoices - CP->get_openvc(\%myconfig, \%$form); + if ($form->{all_vc}) { + $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP}); + } else { + CP->get_openvc(\%myconfig, \%$form); + } + $form->{"select$form->{vc}"} = ""; + if ($form->{"all_$form->{vc}"}) { - map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} }; + $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id}; + map { $form->{"select$form->{vc}"} .= qq|<option value="$_->{name}--$_->{id}">$_->{name}\n| } @{ $form->{"all_$form->{vc}"} }; + } + + # departments + if (@{ $form->{all_departments} }) { + $form->{selectdepartment} = "<option>\n"; + $form->{department} = "$form->{department}--$form->{department_id}" if $form->{department}; + + map { $form->{selectdepartment} .= qq|<option value="$_->{description}--$_->{id}">$_->{description}\n| } (@{ $form->{all_departments} }); } - $form->{arap} = ($form->{vc} eq 'customer') ? "AR" : "AP"; + if (@{ $form->{all_languages} }) { + $form->{selectlanguage} = "<option>\n"; + map { $form->{selectlanguage} .= qq|<option value="$_->{code}">$_->{description}\n| } @{ $form->{all_languages} }; + } CP->paymentaccounts(\%myconfig, \%$form); - map { $form->{selectaccount} .= "<option>$_->{accno}--$_->{description}\n" } @{ $form->{PR} }; + $form->{selectaccount} = ""; + $form->{"select$form->{ARAP}"} = ""; + + map { $form->{selectaccount} .= "<option>$_->{accno}--$_->{description}\n" } @{ $form->{PR}{"$form->{ARAP}_paid"} }; + map { $form->{"select$form->{ARAP}"} .= "<option>$_->{accno}--$_->{description}\n" } @{ $form->{PR}{$form->{ARAP}} }; # currencies @curr = split /:/, $form->{currencies}; chomp $curr[0]; - $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} = $curr[0]; + $form->{defaultcurrency} = $curr[0]; + $form->{selectcurrency} = ""; map { $form->{selectcurrency} .= "<option>$_\n" } @curr; - $form->{media} = "screen"; + $form->{oldcurrency} = $form->{currency}; + + if ($form->{currency} ne $form->{defaultcurrency}) { + $form->{forex} = $form->{exchangerate} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{datepaid}, ($form->{vc} eq 'customer') ? "buy" : "sell"); + } + + $form->{media} = $myconfig{printer}; + $form->{format} = "pdf" unless $myconfig{printer}; &form_header; - &list_invoices; &form_footer; } @@ -72,63 +108,100 @@ sub form_header { $vclabel = ucfirst $form->{vc}; $vclabel = $locale->text($vclabel); - - if ($form->{vc} eq 'customer') { + + if ($form->{type} eq 'receipt') { $form->{title} = $locale->text('Receipt'); - $rclabel = $locale->text('Reference'); - $form->{type} = 'receipt'; - } else { + } + if ($form->{type} eq 'check') { $form->{title} = $locale->text('Payment'); - $rclabel = $locale->text('Check'); - $form->{type} = 'check'; } + # $locale->text('Customer') # $locale->text('Vendor') if ($form->{$form->{vc}} eq "") { - map { $form->{"addr$_"} = "" } (1 .. 4); + map { $form->{$_} = "" } qw(address1 address2 city zipcode state country); } + $exchangerate = ""; if ($form->{currency} ne $form->{defaultcurrency}) { $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); if ($form->{forex}) { $exchangerate = qq| <tr> - <th align=right nowrap>|.$locale->text('Exchangerate').qq|</th> + <th align=right nowrap>|.$locale->text('Exchange Rate').qq|</th> <td colspan=3><input type=hidden name=exchangerate size=10 value=$form->{exchangerate}>$form->{exchangerate}</td> </tr> |; } else { $exchangerate = qq| <tr> - <th align=right nowrap>|.$locale->text('Exchangerate').qq|</th> + <th align=right nowrap>|.$locale->text('Exchange Rate').qq|</th> <td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td> </tr> |; } } + + foreach $item ($form->{vc}, department) { + $form->{"select$item"} = $form->unescape($form->{"select$item"}); + $form->{"select$item"} =~ s/ selected//; + $form->{"select$item"} =~ s/(<option value="\Q$form->{$item}\E")/$1 selected/; + } - foreach $item ($form->{vc}, account, currency) { + foreach $item (account, currency, $form->{ARAP}) { $form->{"select$item"} =~ s/ selected//; $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } $vc = ($form->{"select$form->{vc}"}) ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}\n</select>| : qq|<input name=$form->{vc} size=35 value="$form->{$form->{vc}}">|; + if ($form->{all_vc}) { + $allvc = "checked"; + $form->{openinvoices} = ""; + } else { + $allvc = ""; + $form->{openinvoices} = 1; + } + +# $locale->text('AR') +# $locale->text('AP') + + $department = qq| + <tr> + <th align="right" nowrap>|.$locale->text('Department').qq|</th> + <td><select name=department>$form->{selectdepartment}</select> + <input type=hidden name=selectdepartment value="|.$form->escape($form->{selectdepartment},1).qq|"> + <input type=hidden name=olddepartment value="$form->{department}"> + + </td> + </tr> +| if $form->{selectdepartment}; + $form->header; + $arap = lc $form->{ARAP}; + print qq| <body> <form method=post action=$form->{script}> +<!-- <input type=hidden name=id value=1> --> + <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}> <input type=hidden name=closedto value=$form->{closedto}> <input type=hidden name=vc value=$form->{vc}> <input type=hidden name=type value=$form->{type}> - -<table border=0 width=100%> +<input type=hidden name=formname value=$form->{type}> +<input type=hidden name=queued value="$form->{queued}"> +<input type=hidden name=arap value=$arap> +<input type=hidden name=ARAP value=$form->{ARAP}> +<input type=hidden name=openinvoices value=$form->{openinvoices}> +<input type=hidden name=title value="$form->{title}"> + +<table width=100%> <tr> <th class=listtop>$form->{title}</th> </tr> @@ -140,39 +213,63 @@ sub form_header { <td> <table> <tr> + <td align=right> + <input name=all_vc type=checkbox style=checkbox value=Y $allvc> + <input type=hidden name="oldall_vc" value="$form->{all_vc}"></td> + <th align=left>|.$locale->text('All').qq|</th> + </tr> + <tr> <th align=right>$vclabel</th> <td>$vc</td> - <input type=hidden name="select$form->{vc}" value="$form->{"select$form->{vc}"}"> + <input type=hidden name="select$form->{vc}" value="|.$form->escape($form->{"select$form->{vc}"},1).qq|"> <input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}> <input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}"> </tr> <tr valign=top> <th align=right nowrap>|.$locale->text('Address').qq|</th> - <td> + <td colspan=2> <table> <tr> - <td>$form->{addr1}</td> + <td>$form->{address1}</td> </tr> <tr> - <td>$form->{addr2}</td> + <td>$form->{address2}</td> </tr> - <tr> - <td>$form->{addr3}</td> + <td>$form->{city}</td> + </tr> + </tr> + <td>$form->{state}</td> + </tr> + </tr> + <td>$form->{zipcode}</td> </tr> <tr> - <td>$form->{addr4}</td> + <td>$form->{country}</td> </tr> </table> </td> - <input type=hidden name=addr1 value="$form->{addr1}"> - <input type=hidden name=addr2 value="$form->{addr2}"> - <input type=hidden name=addr3 value="$form->{addr3}"> - <input type=hidden name=addr4 value="$form->{addr4}"> + <input type=hidden name=address1 value="$form->{address1}"> + <input type=hidden name=address2 value="$form->{address2}"> + <input type=hidden name=city value="$form->{city}"> + <input type=hidden name=state value="$form->{state}"> + <input type=hidden name=zipcode value="$form->{zipcode}"> + <input type=hidden name=country value="$form->{country}"> + </tr> + <tr> + <th align=right>|.$locale->text('Memo').qq|</th> + <td colspan=2><input name="memo" size=30 value="$form->{memo}"></td> </tr> </table> </td> <td align=right> <table> + $department + <tr> + <th align=right nowrap>|.$locale->text($form->{ARAP}).qq|</th> + <td colspan=3><select name=$form->{ARAP}>$form->{"select$form->{ARAP}"}</select> + </td> + <input type=hidden name="select$form->{ARAP}" value="$form->{"select$form->{ARAP}"}"> + </tr> <tr> <th align=right nowrap>|.$locale->text('Account').qq|</th> <td colspan=3><select name=account>$form->{selectaccount}</select> @@ -191,21 +288,13 @@ sub form_header { </tr> $exchangerate <tr> - <th align=right nowrap>$rclabel</th> + <th align=right nowrap>|.$locale->text('Source').qq|</th> <td colspan=3><input name=source value="$form->{source}" size=10></td> </tr> <tr> <th align=right nowrap>|.$locale->text('Amount').qq|</th> <td colspan=3><input name=amount size=10 value=|.$form->format_amount(\%myconfig, $form->{amount}, 2).qq|></td> </tr> - <tr> - <th align=right nowrap>|.$locale->text('From').qq|</th> - <td><input name=transdatefrom size=11 title="$myconfig{dateformat}" value=$form->{transdatefrom}></td> - <th align=right nowrap>|.$locale->text('to').qq|</th> - <td><input name=transdateto size=11 title="$myconfig{dateformat}" value=$form->{transdateto}></td> - <input type=hidden name=oldtransdatefrom value=$form->{oldtransdatefrom}> - <input type=hidden name=oldtransdateto value=$form->{oldtransdateto}> - </tr> </table> </td> </tr> @@ -219,9 +308,11 @@ sub form_header { sub list_invoices { - @column_index = qw(invnumber transdate amount due paid selectpaid); + @column_index = qw(invnumber transdate amount due checked paid); $colspan = $#column_index + 1; + + $invoice = $locale->text('Invoices'); print qq| <input type=hidden name=column_index value="id @column_index"> @@ -229,16 +320,16 @@ sub list_invoices { <td> <table width=100%> <tr> - <th class=listheading colspan=$colspan>|.$locale->text('Invoices').qq|</th> + <th class=listheading colspan=$colspan>$invoice</th> </tr> |; $column_data{invnumber} = qq|<th nowrap>|.$locale->text('Invoice')."</th>"; $column_data{transdate} = qq|<th nowrap>|.$locale->text('Date')."</th>"; $column_data{amount} = qq|<th nowrap>|.$locale->text('Amount')."</th>"; - $column_data{due} = qq|<th nowrap>|.$locale->text('Due')."</th>"; - $column_data{paid} = qq|<th nowrap>|.$locale->text('Applied')."</th>"; - $column_data{selectpaid} = qq|<th nowrap>|.$locale->text('Paid in full')."</th>"; + $column_data{due} = qq|<th nowrap>|.$locale->text('Amount Due')."</th>"; + $column_data{paid} = qq|<th nowrap>|.$locale->text('Amount')."</th>"; + $column_data{checked} = qq|<th nowrap>|.$locale->text('Select')."</th>"; print qq| <tr> @@ -250,7 +341,6 @@ sub list_invoices { for $i (1 .. $form->{rowcount}) { - $form->{"selectpaid_$i"} = "checked" if $form->{"selectpaid_$i"}; map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid); $totalamount += $form->{"amount_$i"}; @@ -269,13 +359,10 @@ sub list_invoices { $column_data{due} = qq|<td align=right width=15%>$form->{"due_$i"}</td> <input type=hidden name="due_$i" value=$form->{"due_$i"}>|; - $column_data{paid} = qq|<td align=right width=15%>|; - if ($form->{"selectpaid_$i"}) { - $column_data{paid} .= qq|<input type=hidden name="paid_$i" value=$form->{"paid_$i"}>$form->{"paid_$i"}</td>|; - } else { - $column_data{paid} .= qq|<input name="paid_$i" size=10 value=$form->{"paid_$i"}></td>|; - } - $column_data{selectpaid} = qq|<td align=center width=10%><input name="selectpaid_$i" type=checkbox class=checkbox $form->{"selectpaid_$i"}></td>|; + $column_data{paid} = qq|<td align=right width=15%><input name="paid_$i" size=10 value=$form->{"paid_$i"}></td>|; + + $form->{"checked_$i"} = ($form->{"checked_$i"}) ? "checked" : ""; + $column_data{checked} = qq|<td align=center width=10%><input name="checked_$i" type=checkbox style=checkbox $form->{"checked_$i"}></td>|; $j++; $j %= 2; print qq| @@ -289,9 +376,9 @@ sub list_invoices { map { $column_data{$_} = "<td> </td>" } @column_index; - $column_data{amount} = qq|<th align=right>|.$form->format_amount(\%myconfig, $totalamount, 2, " ").qq|</th>|; - $column_data{due} = qq|<th align=right>|.$form->format_amount(\%myconfig, $totaldue, 2, " ").qq|</th>|; - $column_data{paid} = qq|<th align=right>|.$form->format_amount(\%myconfig, $totalpaid, 2, " ").qq|</th>|; + $column_data{amount} = qq|<th class=listtotal align=right>|.$form->format_amount(\%myconfig, $totalamount, 2, " ").qq|</th>|; + $column_data{due} = qq|<th class=listtotal align=right>|.$form->format_amount(\%myconfig, $totaldue, 2, " ").qq|</th>|; + $column_data{paid} = qq|<th class=listtotal align=right>|.$form->format_amount(\%myconfig, $totalpaid, 2, " ").qq|</th>|; print qq| <tr class=listtotal> @@ -309,18 +396,45 @@ sub list_invoices { sub form_footer { - $form->{OP}{$form->{media}} = "checked"; + $form->{DF}{$form->{format}} = "selected"; + + if ($form->{selectlanguage}) { + $form->{"selectlanguage"} = $form->unescape($form->{"selectlanguage"}); + $form->{"selectlanguage"} =~ s/ selected//; + $form->{"selectlanguage"} =~ s/(<option value="\Q$form->{language_code}\E")/$1 selected/; + $lang = qq|<select name=language_code>$form->{selectlanguage}</select> + <input type=hidden name=selectlanguage value="|. + $form->escape($form->{selectlanguage},1).qq|">|; + } + $media = qq| + <option value=screen>|.$locale->text('Screen') if $latex; + + if (%printer && $latex) { + map { $media .= qq| + <option value="$_">$_| } sort keys %printer; + } + if ($latex) { + $media .= qq| + <option value=queue>|.$locale->text('Queue'); + $format .= qq| + <option value=postscript $form->{DF}{postscript}>|.$locale->text('Postscript').qq| + <option value=pdf $form->{DF}{pdf}>|.$locale->text('PDF'); + } + + print qq| <tr> <td><hr size=3 noshade></td> </tr> </table> + +<input type=hidden name=callback value="$form->{callback}"> <input type=hidden name=rowcount value=$form->{rowcount}> <input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> -<input type=hidden name=password value=$form->{password}> +<input type=hidden name=sessionid value=$form->{sessionid}> <br> <input class=submit type=submit name=action value="|.$locale->text('Update').qq|"> @@ -328,18 +442,24 @@ sub form_footer { if ($latex) { print qq| -<input class=submit type=submit name=action value="|.$locale->text('Print').qq|"> -<input class=radio type=radio name=media value=screen $form->{OP}{screen}> |.$locale->text('Screen'); - - if ($myconfig{printer}) { - print qq| -<input class=radio type=radio name=media value=printer $form->{OP}{printer}> |.$locale->text('Printer'); - } +<input class=submit type=submit name=action value="|.$locale->text('Print').qq|">|; } + $media =~ s/(<option value="\Q$form->{media}\E")/$1 selected/; + print qq| + $lang +<select name=format>$format</select> +<select name=media>$media</select> +|; + + if ($form->{menubar}) { + require "$form->{path}/menu.pl"; + &menubar; + } -</form> + print qq| + </form> </body> </html> @@ -351,15 +471,60 @@ sub form_footer { sub update { my ($new_name_selected) = @_; - # get customer and invoices - $updated = &check_name($form->{vc}); + if ($form->{vc} eq 'customer') { + $buysell = "buy"; + } else { + $buysell = "sell"; + } + + # get customer + $updated = &check_name($form->{vc}, $locale->text('Nothing outstanding for ') . $form->{customer}); - $updated = 1 if (($form->{oldtransdatefrom} ne $form->{transdatefrom}) || ($form->{oldtransdateto} ne $form->{transdateto})); - $form->{oldtransdatefrom} = $form->{transdatefrom}; - $form->{oldtransdateto} = $form->{transdateto}; + if ($form->{department} ne $form->{olddepartment}) { + $updated = 1; + } + # if we switched to all_vc + if ($form->{all_vc} ne $form->{oldall_vc}) { + + $form->{openinvoices} = ($form->{all_vc}) ? 0 : 1; + + $form->{"select$form->{vc}"} = ""; + + if ($form->{all_vc}) { + $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP}); + + if ($form->{"all_$form->{vc}"}) { + map { $form->{"select$form->{vc}"} .= qq|<option value="$_->{name}--$_->{id}">$_->{name}\n| } @{ $form->{"all_$form->{vc}"} }; + } + + } else { + CP->get_openvc(\%myconfig, \%$form); + + if ($form->{"all_$form->{vc}"}) { + $newvc = qq|$form->{"all_$form->{vc}"}[0]->{name}--$form->{"all_$form->{vc}"}[0]->{id}|; + map { $form->{"select$form->{vc}"} .= qq|<option value="$_->{name}--$_->{id}">$_->{name}\n| } @{ $form->{"all_$form->{vc}"} }; + + + # if the name is not the same + if ($form->{"select$form->{vc}"} !~ /$form->{$form->{vc}}/) { + $form->{$form->{vc}} = $newvc; + &check_name($form->{vc}, $locale->text('Nothing outstanding for ') . $form->{customer}); + } + } + } + + if (@{ $form->{all_languages} }) { + $form->{selectlanguage} = "<option>\n"; + map { $form->{selectlanguage} .= qq|<option value="$_->{code}">$_->{description}\n| } @{ $form->{all_languages} }; + } + + } + if ($new_name_selected || $updated) { CP->get_openinvoices(\%myconfig, \%$form); + ($newvc) = split /--/, $form->{$form->{vc}}; + $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;; $updated = 1; } @@ -371,15 +536,16 @@ sub update { } } - # check currency - $buysell = ($form->{vc} eq 'customer') ? "buy" : "sell"; $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{datepaid}, $buysell))); $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount}); - + + if ($updated) { $form->{rowcount} = 0; + + $form->{queued} = ""; $i = 0; foreach $ref (@{ $form->{PR} }) { @@ -389,11 +555,12 @@ sub update { $form->{"transdate_$i"} = $ref->{transdate}; $ref->{exchangerate} = 1 unless $ref->{exchangerate}; $form->{"amount_$i"} = $ref->{amount} / $ref->{exchangerate}; - $form->{"due_$i"} = $form->round_amount(($ref->{amount} - $ref->{paid}) / $ref->{exchangerate}, 2); - $amount = $form->round_amount($amount - $form->{"due_$i"}, 2); - $form->{"selectpaid_$i"} = 1 if $amount > 0; + $form->{"due_$i"} = ($ref->{amount} - $ref->{paid}) / $ref->{exchangerate}; + $form->{"checked_$i"} = ""; + $form->{"paid_$i"} = ""; - map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(amount due paid); + # need to format + map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(amount due); } $form->{rowcount} = $i; @@ -405,14 +572,15 @@ sub update { map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid); - if ($form->{"selectpaid_$i"}) { - $amount -= $form->{"due_$i"}; - - if ($amount < 0) { - $form->{"selectpaid_$i"} = 0; - } else { + if ($form->{"checked_$i"}) { + # calculate paid_$i + if (!$form->{"paid_$i"}) { $form->{"paid_$i"} = $form->{"due_$i"}; } + + $amount -= $form->{"paid_$i"}; + } else { + $form->{"paid_$i"} = ""; } map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(amount due paid); @@ -429,9 +597,24 @@ sub update { sub post { &check_form; + + if ($form->{currency} ne $form->{defaultcurrency}) { + $form->error($locale->text('Exchange rate missing!')) unless $form->{exchangerate}; + } + + $msg1 = "$form->{title} posted!"; + $msg2 = "Cannot post $form->{title}!"; + +# $locale->text('Payment posted!') +# $locale->text('Receipt posted!') +# $locale->text('Cannot post Payment!') +# $locale->text('Cannot post Receipt!') + - $form->redirect($locale->text('Payment posted!')) if (CP->process_payment(\%myconfig, \%$form)); - $form->error($locale->text('Cannot post payment!')); + $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2); + + $form->redirect($locale->text($msg1)) if (CP->process_payment(\%myconfig, \%$form)); + $form->error($locale->text($msg2)); } @@ -443,43 +626,52 @@ sub print { ($whole, $form->{decimal}) = split /\./, $form->{amount}; $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2); - $m = "*" x (24 - length $form->{amount}); - $form->{amount} = $locale->text($form->{currency})."$m$form->{amount}"; $form->{decimal} .= "00"; $form->{decimal} = substr($form->{decimal}, 0, 2); - $check = new CP $myconfig{countrycode}; + $countrycode = ($form->{language_code}) ? $form->{language_code} : $myconfig{countrycode}; + $check = new CP $countrycode; $check->init; $form->{text_amount} = $check->num2text($whole); &{ "$form->{vc}_details" }; - $form->{format} = ($form->{media} eq 'screen') ? "pdf" : "postscript"; $form->{templates} = "$myconfig{templates}"; - $form->{IN} = "$form->{type}.tex"; - $form->{OUT} = "| $myconfig{printer}" if ($form->{media} eq 'printer'); + $form->{IN} = "$form->{formname}.tex"; + + if ($form->{media} !~ /(screen|queue)/) { + $form->{OUT} = "| $printer{$form->{media}}"; + } + if ($form->{media} eq 'queue') { + %queued = split / /, $form->{queued}; + + if ($filename = $queued{$form->{formname}}) { + unlink "$spool/$filename"; + $filename =~ s/\..*$//g; + } else { + $filename = time; + $filename .= $$; + } + $filename .= ($form->{format} eq 'postscript') ? '.ps' : '.pdf'; + $form->{queued} = "$form->{formname} $filename"; + $form->{OUT} = ">$spool/$filename"; + + $form->update_status(\%myconfig); + + } + $form->{company} = $myconfig{company}; $form->{address} = $myconfig{address}; - - @a = qw(name invnumber company address text_amount addr1 addr2 addr3 addr4); + + @a = qw(name company address text_amount address1 address2 city state zipcode country memo); $form->format_string(@a); $form->parse_template(\%myconfig, $userspath); - $form->{callback} = ""; - - $label = uc $form->{type}; + &update if $form->{media} ne 'screen'; -# $locale->text('Check printed!') -# $locale->text('Check printing failed!') -# $locale->text('Receipt printed!') -# $locale->text('Receipt printing failed!') - - $form->redirect($locale->text("$label printed!")); - $form->error($locale->text("$label printing failed!")); - } @@ -489,10 +681,7 @@ sub vendor_details { IR->vendor_details(\%myconfig, \%$form) }; sub check_form { - # construct callback - $form->{callback} = "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $form->redirect unless $form->{rowcount}; + &check_name($form->{vc}, $locale->text('Nothing outstanding for ') . $form->{customer}); if ($form->{currency} ne $form->{oldcurrency}) { &update; @@ -500,17 +689,22 @@ sub check_form { } $form->error($locale->text('Date missing!')) unless $form->{datepaid}; - $form->error($locale->text('Amount missing!')) unless $form->{amount}; $closedto = $form->datetonum($form->{closedto}, \%myconfig); $datepaid = $form->datetonum($form->{datepaid}, \%myconfig); $form->error($locale->text('Cannot process payment for a closed period!')) if ($datepaid <= $closedto); - $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount}); + # this is just to format the year + $form->{datepaid} = $locale->date(\%myconfig, $form->{datepaid}); + + $amount = $form->parse_amount(\%myconfig, $form->{amount}); + $form->{amount} = $amount; + for $i (1 .. $form->{rowcount}) { - $totalpaid += $form->parse_amount(\%myconfig, $form->{"paid_$i"}); if ($form->{"paid_$i"}) { + $amount -= $form->parse_amount(\%myconfig, $form->{"paid_$i"}); + push(@{ $form->{paid} }, $form->{"paid_$i"}); push(@{ $form->{due} }, $form->{"due_$i"}); push(@{ $form->{invnumber} }, $form->{"invnumber_$i"}); @@ -518,11 +712,13 @@ sub check_form { } } - $totalpaid = $form->round_amount($totalpaid, 2); - - $form->error($locale->text('Nothing applied!')) unless $totalpaid; - $form->error($locale->text('Amount does not equal applied!')) if ($form->{amount} != $totalpaid); - + if ($form->round_amount($amount, 2) != 0) { + push(@{ $form->{paid} }, $form->format_amount(\%myconfig, $amount, 2)); + push(@{ $form->{due} }, $form->format_amount(\%myconfig, 0, "0")); + push(@{ $form->{invnumber} }, ($form->{ARAP} eq 'AR') ? $locale->text('Deposit') : $locale->text('Prepayment')); + push(@{ $form->{invdate} }, $form->{datepaid}); + } + } |