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

[..hidden..]

Revision: 5681
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5681&view=rev
Author:   einhverfr
Date:     2013-03-10 10:09:11 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
Tentatively merging onhand fix from trunk. (revisions noted in changelog in case we decide to go a different direction here

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/IR.pm
    branches/1.3/LedgerSMB/IS.pm
    branches/1.3/LedgerSMB/OE.pm

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/OE.pm


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-03-10 10:02:27 UTC (rev 5680)
+++ branches/1.3/Changelog	2013-03-10 10:09:11 UTC (rev 5681)
@@ -6,6 +6,7 @@
 * Removed spurious commit saving orders (Chris T)
 * Removed check for reversing too many sales, since this poses problems 
   in corner cases with no good solutions (Chris T)
+* R5680-1, (tentatively) fixes to shipping/invoice onhand numbers (Chris T)
 
 Changelog for 1.3.30
 * Documented behavior of Outstanding Summary report (Chris T, 3601314)


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680

Modified: branches/1.3/LedgerSMB/IR.pm
===================================================================
--- branches/1.3/LedgerSMB/IR.pm	2013-03-10 10:02:27 UTC (rev 5680)
+++ branches/1.3/LedgerSMB/IR.pm	2013-03-10 10:09:11 UTC (rev 5681)
@@ -425,8 +425,8 @@
                 # update parts table
                 $form->update_balance( $dbh, "parts", "onhand",
                     qq|id = $form->{"id_$i"}|,
-                    $form->{"qty_$i"} )
-                  unless $form->{shipped};
+                    $form->{"qty_$i"} );
+                 # unless $form->{shipped};
 
                 # check if we sold the item
                 $query = qq|

Modified: branches/1.3/LedgerSMB/IS.pm
===================================================================
--- branches/1.3/LedgerSMB/IS.pm	2013-03-10 10:02:27 UTC (rev 5680)
+++ branches/1.3/LedgerSMB/IS.pm	2013-03-10 10:09:11 UTC (rev 5681)
@@ -1182,7 +1182,7 @@
                             $dbh, "parts", "onhand",
                             qq|id = | . qq|$form->{"id_$i"}|,
                             $form->{"qty_$i"} * -1
-                        ) unless $form->{shipped};
+                        ); # unless $form->{shipped};
                     }
 
                     &process_assembly( $dbh, $form, $form->{"id_$i"},
@@ -1193,7 +1193,7 @@
                         $dbh, "parts", "onhand",
                         qq|id = $form->{"id_$i"}|,
                         $form->{"qty_$i"} * -1
-                    ) unless $form->{shipped};
+                    ); # unless $form->{shipped};
 
                     $allocated = cogs(
                         $dbh,              $form,      

Modified: branches/1.3/LedgerSMB/OE.pm
===================================================================
--- branches/1.3/LedgerSMB/OE.pm	2013-03-10 10:02:27 UTC (rev 5680)
+++ branches/1.3/LedgerSMB/OE.pm	2013-03-10 10:09:11 UTC (rev 5681)
@@ -1933,11 +1933,17 @@
             $sth2->finish;
 
             # update onhand for parts
-            $form->update_balance(
-                $dbh, "parts", "onhand",
-                qq|id = $form->{"id_$i"}|,
-                $form->{"ship_$i"} * $ml
-            );
+            # REMOVING THIS
+            #
+            # This leads to corner cases regarding inventory not being adjusted
+            # correctly.  Going to look at how to provide a report which shows
+            # inventory shipping/recieving numbers  for adjusting inventory 
+            # instead. --CT
+            # $form->update_balance(
+            #    $dbh, "parts", "onhand",
+            #    qq|id = $form->{"id_$i"}|,
+            #    $form->{"ship_$i"} * $ml
+            # );
 
         }
     }


Property changes on: branches/1.3/LedgerSMB/OE.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/LedgerSMB/OE.pm:3711-3978,5677
   + /trunk/LedgerSMB/OE.pm:3711-3978,5677,5680

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