Bruno Busco
544b679f4f
Part of OFBIZ-3067 - Menus and form widget files location
...
Assetmaint, Oagis and Projectmgr components
Renamed assetmaint/widget/Menus.xml to assetmaint/widget/AssetmaintMenus.xml
Renamed oagis/widget/Menus.xml to oagis/widget/OagisMenus.xml
Renamed projectmgr/widget/Menus.xml to projectmgr/widget/ProjectMenus.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829325 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 08:54:33 +00:00
Jacques Le Roux
edb87622a3
A patch from Erwan de FERRIERES " Misc. internationalization on projectmgr" ( https://issues.apache.org/jira/browse/OFBIZ-3069 ) - OFBIZ-3069
...
Word "week" was hard-coded in a form and a timesheet's total was hardcoded in the groovy script
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828844 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 20:46:17 +00:00
Bruno Busco
a9c26eb1c1
Changed <container style="screenlet"> pattern to <screenlet...>.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Hans Bakker
1f19468ad7
fix timesheet problems
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767788 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 04:25:56 +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
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
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
2eeaa25b8d
<if-compare field-name= => <if-compare field=
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739769 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 14:13:19 +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
290534059d
<entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:27:43 +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
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
Hans Bakker
0bdbbb66ed
cleanup viewsize/viewindex assignments, to screenlet conversion
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688244 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 01:59:21 +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
af7eb3659f
fix timesheet list,add button in screenlet
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@671494 13f79535-47bb-0310-9956-ffa450edef68
2008-06-25 10:07:20 +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
Jacques Le Roux
a1bf6540a6
Use (new) ${uiLabelMap.CommonNbr} instead of # and ${uiLabelMap.OrderNbr}. Suppressed EcommerceNbr was not used
...
More and better French labels in Order (work in progress...)
Some sparse labels fix in Product
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@659052 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 09:02:28 +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
Adrian Crum
68c1dbbaf9
Second sweep through the maincss.css style sheet. Changed the head1, head2, and head3 style names to h1, h2, and h3. Updated affected styles in ftl and xml files.
...
The ecommerce component is excluded from this commit.
These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.
I won't make any more maincss.css changes for a little while. I'll let the dust settle from these two commits, then I'll go through the file and physically remove the deprecated styles.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 19:30:09 +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
eb428e930b
In the timesheet entry different rateTypes on the same task accepted now
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609923 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 10:29:43 +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
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
68b59b2523
more re-use of screen parts
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607389 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 06:55:00 +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
951831a02f
changed resource selection, need reload of demo data
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604795 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 08:50:54 +00:00
Hans Bakker
1fffed1317
add a partyList to the task overview
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604769 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 04:35:23 +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
Hans Bakker
72e4be85ec
moved project views from workeffort in the projmgr, change the time entry screens to enter only time on tasks, an in the option 'mytime' only on tasks in project of which the logged on user is member of.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597072 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 13:27:53 +00:00
Hans Bakker
3a8369d296
replace edittimesheet.ftl with a form from workeffort
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@596566 13f79535-47bb-0310-9956-ffa450edef68
2007-11-20 08:22:21 +00:00
Anil Patel
acbf2318f9
Adding forms and screens for Project management. Most of the forms are intentionally done using freemarker so we have more control over UI. Planning to use Ajax/Effects where makes sense.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574051 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 19:02:11 +00:00