Commit Graph
26 Commits
Author SHA1 Message Date
Jacques Le Roux eef33a284f EmplLeaveReasonType Relation name was too long
EMP_LEAV_REAS_ELTP is ok now
Thanks to Scott on dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831842 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 10:14:18 +00:00
Jacques Le Roux ef2c935618 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


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831249 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 10:07:09 +00:00
Jacques Le Roux 835ab9c7c1 Revert r826429, the work at https://issues.apache.org/jira/browse/OFBIZ-2938 was not good enough to be committed. Notably issues with data model changes as noticed by Scott.
See http://markmail.org/thread/vzcj3oaevvxyvek7 for more

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826964 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 05:56:47 +00:00
Jacques Le Roux c28b2bf0ca 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. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826429 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 13:15:59 +00:00
Hans Bakker 8ee21f614a commited patch of OFBIZ-2531 with minor changes, however added initial help screens, initial commit need some more work on the permissions for admin and employee
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802308 13f79535-47bb-0310-9956-ffa450edef68
2009-08-08 07:20:30 +00:00
Vikas Mayur 02150938b0 Fixed: Relation Enumeration of entity JobRequisition is not unique for that entity, reported by Hans on dev mailing list.
Also changed entity field names as per best practice and fixed wrong attribute names on services found by chance in the logs.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778587 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 07:15:43 +00:00
Ashish Vijaywargiya 82e1b52445 Applied patch from jira issue OFBIZ-2205 (Implemented recruitment in HR module).
I am committing the recently uploaded patch.
As it looks lot better from the initial one.

It may happen that I have missed some small things(It was around 5th or 7th review from my side) ... although those can be handled as reported in future.

At the end thanks to Abhinav Vaid for his contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776961 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 06:02:38 +00:00
Jacques Le Roux 058d6aed57 A patch from Ashish Vijaywargiya "Change Copyright Year" (https://issues.apache.org/jira/browse/OFBIZ-2346) - OFBIZ-2346
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772936 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:56:14 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Hans Bakker be7b5e7989 some corrections and the addition of a profile screenlet to show an overview of the employment information of a party (to be completed)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739215 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 09:14:36 +00:00
Hans Bakker 8febab931e list employee positions on the employee profile
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738430 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 10:40:35 +00:00
Hans Bakker 7ec1fb6789 Rate refactoring, now can have a base rate with diffrent currencies which can be overridden on a party or workeffort level. see OFBIZ-2037 for more info
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728894 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 07:26:55 +00:00
Anil Patel 9d254f583a Now employment search takes employee first and last name. Updated labels to match with context. Added little tool tip.
Added view entity to show employee (Person) data with employment record.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@717984 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 06:18:59 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
Ashish Vijaywargiya 4e1f4e636e Applied patch from JIRA issue OFBIZ-1659.
Following things are covered in this patch :-

Included LookUps at the required places and done improvements.
Added Employee Leave tab,Create Entity EmplLeave and crud operations by Parimal.

Thanks Harsha Chadhar and Parimal Gain for your work.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661359 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 15:30:53 +00:00
Ashish Vijaywargiya e9dc3b351c Removed the relationship of PayHistory with the PerformanceReview.(This was the optional relationship in DataModel Resource book and I thought it can be better handled by only Employment entity.)
So we should maintain the PayHistory from the Employment only.

Corrected the PrimaryKey for PositionTypeRate.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@659756 13f79535-47bb-0310-9956-ffa450edef68
2008-05-24 06:59:28 +00:00
Ashish Vijaywargiya 1578dc1d29 Cleanups in HR module.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658590 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 08:14:07 +00:00
Vikas Mayur 0d83a87132 Removing RateType entity as it is already defined in workeffort component. Thanks Scott for reporting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658251 13f79535-47bb-0310-9956-ffa450edef68
2008-05-20 14:04:23 +00:00
Ashish Vijaywargiya aabb354e0d Applied patch from JIRA issue :- https://issues.apache.org/jira/browse/OFBIZ-1659
The following points are covered in this patch 
1) Added Resume support for the party.
2) Improved the usability of the Qualification details for party.

Thanks Parimal Gain for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658193 13f79535-47bb-0310-9956-ffa450edef68
2008-05-20 10:31:33 +00:00
Ashish Vijaywargiya 00a6c9b427 Made some improvements in the relationship b/w the entities of HR component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657098 13f79535-47bb-0310-9956-ffa450edef68
2008-05-16 15:09:52 +00:00
Ashish Vijaywargiya dc30eacb29 Applied patch from JIRA issue :- https://issues.apache.org/jira/browse/OFBIZ-1659.
Following things are covered in this patch :-
1) Created Entities PositionTypeRate and  RateType.
(Details of entities are taken from Data Model Resource Book 1)
2) Added the sample data for the BenefitType entity.


Thanks Parimal Gain for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657085 13f79535-47bb-0310-9956-ffa450edef68
2008-05-16 14:40:22 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
David E. Jones d3f94c5aef Replaced all old references to [Copyright * The Open For Business Project] which should take care of all of the legal loose ends
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@446798 13f79535-47bb-0310-9956-ffa450edef68
2006-09-16 00:35:48 +00:00
Jacopo Cappellato a262641e4e Removed $Id$ tags from license header: thanks to Scott Gray for the patch (Apache OFBIZ-87).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423776 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 05:30:13 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00