abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug causing payments to show up on the A/R ledger instead of the customer ledger.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@74 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-06-07 17:00:08 +00:00
parent 2e07cb87a5
commit 2a2d11ba0f
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/sitelink2pmgr.pl
View File

@@ -783,11 +783,12 @@ foreach $row (@{query($sdbh, $query)}) {
# Every lease gets its own ledger # Every lease gets its own ledger
addRow('accounts', addRow('accounts',
{ 'type' => 'ASSET', { 'type' => 'ASSET',
'name' => 'Lease: #' . $newdb{'tables'}{'leases'}{'autoid'}, 'name' => 'Lease: #' . ($newdb{'tables'}{'leases'}{'autoid'}+1),
'comment' => undef }); 'comment' => undef });
addRow('ledgers', addRow('ledgers',
{ 'account_id' => $newdb{'tables'}{'accounts'}{'autoid'}, { 'account_id' => $newdb{'tables'}{'accounts'}{'autoid'},
'name' => 'Lease #' . ($newdb{'tables'}{'leases'}{'autoid'}+1) . ' Ledger', 'name' => 'Lease #' . ($newdb{'tables'}{'leases'}{'autoid'}+1)
. ' ('.$newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'name'} . ')',
'comment' => 'Ledger for Customer Account #' . $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'id'} }); 'comment' => 'Ledger for Customer Account #' . $newdb{'lookup'}{'tenant'}{$row->{'TenantID'}}{'id'} });
$newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'} = $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'} =
@@ -837,12 +838,13 @@ foreach $row (@{query($sdbh, $query)}) {
'customer_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust'} }); 'customer_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'cust'} });
$newdb{'lookup'}{'charge'}{$row->{'ChargeID'}} $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}
= {'tx' => $newdb{'tables'}{'transactions'}{'autoid'} }; = { 'tx' => $newdb{'tables'}{'transactions'}{'autoid'},
'ledger' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'} };
addRow('ledger_entries', addRow('ledger_entries',
{ 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'}, { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'}, 'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'},
'debit_ledger_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'}, 'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
'credit_ledger_id' => $newdb{'lookup'}{'charge_type'}{$row->{'ChargeDescription'}}{'ledger'}, 'credit_ledger_id' => $newdb{'lookup'}{'charge_type'}{$row->{'ChargeDescription'}}{'ledger'},
'amount' => $row->{'ChargeAmount'}, 'amount' => $row->{'ChargeAmount'},
'comment' => "Charge: $row->{'ChargeID'}; Ledger: $row->{'LedgerID'}" }); 'comment' => "Charge: $row->{'ChargeID'}; Ledger: $row->{'LedgerID'}" });
@@ -852,7 +854,7 @@ foreach $row (@{query($sdbh, $query)}) {
addRow('ledger_entries', addRow('ledger_entries',
{ 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'}, { 'monetary_source_id' => $newdb{'ids'}{'monetary_source'}{'internal'},
'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'}, 'transaction_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'tx'},
'debit_ledger_id' => $newdb{'lookup'}{'ledger'}{$row->{'LedgerID'}}{'ledger'}, 'debit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
'credit_ledger_id' => $newdb{'lookup'}{'charge_type'}{'Tax'}{'ledger'}, 'credit_ledger_id' => $newdb{'lookup'}{'charge_type'}{'Tax'}{'ledger'},
'amount' => $row->{'TaxAmount'}, 'amount' => $row->{'TaxAmount'},
'comment' => undef }); 'comment' => undef });
@@ -896,10 +898,6 @@ foreach $row (@{query($sdbh, $query)}) {
# sub idkeys { [ sort( {$a <=> $b} keys(%{$_[0]})) ] } # sub idkeys { [ sort( {$a <=> $b} keys(%{$_[0]})) ] }
# $Data::Dumper::Sortkeys = \&idkeys; # $Data::Dumper::Sortkeys = \&idkeys;
# print("Tenant\n"); print Dumper \%tenant_map;
# print("Ledger\n"); print Dumper \%ledger_map;
# print("Charge\n"); print Dumper \%charge_map;
# print("Receipt\n"); print Dumper \%receipt_map;
###################################################################### ######################################################################
@@ -932,7 +930,7 @@ foreach $row (@{query($sdbh, $query)})
{ 'monetary_source_id' => $monetary_source_id, { 'monetary_source_id' => $monetary_source_id,
'transaction_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'tx'}, 'transaction_id' => $newdb{'lookup'}{'receipt'}{$row->{'ReceiptNum'}}{'tx'},
'debit_ledger_id' => $newdb{'lookup'}{'account'}{'Cash'}{'ledger'}, 'debit_ledger_id' => $newdb{'lookup'}{'account'}{'Cash'}{'ledger'},
'credit_ledger_id' => $newdb{'lookup'}{'account'}{'A/R'}{'ledger'}, 'credit_ledger_id' => $newdb{'lookup'}{'charge'}{$row->{'ChargeID'}}{'ledger'},
'amount' => $row->{'PaymentAmount'}, 'amount' => $row->{'PaymentAmount'},
'comment' => "Receipt: $row->{'ReceiptNum'}; Payment: $row->{'PaymentID'}; Charge: $row->{'ChargeID'}" }); 'comment' => "Receipt: $row->{'ReceiptNum'}; Payment: $row->{'PaymentID'}; Charge: $row->{'ChargeID'}" });
@@ -1058,7 +1056,7 @@ addRow('ledger_entries',
'name' => "Close Out ($newdb{'ids'}{'ledger'}{'Cash-Old'} -> $newdb{'tables'}{'transactions'}{'autoid'})", 'name' => "Close Out ($newdb{'ids'}{'ledger'}{'Cash-Old'} -> $newdb{'tables'}{'transactions'}{'autoid'})",
'comment' => "Carrying forward old ledger balance onto new ledger" }); 'comment' => "Carrying forward old ledger balance onto new ledger" });
$newdb{'tables'}{'ledgers'}{'rows'}[$newdb{'ids'}{'ledger'}{'Cash-Old'}]{'closed'} => 1; $newdb{'tables'}{'ledgers'}{'rows'}[$newdb{'ids'}{'ledger'}{'Cash-Old'}]{'closed'} = 1;
foreach my $ir ('invoice', 'receipt') { foreach my $ir ('invoice', 'receipt') {