Author: jleroux Date: Sat Jan 22 10:55:41 2011 New Revision: 1062139 URL: http://svn.apache.org/viewvc?rev=1062139&view=rev Log: "Applied fix from trunk for revision: 1062138" ------------------------------------------------------------------------ r1062138 | jleroux | 2011-01-22 11:49:57 +0100 (sam., 22 janv. 2011) | 9 lines
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... ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 22 10:55:41 2011 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060261,1060368,1060933,1061167,1061886 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060261,1060368,1060933,1061167,1061886,1062138 Modified: ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1062139&r1=1062138&r2=1062139&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sat Jan 22 10:55:41 2011 @@ -54,13 +54,13 @@ <entity-options entity-name="RateType" description="${description}"/> </drop-down> </field> - <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrSun}"><text size="2"/></field> - <field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrMon}"><text size="2"/></field> - <field name="d2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrTue}"><text size="2"/></field> - <field name="d3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrWen}"><text size="2"/></field> - <field name="d4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><text size="2"/></field> - <field name="d5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><text size="2"/></field> - <field name="d6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><text size="2"/></field> + <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrMon}"><text size="2"/></field> + <field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrTue}"><text size="2"/></field> + <field name="d2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrWen}"><text size="2"/></field> + <field name="d3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrThu}"><text size="2"/></field> + <field name="d4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrFri}"><text size="2"/></field> + <field name="d5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrSat}"><text size="2"/></field> + <field name="d6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSun}"><text size="2"/></field> <field name="total" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field> @@ -297,13 +297,13 @@ </field> <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field> <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field> - <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrSun}"><display/></field> - <field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrMon}"><display/></field> - <field name="d2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrTue}"><display/></field> - <field name="d3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrWen}"><display/></field> - <field name="d4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><display/></field> - <field name="d5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><display/></field> - <field name="d6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><display/></field> + <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrMon}"><display/></field> + <field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrTue}"><display/></field> + <field name="d2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrWen}"><display/></field> + <field name="d3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrThu}"><display/></field> + <field name="d4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrFri}"><display/></field> + <field name="d5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrSat}"><display/></field> + <field name="d6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSun}"><display/></field> <field name="total" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field>
