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

[..hidden..]

Revision: 6454
          http://sourceforge.net/p/ledger-smb/code/6454
Author:   einhverfr
Date:     2014-01-14 04:34:16 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
Full fix for 923, still to document implications

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/bin/aa.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2014-01-14 04:26:08 UTC (rev 6453)
+++ branches/1.3/Changelog	2014-01-14 04:34:16 UTC (rev 6454)
@@ -16,6 +16,7 @@
 * nginx sample configurations (P. Istvan)
 * Fixed unable to delete ar vouchers (Chris T)
 * Fixed copy to new scrambling lines (Chris T, 923)
+* Fixed improper account line handling in ar/ap trans. (Chris T, 923)
 
 Chris T is Chris Travers
 Nick P is Nick Prater

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2014-01-14 04:26:08 UTC (rev 6453)
+++ branches/1.3/LedgerSMB/AA.pm	2014-01-14 04:34:16 UTC (rev 6454)
@@ -1474,60 +1474,6 @@
     $sth->finish;
     chop $form->{taxaccounts};
 
-    # setup last accounts used for this customer/vendor
-
-   if ( !$form->{id} && $form->{type} !~ /_(order|quotation)/ ) {
-
-         $query = qq|
-			   SELECT c.accno, c.description, c.link, 
-                                  c.category,
-			          ac.project_id,
-			          a.department_id
-			     FROM chart c
-			     JOIN acc_trans ac ON (ac.chart_id = c.id)
-			     JOIN $arap a ON (a.id = ac.trans_id)
-			    WHERE c.charttype = 'A' AND a.entity_credit_account = ?
-			          AND a.id = (SELECT max(id) 
-			                         FROM $arap
-			                        WHERE entity_credit_account = 
-			                              ?)
-			|;
-
-        $sth = $dbh->prepare($query);
-        $sth->execute( $form->{"$form->{vc}_id"}, $form->{"$form->{vc}_id"} )
-          || $form->dberror($query);
-
-        my $i = 0;
-
-	
-        while ( $ref = $sth->fetchrow_hashref(NAME_lc) ) {
-            $form->{department_id} = $ref->{department_id};
-            if ( $ref->{link} =~ /_amount/ ) {
-                $i++;
-                $form->{"$form->{ARAP}_amount_$i"} =
-                  "$ref->{accno}--$ref->{description}"
-                  if $ref->{accno};
-                $form->{"projectnumber_$i"} =
-                  "$ref->{projectnumber}--" . "$ref->{project_id}"
-                  if $ref->{project_id};
-            }
-
-            if ( $ref->{link} eq $form->{ARAP} ) {
-                $form->{ $form->{ARAP} } = $form->{"$form->{ARAP}_1"} =
-                  "$ref->{accno}--" . "$ref->{description}"
-                  if $ref->{accno};
-            }
-        }
-
-        $sth->finish;
-        $query = "select description from department where id = ?";
-        $sth = $dbh->prepare($query);
-        $sth->execute($form->{department_id});
-        ($form->{department}) = $sth->fetchrow_array;
-        $form->{rowcount} = $i if ( $i && !$form->{type} );
-    }
-
-    $dbh->commit;
 }
 
 =item taxform_exist($form, $cv_id)

Modified: branches/1.3/bin/aa.pl
===================================================================
--- branches/1.3/bin/aa.pl	2014-01-14 04:26:08 UTC (rev 6453)
+++ branches/1.3/bin/aa.pl	2014-01-14 04:34:16 UTC (rev 6454)
@@ -96,7 +96,7 @@
     if ($form->{paid_1}){
         delete $form->{paid_1};
     }
-    display_form();
+    update();
 }
 
 sub new_screen {

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