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

[..hidden..]

Revision: 5009
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5009&view=rev
Author:   einhverfr
Date:     2012-07-17 02:19:14 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Searching for inventory adjustment reports complete

Modified Paths:
--------------
    trunk/LedgerSMB/DBObject/Report/Inventory/Search_Adj.pm
    trunk/LedgerSMB/Scripts/inv_reports.pm
    trunk/UI/lib/report_base.html

Modified: trunk/LedgerSMB/DBObject/Report/Inventory/Search_Adj.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Report/Inventory/Search_Adj.pm	2012-07-16 15:23:31 UTC (rev 5008)
+++ trunk/LedgerSMB/DBObject/Report/Inventory/Search_Adj.pm	2012-07-17 02:19:14 UTC (rev 5009)
@@ -73,14 +73,14 @@
 =cut
 
 sub header_lines {
-    return [{name => 'from_date'
+    return [{name => 'from_date',
              text => $locale->text('Start Date') },
             {name => 'to_date',
              text => $locale->text('End Date') },
             {name => 'partnumber',
-             text => $locale->text('Including partnumber'},
+             text => $locale->text('Including partnumber') },
             {name => 'source',
-             text => $locale->text('Source starting with'}.
+             text => $locale->text('Source starting with') },
            ];
 }
 
@@ -99,9 +99,11 @@
                name => $locale->text('Reference')},
             {col_id => 'ar_invnumber',
                type => 'href',
+               name => $locale->text('AR Invoice'),
           href_base => 'is.pl?action=edit&id='},
             {col_id => 'ap_invnumber',
                type => 'href',
+               name => $locale->text('AP Invoice'),
           href_base => 'ir.pl?action=edit&id='},
       ];
 }
@@ -116,7 +118,7 @@
 
 sub run_report {
     my ($self) = @_;
-    my @rows = $self->execute_method({funcname => 'inventory_adj__search'});
+    my @rows = $self->exec_method({funcname => 'inventory_adj__search'});
     for my $row (@rows) {
         $row->{ar_invnumber_suffix} = $row->{ar_invoice_id};
         $row->{ap_invnumber_suffix} = $row->{ap_invoice_id};

Modified: trunk/LedgerSMB/Scripts/inv_reports.pm
===================================================================
--- trunk/LedgerSMB/Scripts/inv_reports.pm	2012-07-16 15:23:31 UTC (rev 5008)
+++ trunk/LedgerSMB/Scripts/inv_reports.pm	2012-07-17 02:19:14 UTC (rev 5009)
@@ -20,10 +20,12 @@
 
 =cut
 
+package LedgerSMB::Scripts::inv_reports;
+
 sub search_adj{
     my ($request) = @_;
-    use LedgerSMB::DBObject::Reports::Inventory::Search_Adj;
-    my $rpt = LedgerSMB::DBObject::Reports::Inventory::Search_Adj->new(%$request);
+    use LedgerSMB::DBObject::Report::Inventory::Search_Adj;
+    my $rpt = LedgerSMB::DBObject::Report::Inventory::Search_Adj->new(%$request);
     $rpt->run_report;
     $rpt->render($request);
 }

Modified: trunk/UI/lib/report_base.html
===================================================================
--- trunk/UI/lib/report_base.html	2012-07-16 15:23:31 UTC (rev 5008)
+++ trunk/UI/lib/report_base.html	2012-07-17 02:19:14 UTC (rev 5009)
@@ -129,3 +129,62 @@
 	</td>
       </tr>
 <?lsmb END #BLOCK ?>
+<?lsmb BLOCK date_row_div ?>
+	<div class="input_row">
+          <div class="input_group">
+	  <?lsmb PROCESS input element_data = {
+               label=text('From')
+               class="date" 
+               name="from_date" 
+               size="11" 
+               title=datestyle } ?></div>
+          <div class="input_group">
+	  <?lsmb PROCESS input element_data = {
+               label=text('To')
+                 class="date" 
+                 name="to_date" 
+                 size="11" 
+                 title=datestyle } ?></div>
+        <div class="input_row">
+          <div class="input_group">
+	<label align="right"><?lsmb text('Period') ?></label>
+
+        <?lsmb 
+        all_months.unshift({});
+        all_years.unshift({}); 
+        PROCESS select element_data = {
+               name = "from_month"
+               options = all_months
+        } ?>
+
+	<?lsmb PROCESS select element_data = {
+               name="year"
+               options = all_years
+               text_attr = "date_get_all_years"
+               value_attr = "date_get_all_years"
+        } ?>
+	<?lsmb PROCESS input element_data = {
+               name="interval"
+               class="radio"
+               type="radio"
+               value="none" 
+               checked="checked" } ?>&nbsp;<?lsmb text('Current') ?>
+	<?lsmb PROCESS input element_data = { 
+               name="interval" 
+               class="radio" 
+               type="radio" 
+               value="month" } ?>&nbsp;<?lsmb text('Month') ?>
+	<?lsmb PROCESS input element_data = {
+               name="interval"
+               class="radio"
+               type="radio"
+               value="quarter" } ?>&nbsp;<?lsmb text('Quarter') ?>
+        <?lsmb PROCESS input element_data = {
+               name="interval"
+               class="radio"
+               type="radio"
+               value="year" } ?>&nbsp;<?lsmb text('Year') ?>
+              
+	</div>
+      </div>
+<?lsmb END #BLOCK ?>

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