diff options
Diffstat (limited to 'bin/mozilla')
| -rwxr-xr-x | bin/mozilla/gl.pl | 21 | ||||
| -rwxr-xr-x | bin/mozilla/ir.pl | 65 | ||||
| -rwxr-xr-x | bin/mozilla/pos.pl | 122 | ||||
| -rwxr-xr-x | bin/mozilla/ps.pl | 1 | ||||
| -rwxr-xr-x | bin/mozilla/rc.pl | 353 |
5 files changed, 541 insertions, 21 deletions
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 3e238609..9a83675a 100755 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -83,7 +83,23 @@ require "$form->{path}/arap.pl"; # $locale->text('Nov') # $locale->text('Dec') +sub pos_adjust { + $form->{rowcount} = 3; + require "pos.conf.pl"; + $form->{accno_1} = $pos_config{'close_cash_accno'}; + $form->{accno_2} = $pos_config{'coa_prefix'}; + $form->{accno_3} = $pos_config{'coa_prefix'}; +} +sub add_pos_adjust { + $form->{pos_adjust} = 1; + $form->{reference} = $locale->text("Adjusting Till: (till) Source: (source)"); + $form->{description} = + $locale->text("Adjusting till due to data entry error."); + $form->{callback} = "$form->{script}?action=add_pos_adjust&transfer=$form->{transfer}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback}; + &add; +} + sub add { $form->{title} = "Add"; @@ -93,6 +109,9 @@ sub add { &create_links; $form->{rowcount} = ($form->{transfer}) ? 3 : 9; + if ($form->{pos_adjust}){ + &pos_adjust; + } $form->{oldtransdate} = $form->{transdate}; $form->{focus} = "reference"; @@ -856,7 +875,7 @@ sub display_rows { |; } - $form->hide_form(qw(rowcount selectaccno)); + $form->hide_form(qw(rowcount selectaccno pos_adjust)); print qq| <input type=hidden name=selectprojectnumber value="|.$form->escape($form->{selectprojectnumber},1).qq|">|; diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 1e77dce5..35f9975b 100755 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -461,10 +461,12 @@ sub form_footer { <tr> <th align=left>|.$locale->text('Notes').qq|</th> <th align=left>|.$locale->text('Internal Notes').qq|</th> + <th align=left>|.$locale->text('Import Text').qq|</th> </tr> <tr valign=top> <td>$notes</td> <td>$intnotes</td> + <td><textarea name=import_text rows=$rows cols=25></textarea> </tr> </table> </td> @@ -624,8 +626,71 @@ print qq| } +sub import_text { + my @o_list; + my @i_lines = split(/(\n|\r|\r\n)/, $form->{import_text}); + foreach $i (@i_lines){ + chomp($i); + if ($i != ""){ # Strip out blank lines + push @o_list, $i; + } + } + my $c = 1; + my $linenumber = 0; + foreach $l (@o_list){ + if ($c % 2){ + $linenumber += 1; + $form->{"partnumber_$linenumber"} = $l; + } + else { + $form->{"qty_$linenumber"} = $l; + } + $c += 1; + $form->{rowcount}=$linenumber; + IR->retrieve_item(\%myconfig, \%$form); + $rows = scalar @{ $form->{item_list} }; + $rows = 0 unless $rows; + $i = $form->{rowcount}; + if ($rows = 0){ + $form->{"id_$i"} = 0; + $form->{"unit_$i"} = $locale->text('ea'); + + &new_item; + } elsif ($rows > 1){ + &select_item; + exit; + } else { + map { $form->{item_list}[$i]{$_} = $form->quote($form->{item_list}[$i]{$_}) } qw(partnumber description unit); + + map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; + + $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"}; + + ($dec) = ($s =~ /\.(\d+)/); + $dec = length $dec; + $decimalplaces = ($dec > 2) ? $dec : 2; + + $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100); + map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); + map { $form->{"${_}_base"} += $amount } (split / /, $form->{"taxaccounts_$i"}); + map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded}; + + $form->{creditremaining} -= $amount; + + $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); + $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); + + } + $form->{item_list} = []; + } + ++$form->{rowcount} +} sub update { + if($form->{import_text}){ + &import_text; + } + $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate}); diff --git a/bin/mozilla/pos.pl b/bin/mozilla/pos.pl index 53627496..f7f817ea 100755 --- a/bin/mozilla/pos.pl +++ b/bin/mozilla/pos.pl @@ -44,12 +44,55 @@ 1; # end +sub check_alert { + my $rc = $form->{'rowcount'}; + if (!$form->{"partnumber_$rc"}){ + --$rc; # Ensures that alert shows up when item is selected from a list; + } + for (1 .. $rc){ + $form->{'check_id'} = ($form->{'check_id'} || $form->{"check_id_$_"}); + } +} + +sub send_to_pd{ + socket(SOCK, 2, 1, getprotobynumber($pos_config{'pd_proto'})); + connect(SOCK, $pos_config{'pd_dest'}); + my $rn = $numrows - 1; + my $ds_string = sprintf ( + '%s%s @ $%-7.2f%s%s%s', + $pd_control{'new_line'}, + $form->{"qty_$rn"}, + $form->{"sellprice_$rn"}, + $pd_control{'new_line'}, + "Subtotal: \$".sprintf('%-7.2f', $form->{'invtotal'}) + ); + print SOCK $ds_string; + close SOCK; +} + +sub on_update{ + &send_to_pd; + &check_alert; +} + +sub open_drawer{ + open (PRINTER, "|-", $printer{Printer}); + print PRINTER $pos_config{'rp_cash_open'}; + close PRINTER; + sleep 1; +} + +sub open { + &open_drawer; + &update; +} sub add { + $form->{nextsub} = 'add'; $form->{title} = $locale->text('Add POS Invoice'); - $form->{callback} = "$form->{script}?action=$form->{nextsub}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback}; + $form->{callback} = "$form->{script}?action=$form->{nextsub}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"; &invoice_links; @@ -68,10 +111,14 @@ sub add { &display_form; + $form->{dontdisplayrows} = 1; + &openinvoices; } sub openinvoices { + undef %column_data; + undef %column_heading; $ENV{REMOTE_ADDR} =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/; $form->{till} = $4; @@ -94,7 +141,7 @@ sub edit { $form->{title} = $locale->text('Edit POS Invoice'); - $form->{callback} = "$form->{script}?action=$form->{nextsub}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback}; + $form->{callback} = "$form->{script}?action=$form->{nextsub}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"; &invoice_links; &prepare_invoice; @@ -115,6 +162,10 @@ sub edit { sub form_header { + if (!$form->{'check_id'}){ + &check_alert; + } + # set option selected for (qw(AR currency)) { $form->{"select$_"} =~ s/ selected//; @@ -228,7 +279,7 @@ sub form_header { <form method=post action="$form->{script}"> |; - $form->hide_form(qw(id till type format printed title discount creditlimit creditremaining tradediscount business closedto locked oldtransdate customer_id oldcustomer)); + $form->hide_form(qw(id till type format printed title discount creditlimit creditremaining tradediscount business closedto locked oldtransdate customer_id oldcustomer check_id)); print qq| <input type=hidden name=vc value="customer"> @@ -236,7 +287,15 @@ sub form_header { <table width=100%> <tr class=listtop> <th class=listtop>$form->{title}</font></th> - </tr> + </tr>|; + if ($form->{'check_id'}){ + print qq| + <tr class=listtop> + <th class=listtop style="background-color: red">|.$locale->text('Check ID').qq| + </th> + </tr>|; + } + print qq| <tr height="5"></tr> <tr> <td> @@ -378,12 +437,25 @@ sub form_footer { $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); - - $column_data{paid} = qq|<td><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|; + if ($form->{"paid__$i"}){ + $column_data{paid} = qq|<td><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|; + } else { + $column_data{paid} = qq|<td><input accesskey='n' name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|; + } + $column_data{source} = qq|<td><input name="source_$i" size=10 value="$form->{"source_$i"}"></td>|; $column_data{memo} = qq|<td><input name="memo_$i" size=10 value="$form->{"memo_$i"}"></td>|; - $column_data{AR_paid} = qq|<td><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|; + if ($pos_config{"coa_prefix"}){ + if (!$form->{"AR_paid_$i"}){ + $form->{"AR_paid_$i"} = + $pos_config{"coa_prefix"}.'.'.$pos_config{"till"}; + } + $column_data{AR_paid} = qq|<input type=hidden name="AR_paid_$i" + value='$form->{"AR_paid_$i"}'>|; + } else { + $column_data{AR_paid} = qq|<td><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|; + } print qq| <tr> |; @@ -520,6 +592,7 @@ sub form_footer { sub post { + $form->{media} = 'Printer'; $form->isblank("customer", $locale->text('Customer missing!')); # if oldcustomer ne customer redo form @@ -532,6 +605,7 @@ sub post { } &validate_items; + &print; $form->isblank("exchangerate", $locale->text('Exchange rate missing!')) if ($form->{currency} ne $form->{defaultcurrency}); @@ -542,7 +616,16 @@ sub post { $total = $form->parse_amount(\%myconfig, $form->{invtotal}); # deduct change from first payment - $form->{"paid_1"} = $form->format_amount(\%myconfig, $form->parse_amount(\%myconfig, $form->{"paid_1"}) - ($paid - $total), 2) if $paid > $total; + #$form->{"paid_1"} = $form->{invtotal} if $paid > $total; + $form->{paid} = $paid; + if ($paid > $total){ + ++$form->{paidaccounts}; + my $pa = $form->{paidaccounts}; + $form->{"paid_$pa"} = $total - $paid; + $form->{"source_$pa"} = 'cash'; + $form->{"exchangerate_$pa"} = 0; + $form->{"AR_paid_$pa"} = $form->{AR_paid_1} + } ($form->{AR}) = split /--/, $form->{AR}; @@ -667,6 +750,22 @@ sub display_row { sub print { + if (!$form->{invnumber}){ + $form->{invnumber} = $form->update_defaults(\%myconfig, 'sinumber'); + } + $rc = $form->{'rowcount'}; + $pc = $form->{'paidaccounts'}; + if ($form->{"partnumber_$rc"} || $form->{"description_$rc"} || + $form->{"paid_$pc"}){ + &update; + exit; + } + for $i (1 .. $rc - 1){ + if ($form->{"qty_$i"} != $form->{"oldqty_$i"}){ + &update; + exit; + } + } if (!$form->{invnumber}) { $form->{invnumber} = $form->update_defaults(\%myconfig, "sinumber"); @@ -681,7 +780,8 @@ sub print { for (qw(employee department)) { $form->{$_} =~ s/--.*//g; } $form->{invdate} = $form->{transdate}; - $form->{dateprinted} = scalar localtime; + my @lt = localtime(); + $form->{dateprinted} = $lt[2].":".$lt[1].":".$lt[0]; &print_form($old_form); @@ -690,6 +790,7 @@ sub print { sub print_form { my $old_form = shift; + &open_drawer; # if oldcustomer ne customer redo form $customer = $form->{customer}; @@ -743,6 +844,7 @@ sub print_form { $form->{rowcount}--; $form->{pre} = "<body bgcolor=#ffffff>\n<pre>"; delete $form->{stylesheet}; + $form->{cd_open} = $pos_config{rp_cash_drawer_open}; $form->parse_template(\%myconfig, $userspath); @@ -768,7 +870,7 @@ sub print_form { if (! $form->{printandpost}) { $form->{rowcount}--; - &display_form; + #&display_form; } } diff --git a/bin/mozilla/ps.pl b/bin/mozilla/ps.pl index d8a8bef9..7601fd7e 100755 --- a/bin/mozilla/ps.pl +++ b/bin/mozilla/ps.pl @@ -50,6 +50,7 @@ require "$form->{path}/ar.pl"; require "$form->{path}/is.pl"; require "$form->{path}/rp.pl"; require "$form->{path}/pos.pl"; +require "pos.conf.pl"; # customizations if (-f "$form->{path}/custom_pos.pl") { diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl index c310f9e0..fc5ee24d 100755 --- a/bin/mozilla/rc.pl +++ b/bin/mozilla/rc.pl @@ -188,10 +188,299 @@ sub reconciliation { sub continue { &{ $form->{nextsub} } }; +sub till_closing { + $form->{callback} = "$form->{script}?path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"; + + @colheadings = qw(Source Actual Expected Error); + + $form->{title} = "Closing Till For $form->{login}"; + require "pos.conf.pl"; + RC->getposlines(\%myconfig, \%$form); + $form->header; + print qq| +<body> + +<form method=post action=$form->{script}> +<input type=hidden name=path value=$form->{path}> +<input type=hidden name=login value=$form->{login}> +<input type=hidden name=sessionid value=$form->{sessionid}> + +<input type=hidden name=callback value="$form->{callback}"> +<input type=hidden name=sum value="|.$form->{sum} * -1 .qq|"> +<table width=100%> + <tr> + <th class=listtop>$form->{title}</th> + </tr> +</table> +<table width=100%> +|; + + print "<tr>"; + map {print "<td class=listheading>$_</td>";} @colheadings; + print "</tr>"; + my $j; + my $source; + foreach $source (sort keys %pos_sources){ + $amount = 0; + foreach $ref (@{$form->{TB}}){ + if ($ref->{source} eq $source){ + $amount = $ref->{amount} * -1; + last; + } + } + ++$j; + $j = $j % 2; + print qq|<tr class=listrow$j><td>|.$pos_sources{$source}.qq|</td> + <td><input name="amount_$source"> + <input type=hidden name="expected_$source" + value="$amount"></td> + <td>\$$amount</td> + <td id="error_$source"> </td></tr>|; + } + print qq| +<script type='text/javascript'> + +function money_round(m){ + var r; + r = Math.round(m * 100)/100; + return r; +} + +function custom_calc_total(){ + document.forms[0].sub_100.value = document.forms[0].calc_100.value * 100; + document.forms[0].sub_50.value = document.forms[0].calc_50.value * 50; + document.forms[0].sub_20.value = document.forms[0].calc_20.value * 20; + document.forms[0].sub_10.value = document.forms[0].calc_10.value * 10; + document.forms[0].sub_5.value = document.forms[0].calc_5.value * 5; + document.forms[0].sub_1.value = document.forms[0].calc_1.value * 1; + document.forms[0].sub_050.value = document.forms[0].calc_050.value * .5; + document.forms[0].sub_025.value = document.forms[0].calc_025.value * .25; + document.forms[0].sub_010.value = document.forms[0].calc_010.value * .10; + document.forms[0].sub_005.value = document.forms[0].calc_005.value * .05; + document.forms[0].sub_001.value = document.forms[0].calc_001.value * .01; + document.forms[0].sub_sub.value = document.forms[0].sub_100.value * 1 + + document.forms[0].sub_50.value*1 + document.forms[0].sub_20.value*1 + + document.forms[0].sub_10.value*1 + document.forms[0].sub_5.value*1 + + document.forms[0].sub_1.value*1 + document.forms[0].sub_050.value*1 + + document.forms[0].sub_025.value*1 + document.forms[0].sub_010.value*1 + + document.forms[0].sub_005.value*1 + document.forms[0].sub_001.value*1; + document.forms[0].sub_001.value = + money_round(document.forms[0].sub_001.value); + document.forms[0].sub_010.value = + money_round(document.forms[0].sub_010.value); + document.forms[0].sub_005.value = + money_round(document.forms[0].sub_005.value); + document.forms[0].sub_sub.value = + money_round(document.forms[0].sub_sub.value); + document.forms[0].amount_cash.value = money_round( + document.forms[0].sub_sub.value - $pos_config{till_cash}); + check_errors(); +} +function check_errors(){ + var cumulative_error = 0; + var source_error = 0; + var err_cell; + |; + map { + print " source_error = money_round( + document.forms[0].amount_$_.value - + document.forms[0].expected_$_.value); + cumulative_error = cumulative_error + source_error; + err_cell = document.getElementById('error_$_'); + err_cell.innerHTML = '\$' + source_error;\n"; + } (keys %pos_sources); + print qq| + alert('Cumulative Error: \$' + money_round(cumulative_error)); +} +</script> + +<table> +<col><col><col> + <tr> + <td><input type=text name=calc_100 value="$form->{calc_100}"></td> + <th>X \$100 = </th> + <td><input type=text name=sub_100 value="$form->{sub_100}"></td> + </tr> + <tr> + <td><input type=text name=calc_50 value="$form->{calc_50}"></td> + <th>X \$50 = </th> + <td><input type=text name=sub_50 value="$form->{sub_50}"></td> + </tr> + <tr> + <td><input type=text name=calc_20 value="$form->{calc_20}"></td> + <th>X \$20 = </th> + <td><input type=text name=sub_20 value="$form->{sub_20}"></td> + </tr> + <tr> + <td><input type=text name=calc_10 value="$form->{calc_10}"></td> + <th>X \$10 = </th> + <td><input type=text name=sub_10 value="$form->{sub_10}"></td> + </tr> + <tr> + <td><input type=text name=calc_5 value="$form->{calc_5}"></td> + <th>X \$5 = </th> + <td><input type=text name=sub_5 value="$form->{sub_5}"></td> + </tr> + <tr> + <td><input type=text name=calc_1 value="$form->{calc_1}"></td> + <th>X \$1 = </th> + <td><input type=text name=sub_1 value="$form->{sub_1}"></td> + </tr> + <tr> + <td><input type=text name=calc_050 value="$form->{calc_050}"></td> + <th>X \$0.50 = </th> + <td><input type=text name=sub_050 value="$form->{sub_050}"></td> + </tr> + <tr> + <td><input type=text name=calc_025 value="$form->{calc_025}"></td> + <th>X \$.25 = </th> + <td><input type=text name=sub_025 value="$form->{sub_025}"></td> + </tr> + <tr> + <td><input type=text name=calc_010 value="$form->{calc_010}"></td> + <th>X \$.10 = </th> + <td><input type=text name=sub_010 value="$form->{sub_010}"></td> + </tr> + <tr> + <td><input type=text name=calc_005 value="$form->{calc_005}"></td> + <th>X \$.05 = </th> + <td><input type=text name=sub_005 value="$form->{sub_005}"></td> + </tr> + <tr> + <td><input type=text name=calc_001 value="$form->{calc_001}"></td> + <th>X \$.01 = </th> + <td><input type=text name=sub_001 value="$form->{sub_001}"></td> + </tr> + <tr> + <td> </td> + <th>Subtotal:</th> + <td><input type=text name=sub_sub value="$form->{sub_sub}"></td> +</table> +<input type=button name=calculate class=submit onClick="custom_calc_total()" + value='Calculate'> +|; + print qq|</table><input type=submit name=action value="|. + $locale->text("close_till").qq|">|; + print qq| +</form> + +</body> +</html> +|; +} + + +sub close_till { + use SL::GL; + require 'pos.conf.pl'; + RC->clear_till(\%myconfig, \%$form); + my $amount = 0; + my $expected = 0; + my $difference = 0; + my $lines = ''; + $form->{rowcount} = 2; + foreach $key (keys %pos_sources){ + $amount = 0; + $expected = 0; + $amount = $form->parse_amount(\%myconfig, $form->{"amount_$key"}); + $expected = $form->parse_amount(\%myconfig, $form->{"expected_$key"}); + $gl_entry = "Closing Till $pos_config{till} source = $key"; + $accno1 = $pos_config{till_accno}; + if (${$pos_config{'source_accno_override'}{$key}}){ + $accno2 = ${$pos_config{'source_accno_override'}{$key}}; + } else { + $accno2 = $pos_config{'close_cash_accno'}; + } + $form->{reference} = $gl_entry; + $form->{accno_1} = $accno1; + $form->{credit_1} = $amount; + $form->{accno_2} = $accno2; + $form->{debit_2} = $amount; + $form->{transdate} = $form->current_date(\%myconfig); + GL->post_transaction(\%myconfig, \%$form); + delete $form->{id}; + $error = $amount - $expected; + $difference += $error; + $lines .= "Source: $key, Amount: $amount\nExpected: $expected. Error= $error\n\n"; + } + $gl_entry = "Closing Till: $pos_config{till} Over/Under"; + $amount = $difference * -1; + $form->{reference} = $gl_entry; + $form->{accno_1} = $accno1; + $form->{credit_1} = $amount; + $form->{accno_2} = $pos_config{coa_prefix}; + $form->{debit_2} = $amount; + $form->{transdate} = $form->current_date(\%myconfig); + GL->post_transaction(\%myconfig, \%$form); + delete $form->{id}; + $lines .= "Cumulative Error: $amount"; + $form->{accno} = $form->{accno_1}; + RC->getbalance(\%myconfig, \%$form); + $amount = $form->{balance} * -1; + $gl_entry = "Resetting Till: $pos_config{till}"; + $form->{reference} = $gl_entry; + $form->{accno_1} = $accno1; + $form->{credit_1} = $amount; + $form->{accno_2} = $pos_config{coa_prefix}; + $form->{debit_2} = $amount; + $form->{transdate} = $form->current_date(\%myconfig); + GL->post_transaction(\%myconfig, \%$form); + delete $form->{id}; + + $head = "Closing Till $pos_config{till} for $form->{login}\n". + "Date: $form->{transdate}\n\n\n"; + $cash = join ("\n", + ("Cash Breakdown:", + "$form->{calc_100} x 100 = $form->{sub_100}", + "$form->{calc_50} x 50 = $form->{sub_50}", + "$form->{calc_20} x 20 = $form->{sub_20}", + "$form->{calc_10} x 10 = $form->{sub_10}", + "$form->{calc_5} x 5 = $form->{sub_5}", + "$form->{calc_1} x 1 = $form->{sub_1}", + "$form->{calc_050} x 0.50 = $form->{sub_050}", + "$form->{calc_025} x 0.25 = $form->{sub_025}", + "$form->{calc_010} x 0.10 = $form->{sub_010}", + "$form->{calc_005} x 0.05 = $form->{sub_005}", + "$form->{calc_001} x 0.01 = $form->{sub_001}", + "Total Cash in Drawer: $form->{sub_sub}", + "Less Cash in Till At Start: $pos_config{till_cash}", + "\n")); + $foot = "Cumulative Error: $difference\n Reset Till By $amount\n\n\n\n\n\n\n\n\n\n"; + open (PRN, "|-", $printer{Printer}); + print PRN $head; + print PRN $lines; + print PRN $cash; + print PRN $cash; + print PRN $foot; + close PRN; + if ($difference > 0){ + $message = "You are over by ".$difference; + } elsif ($difference < 0){ + $message = "You are under by ".$difference * -1; + } + else { + $message = "Congradulations! Your till is exactly balanced."; + } + $form->info($message); +} sub get_payments { ($form->{accno}, $form->{account}) = split /--/, $form->{accno}; + if ($form->{'pos'}){ + require "pos.conf.pl"; + $form->{fromdate} = $form->current_date(\%myconfig); + unless ($form->{source}){ + $form->{source} = (sort keys(%pos_sources))[0]; + } + if ($form->{source} eq 'cash'){ + $form->{summary} = "true"; + } else { + $form->{summary} = ""; + } + $form->{accno} = $pos_config{'coa_prefix'} . "." . $pos_config{'till'}; + $form->{account} = $form->{source}; + } RC->payment_transactions(\%myconfig, \%$form); @@ -243,6 +532,8 @@ sub display_form { <form method=post action=$form->{script}> +<input type=hidden name=source value="$form->{source}"> +<input type=hidden name=cumulative_error value="$form->{cumulative_error}"> <table width=100%> <tr> <th class=listtop>$form->{title}</th> @@ -359,12 +650,15 @@ sub display_form { $column_data{cleared} = qq|<td align=center>*</td> <input type=hidden name="cleared_$i" value=$ref->{cleared}> <input type=hidden name="oldcleared_$i" value=$ref->{oldcleared}> - <input type=hidden name="source_$i" value="$ref->{source}">|; + <input type=hidden name="source_$i" value="$ref->{source}"> + <input type=hidden name="amount_$1" value="$ref->{amount}">|; } else { $cleared += $ref->{amount} * $ml if $checked; $clearfx = ($checked) ? 1 : 0; $column_data{cleared} = qq|<td align=center><input name="cleared_$i" type=checkbox class=checkbox value=1 $checked> - <input type=hidden name="source_$i" value="$ref->{source}"></td>|; + <input type=hidden name="source_$i" value="$ref->{source}"> + <input type=hidden name="amount_$i" value="$ref->{amount}"> + </td>|; } } @@ -402,6 +696,9 @@ sub display_form { $form->{statementbalance} = $form->parse_amount(\%myconfig, $form->{statementbalance}); $difference = $form->format_amount(\%myconfig, $form->{beginningbalance} + $cleared - $form->{statementbalance}, 2, 0); + if ($form->{source}){ + $difference = 0; + } $form->{statementbalance} = $form->format_amount(\%myconfig, $form->{statementbalance}, 2, 0); print qq| @@ -411,7 +708,46 @@ sub display_form { </tr> |; - + if ($form->{'pos'}){ + $close_next = qq|<input type=submit class=submit name=action + value="|.$locale->text('close_next').qq|">|; + $done = ""; + } + else { + $close_next = ""; + $done = qq|<input type=submit class=submit name=action + value="|.$locale->text('Done').qq|">|; + } + if ($form->{'pos'}){ + $difference = qq| + <tr> + <th align=right><select name=over_under> + <option value=under>|.$locale->text('Under').qq|</option> + <option value=over>|.$locale->text('Over').qq|</option> + </select><input type=hidden name=pos value='true'> + </th> + <td width=10%></td> + <td align=right><input name=null size=11 + value='|.$form->{null2}.qq|'></td> + <input type=hidden name=difference + value=$difference> + + |; + if ($form->{'over_under'}){ + $o_u = $form->{'over_under'}; + $difference =~ s/(value=$o_u)/SELECTED $1/g; + } + } else { + $difference = qq| + <tr> + <th align=right nowrap>|.$locale->text('Difference').qq|</th> + <td width=10%></td> + <td align=right><input name=null size=11 value=$difference></td> + <input type=hidden name=difference value=$difference> + </tr>|; + } + + if ($form->{report}) { print qq| @@ -434,12 +770,7 @@ sub display_form { <td width=10%></td> <td align=right><input name=statementbalance size=11 value=$form->{statementbalance}></td> </tr> - <tr> - <th align=right nowrap>|.$locale->text('Difference').qq|</th> - <td width=10%></td> - <td align=right><input name=null size=11 value=$difference></td> - <input type=hidden name=difference value=$difference> - </tr> + $difference </table> </td> </tr> @@ -458,7 +789,8 @@ sub display_form { <br> <input type=submit class=submit name=action value="|.$locale->text('Update').qq|"> <input type=submit class=submit name=action value="|.$locale->text('Select all').qq|"> -<input type=submit class=submit name=action value="|.$locale->text('Done').qq|">|; + $done + $close_next |; } if ($form->{menubar}) { @@ -477,6 +809,7 @@ sub display_form { sub update { + $form->{null2} = $form->{null}; RC->payment_transactions(\%myconfig, \%$form); |