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

[..hidden..]

Revision: 5280
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5280&view=rev
Author:   einhverfr
Date:     2012-11-28 02:50:25 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/DBObject/TaxForm.pm
    trunk/LedgerSMB/Scripts/taxform.pm
    trunk/UI/taxform/details_report.html
    trunk/UI/taxform/summary_report.html

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/taxform.pm


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5275
   + /branches/1.3:3711-5279

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-28 02:43:47 UTC (rev 5279)
+++ trunk/Changelog	2012-11-28 02:50:25 UTC (rev 5280)
@@ -92,6 +92,7 @@
 * Removed blank/unused Contact/Employee dropdown on shipping screen (Chris T)
 * Fixed internal server errors retrieving taxes with invalid dates (Chris T)
 * Fixed taxform "default reportable" checkbox not persisted (Chris T, 3581310)
+* Fixed labelling of vendor column on taxform reports (Chris T, 3581317)
 
 Chris T is Chris Travers
 Kevin B is Kevin Bailey

Modified: trunk/LedgerSMB/DBObject/TaxForm.pm
===================================================================
--- trunk/LedgerSMB/DBObject/TaxForm.pm	2012-11-28 02:43:47 UTC (rev 5279)
+++ trunk/LedgerSMB/DBObject/TaxForm.pm	2012-11-28 02:50:25 UTC (rev 5280)
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-LedgerSMB::DBObject::TaxFormm - Includes methods for saving and retrieving tax forms.
+LedgerSMB::DBObject::TaxForm - Includes methods for saving and retrieving tax forms.
 
 =head1 SYNOPSIS
 

Modified: trunk/LedgerSMB/Scripts/taxform.pm
===================================================================
--- trunk/LedgerSMB/Scripts/taxform.pm	2012-11-28 02:43:47 UTC (rev 5279)
+++ trunk/LedgerSMB/Scripts/taxform.pm	2012-11-28 02:50:25 UTC (rev 5280)
@@ -191,7 +191,7 @@
             $company->get_billing_info;
             delete $company->{id};
             for my $k (keys %$company){
-                 $r->{$k} = $company->{$k};
+                 $r->{$k} = $company->{$k} unless $k == 'entity_class';
             }
  
             $r->{acc_sum} = $request->format_amount({amount => $r->{acc_sum}});


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4945
/branches/1.3/scripts/taxform.pl:3711-4950
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4945
/branches/1.3/scripts/taxform.pl:3711-5279

Modified: trunk/UI/taxform/details_report.html
===================================================================
--- trunk/UI/taxform/details_report.html	2012-11-28 02:43:47 UTC (rev 5279)
+++ trunk/UI/taxform/details_report.html	2012-11-28 02:50:25 UTC (rev 5280)
@@ -15,18 +15,25 @@
 
 <table width="100%">
   <tr class="listtop">
-    <th>Company</th>
-    <th>Vendor Number</th>
-    <th>Invoice Number</th>
-    <th>Due Date</th>
-    <th>acc_trans Sum</th>
-    <th>invoice Sum</th>
-    <th>Total</th>
+    <th><?lsmb text('Company') ?></th>
+    <th><?lsmb text('Account Type') ?></th>
+    <th><?lsmb text('Account Number') ?></th>
+    <th><?lsmb text('Invoice Number') ?></th>
+    <th><?lsmb text('Due Date') ?></th>
+    <th><?lsmb text('Acc_trans Sum') ?></th>
+    <th><?lsmb text('Invoice Sum') ?></th>
+    <th><?lsmb text('Total') ?></th>
   </tr>
   <tr height="5"><td></td></tr>
-<?lsmb FOREACH result IN results; i = loop.count ?>
+<?lsmb 
+FOREACH result IN results; i = loop.count;
+   IF result.entity_class == 1; RES_ROLE = text('Vendor');
+   ELSE; RES_ROLE = text('Customer');
+   END;
+?>
     <tr>
       <td><?lsmb result.legal_name ?></td>
+      <td><?lsmb RES_ROLE ?></td>
       <td><a href="vendor.pl?action=get&account_class=<?lsmb result.entity_class ?>&entity_id=<?lsmb result.entity_id ?>&meta_number=<?lsmb result.meta_number ?>"><?lsmb result.meta_number ?></a></td>
       <td><a href="ap.pl?AP=&vendor=&meta_number=<?lsmb result.meta_number ?>&invnumber=<?lsmb result.invnumber ?>&ordnumber=&ponumber=&source=&description=&notes=&shipvia=&transdatefrom=&transdateto=&month=&year=&interval=0&invoice_type=1&open=Y&summary=1&title=AP+Transactions&outstanding=&sort=transdate&l_invnumber=Y&l_transdate=Y&l_name=Y&l_amount=Y&l_paid=Y&action=continue&action=continue&nextsub=transactions&path=bin"><?lsmb result.invnumber ?></a></td>
       <td><?lsmb result.duedate ?></td>

Modified: trunk/UI/taxform/summary_report.html
===================================================================
--- trunk/UI/taxform/summary_report.html	2012-11-28 02:43:47 UTC (rev 5279)
+++ trunk/UI/taxform/summary_report.html	2012-11-28 02:50:25 UTC (rev 5280)
@@ -15,17 +15,24 @@
 
 <table width="100%">
   <tr class="listtop">
-    <th>Company</th>
-    <th>Vendor Number</th>
-    <th>Control Code</th>
-    <th>acc_trans Sum</th>
-    <th>invoice Sum</th>
-    <th>Total</th>
+    <th><?lsmb text('Company') ?></th>
+    <th><?lsmb text('Account Type') ?></th> 
+    <th><?lsmb text('Account Number') ?></th>
+    <th><?lsmb text('Control Code') ?></th>
+    <th><?lsmb text('Acc_trans Sum') ?></th>
+    <th><?lsmb text('Invoice Sum') ?></th>
+    <th><?lsmb text('Total') ?></th>
   </tr>
   <tr height="5"><td></td></tr>
-<?lsmb FOREACH result IN results; i = loop.count ?>
+<?lsmb 
+FOREACH result IN results; i = loop.count;
+   IF result.entity_class == 1; RES_ROLE = text('Vendor');
+   ELSE; RES_ROLE = text('Customer');
+   END;
+?>
     <tr>
       <td><?lsmb result.legal_name ?></td>
+      <td><?lsmb RES_ROLE ?></td>
       <td><a href="vendor.pl?action=get&account_class=<?lsmb result.entity_class ?>&entity_id=<?lsmb result.entity_id ?>&meta_number=<?lsmb result.meta_number ?>"><?lsmb result.meta_number ?></a></td>
       <td><?lsmb result.control_code ?></td>
       <td><?lsmb result.acc_sum ?></td>

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