Commit Graph
68 Commits
Author SHA1 Message Date
Jacques Le Roux ec2b84341e Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
This reverts commit 17eb2e4cf7.

It does not work when using <<target="javascript:........>>
I could change those cases but it's easier and safer to simply revert back to
target-type!

Thanks: James for report
2020-12-18 11:08:32 +01:00
Jacques Le Roux 17eb2e4cf7 Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)
Same for sub-hyperlink
2020-12-11 16:52:04 +01:00
lodhiravi 32a0cb865e Fixed: Added employee lookup to search/select employee(person) while creating new employment. This will also fixed the issue of party groups being selected as a employee. (OFBIZ-11697) (#210) 2020-07-04 23:11:58 +05:30
Jacques Le Roux ddb43a6493 Fixed: field emplFromDate is forgot in PayHistory entity
(OFBIZ-11028)

Arpit Mor: steps to regenerate:
    Login to the URL: https://demo-trunk.ofbiz.apache.org/humanres/control/main
    Click on Employments
    Click on New Employments
    Click on Create
Actual: Error message is displayed.

Olivier Heintz: employment is associated with PayHistory, and there is a problem 
in PayHistory entity definition in OFBiz,
In PayHistory, the field fromDate from Employment is confused with fromDate 
about the current record.
A Employment can have multiple PayHistories and should have multiple
because PayHistory should show history of Pay  for a employment  !
It's necessary to have a field emplFromDate (to have the complete employment 
primaryKey).
When modifying a PayRecord the current should be expire and a new one should 
be created.

Thanks: Arpit Mor for report at OFBIZ-10969 and Olivier Heintz for the fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859571 13f79535-47bb-0310-9956-ffa450edef68
2019-05-20 17:14:43 +00:00
Deepak Dixit 7f04d6de79 Improved: Service "deletePayHistory" does not have correct implementation (OFBIZ-9111)
Use entity auto for deletePayHistory service, also added new service to expirePayHistory and call expirePayHistory from UI.

Thanks Pawan Verma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801348 13f79535-47bb-0310-9956-ffa450edef68
2017-07-09 06:02:33 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Divesh Dutta 556279917d Improved:Display from date with default to now timestamp and also add asterisk sign to all the forms where it is part of primary key in all the components.
(OFBIZ-7650) (OFBIZ-7651) (OFBIZ-7653) (OFBIZ-7660) (OFBIZ-7662) (OFBIZ-7665) (OFBIZ-7666) (OFBIZ-8028)(OFBIZ-8029) (OFBIZ-8255)

Thanks: Anuj Jain and Ratnesh for the pathes and Swapnil Shah for reporting the issues.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761192 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:02:39 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Nicolas Malin ce97afbf6b patch from Pierre Smits : Remove tooltip CommonNotModifRecreat from display fields (OFBIZ-6696), thanks for the screen clean Pierre
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1718970 13f79535-47bb-0310-9956-ffa450edef68
2015-12-09 21:24:44 +00:00
Jacques Le Roux 901b1a4a06 Removes tooltip="${uiLabelMap.CommonRequired}" from fields, https://issues.apache.org/jira/browse/OFBIZ-6691
Instead of a quiet S/R action, this was an unexpected pain in the ass. A considerable number of forms:
    EmployeeForms.xml
    EmploymentForms.xml
    EmplPositionForms.xml
    GlobalHRSettingForms.xml
    RecruitmentForms.xml
    QuoteForms.xml
    PartyForms.xml
    StoreForms.xml
    ContactForms.xml
    FixedAssetForms.xml
    TaskForms.xml
    scrumForms.xml
    TaskForms.xml
contained a large number of fields with 
  tooltip="${uiLabelMap.CommonRequired}"
but no 
  required-field="true"


Of course display and display-entity should not be concerned, I spotted a number of them in the lot.

I also removed a bunch of harcoded * at end of labels (those followed by required-field="true"* and spotted a number of others }*"  who still need to be carefully reviewed to see if required=true is not missing there :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709882 13f79535-47bb-0310-9956-ffa450edef68
2015-10-21 16:57:25 +00:00
Jacques Le Roux 7dc24b6902 A slightly modified patch from Taher Alkhateeb for <<replace widget-style="required" with required-field="true">> https://issues.apache.org/jira/browse/OFBIZ-6690
jleroux: after a cursory review, I simply did the chunk related to exampleName by hand, it needed more work. I also removed some trailing blanks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709872 13f79535-47bb-0310-9956-ffa450edef68
2015-10-21 16:00:02 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacques Le Roux 3369dca046 Replaces title="${uiLabelMap.CommonEmptyHeader}" by title=" " where it's known to not be a problem. Here with links styled by widget-style="buttontext"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340373 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:45:18 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Ashish Vijaywargiya 88a092d2f9 Applied patch from jira issue OFBIZ-3320 - improvement in Find screen.
Fix title of buttons to Find, for all the find screens to maintain consistency. 

Thanks Chandan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889084 13f79535-47bb-0310-9956-ffa450edef68
2009-12-10 04:29:19 +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 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
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
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
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 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 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 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 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
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
Jacques Le Roux 66ffa47fd6 This does not hurt and help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732677 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 10:36:01 +00:00
Jacques Le Roux b5d83243e3 Last touch to Human Res i18n, French l10n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728669 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 12:52:20 +00:00
Anil Patel c45cbc8b03 Updated link to point to EmployeeProfile instead of viewprofile page in party manager.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718365 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 20:26:54 +00:00
Anil Patel 7b73bf1223 Minor usability cleanups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@717988 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 08:00:20 +00:00
Anil Patel 7bebc5b46c Added form of employment list to on employee profile page. I'll build Profile Portal page once Portal patch to be added in trunk.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@717986 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 06:33:21 +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
Adrian Crum 75191fa776 Removed deprecated CSS styles from back office applications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@676212 13f79535-47bb-0310-9956-ffa450edef68
2008-07-12 18:41:44 +00:00
Ashish Vijaywargiya d4e47f16c3 Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Human Resource component.

Thanks Harsha Chadhar for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667014 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 09:36:32 +00:00
Ashish Vijaywargiya dcaeb77523 Applied patch from JIRA issue OFBIZ-1659.
Few more improvements are included in this patch.
There were navigation problems in the tab's inside Employee header item.

Thanks Primal Gain for your patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662162 13f79535-47bb-0310-9956-ffa450edef68
2008-06-01 07:46:13 +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 16a12b6140 Applied patch from JIRA issue OFBIZ-1659.
Following things are covered in this work :-

Restructured and organized the Screenc and Forms in the HR component.
Improved and Updated the naming conventions in the naming of Screens,Forms and requests. 

Thanks Harsha Chadhar for this work.
It was really very important for us to Manage the files before the component is used Extensively with other components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660980 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 15:25:38 +00:00
Ashish Vijaywargiya 617b28873e Applied patch from JIRA Issue # OFBIZ-1659.
Following things are covered in this patch.
Added tab for AgreementEmploymentAppl.
And added the common decorator pattern for search screen i.e "FindScreenDecorator".

For now we kept AgreementEmploymentAppl entity in the party component(Because other entities like AgreementProductAppl & AgreementWorkEffortAppl is also kept there).

Thanks Harsha Chadhar for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660223 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 16:08:13 +00:00