Commit Graph
56 Commits
Author SHA1 Message Date
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 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 d1c6f07aa3 Secure URLs fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762278 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 11:15:51 +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 b600c9b257 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@760405 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:45:35 +00:00
Jacques Le Roux 2d07881d51 replaced BSH by direct UEL
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760388 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 10:31:45 +00:00
Jacques Le Roux 01bfb49027 Fix a non secured URL reported on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760363 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 08:25:08 +00:00
Hans Bakker 1b23be60c1 cleanup in myportal, move taskslist back to project manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759965 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 13:36:47 +00:00
Hans Bakker 4efc321fad 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@759853 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 06:49:26 +00:00
Jacques Le Roux d3647429f9 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@759700 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:42:55 +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
Hans Bakker 9faa38c7d1 add task actual total column for all participants to timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742892 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 08:46:22 +00:00
Hans Bakker e1a14431c6 fix error in completed timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739948 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 09:17:09 +00:00
Marco Risaliti ab496554ff Artifact cleaning on various components after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739849 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 21:40:35 +00:00
Jacques Le Roux 5d9fd471dc <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@739764 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 13:54:08 +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
Hans Bakker 478ac9cc39 bsh in formfields gives a problem...is working in rowactions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731474 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 06:37:39 +00:00
Marco Risaliti 420f16c4b6 A lot of cleaning into WorkEffort labels (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731376 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 22:14:57 +00:00
Hans Bakker 4cbfb5de83 adjustment because of changed uel syntax
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729889 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 12:45:21 +00:00
Hans Bakker 2e4cb961fe several small corrections in projectman, mypage, myportal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729276 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 08:03:53 +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
Hans Bakker 5c998a6915 correct wrong link and remove debug message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@711956 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 20:07:00 +00:00
Hans Bakker 3c90fe581a some corrections on the timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@708424 13f79535-47bb-0310-9956-ffa450edef68
2008-10-28 03:36:28 +00:00
Hans Bakker 2288b88562 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@706643 13f79535-47bb-0310-9956-ffa450edef68
2008-10-21 14:46:23 +00:00
Hans Bakker 6171cd633b 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@704298 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 02:55:40 +00:00
Jacques Le Roux ca5aac7376 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@694216 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 11:06:04 +00:00
Hans Bakker 79a554f5e5 add total registered time on timesheet list, add some orderby statements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688237 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 01:09:32 +00:00
Hans Bakker 7b219a0e76 change order of project drop down, fix of timesheet display, remove log messages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687663 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 09:30:33 +00:00
Hans Bakker 5d831989c8 convert to screenlet and do not show checkboxes on timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@671044 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 07:03:20 +00:00
Hans Bakker 2325969cb5 OFBIZ-1703: localization of projectmanager and chinese language added
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@636182 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 02:45:18 +00:00
Christian Geisert 0e5c63c956 Setting svn properties (svn:eol-style,svn:mime-type,svn:keywords)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@634225 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 11:32:39 +00:00
Hans Bakker 2d093c4531 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@630809 13f79535-47bb-0310-9956-ffa450edef68
2008-02-25 11:09:35 +00:00
Adrian Crum 83ece87409 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@627034 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 18:55:41 +00:00
Marco Risaliti 1caf5aa6cd 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@618698 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 16:47:50 +00:00
Hans Bakker 4dd2c648db fix the paging on all projectmgr screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@611997 13f79535-47bb-0310-9956-ffa450edef68
2008-01-15 02:47:08 +00:00
Hans Bakker eb7d4c3246 small correction in previous commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609926 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 10:50:00 +00:00
Hans Bakker c743081e35 fixed a number of errors, simplified the weeklytimesheet retrieval bsh, fixed some problem with the timesheet main option
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609895 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 07:33:08 +00:00
Hans Bakker f9b54f73b2 added rateTypeId to weekly timesheet using the default of the partyRate table
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609883 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 06:10:48 +00:00
Hans Bakker 2cd283b6cc corrected errors in timesheet, 'set to comlete' wrong link'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609865 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 04:23:33 +00:00
Hans Bakker 4f48f28aa6 set the assignment to 'complete' on the timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609535 13f79535-47bb-0310-9956-ffa450edef68
2008-01-07 09:12:32 +00:00
Hans Bakker 1dc40269ea refactoring of names to re-use more forms/screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607391 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 07:30:30 +00:00
Hans Bakker f5d572b2e0 only show link if status is valid
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607387 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 06:44:47 +00:00
Hans Bakker a1f2f05292 reorganised timesheet option
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607374 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 04:55:24 +00:00
Hans Bakker 705bc05768 add the possibility to create any weekly timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607193 13f79535-47bb-0310-9956-ffa450edef68
2007-12-28 09:12:42 +00:00
Hans Bakker 6bef174e32 introduced a 'readOnly' timesheet after the status has been set to 'complete
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606847 13f79535-47bb-0310-9956-ffa450edef68
2007-12-26 05:08:47 +00:00
Hans Bakker efff889787 set actual start date when time is registered, remove NPE from bsh, add subhyperlink on timesheet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606662 13f79535-47bb-0310-9956-ffa450edef68
2007-12-24 04:25:06 +00:00
Hans Bakker d2babb0e44 a first version of the myTask screen to assign and reassign logged on person tasks. Als some fault fixing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605459 13f79535-47bb-0310-9956-ffa450edef68
2007-12-19 08:14:59 +00:00
Hans Bakker 7676ad0758 rewritten timesheet maintenance screens to allow the weekly input to tasks of projects the login ID is member of.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@602651 13f79535-47bb-0310-9956-ffa450edef68
2007-12-09 08:06:00 +00:00
Hans Bakker e4ade71f5c cleanup of the timesheet screens, only reporting on tasks, temporary removed tree menu items. This completes the basic implementation of the project manager. Next actions will be a ganttchart in Dojo and a project sheduler to set estimated dates on the tasks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@599289 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 06:02:05 +00:00