SF.net SVN: ledger-smb:[6763] branches/1.3

[..hidden..]

Revision: 6763
          http://sourceforge.net/p/ledger-smb/code/6763
Author:   einhverfr
Date:     2014-02-05 12:22:36 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
fixing bug 979 for 1.3 based on 1.4 patch

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/employee/filter.html
    branches/1.3/scripts/employee.pl
    branches/1.3/sql/modules/Employee.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2014-02-05 12:11:47 UTC (rev 6762)
+++ branches/1.3/Changelog	2014-02-05 12:22:36 UTC (rev 6763)
@@ -14,6 +14,7 @@
 * Fixed permission denied errors after upgrading copied db (Chris T, 956)
 * Fixed "access denied" when deleting unused tax account (Chris T, 967)
 * Fixed GL Report fails before entering transactions (Chris T, 977)
+* Fixed start and end dates not shown on contact screen (Chris T, 979)
 
 Changelog for 1.3.37
 * 1.3-1.2 downgrade now drops extensions (Chris T, 943)

Modified: branches/1.3/UI/employee/filter.html
===================================================================
--- branches/1.3/UI/employee/filter.html	2014-02-05 12:11:47 UTC (rev 6762)
+++ branches/1.3/UI/employee/filter.html	2014-02-05 12:22:36 UTC (rev 6763)
@@ -184,31 +184,31 @@
 } ?>
 </div>
 <div class="inputgroup">
-<?lsmb IF l_startdate; 
-             c_id = 'CHECKED';
+<?lsmb IF l_start_date; 
+             c_start_date = 'CHECKED';
        END 
 ?> 
 <?lsmb INCLUDE input element_data = {
-    name = 'l_startdate'
+    name = 'l_start_date'
    value = '1'
     type = 'checkbox'
    class = 'checkbox'
    label = text('Start Date') #'
- checked = c_startdate
+ checked = c_start_date
 } ?>
 </div>
 <div class="inputgroup">
-<?lsmb IF l_enddate; 
-             c_enddate = 'CHECKED';
+<?lsmb IF l_end_date; 
+             c_end_date = 'CHECKED';
        END 
 ?> 
 <?lsmb INCLUDE input element_data = {
-    name = 'l_enddate'
+    name = 'l_end_date'
    value = '1'
     type = 'checkbox'
    class = 'checkbox'
    label = text('End Date') #'
- checked = c_enddate
+ checked = c_end_date
 } ?>
 </div>
 <div class="inputgroup">

Modified: branches/1.3/scripts/employee.pl
===================================================================
--- branches/1.3/scripts/employee.pl	2014-02-05 12:11:47 UTC (rev 6762)
+++ branches/1.3/scripts/employee.pl	2014-02-05 12:22:36 UTC (rev 6763)
@@ -295,7 +295,7 @@
     $request->{title} = $locale->text('Search Results');
     for my $col (qw(l_position l_id l_employeenumber l_salutation 
                     l_first_name l_middle_name l_last_name l_dob 
-                    l_startdate l_enddate l_role l_ssn l_sales l_manager_id
+                    l_start_date l_end_date l_role l_ssn l_sales l_manager_id
                     l_manager_first_name l_manager_last_name)){
         if ($request->{$col}){
            my $pcol = $col;
@@ -311,8 +311,8 @@
   middle_name => $locale->text('Middle Name'),
     last_name => $locale->text('Last Name'),
           dob => $locale->text('DOB'),
-    startdate => $locale->text('Start Date'),
-      enddate => $locale->text('End Date'),
+   start_date => $locale->text('Start Date'),
+     end_date => $locale->text('End Date'),
          role => $locale->text('Role'),
           ssn => $locale->text('SSN'),
         sales => $locale->text('Sales'),

Modified: branches/1.3/sql/modules/Employee.sql
===================================================================
--- branches/1.3/sql/modules/Employee.sql	2014-02-05 12:11:47 UTC (rev 6762)
+++ branches/1.3/sql/modules/Employee.sql	2014-02-05 12:22:36 UTC (rev 6763)
@@ -75,8 +75,8 @@
     first_name text,
     middle_name text,
     last_name text,
-    startdate date,
-    enddate date,
+    start_date date,
+    end_date date,
     role varchar(20),
     ssn text,
     sales bool,

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


------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits