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

[..hidden..]

Revision: 5269
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5269&view=rev
Author:   einhverfr
Date:     2012-11-27 04:13:01 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/bin/oe.pl

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5264
   + /branches/1.3:3711-5268

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-27 03:30:48 UTC (rev 5268)
+++ trunk/Changelog	2012-11-27 04:13:01 UTC (rev 5269)
@@ -89,6 +89,7 @@
 * Fixed error saving imported user with no existing db role (Chris T, 3559844)
 * Added ar-transation.csv and ap-transaction.csvn templates (Erik H)
 * Fixed blank screen processing recurring transactiosn in fcgi (Chris T)
+* Removed blank/unused Contact/Employee dropdown on shipping screen (Chris T)
 
 Chris T is Chris Travers
 Kevin B is Kevin Bailey

Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl	2012-11-27 03:30:48 UTC (rev 5268)
+++ trunk/bin/oe.pl	2012-11-27 04:13:01 UTC (rev 5269)
@@ -2809,11 +2809,7 @@
 | if $form->{selectwarehouse};
 
     $employee = qq|
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
-		<td><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="|
-      . $form->escape( $form->{selectemployee}, 1 ) . qq|">
+ 	      <tr><td>&nbsp;</td>
 	      </tr>
 |;
 

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