Commit Graph
69 Commits
Author SHA1 Message Date
Nicolas Malin 8995c4fd02 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/specialpurpose@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacques Le Roux 832e582052 This closes "Replace bsh code with Groovy code" https://issues.apache.org/jira/browse/OFBIZ-6332 with all its subtasks and more.
jleroux: I suspected it was only a matter of replacing "${bsh" by "${groovy" in *.xml. But I had not the guts to get into 11(!) sub tasks. 
So, in Eclipse, I simply did a S/R in *.xml and compared parts of my changes with some Pierre's most "complex" patches respectively product, ebaystore, projectmgr and scrum. 
They were totally similar (just revisions number changed) so here is the whole. 

I will later improve these changes by removing HTML entities when possible, this is a bit more delicate because in some cases the XML schema are not complete (or/and for other still obscure to me reasons) and if you simply replace HTML entities by simple code (eg &Amp; by &) you get issues in logs when the XML parser cross them...

Note: only menus, screen and forms are changed here.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1682118 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 20:39:43 +00:00
Jacques Le Roux 127e509288 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/specialpurpose@1340373 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 08:45:18 +00:00
Jacques Le Roux 9865a1d36b A patch from Pierre Smits "my time screen in project mgr shows wrong labels with entry field for hours" (https://issues.apache.org/jira/browse/OFBIZ-3942) - OFBIZ-3942
The my time entry screen for hours in Project Mgr shows labels (in English) for the hour columns in following order: sun, mon,tue,wen,thu,fri,sat.

However when entering hours on in e.g the mon(day) column the actual date registered for the hours is for tuesday.

Seems like the week starts on monday, not on sunday

JLR: works well, would need more work for those who prefer to have weeks start on Monday...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1062138 13f79535-47bb-0310-9956-ffa450edef68
2011-01-22 10:49:57 +00:00
Hans Bakker 15f446e69e show wbsId on project manager timesheets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@920212 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 06:59:23 +00:00
Hans Bakker 7e22069ffa 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/specialpurpose@834379 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:12:45 +00:00
Hans Bakker 5cf40a27a0 change timesheet form entry from 5 -> 2 characters to accomodate business theme
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@815584 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 01:31:49 +00:00
Scott Gray 684156d029 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/specialpurpose@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Hans Bakker 87bb85757b do not allow tasks of closed projects for selection
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@791199 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 04:35:40 +00:00
Anil Patel 150c949b89 Updated criteria to find parties in AddWeeklyTimesheet form. Now it users criteria same as used in AddWorkEffortPartyAssign screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@770055 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 04:27:59 +00:00
Jacopo Cappellato 7674b6493f Fix for name of form's field. This also fixes OFBIZ-2359
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@768960 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 12:48:29 +00:00
Hans Bakker f86f675fca various timesheet problems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@768669 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 07:04:49 +00:00
Hans Bakker 7a775df6e6 fix timesheet problems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@767788 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 04:25:56 +00:00
Jacques Le Roux 2693f9eddb Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux 08ae117fe5 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/specialpurpose@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Jacques Le Roux 2d1c2de5a8 Secure URLs fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@762278 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 11:15:51 +00:00
Jacques Le Roux 4fb56aa2f7 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/specialpurpose@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux c149a26c6b Replaced BSH by direct UEL. Fix URLs not already secured (I checked there are no other case like this, it was related to "${bsh:" in description wich made fail regexp used before)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@760405 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:45:35 +00:00
Jacques Le Roux 4400b0cdf0 replaced BSH by direct UEL
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@760388 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 10:31:45 +00:00
Jacques Le Roux 738cc8e79b Fix a non secured URL reported on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@760363 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 08:25:08 +00:00
Hans Bakker da62ca49ab cleanup in myportal, move taskslist back to project manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@759965 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 13:36:47 +00:00
Hans Bakker f75c3840ec move timesheet back into project manager, corrected field format error in portletCategory entity (needs drop and reload from seed data) and general corrections
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@759853 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 06:49:26 +00:00
Jacques Le Roux b1f515e6b5 Fix some bugs introduced by recent work to secure URLs in XML files
(Also some trailing blanks removed by chance)

Should be all clear now, waiting for inevitable typos or worse...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@759700 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:42:55 +00:00
Jacques Le Roux cfe00482c4 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/specialpurpose@759684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:02:55 +00:00
Jacques Le Roux db687abdcc 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/specialpurpose@759680 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 13:33:53 +00:00
Hans Bakker 6605b8d5a2 add task actual total column for all participants to timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@742892 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 08:46:22 +00:00
Hans Bakker 0366eed2ec fix error in completed timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@739948 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 09:17:09 +00:00
Marco Risaliti d11f3a3aa1 Artifact cleaning on various components after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@739849 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 21:40:35 +00:00
Jacques Le Roux 949e088c08 <field-map(.*)env-name => <field-map$1from-field
<service(.*)result-map-name => <service$1result-map

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@739764 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 13:54:08 +00:00
Jacques Le Roux 49d1e95dd8 This does not hurt and help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@732677 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 10:36:01 +00:00
Hans Bakker 4eeb9094d7 bsh in formfields gives a problem...is working in rowactions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@731474 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 06:37:39 +00:00
Marco Risaliti f5e116b4fc A lot of cleaning into WorkEffort labels (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@731376 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 22:14:57 +00:00
Hans Bakker 4c954f95c5 adjustment because of changed uel syntax
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@729889 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 12:45:21 +00:00
Hans Bakker 91080aaca6 several small corrections in projectman, mypage, myportal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@729276 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 08:03:53 +00:00
Hans Bakker 031f5be0bc 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/specialpurpose@728894 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 07:26:55 +00:00
Hans Bakker 2bf08bd3a4 correct wrong link and remove debug message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@711956 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 20:07:00 +00:00
Hans Bakker fa3eaf0c6d some corrections on the timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@708424 13f79535-47bb-0310-9956-ffa450edef68
2008-10-28 03:36:28 +00:00
Hans Bakker 0143d0dc80 correct timesheet groovy file and drop down, also took out some permission check because they cause a database lockup
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@706643 13f79535-47bb-0310-9956-ffa450edef68
2008-10-21 14:46:23 +00:00
Hans Bakker fdc47f8656 show in timesheet task list and 'assign task to me', only the available tasks + grrovy conversion
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@704298 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 02:55:40 +00:00
Jacques Le Roux 6ee02b2e5d A bunch of i18n for Project and My Page, included French Translation
Also fix r693536

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@694216 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 11:06:04 +00:00
Hans Bakker 1125799aab add total registered time on timesheet list, add some orderby statements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@688237 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 01:09:32 +00:00
Hans Bakker ffd0c6fd07 change order of project drop down, fix of timesheet display, remove log messages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@687663 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 09:30:33 +00:00
Hans Bakker 171cb4c424 convert to screenlet and do not show checkboxes on timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@671044 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 07:03:20 +00:00
Hans Bakker 282136a46d OFBIZ-1703: localization of projectmanager and chinese language added
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@636182 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 02:45:18 +00:00
Christian Geisert dd5c44cca9 Setting svn properties (svn:eol-style,svn:mime-type,svn:keywords)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@634225 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 11:32:39 +00:00
Hans Bakker 7f74faff7c convert language properties file of OAGIS,EBAY and GOOGLE to the xml format and added the Thai language
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@630809 13f79535-47bb-0310-9956-ffa450edef68
2008-02-25 11:09:35 +00:00
Adrian Crum 50b9204665 First sweep through maincss.css style sheet. Made sure all deprecated styles are marked as deprecated. Eliminated a number of deprecated styles from ftl and xml files.
The ecommerce component is excluded in this commit.

These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@627034 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 18:55:41 +00:00
Marco Risaliti 3332c243ff All the Project Manager forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1618)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@618698 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 16:47:50 +00:00
Hans Bakker 0c7173dc48 fix the paging on all projectmgr screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@611997 13f79535-47bb-0310-9956-ffa450edef68
2008-01-15 02:47:08 +00:00
Hans Bakker 7d46733a0d small correction in previous commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@609926 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 10:50:00 +00:00