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

[..hidden..]

Revision: 5714
          http://sourceforge.net/p/ledger-smb/code/5714
Author:   einhverfr
Date:     2013-04-24 01:42:20 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Inventory adjustment fix for 1.3.30 and below

Modified Paths:
--------------
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl
    branches/1.3/bin/oe.pl
    branches/1.3/sql/modules/Fixes.sql

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2013-04-16 12:11:32 UTC (rev 5713)
+++ branches/1.3/bin/ir.pl	2013-04-24 01:42:20 UTC (rev 5714)
@@ -458,7 +458,7 @@
 	      <tr>
 	        <td></td>
 		<td colspan=3>
-		  <table>
+		  <table class="creditlimit">
 		    <tr>
 		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
 		      <td>|

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-04-16 12:11:32 UTC (rev 5713)
+++ branches/1.3/bin/is.pl	2013-04-24 01:42:20 UTC (rev 5714)
@@ -508,7 +508,7 @@
 	      <tr>
 		<td></td>
 		<td colspan=3>
-		  <table>
+		  <table class="creditlimit">
 		    <tr>
 		      <th align=right nowrap>| . $locale->text('Credit Limit') . qq|</th>
 		      <td>|
@@ -546,11 +546,11 @@
 	      </tr>
 	      $department
 	      $exchangerate
-	      <tr>
+	      <tr class="shippingpoint-row">
 		<th align=right nowrap>| . $locale->text('Shipping Point') . qq|</th>
 		<td colspan=3><input name="shippingpoint" size="35" value="$form->{shippingpoint}"></td>
 	      </tr>
-	      <tr>
+	      <tr class="shipvia-row">
 		<th align=right nowrap>| . $locale->text('Ship via') . qq|</th>
 		<td colspan=3><input name="shipvia" size="35" value="$form->{shipvia}"></td>
 	      </tr>
@@ -559,24 +559,24 @@
 	  <td align=right>
 	    <table>
 	      $employee
-	      <tr>
+	      <tr class="invnumber-row">
 		<th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
 		<td><input name="invnumber" size="20" value="$form->{invnumber}"></td>
 	      </tr>
-	      <tr>
+	      <tr class="ordnumber-row">
 		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
 		<td><input name="ordnumber" size="20" value="$form->{ordnumber}"></td>
 <input type=hidden name="quonumber" value="$form->{quonumber}">
 	      </tr>
-	      <tr>
+	      <tr class="transdate-row">
 		<th align=right>| . $locale->text('Invoice Date') . qq|</th>
 		<td><input class="date" name="transdate" size="11" title="$myconfig{dateformat}" value="$form->{transdate}"></td>
 	      </tr>
-	      <tr>
+	      <tr class="duedate-row">
 		<th align=right>| . $locale->text('Due Date') . qq|</th>
 		<td><input class="date" name="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}"></td>
 	      </tr>
-	      <tr>
+	      <tr class="ponumber-row">
 		<th align=right nowrap>| . $locale->text('PO Number') . qq|</th>
 		<td><input name="ponumber" size="20" value="$form->{ponumber}"></td>
 	      </tr>

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2013-04-16 12:11:32 UTC (rev 5713)
+++ branches/1.3/bin/oe.pl	2013-04-24 01:42:20 UTC (rev 5714)
@@ -439,7 +439,7 @@
 		<th align=right nowrap=true>| . $locale->text('Required by') . qq|</th>
 		<td><input class="date" name=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>
 	      </tr>
-	      <tr class="ponunber-row">
+	      <tr class="ponumber-row">
 		<th align=right nowrap>| . $locale->text('PO Number') . qq|</th>
 		<td><input name=ponumber size=20 value="$form->{ponumber}"></td>
 	      </tr>

Modified: branches/1.3/sql/modules/Fixes.sql
===================================================================
--- branches/1.3/sql/modules/Fixes.sql	2013-04-16 12:11:32 UTC (rev 5713)
+++ branches/1.3/sql/modules/Fixes.sql	2013-04-24 01:42:20 UTC (rev 5714)
@@ -498,3 +498,21 @@
 update menu_attribute set value = 'ap_aging' where node_id = 27 and attribute = 'report';
 
 COMMIT;
+
+BEGIN;
+
+-- inventory from 1.3.30 and lower
+
+UPDATE parts 
+   SET onhand = onhand + coalesce((select sum(qty) 
+                            from inventory 
+                           where orderitems_id 
+                                 IN (select id 
+                                       from orderitems oi
+                                       join oe on oi.trans_id = oe.id
+                                      where closed is not true)
+                                 and parts_id = parts.id), 0)
+ WHERE string_to_array((setting_get('version')).value::text, '.')::int[] 
+       < '{1,3,31}';
+
+COMMIT;

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