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

[..hidden..]

Revision: 6042
          http://sourceforge.net/p/ledger-smb/code/6042
Author:   einhverfr
Date:     2013-09-17 08:22:44 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
Pre-entry filter for timecards now mostly renders

Modified Paths:
--------------
    trunk/LedgerSMB/Scripts/timecard.pm
    trunk/UI/lib/utilities.html
    trunk/sql/Pg-database.sql
    trunk/sql/modules/Fixes.sql

Modified: trunk/LedgerSMB/Scripts/timecard.pm
===================================================================
--- trunk/LedgerSMB/Scripts/timecard.pm	2013-09-17 08:11:32 UTC (rev 6041)
+++ trunk/LedgerSMB/Scripts/timecard.pm	2013-09-17 08:22:44 UTC (rev 6042)
@@ -20,6 +20,7 @@
 use LedgerSMB::Timecard::Type;
 use LedgerSMB::Report::Timecards;
 use LedgerSMB::Company_Config;
+use LedgerSMB::Business_Unit_Class;
 use DateTime;
 
 =head1 ROUTINES
@@ -44,6 +45,7 @@
 
 sub new {
     my ($request) = @_;
+    @{$request->{bu_class_list}} = LedgerSMB::Business_Unit_Class->list();
     LedgerSMB::Template->new(
         user     => $request->{_user},
         locale   => $request->{_locale},

Modified: trunk/UI/lib/utilities.html
===================================================================
--- trunk/UI/lib/utilities.html	2013-09-17 08:11:32 UTC (rev 6041)
+++ trunk/UI/lib/utilities.html	2013-09-17 08:22:44 UTC (rev 6042)
@@ -33,9 +33,46 @@
 PROCESS select element_data = {
             name = element_name
          options = employees
-  default_values = $element_name
+  default_values = [$element_name]
            class = 'employees'
            label = label
+       text_attr = text_attr 
+      value_attr = value_attr
 };
 
-END; ?>
+END; 
+
+BLOCK business_unit_class;
+IF !element_name;
+    element_name = 'bu_class_id';
+END;
+
+PROCESS select element_data = {
+            name = element_name
+         options = bu_class_list
+  default_values = [$element_name]
+           class = 'bu-class'
+           label = label
+       text_attr = text_attr 
+      value_attr = value_attr
+};
+
+END;
+BLOCK business_unit;
+
+IF !element_name;
+    element_name = 'business_unit_id';
+END;
+
+PROCESS select element_data = {
+            name = element_name
+         options = b_unit_list
+  default_values = [$element_name]
+           class = 'b-unit'
+           label = label
+       text_attr = text_attr 
+      value_attr = value_attr
+};
+
+END;
+-?>

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2013-09-17 08:11:32 UTC (rev 6041)
+++ trunk/sql/Pg-database.sql	2013-09-17 08:22:44 UTC (rev 6042)
@@ -30,7 +30,8 @@
        (3, 'GL'),
        (4, 'Entity'),
        (5, 'Manufacturing'),
-       (6, 'Fixed Assets');
+       (6, 'Fixed Assets'),
+       (7, 'Timecards');
 
 
 CREATE OR REPLACE FUNCTION person__get_my_entity_id() RETURNS INT AS

Modified: trunk/sql/modules/Fixes.sql
===================================================================
--- trunk/sql/modules/Fixes.sql	2013-09-17 08:11:32 UTC (rev 6041)
+++ trunk/sql/modules/Fixes.sql	2013-09-17 08:22:44 UTC (rev 6042)
@@ -197,3 +197,7 @@
 BEGIN;
 ALTER TABLE location ALTER COLUMN mail_code DROP NOT NULL;
 COMMIT;
+
+BEGIN;
+INSERT INTO lsmb_module(id, label) values (7, 'Timecards');
+COMMIT;

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


------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits