SF.net SVN: ledger-smb:[6451] branches/1.3

[..hidden..]

Revision: 6451
          http://sourceforge.net/p/ledger-smb/code/6451
Author:   einhverfr
Date:     2014-01-14 04:02:39 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
Corrects copy to new behavior, but update still broken.
Fixes deleting ar vouchers in batch delete

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/bin/aa.pl
    branches/1.3/scripts/vouchers.pl
    branches/1.3/sql/modules/Voucher.sql
    branches/1.3/sql/upgrade/1.2-1.3.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2014-01-14 03:57:34 UTC (rev 6450)
+++ branches/1.3/Changelog	2014-01-14 04:02:39 UTC (rev 6451)
@@ -14,6 +14,8 @@
 * Fixing receipts listing "to pay" for amount (Chris T, 892)
 * Setting->get() now works with named keys (Chris T)
 * nginx sample configurations (P. Istvan)
+* Fixed unable to delete ar vouchers (Chris T)
+* Fixed copy to new scrambling lines (Chris T, 923)
 
 Chris T is Chris Travers
 Nick P is Nick Prater

Modified: branches/1.3/bin/aa.pl
===================================================================
--- branches/1.3/bin/aa.pl	2014-01-14 03:57:34 UTC (rev 6450)
+++ branches/1.3/bin/aa.pl	2014-01-14 04:02:39 UTC (rev 6451)
@@ -96,7 +96,7 @@
     if ($form->{paid_1}){
         delete $form->{paid_1};
     }
-    update();
+    display_form();
 }
 
 sub new_screen {

Modified: branches/1.3/scripts/vouchers.pl
===================================================================
--- branches/1.3/scripts/vouchers.pl	2014-01-14 03:57:34 UTC (rev 6450)
+++ branches/1.3/scripts/vouchers.pl	2014-01-14 04:02:39 UTC (rev 6451)
@@ -557,6 +557,7 @@
 
 sub batch_delete {
     my ($request)  = @_;
+    warn 'batch_delete';
     my $batch = LedgerSMB::Batch->new(base => $request);
     if (!$batch->close_form){
         list_batches($request);

Modified: branches/1.3/sql/modules/Voucher.sql
===================================================================
--- branches/1.3/sql/modules/Voucher.sql	2014-01-14 03:57:34 UTC (rev 6450)
+++ branches/1.3/sql/modules/Voucher.sql	2014-01-14 04:02:39 UTC (rev 6451)
@@ -464,6 +464,7 @@
 
 	DELETE FROM acc_trans WHERE trans_id = ANY(t_transaction_ids);
 	DELETE FROM ap WHERE id = ANY(t_transaction_ids);
+	DELETE FROM ar WHERE id = ANY(t_transaction_ids);
 	DELETE FROM gl WHERE id = ANY(t_transaction_ids);
 	DELETE FROM voucher WHERE batch_id = in_batch_id;
 	DELETE FROM payments_queue WHERE batch_id = in_batch_id;

Modified: branches/1.3/sql/upgrade/1.2-1.3.sql
===================================================================
--- branches/1.3/sql/upgrade/1.2-1.3.sql	2014-01-14 03:57:34 UTC (rev 6450)
+++ branches/1.3/sql/upgrade/1.2-1.3.sql	2014-01-14 04:02:39 UTC (rev 6451)
@@ -461,7 +461,10 @@
             fx_transaction, project_id, memo, invoice_id, entry_id
        FROM lsmb12.acc_trans
        JOIN lsmb12.chart ON acc_trans.chart_id = chart.id
-       JOIN account a ON chart.accno = a.accno; 
+       JOIN account a ON chart.accno = a.accno
+      WHERE trans_id IN (select id from lsmb12.ar UNION
+                         SELECT id from lsmb12.ap UNION
+                         SELECT id FROM lsmb12.gl); 
 
 INSERT INTO invoice (id, trans_id, parts_id, description, qty, allocated,
             sellprice, fxsellprice, discount, assemblyitem, unit, project_id,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits