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

[..hidden..]

Revision: 4547
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4547&view=rev
Author:   einhverfr
Date:     2012-03-24 08:57:46 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Making it more obvious which customer account is selected

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/bin/arap.pl
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl
    branches/1.3/bin/oe.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-03-24 08:25:13 UTC (rev 4546)
+++ branches/1.3/Changelog	2012-03-24 08:57:46 UTC (rev 4547)
@@ -20,6 +20,7 @@
 * Fixed unknown db detected as SQL-Ledger (Chris T, bug 3510039)
 * Fixed pos ignores pd_proto and always connects tcp (Chris T, bug 3458112)
 * Error now displayed when currencies are not defined (Chris T, bug 3509555)
+* Fixed "no obvious way to select credit account" (Chris T, bug 3510564)
 
 Andres B is Andres Basile
 

Modified: branches/1.3/bin/arap.pl
===================================================================
--- branches/1.3/bin/arap.pl	2012-03-24 08:25:13 UTC (rev 4546)
+++ branches/1.3/bin/arap.pl	2012-03-24 08:57:46 UTC (rev 4547)
@@ -156,16 +156,18 @@
 sub select_name {
     my ($table) = @_;
 
-    @column_index = qw(ndx name control_code address);
+    @column_index = qw(ndx name control_code meta_number);
 
     $label = ucfirst $table;
-    $column_data{ndx} = qq|<th>&nbsp;</th>|;
-    $column_data{name} =
-      qq|<th class=listheading colspan=3>| . $locale->text($label) . qq|</th>|;
-    $column_data{address} =
-        qq|<th class=listheading colspan=5>|
-      . $locale->text('Address')
-      . qq|</th>|;
+    %column_data = (ndx => qq|<th>&nbsp;</th>|,
+                   name => qq|<th class=listheading>| . 
+                               $locale->text('Name') . qq|</th>|,
+           control_code => qq|<th class=listheading>| .
+                               $locale->text('Control Code') . qq|</th>|,
+            meta_number => qq|<th class=listheading>| .
+                               $locale->text('[_1] Number', $label) . qq|</th>|
+    );
+    
 
     # list items with radio button on a form
     $form->header;
@@ -193,7 +195,7 @@
 	</tr>
 |;
 
-    @column_index = qw(ndx name control_code meta_number address city state zipcode country);
+    @column_index = qw(ndx name control_code meta_number);
 
     my $i = 0;
     foreach $ref ( @{ $form->{name_list} } ) {

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2012-03-24 08:25:13 UTC (rev 4546)
+++ branches/1.3/bin/ir.pl	2012-03-24 08:57:46 UTC (rev 4547)
@@ -451,7 +451,21 @@
 		      <td class="plus$n" nowrap>|
       . $form->format_amount( \%myconfig, $form->{creditremaining}, 0, "0" )
       . qq|</td>
-		    </tr>
+		    </tr>|;
+		if ($form->{entity_control_code}){
+                    $form->hide_form(qw(entity_control_code meta_number));
+			print qq|
+	        <tr>
+		<th align="right" nowrap>| . 
+			$locale->text('Entity Code') . qq|</th>
+		<td colspan="2">$form->{entity_control_code}</td>
+		<th align="right" nowrap>| . 
+			$locale->text('Account') . qq|</th>
+		<td colspan=3>$form->{meta_number}</td>
+	      </tr>
+		|;
+	       }
+	print qq|
 		  </table>
 		</td>
 	      <tr>

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2012-03-24 08:25:13 UTC (rev 4546)
+++ branches/1.3/bin/is.pl	2012-03-24 08:57:46 UTC (rev 4547)
@@ -448,7 +448,8 @@
     $form->hide_form(
         qw(form_id id type printed emailed queued title vc terms discount 
            creditlimit creditremaining tradediscount business closedto locked 
-           shipped oldtransdate recurring reverse batch_id subtype)
+           shipped oldtransdate recurring reverse batch_id subtype 
+           meta_number)
     );
 
     if ($form->{notice}){
@@ -502,12 +503,27 @@
 		      <td class="plus$n" nowrap>|
       . $form->format_amount( \%myconfig, $form->{creditremaining}, 0, "0" )
       . qq|</td>
-		    </tr>
+		    </tr>|;
+		if ($form->{entity_control_code}){
+                    $form->hide_form(qw(entity_control_code meta_number));
+			print qq|
+	        <tr>
+		<th align="right" nowrap>| . 
+			$locale->text('Entity Code') . qq|</th>
+		<td colspan="2">$form->{entity_control_code}</td>
+		<th align="right" nowrap>| . 
+			$locale->text('Account') . qq|</th>
+		<td colspan=3>$form->{meta_number}</td>
+	      </tr>
+		|;
+	       }
+	print qq|
 		    $business
 		  </table>
-		</td>
-	      </tr>
-	      <tr>
+		</td>
+	      </tr>
+
+	      <tr>
 		<th align="right" nowrap>| . $locale->text('Record in') . qq|</th>
 		<td colspan="3"><select name="AR">$form->{selectAR}</select></td>
 		<input type="hidden" name="selectAR" value="$form->{selectAR}">

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2012-03-24 08:25:13 UTC (rev 4546)
+++ branches/1.3/bin/oe.pl	2012-03-24 08:57:46 UTC (rev 4547)
@@ -462,7 +462,21 @@
 		      <td class="plus$n" nowrap>|
           . $form->format_amount( \%myconfig, $form->{creditremaining}, 0, "0" )
           . qq|</td>
-		    </tr>
+		    </tr>|;
+		if ($form->{entity_control_code}){
+                    $form->hide_form(qw(entity_control_code meta_number));
+			print qq|
+	        <tr>
+		<th align="right" nowrap>| . 
+			$locale->text('Entity Code') . qq|</th>
+		<td colspan="2">$form->{entity_control_code}</td>
+		<th align="right" nowrap>| . 
+			$locale->text('Account') . qq|</th>
+		<td colspan=3>$form->{meta_number}</td>
+	      </tr>
+		|;
+	       }
+	print qq|
 		  </table>
 		</td>
 	      </tr>

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