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

[..hidden..]

Revision: 3384
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3384&view=rev
Author:   ehuelsmann
Date:     2011-06-29 21:44:11 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Based on the syntax of Pg-database.sql, we require PostgreSQL 8.2+
and update the list of packages to install on RedHat/Fedora derivatives.

Modified Paths:
--------------
    trunk/INSTALL
    trunk/LedgerSMB/IS.pm
    trunk/bin/is.pl

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2011-06-29 15:01:13 UTC (rev 3383)
+++ trunk/INSTALL	2011-06-29 21:44:11 UTC (rev 3384)
@@ -18,7 +18,7 @@
 LedgerSMB depends on the following software:
 
  * a web server (Apache v2.x or MS IIS)
- * PostgreSQL 8.1+
+ * PostgreSQL 8.2+
  * Perl 5.8+
 
 
@@ -48,7 +48,7 @@
 
 On Fedora systems this command does the same:
 
- $ yum install postgresql postgresql-server
+ $ yum install postgresql postgresql-server postgresql-contrib
 
 On other systems, the steps to follow may differ.  Please submit
 instructions for your system for inclusion here.

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2011-06-29 15:01:13 UTC (rev 3383)
+++ trunk/LedgerSMB/IS.pm	2011-06-29 21:44:11 UTC (rev 3384)
@@ -846,17 +846,18 @@
 
     # get rest for the customer
     my $query = qq|
-		SELECT c.customernumber, e.name, l.line_one as address1, 
+		SELECT meta_number as customernumber,
+                       e.name, l.line_one as address1, 
 		       l.line_two as address2, l.city AS city,
 		       l.state as state, l.mail_code AS zipcode, 
 		       country.name as country,
 		       '' as contact, '' as customerphone, '' as customerfax,
 		       '' AS customertaxnumber, sic_code AS sic, iban, 
  		       bic,eca.startdate,eca.enddate
-		  FROM customer c
-		  JOIN company cm ON c.entity_id = cm.entity_id
-		  JOIN entity e ON (c.entity_id = e.id)
-                    JOIN entity_credit_account eca ON e.id = eca.entity_id
+		  FROM company cm
+		  JOIN entity e ON (cm.entity_id = e.id)
+                  JOIN entity_credit_account eca ON e.id = eca.entity_id
+                  LEFT JOIN entity_bank_account eba ON eca.entity_id = eba.entity_id
 		  LEFT JOIN eca_to_location el ON eca.id = el.credit_id
 		  LEFT JOIN location l ON el.location_id = l.id
 		  LEFT JOIN country ON l.country_id = country.id

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2011-06-29 15:01:13 UTC (rev 3383)
+++ trunk/bin/is.pl	2011-06-29 21:44:11 UTC (rev 3384)
@@ -1149,6 +1149,8 @@
     ( $form->{AR_paid} ) = split /--/, $form->{AR_paid};
 
     if ( IS->post_invoice( \%myconfig, \%$form ) ) {
+	$form->{callback} =
+	    "$form->{script}?action=edit&type=$form->{type}&login=$form->{login}&path=$form->{path}&sessionid=$form->{sessionid}&id=$form->{id}";
         $form->redirect(
             $locale->text( 'Invoice [_1] posted!', $form->{invnumber} ) );
     }


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