SF.net SVN: ledger-smb:[5030] trunk

[..hidden..]

Revision: 5030
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5030&view=rev
Author:   einhverfr
Date:     2012-07-24 02:29:50 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/AA.pm
    trunk/LedgerSMB/OE.pm
    trunk/bin/oe.pl
    trunk/sql/modules/Reconciliation.sql

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5025
   + /branches/1.3:3711-5029

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-24 02:25:14 UTC (rev 5029)
+++ trunk/Changelog	2012-07-24 02:29:50 UTC (rev 5030)
@@ -80,6 +80,11 @@
 Changelog for 1.3.21
 * Added a default numberformat in Form.pm (Chris T)
 * Added a container div for theming saved and/or posted docs (Chris T)
+* Fixed an is_zero error saving purchase transactions (Nick P)
+* Fixed shipping selection not displaying customer info (Chris T, 3543932)
+* Fixed shipping redirection not displaying orders (Chris T, h/t Nigel T)
+* Recon screen now groups journal entries by transaction (Chris T, h/t Nick P)
+* Fixed empty string working as empty source for cash recon (Chris T)
 
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2012-07-24 02:25:14 UTC (rev 5029)
+++ trunk/LedgerSMB/AA.pm	2012-07-24 02:29:50 UTC (rev 5030)
@@ -122,7 +122,7 @@
     my $tax         = 0;
     my $fxtax       = 0;
     my $amount;
-    my $diff;
+    my $diff        = 0;
 
     my %tax = ();
     my $accno;

Modified: trunk/LedgerSMB/OE.pm
===================================================================
--- trunk/LedgerSMB/OE.pm	2012-07-24 02:25:14 UTC (rev 5029)
+++ trunk/LedgerSMB/OE.pm	2012-07-24 02:29:50 UTC (rev 5030)
@@ -177,8 +177,10 @@
         #HV alias company.ct changed to company.c
         $query = qq|
 			SELECT DISTINCT o.id, o.ordnumber, o.transdate,
-				o.reqdate, o.amount, c.legal_name, o.netamount, 
-				o.entity_credit_account as $form->{vc}_id, ex.$rate AS exchangerate,
+				o.reqdate, o.amount, c.legal_name as name, 
+                                eca.meta_number, o.netamount, eca.entity_id,
+                                o.entity_credit_account as $form->{vc}_id, 
+                                ex.$rate AS exchangerate,
 		 		o.closed, o.quonumber, o.shippingpoint, 
 				o.shipvia, ee.name AS employee, o.curr, 
 				o.ponumber

Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl	2012-07-24 02:25:14 UTC (rev 5029)
+++ trunk/bin/oe.pl	2012-07-24 02:29:50 UTC (rev 5030)
@@ -1631,7 +1631,7 @@
     for (
         "oldsort",     "direction", "path",      "type",
         "vc",          "login",     "sessionid", "transdatefrom",
-        "transdateto", "open",      "closed"
+        "transdateto", "open",      "closed", "oe_class_id"
       )
     {
         $callback .= qq|&$_=$form->{$_}|;

Modified: trunk/sql/modules/Reconciliation.sql
===================================================================
--- trunk/sql/modules/Reconciliation.sql	2012-07-24 02:25:14 UTC (rev 5029)
+++ trunk/sql/modules/Reconciliation.sql	2012-07-24 02:29:50 UTC (rev 5030)
@@ -380,7 +380,9 @@
 		INSERT INTO cr_report_line (report_id, scn, their_balance, 
 			our_balance, "user", voucher_id, ledger_id, post_date)
 		SELECT in_report_id, 
-		       COALESCE(ac.source, gl.ref),
+		       CASE WHEN ac.source IS NULL OR ac.source = '' 
+                            THEN gl.ref
+                            ELSE ac.source END,
 		       0, 
 		       sum(amount / CASE WHEN t_recon_fx IS NOT TRUE OR gl.table = 'gl'
                                          THEN 1
@@ -421,7 +423,8 @@
                                 AND (gl.table <> 'gl' OR ac.fx_transaction
                                                       IS TRUE))) 
 		GROUP BY gl.ref, ac.source, ac.transdate,
-			ac.memo, ac.voucher_id, gl.table
+			ac.memo, ac.voucher_id, gl.table, 
+                        case when gl.table = 'gl' then gl.id else 1 end
 		HAVING count(rl.id) = 0;
 
 		UPDATE cr_report set updated = now(),

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