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

[..hidden..]

Revision: 6621
          http://sourceforge.net/p/ledger-smb/code/6621
Author:   einhverfr
Date:     2014-01-24 11:16:57 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
Fixing history report always showing details report

Modified Paths:
--------------
    trunk/LedgerSMB/Report/Contact/History.pm
    trunk/UI/Reports/filters/purchase_history.html
    trunk/sql/modules/Company.sql

Modified: trunk/LedgerSMB/Report/Contact/History.pm
===================================================================
--- trunk/LedgerSMB/Report/Contact/History.pm	2014-01-24 08:49:09 UTC (rev 6620)
+++ trunk/LedgerSMB/Report/Contact/History.pm	2014-01-24 11:16:57 UTC (rev 6621)
@@ -47,15 +47,18 @@
 sub columns {
     my ($self) = @_;
     my $script = 'contacts.pl';
-    return [
+    my $cols = [
          {col_id => 'name',
             type => 'text',
             name => LedgerSMB::Report::text('Name') },
 
          {col_id => 'meta_number',
             type => 'text',
-            name => LedgerSMB::Report::text('Account Number') },
+            name => LedgerSMB::Report::text('Account Number') }];
 
+    if ($self->is_summary){
+     
+      push @$cols,
          {col_id => 'invnumber',
             type => 'href',
        #href_base => 'is.pl?action=edit&id=',
@@ -63,8 +66,11 @@
 
          {col_id => 'curr',
             type => 'text',
-            name => LedgerSMB::Report::text('Currency') },
+            name => LedgerSMB::Report::text('Currency') };
+    }
 
+      push @$cols,
+
          {col_id => 'partnumber',
             type => 'text',
             name => LedgerSMB::Report::text('Part Number') },
@@ -96,17 +102,18 @@
 
          {col_id => 'serialnumber',
             type => 'text',
-            name => LedgerSMB::Report::text('Serial Number') },
-
+            name => LedgerSMB::Report::text('Serial Number') };
+    
+    push @$cols, 
          {col_id => 'exchangerate',
             type => 'text',
             name => LedgerSMB::Report::text('Exchange Rate') },
 
          {col_id => 'salesperson_name',
             type => 'text',
-            name => LedgerSMB::Report::text('Salesperson') },
+            name => LedgerSMB::Report::text('Salesperson') };
 
-    ];
+    return $cols;
 }
 
 =item name

Modified: trunk/UI/Reports/filters/purchase_history.html
===================================================================
--- trunk/UI/Reports/filters/purchase_history.html	2014-01-24 08:49:09 UTC (rev 6620)
+++ trunk/UI/Reports/filters/purchase_history.html	2014-01-24 11:16:57 UTC (rev 6621)
@@ -216,18 +216,18 @@
 		<td><?lsmb
                      INCLUDE input element_data= {
                              label = text('Summary'),
-                             name  = 'report_type'
+                             name  = 'is_summary'
                              type  = 'radio',
-                             value = 'summary',
+                             value = '1',
                              class = 'radio',
                            checked = 'CHECKED'
                     } ?></td>
 		<td><?lsmb
                      INCLUDE input element_data= {
                              label = text('Detail'),
-                             name  = 'report_type',
+                             name  = 'is_summary',
                              type  = 'radio',
-                             value = 'detail',
+                             value = '0',
                              class = 'radio',
                     } ?></td>
 	      </tr> 

Modified: trunk/sql/modules/Company.sql
===================================================================
--- trunk/sql/modules/Company.sql	2014-01-24 08:49:09 UTC (rev 6620)
+++ trunk/sql/modules/Company.sql	2014-01-24 11:16:57 UTC (rev 6621)
@@ -196,7 +196,7 @@
 (in_name text, in_meta_number text, in_contact_info text, in_address_line text,
  in_city text, in_state text, in_zip text, in_salesperson text, in_notes text,
  in_country_id int, in_from_date date, in_to_date date, in_type char(1),
- in_start_from date, in_start_to date, in_account_class int,
+ in_start_from date, in_start_to date, in_entity_class int,
  in_inc_open bool, in_inc_closed bool) IS
 $$This produces a history detail report, i.e. a list of all products purchased by
 a customer over a specific date range.  
@@ -209,7 +209,7 @@
 (in_name text, in_meta_number text, in_contact_info text, in_address_line text,
  in_city text, in_state text, in_zip text, in_salesperson text, in_notes text, 
  in_country_id int, in_from_date date, in_to_date date, in_type char(1), 
- in_start_from date, in_start_to date, in_account_class int, 
+ in_start_from date, in_start_to date, in_entity_class int, 
  in_inc_open bool, in_inc_closed bool)
 RETURNS SETOF  eca_history_result AS
 $$
@@ -227,7 +227,7 @@
 (in_name text, in_meta_number text, in_contact_info text, in_address_line text,
  in_city text, in_state text, in_zip text, in_salesperson text, in_notes text,
  in_country_id int, in_from_date date, in_to_date date, in_type char(1),
- in_start_from date, in_start_to date, in_account_class int,
+ in_start_from date, in_start_to date, in_entity_class int,
  in_inc_open bool, in_inc_closed bool) IS
 $$Creates a summary account (no quantities, just parts group by invoice).
 

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits