Re: svn commit: r831249 - in /ofbiz/trunk/applications/humanres: config/ data/ entitydef/ script/org/ofbiz/humanres/ servicedef/ webapp/humanres/WEB-INF/ widget/ widget/forms/

Fri, 30 Oct 2009 04:15:16 -0700

Could someone explain the EmplLeaveTypes below? I've never heard of the terms (particularly "Inland") before and a google search for those exact phrases reveals nothing but OFBiz mailing list results. 

Thanks
Scott

HotWax Media
http://www.hotwaxmedia.com

On 30/10/2009, at 11:07 PM, [email protected] wrote:


Author: jleroux
Date: Fri Oct 30 10:07:09 2009
New Revision: 831249

URL: http://svn.apache.org/viewvc?rev=831249&view=rev
Log:
A patch from Pradeep Ruhil "HR Leave Enhancement ." (https://issues.apache.org/jira/browse/OFBIZ-2938 ) - OFBIZ-2938 
In this patch we are doing enhancement in HumanResource Leave Module.
Initially we can only create new leave application for a partyId.
But there was not functionality available for approval of leave.
So in this patch we have given functionality for Leave approval as well as leave creation. 
+ A better French label

Modified:
   ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
   ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
   ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/ HumanResServices.xml 
   ofbiz/trunk/applications/humanres/servicedef/services.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/ controller.xml 
   ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
   ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
   ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
   ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
   ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
   ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
ofbiz/trunk/applications/humanres/widget/forms/ GlobalHRSettingForms.xml 

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=831249&r1=831248&r2=831249&view=diff
= = = = = = = = ====================================================================== --- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Fri Oct 30 10:07:09 2009 
@@ -101,8 +105,10 @@
<TerminationType description="Fired" hasTable="N" parentTypeId="" terminationTypeId="FIRE"/> <TerminationType description="Retirement" hasTable="N" parentTypeId="" terminationTypeId="RETIRE"/>
- <EmplLeaveType description="Medical" hasTable="N" parentTypeId="" leaveTypeId="MEDICAL"/> - <EmplLeaveType description="Casual" hasTable="N" parentTypeId="" leaveTypeId="CASUAL"/> + <EmplLeaveType description="Inland Earned Leave" hasTable="N" parentTypeId="" leaveTypeId="INLAND_EARNED"/> + <EmplLeaveType description="Inland Loss of Pay" hasTable="N" parentTypeId="" leaveTypeId="LOSS_OF_PAY"/> + <EmplLeaveType description="Inland Restricted Holiday" hasTable="N" parentTypeId="" leaveTypeId="RESTRICTED_HOLIDAY"/> + <EmplLeaveType description="Inland Special Day Off" hasTable="N" parentTypeId="" leaveTypeId="SPECIAL_DAY_OFF"/>
<WebSite webSiteId="HR" siteName="Human Resource Manager" visualThemeSetId="BACKOFFICE"/>

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Reply via email to