svn commit: r984399 [5/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r984399 [5/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/MostRecentPrep.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/MostRecentPrep.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/MostRecentPrep.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/MostRecentPrep.groovy Wed Aug 11 13:22:40 2010 @@ -43,4 +43,4 @@ if (forumId) { Debug.logInfo("in mostrecentprep(1), entityList.size():" + entityList.size(),""); Debug.logInfo("in mostrecentprep(1), entityList:" + entityList,""); context.mostRecentList = entityList; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy Wed Aug 11 13:22:40 2010 @@ -137,4 +137,4 @@ if (searchFeature1 || searchFeature2 || } context.queryResults = contentList; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/UserPermPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/UserPermPrep.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/UserPermPrep.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/UserPermPrep.groovy Wed Aug 11 13:22:40 2010 @@ -55,4 +55,4 @@ if (forumId) { blogRoleList.add(roleType.roleTypeId); } context.blogRoleIdList = blogRoleList; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy Wed Aug 11 13:22:40 2010 @@ -128,4 +128,4 @@ context.resultPartialList = resultPartia viewIndexLast = (int) (arraySize/viewSize); context.viewIndexLast = viewIndexLast; contentAssoc = FastList.newInstance(); -context.contentAssoc=resultPartialList; \ No newline at end of file +context.contentAssoc=resultPartialList; Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/PrepSeqNo.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/PrepSeqNo.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/PrepSeqNo.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/content/PrepSeqNo.groovy Wed Aug 11 13:22:40 2010 @@ -30,4 +30,4 @@ if (seqNo) { context.seqNumBefore = seqNumBefore; seqNumAfter = seqNo + 1; context.seqNumAfter = seqNumAfter; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/contentsetup/UserPermPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/contentsetup/UserPermPrep.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/contentsetup/UserPermPrep.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/contentsetup/UserPermPrep.groovy Wed Aug 11 13:22:40 2010 @@ -60,4 +60,4 @@ if (forumId) { blogRoleList.add(roleType.roleTypeId); } context.blogRoleIdList = blogRoleList; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/datasetup/DataCategoryPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/datasetup/DataCategoryPrep.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/datasetup/DataCategoryPrep.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/datasetup/DataCategoryPrep.groovy Wed Aug 11 13:22:40 2010 @@ -33,4 +33,4 @@ DataResourceWorker.getDataCategoryMap(de dataCategoryList = [] as ArrayList; DataResourceWorker.buildList(rootNode, dataCategoryList, 0); -context.dataCategoryList = dataCategoryList; \ No newline at end of file +context.dataCategoryList = dataCategoryList; Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy Wed Aug 11 13:22:40 2010 @@ -51,4 +51,4 @@ if (currentValue) { textData = out.toString(); context.textData = textData; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy Wed Aug 11 13:22:40 2010 @@ -21,4 +21,4 @@ import javax.print.PrintServiceLookup printServices = PrintServiceLookup.lookupPrintServices(null, null); printServiceNames = printServices.collect { it.getName() } -context.printers = printServiceNames; \ No newline at end of file +context.printers = printServiceNames; Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Wed Aug 11 13:22:40 2010 @@ -80,4 +80,4 @@ context.createSurveyQuestionCategoryWrap context.surveyQuestionCategory = surveyQuestionCategory; context.categoryQuestions = categoryQuestions; -context.questionCategories = questionCategories; \ No newline at end of file +context.questionCategories = questionCategories; Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy Wed Aug 11 13:22:40 2010 @@ -37,4 +37,4 @@ if (templateUrl) { writer = new StringWriter(); surveyWrapper.render(templateUrl, writer); context.surveyString = writer.toString(); -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy Wed Aug 11 13:22:40 2010 @@ -38,4 +38,4 @@ if (survey) { surveyWrapper = new SurveyWrapper(delegator, surveyId); context.surveyWrapper = surveyWrapper; context.sequenceSort = ['sequenceNum']; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy Wed Aug 11 13:22:40 2010 @@ -29,4 +29,4 @@ if (webSite) { webSiteRoleDatas.add(webSiteRoleData); } } -context.webSiteRoleDatas = webSiteRoleDatas; \ No newline at end of file +context.webSiteRoleDatas = webSiteRoleDatas; Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy Wed Aug 11 13:22:40 2010 @@ -58,4 +58,4 @@ if (content) { mkcdr = mkc.getRelatedOne("DataResource"); context.metaKeywords = mkcdr; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy Wed Aug 11 13:22:40 2010 @@ -61,4 +61,4 @@ if (webSiteError) { // get all sub content for the error root errors = delegator.findList("ContentAssoc", EntityCondition.makeCondition([contentId : errorRoot]), null, null, null, false); context.errors = errors; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/content/webapp/content/contentsetup/ContentSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/contentsetup/ContentSetupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/contentsetup/ContentSetupForms.xml (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/contentsetup/ContentSetupForms.xml Wed Aug 11 13:22:40 2010 @@ -230,4 +230,4 @@ under the License. </hyperlink> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/content/webapp/content/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/datasetup/DataSetupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/datasetup/DataSetupForms.xml (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/datasetup/DataSetupForms.xml Wed Aug 11 13:22:40 2010 @@ -276,4 +276,4 @@ under the License. </hyperlink> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/content/webapp/content/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/lookup/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/lookup/LookupForms.xml (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/lookup/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -99,4 +99,4 @@ under the License. <display/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/content/widget/EmailScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/EmailScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/EmailScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/EmailScreens.xml Wed Aug 11 13:22:40 2010 @@ -29,4 +29,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml Wed Aug 11 13:22:40 2010 @@ -348,4 +348,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/widget/contentsetup/ContentSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/contentsetup/ContentSetupScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/contentsetup/ContentSetupScreens.xml Wed Aug 11 13:22:40 2010 @@ -183,4 +183,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/widget/datasetup/DataResourceSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/datasetup/DataResourceSetupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/datasetup/DataResourceSetupScreens.xml Wed Aug 11 13:22:40 2010 @@ -189,4 +189,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml Wed Aug 11 13:22:40 2010 @@ -251,4 +251,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/forum/ForumForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/forum/ForumForms.xml Wed Aug 11 13:22:40 2010 @@ -242,4 +242,4 @@ under the License. <field name="textData" title="${uiLabelMap.FormFieldTitle_textDataTitle}"><textarea rows="8"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - </forms> \ No newline at end of file + </forms> Modified: ofbiz/branches/jquery/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/forum/ForumScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/forum/ForumScreens.xml Wed Aug 11 13:22:40 2010 @@ -346,4 +346,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/widget/layout/LayoutMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/layout/LayoutMenus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/layout/LayoutMenus.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/layout/LayoutMenus.xml Wed Aug 11 13:22:40 2010 @@ -101,4 +101,4 @@ under the License. </link> </menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/humanres/widget/EmplLeaveScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/EmplLeaveScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/EmplLeaveScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/EmplLeaveScreens.xml Wed Aug 11 13:22:40 2010 @@ -164,4 +164,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/EmplPositionScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/EmplPositionScreens.xml Wed Aug 11 13:22:40 2010 @@ -301,4 +301,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/EmploymentAppScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/EmploymentAppScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/EmploymentAppScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/EmploymentAppScreens.xml Wed Aug 11 13:22:40 2010 @@ -97,4 +97,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/EmploymentScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/EmploymentScreens.xml Wed Aug 11 13:22:40 2010 @@ -237,4 +237,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PartyAbilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PartyAbilityScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PartyAbilityScreens.xml Wed Aug 11 13:22:40 2010 @@ -26,4 +26,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PartyQualScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PartyQualScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PartyQualScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PartyQualScreens.xml Wed Aug 11 13:22:40 2010 @@ -98,4 +98,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PartyResumeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PartyResumeScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PartyResumeScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PartyResumeScreens.xml Wed Aug 11 13:22:40 2010 @@ -77,4 +77,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PartySkillScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PartySkillScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PartySkillScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PartySkillScreens.xml Wed Aug 11 13:22:40 2010 @@ -100,4 +100,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PartyTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PartyTrees.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PartyTrees.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PartyTrees.xml Wed Aug 11 13:22:40 2010 @@ -58,4 +58,4 @@ under the License. <include-screen name="PartyPersonTreeLine" location="component://humanres/widget/CommonScreens.xml"/> </node> </tree> -</trees> \ No newline at end of file +</trees> Modified: ofbiz/branches/jquery/applications/humanres/widget/PayGradeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PayGradeScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PayGradeScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PayGradeScreens.xml Wed Aug 11 13:22:40 2010 @@ -115,4 +115,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PerfReviewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PerfReviewScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PerfReviewScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PerfReviewScreens.xml Wed Aug 11 13:22:40 2010 @@ -96,4 +96,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml Wed Aug 11 13:22:40 2010 @@ -280,4 +280,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/EmplLeaveForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/EmplLeaveForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/EmplLeaveForms.xml Wed Aug 11 13:22:40 2010 @@ -180,4 +180,4 @@ <field name="leaveStatus" use-when="leaveApp!=null&&leaveApp.getString("leaveStatus").equals("LEAVE_REJECTED")"><display></display></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/EmplPositionForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/EmplPositionForms.xml Wed Aug 11 13:22:40 2010 @@ -329,4 +329,4 @@ under the License. <auto-fields-service service-name="updateEmplPositionReportingStruct" default-field-type="display"/> <field name="emplPositionIdReportingTo"><hidden/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/EmploymentForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/EmploymentForms.xml Wed Aug 11 13:22:40 2010 @@ -445,4 +445,4 @@ <field name="thruDate"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PartyAbilityForms.xml Wed Aug 11 13:22:40 2010 @@ -22,4 +22,4 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="none"> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PartyQualForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PartyQualForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PartyQualForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PartyQualForms.xml Wed Aug 11 13:22:40 2010 @@ -133,4 +133,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PartyResumeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PartyResumeForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PartyResumeForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PartyResumeForms.xml Wed Aug 11 13:22:40 2010 @@ -71,4 +71,4 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="resumeId!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PartySkillForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PartySkillForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PartySkillForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PartySkillForms.xml Wed Aug 11 13:22:40 2010 @@ -80,4 +80,4 @@ under the License. <field name="skillLevel"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PayGradeForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PayGradeForms.xml Wed Aug 11 13:22:40 2010 @@ -84,4 +84,4 @@ <field name="payGradeId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PerfReviewForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PerfReviewForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PerfReviewForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PerfReviewForms.xml Wed Aug 11 13:22:40 2010 @@ -121,4 +121,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/humanres/widget/forms/PersonTrainingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/forms/PersonTrainingForms.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/forms/PersonTrainingForms.xml Wed Aug 11 13:22:40 2010 @@ -194,4 +194,4 @@ under the License. <field name="trainingRequestId" widget-style="buttontext"/> <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/manufacturing/data/ManufacturingScheduledServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/data/ManufacturingScheduledServices.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/data/ManufacturingScheduledServices.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/data/ManufacturingScheduledServices.xml Wed Aug 11 13:22:40 2010 @@ -62,4 +62,4 @@ under the License. </RuntimeData> <JobSandbox jobId="8401" jobName="Calculate product costs" runTime="2000-01-01 00:00:00.000" serviceName="calculateAllProductsCosts" runtimeDataId="8401" poolId="pool" runAsUser="system" recurrenceInfoId="301"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/manufacturing/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/entitydef/entitymodel.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/entitydef/entitymodel.xml Wed Aug 11 13:22:40 2010 @@ -99,8 +99,8 @@ under the License. </description> <field name="calendarId" type="id-ne"></field> <field name="exceptionDateStartTime" type="date-time"></field> - <field name="exceptionCapacity" type="floating-point"></field> - <field name="usedCapacity" type="floating-point"></field> + <field name="exceptionCapacity" type="fixed-point"></field> + <field name="usedCapacity" type="fixed-point"></field> <field name="description" type="description"></field> <prim-key field="calendarId"/> <prim-key field="exceptionDateStartTime"/> Modified: ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml Wed Aug 11 13:22:40 2010 @@ -1024,4 +1024,4 @@ under the License. </assert> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml Wed Aug 11 13:22:40 2010 @@ -44,50 +44,22 @@ under the License. <attribute name="calendarId" type="String" mode="IN" optional="false"/> </service> - <service name="createCalendarWeek" engine="simple" + <service name="createCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek" location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendarWeek"> <description>Create a Calendar Week</description> - <attribute name="calendarWeekId" type="String" mode="IN" optional="false"/> - <attribute name="description" type="String" mode="IN" optional="true"/> - <attribute name="mondayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="mondayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="tuesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="tuesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="wednesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="wednesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="thursdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="thursdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="fridayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="fridayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="saturdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="saturdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="sundayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="sundayCapacity" type="BigDecimal" mode="IN" optional="true"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateCalendarWeek" engine="simple" + <service name="updateCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek" location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarWeek"> <description>Update a Calendar Week</description> - <attribute name="calendarWeekId" type="String" mode="IN" optional="false"/> - <attribute name="description" type="String" mode="IN" optional="true"/> - <attribute name="mondayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="mondayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="tuesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="tuesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="wednesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="wednesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="thursdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="thursdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="fridayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="fridayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="saturdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="saturdayCapacity" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="sundayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="sundayCapacity" type="BigDecimal" mode="IN" optional="true"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeCalendarWeek" engine="simple" + <service name="removeCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek" location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarWeek"> <description>Remove a Calendar Week</description> - <attribute name="calendarWeekId" type="String" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="createCalendarExceptionDay" engine="simple" Modified: ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java (original) +++ ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java Wed Aug 11 13:22:40 2010 @@ -21,25 +21,23 @@ package org.ofbiz.manufacturing.jobshopm import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Collection; -import java.util.List; import java.util.Map; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javolution.util.FastMap; + import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericPK; -import org.ofbiz.service.GenericServiceException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; - -import javolution.util.FastMap; +import org.ofbiz.service.ServiceUtil; public class ProductionRunEvents { @@ -91,6 +89,10 @@ public class ProductionRunEvents { inputMap.put("lotId", parameters.get("lotId")); inputMap.put("userLogin", userLogin); Map result = dispatcher.runSync("productionRunDeclareAndProduce", inputMap); + if (ServiceUtil.isError(result)) { + request.setAttribute("_ERROR_MESSAGE_", ServiceUtil.getErrorMessage(result)); + return "error"; + } } catch (GenericServiceException e) { String errMsg = "Error issuing materials: " + e.toString(); Debug.logError(e, errMsg, module); Modified: ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Wed Aug 11 13:22:40 2010 @@ -40,13 +40,13 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.common.CommonWorkers; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.util.EntityTypeUtil; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.manufacturing.bom.BOMTree; import org.ofbiz.manufacturing.bom.BOMNode; @@ -2958,7 +2958,7 @@ public class ProductionRunServices { if (product == null) { return ServiceUtil.returnError("Error: product with id [" + inventoryItem.get("productId") + "] not found."); } - if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG_AUTO")) { + if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG_AUTO")) { Map serviceContext = UtilMisc.toMap("inventoryItemId", inventoryItemId, "userLogin", userLogin); /* Modified: ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Wed Aug 11 13:22:40 2010 @@ -21,12 +21,11 @@ package org.ofbiz.manufacturing.mrp; import java.math.BigDecimal; import java.sql.Timestamp; -import com.ibm.icu.util.Calendar; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.ArrayList; import java.util.ListIterator; import java.util.Map; import java.util.Set; @@ -39,8 +38,6 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.condition.EntityConditionList; -import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityFieldMap; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityUtil; @@ -52,6 +49,8 @@ import org.ofbiz.service.LocalDispatcher import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceUtil; +import com.ibm.icu.util.Calendar; + /** * Services for running MRP * Modified: ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java (original) +++ ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java Wed Aug 11 13:22:40 2010 @@ -21,9 +21,9 @@ package org.ofbiz.manufacturing.mrp; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; import java.util.ListIterator; import java.util.Map; @@ -40,8 +40,6 @@ import org.ofbiz.service.DispatchContext import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.manufacturing.bom.BOMTree; - /** * Proposed Order Object generated by the MRP process or other re-Order process * Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy Wed Aug 11 13:22:40 2010 @@ -55,4 +55,4 @@ if (!parameters.productId && !parameters fieldToSelect = UtilMisc.toSet("productId","internalName","productAssocTypeId"); bomListIterator = delegator.find("ProductAndAssoc", cond, null, fieldToSelect, null, findOpts); } -context.ListProductBom = bomListIterator; \ No newline at end of file +context.ListProductBom = bomListIterator; Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Wed Aug 11 13:22:40 2010 @@ -152,7 +152,8 @@ if (productionRunId) { !issueTaskId && !completeTaskId && ("PRUN_CREATED".equals(task.currentStatusId) || - "PRUN_SCHEDULED".equals(task.currentStatusId))) { + "PRUN_SCHEDULED".equals(task.currentStatusId) || + "PRUN_DOC_PRINTED".equals(task.currentStatusId))) { startTaskId = task.workEffortId; } } Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy Wed Aug 11 13:22:40 2010 @@ -17,6 +17,7 @@ * under the License. */ +import org.ofbiz.base.util.ObjectType; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.condition.EntityCondition; Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy Wed Aug 11 13:22:40 2010 @@ -76,4 +76,4 @@ if (allProductionRuns) { productionRuns.add(productionRunMap); } } -context.productionRuns = productionRuns; \ No newline at end of file +context.productionRuns = productionRuns; Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy Wed Aug 11 13:22:40 2010 @@ -42,4 +42,4 @@ if (!calendarData) { context.calendarData = calendarData; allCalendarWeek = delegator.findList("TechDataCalendarWeek", null, null, null, null, false); -context.calendarWeeks = allCalendarWeek; \ No newline at end of file +context.calendarWeeks = allCalendarWeek; Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Wed Aug 11 13:22:40 2010 @@ -53,7 +53,7 @@ context.listCalendarExceptionWeekWrapper context.addCalendarExceptionWeekWrapper = addCalendarExceptionWeekWrapper; exceptionDateStart = parameters.exceptionDateStart ?: request.getAttribute("exceptionDateStart"); -exceptionDateStart = ObjectType.simpleTypeConvert(exceptionDateStart, "Timestamp", null, null); +exceptionDateStart = ObjectType.simpleTypeConvert(exceptionDateStart, "java.sql.Date", null, null); if (exceptionDateStart) { calendarExceptionWeek = delegator.findByPrimaryKey("TechDataCalendarExcWeek", [calendarId : calendarId , exceptionDateStart : exceptionDateStart]); @@ -63,4 +63,4 @@ if (exceptionDateStart) { context.calendarExceptionWeek = calendarExceptionWeek; context.updateCalendarExceptionWeekWrapper = updateCalendarExceptionWeekWrapper; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Wed Aug 11 13:22:40 2010 @@ -134,6 +134,13 @@ under the License. </form> <form name="ListProductionRunInventoryItems" type="list" title="" list-name="inventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <row-actions> + <entity-condition entity-name="InventoryItemDetail" list="inventoryItemDetails"> + <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItemId"/> + <order-by field-name="inventoryItemDetailSeqId"/> + </entity-condition> + <set field="quantityOnHandDiff" from-field="inventoryItemDetails[0].quantityOnHandDiff"/> + </row-actions> <field name="inventoryItemId" widget-style="buttontext"> <hyperlink target="/facility/control/EditInventoryItem" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"> <parameter param-name="inventoryItemId"/> @@ -141,6 +148,7 @@ under the License. </field> <field name="lotId" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${lotId} "/></field> <field name="unitCost" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${unitCost} "/></field> + <field name="quantity" entry-name="quantityOnHandDiff"><display/></field> <field name="creationDate" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${datetimeReceived}"/></field> </form> Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Wed Aug 11 13:22:40 2010 @@ -66,7 +66,6 @@ function lookupInventory() { <span> <@htmlTemplate.lookupField value='${requestParameters.productId?if_exists}' formName="lookupinventory" name="productId" id="productId" fieldFormName="LookupProduct"/> </span> - <input type='text' size='25' readonly="readonly" name='productId_description' value=''/>${uiLabelMap.CommonDescription} </td> </tr> <tr> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/BomForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/BomForms.xml Wed Aug 11 13:22:40 2010 @@ -168,4 +168,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CalendarForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CalendarForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CalendarForms.xml Wed Aug 11 13:22:40 2010 @@ -175,4 +175,4 @@ under the License. <field name="sundayCapacity" position="2"><text/></field> <field name="submitButton"><submit button-type="button"/></field> </form> - </forms> \ No newline at end of file + </forms> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostForms.xml Wed Aug 11 13:22:40 2010 @@ -68,4 +68,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostScreens.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/CostScreens.xml Wed Aug 11 13:22:40 2010 @@ -47,4 +47,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml Wed Aug 11 13:22:40 2010 @@ -83,4 +83,4 @@ under the License. <field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><display/></field> <field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><display/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Wed Aug 11 13:22:40 2010 @@ -266,6 +266,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="ManufacturingProductionRun"/> + <set field="bodyFontSize" value="10pt"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -74,4 +74,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/MrpForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/MrpForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/MrpForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/MrpForms.xml Wed Aug 11 13:22:40 2010 @@ -75,4 +75,4 @@ under the License. <field name="recurrenceInfoId"><hidden/></field> <field name="serviceName"><hidden/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original) +++ ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Wed Aug 11 13:22:40 2010 @@ -390,4 +390,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/marketing/config/sfa.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/config/sfa.properties?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/config/sfa.properties (original) +++ ofbiz/branches/jquery/applications/marketing/config/sfa.properties Wed Aug 11 13:22:40 2010 @@ -18,4 +18,4 @@ ############################################################################### # if the save.outgoing.directory is specified the file will be saved there else it will be saved under OFBIZ_HOME -#save.outgoing.directory= \ No newline at end of file +#save.outgoing.directory= Modified: ofbiz/branches/jquery/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/servicedef/services.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/servicedef/services.xml (original) +++ ofbiz/branches/jquery/applications/marketing/servicedef/services.xml Wed Aug 11 13:22:40 2010 @@ -498,4 +498,4 @@ under the License. <attribute name="partyId" type="String" mode="IN" optional="false"/> </service> -</services> \ No newline at end of file +</services> Modified: ofbiz/branches/jquery/applications/marketing/servicedef/services_opportunity.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/servicedef/services_opportunity.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/servicedef/services_opportunity.xml (original) +++ ofbiz/branches/jquery/applications/marketing/servicedef/services_opportunity.xml Wed Aug 11 13:22:40 2010 @@ -119,4 +119,4 @@ under the License. </service> -</services> \ No newline at end of file +</services> Modified: ofbiz/branches/jquery/applications/marketing/testdef/MarketingTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/testdef/MarketingTests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/testdef/MarketingTests.xml (original) +++ ofbiz/branches/jquery/applications/marketing/testdef/MarketingTests.xml Wed Aug 11 13:22:40 2010 @@ -24,4 +24,4 @@ <test-case case-name="marketing-tests"> <simple-method-test location="component://marketing/script/org/ofbiz/marketing/test/MarketingTests.xml"/> </test-case> -</test-suite> \ No newline at end of file +</test-suite> Modified: ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy Wed Aug 11 13:22:40 2010 @@ -45,4 +45,4 @@ conditionList.add(EntityCondition.makeCo conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); commStatausList = delegator.findList("CommunicationEventAndRole", conditions, null, null, null, false); -context.commStatausList = commStatausList; \ No newline at end of file +context.commStatausList = commStatausList; Modified: ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy Wed Aug 11 13:22:40 2010 @@ -52,4 +52,4 @@ orders = delegator.findList("MarketingCa //use this helper to build a List of visits, orders, order totals, and conversion rates marketingCampaignVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "marketingCampaignId"); -context.marketingCampaignVisitAndOrders = marketingCampaignVisitAndOrders; \ No newline at end of file +context.marketingCampaignVisitAndOrders = marketingCampaignVisitAndOrders; Modified: ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy Wed Aug 11 13:22:40 2010 @@ -38,4 +38,4 @@ if (statusId) { } conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); partyStatusLists = delegator.findList("ContactListPartyStatus", conditions, null, null, null, false); -context.partyStatusLists = partyStatusLists; \ No newline at end of file +context.partyStatusLists = partyStatusLists; Modified: ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy Wed Aug 11 13:22:40 2010 @@ -51,4 +51,4 @@ orders = delegator.findList("TrackingCod // use this helper to build a List of visits, orders, order totals, and conversion rates trackingCodeVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "trackingCodeId"); -context.trackingCodeVisitAndOrders = trackingCodeVisitAndOrders; \ No newline at end of file +context.trackingCodeVisitAndOrders = trackingCodeVisitAndOrders; Modified: ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/sfa/WEB-INF/controller.xml Wed Aug 11 13:22:40 2010 @@ -186,7 +186,9 @@ under the License. <request-map uri="quickAddContact"> <security https="true" auth="true"/> <event type="service" invoke="createContact"/> - <response name="success" type="request" value="viewprofile"/> + <response name="success" type="request-redirect" value="viewprofile"> + <redirect-parameter name="partyId"/> + </response> </request-map> <!-- Forecast Requests --> @@ -299,4 +301,4 @@ under the License. <view-map name="LookupAccountLeads" type="screen" page="component://marketing/widget/sfa/LookupScreens.xml#LookupAccountLeads"/> <!-- end of view mappings --> -</site-conf> \ No newline at end of file +</site-conf> Modified: ofbiz/branches/jquery/applications/marketing/widget/DataSourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/DataSourceForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/DataSourceForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/DataSourceForms.xml Wed Aug 11 13:22:40 2010 @@ -157,4 +157,4 @@ under the License. </field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/marketing/widget/DataSourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/DataSourceScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/DataSourceScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/DataSourceScreens.xml Wed Aug 11 13:22:40 2010 @@ -196,4 +196,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/LookupForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -100,4 +100,4 @@ under the License. <hyperlink also-hidden="false" target-type="plain" description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/marketing/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -71,4 +71,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/MarketingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/MarketingMenus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/MarketingMenus.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/MarketingMenus.xml Wed Aug 11 13:22:40 2010 @@ -26,4 +26,4 @@ under the License. <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}"><link target="FindContactLists"/></menu-item> <menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link target="MarketingReport"/></menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/marketing/widget/MarketingReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/MarketingReportScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/MarketingReportScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/MarketingReportScreens.xml Wed Aug 11 13:22:40 2010 @@ -166,4 +166,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/ReportForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/ReportForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/ReportForms.xml Wed Aug 11 13:22:40 2010 @@ -183,4 +183,4 @@ under the License. <field name="statusDate" title="${uiLabelMap.CommonStatus} ${uiLabelMap.CommonDate}"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display description="${statusItem.description}"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/marketing/widget/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/SegmentForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/SegmentForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/SegmentForms.xml Wed Aug 11 13:22:40 2010 @@ -175,4 +175,4 @@ under the License. </hyperlink> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/marketing/widget/SegmentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/SegmentMenus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/SegmentMenus.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/SegmentMenus.xml Wed Aug 11 13:22:40 2010 @@ -42,4 +42,4 @@ under the License. </link> </menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/SegmentScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/SegmentScreens.xml Wed Aug 11 13:22:40 2010 @@ -268,4 +268,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/TrackingCodeMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/TrackingCodeMenus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/TrackingCodeMenus.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/TrackingCodeMenus.xml Wed Aug 11 13:22:40 2010 @@ -48,4 +48,4 @@ under the License. <link target="FindTrackingCodeType"/> </menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml Wed Aug 11 13:22:40 2010 @@ -197,4 +197,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/EventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/EventScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/EventScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/EventScreens.xml Wed Aug 11 13:22:40 2010 @@ -77,4 +77,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/ForecastScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/ForecastScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/ForecastScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/ForecastScreens.xml Wed Aug 11 13:22:40 2010 @@ -143,4 +143,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/LeadScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/LeadScreens.xml Wed Aug 11 13:22:40 2010 @@ -228,4 +228,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -97,4 +97,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/OpportunityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/OpportunityScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/OpportunityScreens.xml Wed Aug 11 13:22:40 2010 @@ -117,4 +117,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/AccountForms.xml Wed Aug 11 13:22:40 2010 @@ -258,4 +258,4 @@ under the License. </service> </actions> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/ForecastForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/ForecastForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/forms/ForecastForms.xml Wed Aug 11 13:22:40 2010 @@ -131,4 +131,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |