Commit Graph
107 Commits
Author SHA1 Message Date
Hans Bakker 96d54615ca removed default-option='contains' because now set from widget.properties which is the current default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834379 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:12:45 +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
Jacques Le Roux 5bf0504a98 Fix issues with r802308 : all calls to createPersonTraining and updatePersonTraining services from forms, screens and controllers should have been removed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817443 13f79535-47bb-0310-9956-ffa450edef68
2009-09-21 22:20:10 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux c1f2024e65 A patch from Pradeep Ruhil "This patch is for Improvent in HR module in Global Hr Setting tabs in Paygrade section." (https://issues.apache.org/jira/browse/OFBIZ-2739) - OFBIZ-2739
This issue is that when you select any payGradeId that is already created and then you check the Salary Steps for that payGradeId, it was showing the Salary Steps of all the payGradeId present. So I resolved that issue and now it will display the Salary Step for the selected payGradeId only.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813702 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 07:54:45 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Jacques Le Roux e0c84350be A patch from Anil Soni "Improvements in HR module." (https://issues.apache.org/jira/browse/OFBIZ-2604) - OFBIZ-2604
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811838 13f79535-47bb-0310-9956-ffa450edef68
2009-09-06 17:13:04 +00:00
Jacques Le Roux 1c912ce7cf A patch from Abhinav Vaid " Improvements in Recruitment sub module in HR" (https://issues.apache.org/jira/browse/OFBIZ-2540) - OFBIZ-2540
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811484 13f79535-47bb-0310-9956-ffa450edef68
2009-09-04 16:47:22 +00:00
Scott Gray 12566c26b9 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +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
Hans Bakker fe146772e2 take the default currency as set in the commonext component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795474 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 03:54:22 +00:00
Hans Bakker 7e815c48c7 sort currency by country and not by abbreviation in form dropdowns
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@794619 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 10:40:07 +00:00
Adrian Crum 397595a15d Removed deprecated CSS styles from humanres component - https://issues.apache.org/jira/browse/OFBIZ-2525.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778809 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 17:43:32 +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 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +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
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Marco Risaliti a7c32b64af Missing translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761795 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 21:06:57 +00:00
Jacques Le Roux 77a2ff1d9f 21th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

We are near the end...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:02:55 +00:00
Jacques Le Roux 40f5281303 20th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759680 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 13:33:53 +00:00
Jacques Le Roux 8c6d89fe75 18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!)

I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 11:00:00 +00:00
Jacques Le Roux 3fe66ef254 tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759574 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:13:03 +00:00
Jacques Le Roux e3f730799b 12th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759562 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:45:05 +00:00
Jacques Le Roux efd4862041 10th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Some hyperlink tag are still not well indented (3 spaces instead of 4), I gave up :/



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759515 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 17:36:08 +00:00
Jacques Le Roux 04eb726169 I think there were typos (&&) in
<hyperlink target="deleteEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${partyId}&amp;&amp;referredByPartyId=${referredByPartyId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>

else please explain me...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759499 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:22:09 +00:00
Jacques Le Roux 10a5ee651a Replace tabs by 4 spaces in previous commit. I used 4 spaces instead of 2 because this was already used in this files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759496 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:16:29 +00:00
Jacques Le Roux a30c0c9f3e 8th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759495 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:14:58 +00:00
Jacques Le Roux 6936c24e22 6th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759481 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 15:12:54 +00:00
Jacques Le Roux a70fb8275b 5th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759475 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 14:54:29 +00:00
Jacques Le Roux 4106babe54 Forgot to replace tabs by 4 spaces in previous commit. I used 4 spaces instead of 2 because this was already used in this files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759468 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 14:25:39 +00:00
Jacques Le Roux e9e528f28e 3d set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759464 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 14:06:16 +00:00
Jacques Le Roux 17d27b12b3 Fix bugs (wrong ends of elements)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756060 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 15:53:57 +00:00
Jacques Le Roux d95c23ea37 Fix issues in r756025
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756037 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 15:05:44 +00:00
Jacques Le Roux 30297cee33 2st set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
In previous commit I forgot my own recommendations and lost the part at end of link. I will fix in a next commit...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756034 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 14:47:17 +00:00
Jacques Le Roux 42cbb5765d 1st set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Note that some hyperlinks here are commented out and should maybe dropped

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756025 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 14:34:33 +00:00
Marco Risaliti 244eea12bb A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752268 13f79535-47bb-0310-9956-ffa450edef68
2009-03-10 21:16:58 +00:00
Marco Risaliti fd032fc098 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746654 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 10:45:15 +00:00
Marco Risaliti 201290e8db A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746341 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 19:11:06 +00:00
Jacques Le Roux 4ef6848f7c From Louis Briolet suggestions in "Error when update skill or training in the party and human resources components" https://issues.apache.org/jira/browse/OFBIZ-2196 OFBIZ-2196
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745818 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 11:11:51 +00:00
Marco Risaliti 8a3e5a7f52 A lot of hardcoded labels cleaning and changes some wrong references into humanres and marketing components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744509 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 15:54:35 +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 ec47bc0b00 make hyperlink from empl position to type move paygrades to settings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738484 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 13:43:45 +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 5907deeb97 add the employementlist to the employee profile
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738405 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 08:53:15 +00:00
Hans Bakker 8fa5048c35 some display enhancements and showing function keys after new employment is created
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738377 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 06:22:27 +00:00
Marco Risaliti eeb2b0c785 Artifact cleaning on humanres component after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738249 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 21:25:52 +00:00