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

[..hidden..]

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

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/DBObject/Payment.pm
    trunk/doc/release_notes
    trunk/templates/demo/balance_sheet.html
    trunk/templates/demo/income_statement.html

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/DBObject/Payment.pm


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4961
   + /branches/1.3:3711-4998

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-16 01:34:55 UTC (rev 4998)
+++ trunk/Changelog	2012-07-16 02:03:50 UTC (rev 4999)
@@ -86,12 +86,15 @@
 * Fixed inability to look up vendor by ECA with discounts (Erik H h/t Matt B)
 * Removed broken cash-basis reports (Chris T, h/t Jigme D
 * Backporting LedgerSMB::App_State to make other backports easier (Chris T)
+* Fixed Customer/Vendor search results unsorted (Chris T, h/t lbm, 3537592)
+* Income Statement/Balance sheet now pass through date ranges (Chris T)
 
 Andres B is Andres Basile
 Brian W is Brian Wolf
 Chris T is Chris Travers
 Erik H is Erik Huelsmann
 Jigme D is JigmeDatse
+lbm is Louis Moore
 Matt B is Matthew Bourque
 
 Changelog for 1.3.19

Modified: trunk/LedgerSMB/DBObject/Payment.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Payment.pm	2012-07-16 01:34:55 UTC (rev 4998)
+++ trunk/LedgerSMB/DBObject/Payment.pm	2012-07-16 02:03:50 UTC (rev 4999)
@@ -197,8 +197,16 @@
 
 sub get_entity_credit_account{
   my ($self) = @_;
-  @{$self->{entity_accounts}} =
-    ($self->exec_method(funcname => 'payment_get_entity_account_payment_info'),);
+
+  # This is ugly but not sure what else to do for the moment.  Looking at 
+  # refactoring later.  -CT
+  if ($self->{credit_id}){
+    @{$self->{entity_accounts}} =
+      $self->exec_method(funcname => 'payment_get_entity_account_payment_info');
+   } else {
+     @{$self->{entity_accounts}} =
+        $self->exec_method(funcname => 'payment_get_entity_accounts');
+   }
    return  @{$self->{entity_accounts}};
 }
 


Property changes on: trunk/LedgerSMB/DBObject/Payment.pm
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/1.3/LedgerSMB/DBObject/Payment.pm:3711-4956

Modified: trunk/doc/release_notes
===================================================================
--- trunk/doc/release_notes	2012-07-16 01:34:55 UTC (rev 4998)
+++ trunk/doc/release_notes	2012-07-16 02:03:50 UTC (rev 4999)
@@ -1,7 +1,7 @@
 RELEASE NOTES
 LedgerSMB 1.3
 
-Latest Revision:  1.3.19, June 17, 2012.
+Latest Revision:  1.3.20, June 17, 2012.
 
 1:  Welcome to LedgerSMB
 

Modified: trunk/templates/demo/balance_sheet.html
===================================================================
--- trunk/templates/demo/balance_sheet.html	2012-07-16 01:34:55 UTC (rev 4998)
+++ trunk/templates/demo/balance_sheet.html	2012-07-16 02:03:50 UTC (rev 4999)
@@ -40,9 +40,9 @@
 	RETURN UNLESS account_data.defined;
 	IF account_data.heading; ?><b><?lsmb
 		account_data.text; ?></b><?lsmb
-	ELSIF account_data.gifi_account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;login=<?lsmb login ?>&amp;sessionid=<?lsmb sessionid ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_gifi_accno=Y&amp;category=X&amp;gifi_accno=<?lsmb account_data.account ?>"><?lsmb
+	ELSIF account_data.gifi_account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;l_transdate=Y&amp;dateto=<?lsmb asofdate ?>&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_gifi_accno=Y&amp;category=X&amp;gifi_accno=<?lsmb account_data.account ?>"><?lsmb
 		account_data.text; ?></a><?lsmb
-	ELSIF account_data.account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;login=<?lsmb login ?>&amp;sessionid=<?lsmb sessionid ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_accno=Y&amp;category=X&amp;accno=<?lsmb account_data.account ?>"><?lsmb
+	ELSIF account_data.account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;dateto=<?lsmb asofdate ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_accno=Y&amp;category=X&amp;accno=<?lsmb account_data.account ?>"><?lsmb
 		account_data.text; ?></a><?lsmb
 	ELSIF account_data.subtotal; ?><b>&nbsp;&nbsp;<?lsmb
 		account_data.text; ?></b><?lsmb

Modified: trunk/templates/demo/income_statement.html
===================================================================
--- trunk/templates/demo/income_statement.html	2012-07-16 01:34:55 UTC (rev 4998)
+++ trunk/templates/demo/income_statement.html	2012-07-16 02:03:50 UTC (rev 4999)
@@ -40,9 +40,9 @@
 	RETURN UNLESS account_data.defined;
 	IF account_data.heading; ?><br /><b><?lsmb
 		account_data.text; ?></b><?lsmb
-	ELSIF account_data.gifi_account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;login=<?lsmb login ?>&amp;sessionid=<?lsmb sessionid ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_gifi_accno=Y&amp;category=X&amp;gifi_accno=<?lsmb account_data.account ?>"><?lsmb
+	ELSIF account_data.gifi_account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;login=<?lsmb login ?>&amp;sessionid=<?lsmb sessionid ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_gifi_accno=Y&amp;category=X&amp;gifi_accno=<?lsmb account_data.account ?>&amp;datefrom=<?lsmb fromdate ?>&amp;dateto=<?lsmb todate ?>"><?lsmb
 		account_data.text; ?></a><?lsmb
-	ELSIF account_data.account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;login=<?lsmb login ?>&amp;sessionid=<?lsmb sessionid ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_accno=Y&amp;category=X&amp;accno=<?lsmb account_data.account ?>"><?lsmb
+	ELSIF account_data.account; ?><a href="gl.pl?action=generate_report&amp;path=<?lsmb path ?>&amp;login=<?lsmb login ?>&amp;sessionid=<?lsmb sessionid ?>&amp;l_transdate=Y&amp;l_reference=Y&amp;l_description=Y&amp;l_source=Y&amp;l_debit=Y&amp;l_credit=Y&amp;l_accno=Y&amp;category=X&amp;accno=<?lsmb account_data.account ?>&amp;datefrom=<?lsmb fromdate ?>&amp;dateto=<?lsmb todate ?>"><?lsmb
 		account_data.text; ?></a><?lsmb
 	ELSIF account_data.subtotal; ?><b>&nbsp;&nbsp;<?lsmb
 		account_data.text; ?></b><?lsmb

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