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

[..hidden..]

Revision: 6453
          http://sourceforge.net/p/ledger-smb/code/6453
Author:   einhverfr
Date:     2014-01-14 04:26:08 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
Update now works re:923.  This does so by removing a misfeature and associated code.  Must be documented in release notes

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

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2014-01-14 04:09:04 UTC (rev 6452)
+++ trunk/Changelog	2014-01-14 04:26:08 UTC (rev 6453)
@@ -118,6 +118,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: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2014-01-14 04:09:04 UTC (rev 6452)
+++ trunk/LedgerSMB/AA.pm	2014-01-14 04:26:08 UTC (rev 6453)
@@ -1005,61 +1005,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,
-			          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
-			                        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;
-        $form->{rowcount} = $i if ( $i && !$form->{type} );
-    }
-
 }
 
 =item taxform_exist($form, $cv_id)

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2014-01-14 04:09:04 UTC (rev 6452)
+++ trunk/bin/aa.pl	2014-01-14 04:26:08 UTC (rev 6453)
@@ -1340,7 +1340,7 @@
     # and updates $form->{oldvendor} or $form->{oldcustomer}
 
     #tshvr4 should be revised!
-    #&create_links;#tshvr4 bug_#923 AA->get_name is called again from create_links and already user-filled in fields like $form->{AP_amount_1} $form->{amount_1} $form->{AP} are overridden again in get_name.TODO prevent change of vendor/customer on update?
+    &create_links; 
 
 
     &display_form;

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