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

[..hidden..]

Revision: 5635
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5635&view=rev
Author:   einhverfr
Date:     2013-01-27 10:37:10 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Merging from trunk: Fixing ECA cash account link not respected on single payments screen

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/payments/payment2.html
    branches/1.3/scripts/payment.pl
    branches/1.3/sql/modules/Company.sql

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog
    branches/1.3/scripts/payment.pl


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
   + /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

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-27 10:33:13 UTC (rev 5634)
+++ branches/1.3/Changelog	2013-01-27 10:37:10 UTC (rev 5635)
@@ -6,6 +6,7 @@
 * Documented behavior of Outstanding Summary report (Chris T, 3601314)
 * Fix for translations showing multiple types (Chris T, 3601737)
 * Updated gnome.css (Pongracz Istvan)
+* Fixed vendor cash account link not respected in payment interface (Chris T)
 
 Changelog for 1.3.29
 * Added db routines for role backup and restore for shared hosting


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
   + /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

Modified: branches/1.3/UI/payments/payment2.html
===================================================================
--- branches/1.3/UI/payments/payment2.html	2013-01-27 10:33:13 UTC (rev 5634)
+++ branches/1.3/UI/payments/payment2.html	2013-01-27 10:37:10 UTC (rev 5635)
@@ -79,11 +79,14 @@
      <?lsmb  #here goes all the posible accounts were the paid can be done  ?>
       <th align="right" nowrap id="account_label_column"><?lsmb text('Account') ?></th>
       <td colspan="2" id="account_column">
-       <select id="account" name="account">
-        <?lsmb FOREACH item IN account -?>
-         <option value="<?lsmb item.id -?>" <?lsmb IF item.id ==  selected_account -?> selected <?lsmb END ?>><?lsmb item.description -?></option>
-        <?lsmb END -?>
-       </select> 
+       <?lsmb 
+      PROCESS select element_data = {
+                  name = 'account'
+               options = account
+             text_attr = 'description'
+            value_attr = 'id'
+        default_values = [selected_account]
+       } ?>
      </td>
      </tr>
      <tr id="date_row"><?lsmb # here goes an input where the date can be written, we can also use a java calendar :). We can use an ajax script to call the Exchange rate of the input date wich can be called with the onChange Method	  ?>

Modified: branches/1.3/scripts/payment.pl
===================================================================
--- branches/1.3/scripts/payment.pl	2013-01-27 10:33:13 UTC (rev 5634)
+++ branches/1.3/scripts/payment.pl	2013-01-27 10:37:10 UTC (rev 5635)
@@ -1184,6 +1184,9 @@
  overpayment_account => ..hidden..,
  format_amount => sub {return $Payment->format_amount(amount=>@_)}
 };
+
+$select->{selected_account} = $vc_options[0]->{cash_account_id} 
+      unless defined $select->{selected_account};
 my $template = LedgerSMB::Template->new(
   user     => $request->{_user},
   locale   => $request->{_locale},


Property changes on: branches/1.3/scripts/payment.pl
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/LedgerSMB/Scripts/payment.pm:5587
   + /trunk/LedgerSMB/Scripts/payment.pm:5587,5633-5634

Modified: branches/1.3/sql/modules/Company.sql
===================================================================
--- branches/1.3/sql/modules/Company.sql	2013-01-27 10:33:13 UTC (rev 5634)
+++ branches/1.3/sql/modules/Company.sql	2013-01-27 10:37:10 UTC (rev 5635)
@@ -605,6 +605,7 @@
 legal_name text,
 meta_number text,
 control_code text,
+cash_account_id int,
 tax_id text,
 street1 text,
 street2 text,
@@ -622,7 +623,8 @@
 	t_id INT;
 BEGIN
 	select coalesce(eca.pay_to_name, c.legal_name), eca.meta_number, 
-		e.control_code, c.tax_id, a.line_one, a.line_two, a.line_three, 
+		e.control_code, eca.cash_account_id, c.tax_id, 
+                a.line_one, a.line_two, a.line_three, 
 		a.city, a.state, a.mail_code, cc.name
 	into out_var
 	FROM company c

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