SF.net SVN: ledger-smb:[4354] trunk/LedgerSMB

[..hidden..]

Revision: 4354
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4354&view=rev
Author:   einhverfr
Date:     2012-02-23 14:11:33 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Trunk now mostly appears to work.  Note the following bugs:
Roles.sql does not appear to be loading properly in setup.pl
Business units do not yet show up in interface
Menu structure has an issue
Sales tax doesn't save
The above issues have been filed on our sourceforge.net tracker and status can be found there

Modified Paths:
--------------
    trunk/LedgerSMB/AA.pm
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB/GL.pm

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2012-02-23 13:19:14 UTC (rev 4353)
+++ trunk/LedgerSMB/AA.pm	2012-02-23 14:11:33 UTC (rev 4354)
@@ -974,6 +974,7 @@
 		   HAVING abs(sum(acs.amount::numeric(20,$p))) > 0 |;
        } 
     } else {
+        # XXX MUST BE PORTED TO NEW BUSINESS UNIT FRAMEWORK
         $query = qq|
 		   SELECT a.id, a.invnumber, a.ordnumber, a.transdate,
 		          a.duedate, a.netamount, a.amount, 
@@ -1472,11 +1473,17 @@
          $query = qq|
 			   SELECT c.accno, c.description, c.link, 
                                   c.category,
-			          ac.project_id,
-			          a.department_id
+			          pbu.bu_id AS project_id,
+			          dbu.bu_id AS department_id
 			     FROM chart c
 			     JOIN acc_trans ac ON (ac.chart_id = c.id)
 			     JOIN $arap a ON (a.id = ac.trans_id)
+                        LEFT JOIN business_unit_ac pbu 
+                                  ON (ac.entry_id = pbu.entry_id 
+                                     AND pbu.class_id = 2)
+                        LEFT JOIN business_unit_ac dbu
+                                  ON (ac.entry_id = dbu.entry_id
+                                      AND dbu.class_id = 1)
 			    WHERE c.charttype = 'A' AND a.entity_credit_account = ?
 			          AND a.id = (SELECT max(id) 
 			                         FROM $arap

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2012-02-23 13:19:14 UTC (rev 4353)
+++ trunk/LedgerSMB/Form.pm	2012-02-23 14:11:33 UTC (rev 4354)
@@ -1935,7 +1935,6 @@
     $dbh = $self->{dbh};
 
     $self->all_employees( $myconfig, $dbh, $transdate, 1 );
-    $self->all_departments( $myconfig, $dbh, $vc );
     $self->all_business_units( $myconfig, $dbh, $transdate, $job );
     $self->all_taxaccounts( $myconfig, $dbh, $transdate );
     $self->all_languages();

Modified: trunk/LedgerSMB/GL.pm
===================================================================
--- trunk/LedgerSMB/GL.pm	2012-02-23 13:19:14 UTC (rev 4353)
+++ trunk/LedgerSMB/GL.pm	2012-02-23 14:11:33 UTC (rev 4354)
@@ -697,9 +697,6 @@
 
     $sth->finish;
 
-    # get departments
-    $form->all_departments( $myconfig, $dbh );
-
     # get projects
     $form->all_business_units( $form->{transdate} );
 

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