[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4548] trunk
- Subject: SF.net SVN: ledger-smb:[4548] trunk
- From: ..hidden..
- Date: Sat, 24 Mar 2012 10:04:00 +0000
Revision: 4548
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4548&view=rev
Author: einhverfr
Date: 2012-03-24 10:04:00 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/bin/arap.pl
trunk/bin/ir.pl
trunk/bin/is.pl
trunk/bin/oe.pl
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/customer.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/login.pm
trunk/LedgerSMB/Scripts/menu.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/LedgerSMB/Scripts/vendor.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4545
+ /branches/1.3:3711-4547
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-03-24 08:57:46 UTC (rev 4547)
+++ trunk/Changelog 2012-03-24 10:04:00 UTC (rev 4548)
@@ -54,6 +54,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
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4545
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4547
/branches/1.3/scripts/account.pl:3711-4368
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4545
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4547
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4545
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4547
/branches/1.3/scripts/customer.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4545
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4547
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4545
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4547
/branches/1.3/scripts/file.pl:3711-4138
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4545
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4547
/branches/1.3/scripts/journal.pl:3711-4328
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4545
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4547
/branches/1.3/scripts/login.pl:3711-4192
Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4545
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4547
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4545
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4547
/branches/1.3/scripts/payment.pl:3711-4310
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4545
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4547
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4545
/branches/1.3/scripts/setup.pl:3711-4525
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4547
/branches/1.3/scripts/setup.pl:3711-4525
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4545
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4547
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4545
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4547
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/bin/arap.pl
===================================================================
--- trunk/bin/arap.pl 2012-03-24 08:57:46 UTC (rev 4547)
+++ trunk/bin/arap.pl 2012-03-24 10:04:00 UTC (rev 4548)
@@ -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> </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> </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: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl 2012-03-24 08:57:46 UTC (rev 4547)
+++ trunk/bin/ir.pl 2012-03-24 10:04:00 UTC (rev 4548)
@@ -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: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl 2012-03-24 08:57:46 UTC (rev 4547)
+++ trunk/bin/is.pl 2012-03-24 10:04:00 UTC (rev 4548)
@@ -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: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl 2012-03-24 08:57:46 UTC (rev 4547)
+++ trunk/bin/oe.pl 2012-03-24 10:04:00 UTC (rev 4548)
@@ -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>
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4545
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4547
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.